Update to 2.14.0:

Mars 13, 2006: Overview of changes in 2.14.0
============================================
* Updated translations.

February 27, 2006: Overview of changes in 2.13.92
=================================================
* Fixed proc_state documentation.
* Updated mountlist ignore list.

January 23, 2006: Overview of changes in 2.13.3
===============================================
* linux:
	- fixe get_procmap for linux < 2.6.14.

January 2, 2006: Overview of changes in 2.13.2
==============================================
* Fixed libtool versioning (James Henstridge)

December 15, 2005: Overview of changes in 2.13.1
================================================
* linux:
    - fixed proclist
    - implemented server->real_ncpu

December 13, 2005: Overview of changes in 2.13.0
================================================
* Requires automake-1.9 (James Henstridge)
* Supports up to 32 CPU
* Supports Linux smaps
* linux: fixed SMP detection

This release is not ABI compatible with previous releases. Sorry.
This commit is contained in:
jmmv 2006-03-30 21:09:48 +00:00
parent 6d4735616c
commit fc74d2d794
9 changed files with 86 additions and 70 deletions

View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.33 2006/03/30 03:44:44 jlam Exp $
# $NetBSD: Makefile,v 1.34 2006/03/30 21:09:48 jmmv Exp $
DISTNAME= libgtop-2.12.2
DISTNAME= libgtop-2.14.0
PKGNAME= ${DISTNAME:S/-/2-/}
PKGREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.12/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.11 2006/03/30 03:44:44 jlam Exp $
@comment $NetBSD: PLIST,v 1.12 2006/03/30 21:09:48 jmmv Exp $
bin/libgtop_daemon2
${LIBGTOP_SERVER}bin/libgtop_server2
include/libgtop-2.0/glibtop.h
@ -106,6 +106,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop-2.0.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgtop-2.0.mo

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:55 joerg Exp $
# $NetBSD: buildlink3.mk,v 1.8 2006/03/30 21:09:48 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGTOP2_BUILDLINK3_MK:= ${LIBGTOP2_BUILDLINK3_MK}+
@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtop2}
BUILDLINK_PACKAGES+= libgtop2
.if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.12.0
BUILDLINK_RECOMMENDED.libgtop2?= libgtop2>=2.12.0nb3
BUILDLINK_DEPENDS.libgtop2+= libgtop2>=2.14.0
BUILDLINK_PKGSRCDIR.libgtop2?= ../../sysutils/libgtop2
.endif # LIBGTOP2_BUILDLINK3_MK

View file

@ -1,16 +1,16 @@
$NetBSD: distinfo,v 1.20 2006/03/08 15:52:54 joerg Exp $
$NetBSD: distinfo,v 1.21 2006/03/30 21:09:48 jmmv Exp $
SHA1 (libgtop-2.12.2.tar.bz2) = b8dc4c1abf3771ea3a088c1216530bb66b002242
RMD160 (libgtop-2.12.2.tar.bz2) = b58186960bd1bca014b3e886105dd22f8c8add4d
Size (libgtop-2.12.2.tar.bz2) = 623479 bytes
SHA1 (patch-aa) = 7cbe7cc09051bf26f825529d8d5bca7e53f807ad
SHA1 (libgtop-2.14.0.tar.bz2) = a396a72c415c678efb94ad3cdc9a2543d543c248
RMD160 (libgtop-2.14.0.tar.bz2) = f6622a5e8b27e18fde9b5a728f18371afe95858a
Size (libgtop-2.14.0.tar.bz2) = 659522 bytes
SHA1 (patch-aa) = db6132ff556d1a20e24a817bb6d8ba247f202659
SHA1 (patch-ab) = 9d5735babbc4cbc4aeb7d55762cd6cc63f46ca9b
SHA1 (patch-ac) = c645307376eddb5c469ab00bd7ec8217feb3e2d5
SHA1 (patch-ad) = c693dda2eef870d625d78da8f4e977613358314e
SHA1 (patch-ae) = 035419a4e8a505c672f727c843dbd977acd8ce35
SHA1 (patch-af) = 520dbdec4a8cba6e82b08c169d97c3caebacd419
SHA1 (patch-ag) = 74d20bdc56224ae553935cc81ce47504e98701fe
SHA1 (patch-ah) = 496c67e6de00ec105cf292f5e44a244b852db51b
SHA1 (patch-ah) = 57d112d551149190a6b9c24074427457f8591691
SHA1 (patch-ai) = 57d891785a45ec532757a48e77adafec091f3953
SHA1 (patch-aj) = c244b5c60e61594c3d2c0bc95e05e12ad68938db
SHA1 (patch-ak) = 0a29c6b7daf1ae34b528dbb2535d05009ad61b84
@ -19,12 +19,13 @@ SHA1 (patch-am) = 2e10fd8096449ebc3428ef493e1ae4fe61a98e00
SHA1 (patch-an) = 57a79bddc3f0e8237b72486aa8f8906f318ca38d
SHA1 (patch-ao) = 72aa455cbc10afc6a744fd0684ec2d7a2e2c19c7
SHA1 (patch-ap) = 1b842a59b821b2703b68935f59a65ffb6db3a68f
SHA1 (patch-aq) = ca24cc64eaa6a27f7d140b2999edf5f0b524140f
SHA1 (patch-ba) = ebe5f9a5148ff72ae978934b259e63ce15f2d4c8
SHA1 (patch-bb) = 2e98f16668f74b64848f54db57037289623ed3f2
SHA1 (patch-bc) = a48255606b5c340a20d01cc7f4e2c1e821d9d629
SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
SHA1 (patch-be) = ba1b688ea04f41a88b5d65b8af90927843619c0f
SHA1 (patch-bf) = 1cf732d7ad22fbf34aa3511e77d17cacedbc810f
SHA1 (patch-bg) = 330de57b732550a92b4e077ad8e850acf7e0e24d
SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
SHA1 (patch-bj) = 48c46dec8d1f8ed35e452b66f3a5283a6a8f521f
SHA1 (patch-bj) = f0d1a877f7aab9d1c191cd24172d39a032ead5f2

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
$NetBSD: patch-aa,v 1.6 2006/03/30 21:09:48 jmmv Exp $
--- configure.orig 2005-11-29 11:49:14.000000000 +0100
--- configure.orig 2006-03-13 10:04:55.000000000 +0100
+++ configure
@@ -20691,17 +20691,17 @@ echo $ECHO_N "checking for libgtop sysde
@@ -20242,17 +20242,17 @@ echo $ECHO_N "checking for libgtop sysde
libgtop_have_sysinfo=yes
libgtop_need_server=no
;;
@ -21,9 +21,9 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
- libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+ libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server'
;;
aix*)
aix*)
libgtop_sysdeps_dir=aix
@@ -20749,7 +20749,7 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
@@ -20300,7 +20300,7 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
case "$host_os" in
@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
for ac_header in net/if_var.h
do
@@ -20921,7 +20921,9 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -20472,7 +20472,9 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <net/netisr.h>
#include <net/route.h>
@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>
@@ -20995,7 +20997,9 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -20547,7 +20549,9 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <net/netisr.h>
#include <net/route.h>
@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>
@@ -24343,6 +24347,146 @@ fi
@@ -23902,6 +23906,146 @@ fi
esac
@ -201,7 +201,7 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6
if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
@@ -30043,7 +30187,7 @@ if test x$cross_compiling = xyes ; then
@@ -29624,7 +29768,7 @@ if test x$cross_compiling = xyes ; then
sunos*)
fu_cv_sys_stat_statfs4=yes
;;
@ -210,7 +210,7 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
fu_cv_sys_stat_statfs2_bsize=yes
;;
osf*)
@@ -30688,7 +30832,7 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -30275,7 +30419,7 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@ -219,7 +219,7 @@ $NetBSD: patch-aa,v 1.5 2006/03/08 15:52:54 joerg Exp $
ok=yes
fi
rm -f conftest*
@@ -32094,6 +32240,7 @@ s,@ECHO_C@,$ECHO_C,;t t
@@ -31803,6 +31947,7 @@ s,@ECHO_C@,$ECHO_C,;t t
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t

View file

@ -1,10 +1,10 @@
$NetBSD: patch-ah,v 1.1 2006/02/28 23:48:12 joerg Exp $
$NetBSD: patch-ah,v 1.2 2006/03/30 21:09:48 jmmv Exp $
--- sysdeps/freebsd/open.c.orig 2006-02-24 17:02:00.000000000 +0000
--- sysdeps/freebsd/open.c.orig 2005-12-12 11:09:39.000000000 +0100
+++ sysdeps/freebsd/open.c
@@ -22,6 +22,7 @@
*/
@@ -23,6 +23,7 @@
#include <config.h>
#include <glibtop.h>
+#include <glibtop/error.h>
#include <glibtop/open.h>

View file

@ -0,0 +1,13 @@
$NetBSD: patch-aq,v 1.1 2006/03/30 21:09:48 jmmv Exp $
--- sysdeps/freebsd/msg_limits.c.orig 2005-12-12 11:09:39.000000000 +0100
+++ sysdeps/freebsd/msg_limits.c
@@ -49,7 +49,7 @@ glibtop_get_msg_limits_p (glibtop *serve
#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__)
#define KERNEL 1
-#else
+#elif !defined(__NetBSD__)
#define _KERNEL 1
#endif

View file

@ -1,18 +1,18 @@
$NetBSD: patch-bc,v 1.1 2005/10/12 21:49:39 jmmv Exp $
$NetBSD: patch-bc,v 1.2 2006/03/30 21:09:48 jmmv Exp $
From FreeBSD's GNOME development repository.
--- src/daemon/io.c.orig Mon Apr 11 03:30:12 2005
+++ src/daemon/io.c Mon Apr 11 03:33:22 2005
@@ -21,6 +21,7 @@
Boston, MA 02111-1307, USA.
--- src/daemon/io.c.orig 2005-12-12 11:09:38.000000000 +0100
+++ src/daemon/io.c
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include "daemon.h"
#include <glibtop/error.h>
@@ -36,9 +37,13 @@
@@ -37,9 +38,13 @@ do_output (int s, glibtop_response *resp
resp->offset = offset;
resp->data_size = data_size;
@ -27,7 +27,7 @@ From FreeBSD's GNOME development repository.
} else {
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
glibtop_warn_io ("send");
@@ -49,9 +54,13 @@
@@ -50,9 +55,13 @@ do_output (int s, glibtop_response *resp
fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
#endif
@ -42,7 +42,7 @@ From FreeBSD's GNOME development repository.
} else {
if (send (s, data, resp->data_size, 0) , 0)
glibtop_warn_io ("send");
@@ -67,6 +76,7 @@
@@ -68,6 +77,7 @@ do_read (int s, void *ptr, size_t total_
size_t already_read = 0, remaining = total_size;
while (already_read < total_size) {
@ -50,7 +50,7 @@ From FreeBSD's GNOME development repository.
if (s)
nread = recv (s, ptr, remaining, 0);
else
@@ -78,6 +88,8 @@
@@ -79,6 +89,8 @@ do_read (int s, void *ptr, size_t total_
}
if (nread <= 0) {

View file

@ -1,39 +1,42 @@
$NetBSD: patch-bj,v 1.1 2005/10/12 21:49:39 jmmv Exp $
$NetBSD: patch-bj,v 1.2 2006/03/30 21:09:48 jmmv Exp $
From FreeBSD's GNOME development repository.
--- sysdeps/freebsd/Makefile.in.orig 2005-09-05 00:32:25.000000000 +0200
--- sysdeps/freebsd/Makefile.in.orig 2006-03-13 10:04:48.000000000 +0100
+++ sysdeps/freebsd/Makefile.in
@@ -143,11 +143,11 @@ INCLUDES = @INCLUDES@
@@ -50,15 +50,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libgtop_sysdeps_2_0_la_LIBADD =
-am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
+libgtop_sysdeps_2_0_la_LIBADD = @KVM_LIBS@
+am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo netlist.lo
libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
-libgtop_sysdeps_suid_2_0_la_LIBADD =
+libgtop_sysdeps_suid_2_0_la_LIBADD = @KVM_LIBS@
am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo \
mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo \
msg_limits.lo sem_limits.lo proclist.lo procstate.lo \
procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \
- procsegment.lo procargs.lo procmap.lo netlist.lo netload.lo \
+ procsegment.lo procargs.lo procmap.lo netload.lo \
ppp.lo procopenfiles.lo fsusage.lo
libgtop_sysdeps_suid_2_0_la_OBJECTS = \
$(am_libgtop_sysdeps_suid_2_0_la_OBJECTS)
@@ -256,13 +256,13 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c
+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c netlist.c
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c
+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c
libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
uptime.c loadavg.c shm_limits.c msg_limits.c \
sem_limits.c proclist.c procstate.c procuid.c \
proctime.c procmem.c procsignal.c prockernel.c \
- procsegment.c procargs.c procmap.c netlist.c \
+ procsegment.c procargs.c procmap.c \
netload.c ppp.c procopenfiles.c fsusage.c
libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
@@ -170,14 +170,14 @@ X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-libgtop_sysdeps_2_0_la_LIBADD =
-libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
-libgtop_sysdeps_suid_2_0_la_LIBADD =
+libgtop_sysdeps_2_0_la_LIBADD = @KVM_LIBS@
+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo
+libgtop_sysdeps_suid_2_0_la_LIBADD = @KVM_LIBS@
libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \
swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \
-netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo
+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)