Thu Apr 28 22:18:58 2016 UTC ()
Fix SunOS cpu and network interface detection.  Bump PKGREVISION.


(jperkin)
diff -r1.51 -r1.52 pkgsrc/sysutils/libgtop/Makefile
diff -r1.31 -r1.32 pkgsrc/sysutils/libgtop/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_netlist.c
diff -r0 -r1.1 pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_netload.c
diff -r1.1 -r1.2 pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c
cvs diff -r1.51 -r1.52 pkgsrc/sysutils/libgtop/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/Makefile 2016/04/07 11:54:57 1.51
+++ pkgsrc/sysutils/libgtop/Makefile 2016/04/28 22:18:58 1.52
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.51 2016/04/07 11:54:57 youri Exp $ 1# $NetBSD: Makefile,v 1.52 2016/04/28 22:18:58 jperkin Exp $
2 2
3DISTNAME= libgtop-2.28.4 3DISTNAME= libgtop-2.28.4
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= sysutils gnome 5CATEGORIES= sysutils gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.28/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.28/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= Library to retrieve system information, used in GNOME2 11COMMENT= Library to retrieve system information, used in GNOME2
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14OSVERSION_SPECIFIC= YES 14OSVERSION_SPECIFIC= YES
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17CONFIG_SHELL= bash 17CONFIG_SHELL= bash
cvs diff -r1.31 -r1.32 pkgsrc/sysutils/libgtop/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/distinfo 2016/04/07 11:54:57 1.31
+++ pkgsrc/sysutils/libgtop/distinfo 2016/04/28 22:18:58 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.31 2016/04/07 11:54:57 youri Exp $ 1$NetBSD: distinfo,v 1.32 2016/04/28 22:18:58 jperkin Exp $
2 2
3SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7 3SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7
4RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b 4RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b
5SHA512 (libgtop-2.28.4.tar.bz2) = 3bfb844eb09e4afed1f15f2d948fe09bf2080be52f3914a35aebd026cc61576de16d5b3beebe293bb1141a1a4aee23a474fba0f2322ea861368940880aeafe1c 5SHA512 (libgtop-2.28.4.tar.bz2) = 3bfb844eb09e4afed1f15f2d948fe09bf2080be52f3914a35aebd026cc61576de16d5b3beebe293bb1141a1a4aee23a474fba0f2322ea861368940880aeafe1c
6Size (libgtop-2.28.4.tar.bz2) = 819576 bytes 6Size (libgtop-2.28.4.tar.bz2) = 819576 bytes
7SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc 7SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc
8SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161 8SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161
9SHA1 (patch-ac) = dc45ad98e21de821b4b23008cd0020c47064c9eb 9SHA1 (patch-ac) = dc45ad98e21de821b4b23008cd0020c47064c9eb
10SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e 10SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e
11SHA1 (patch-ae) = 6e8386473dde21f316f867b5212d8c3324abb747 11SHA1 (patch-ae) = 6e8386473dde21f316f867b5212d8c3324abb747
12SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf 12SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf
13SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1 13SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1
14SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422 14SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422
@@ -33,14 +33,16 @@ SHA1 (patch-dg) = b10933f50a1561d211afb6 @@ -33,14 +33,16 @@ SHA1 (patch-dg) = b10933f50a1561d211afb6
33SHA1 (patch-dh) = 1c07bccae7a69974e4ab38ffc9ee74b3f10c4ba4 33SHA1 (patch-dh) = 1c07bccae7a69974e4ab38ffc9ee74b3f10c4ba4
34SHA1 (patch-di) = 95a8566cc319f6f00510135902f921e3e0686ad4 34SHA1 (patch-di) = 95a8566cc319f6f00510135902f921e3e0686ad4
35SHA1 (patch-dj) = 8389a0c6ca45e509022aa6bdbba51800bb57c4db 35SHA1 (patch-dj) = 8389a0c6ca45e509022aa6bdbba51800bb57c4db
36SHA1 (patch-dk) = c95e5aa709dff7685af03f19e830d15fd17c0315 36SHA1 (patch-dk) = c95e5aa709dff7685af03f19e830d15fd17c0315
37SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a 37SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
38SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50 38SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
39SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb 39SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
40SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c 40SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c
41SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2 41SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2
42SHA1 (patch-sysdeps_darwin_glibtop__suid.h) = 1887511f74e27c7ed628ae37d5eec173db71ee81 42SHA1 (patch-sysdeps_darwin_glibtop__suid.h) = 1887511f74e27c7ed628ae37d5eec173db71ee81
43SHA1 (patch-sysdeps_darwin_proclist.c) = ee8e4df9376f4516787ae2e25453de6d871357d2 43SHA1 (patch-sysdeps_darwin_proclist.c) = ee8e4df9376f4516787ae2e25453de6d871357d2
44SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8 44SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
45SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726 45SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
46SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5 46SHA1 (patch-sysdeps_solaris_netlist.c) = f26cfcee588fc40ad550bcd219d9538d20095e62
 47SHA1 (patch-sysdeps_solaris_netload.c) = e4ba72bf3855621eab0c05918da2094165f158cb
 48SHA1 (patch-sysdeps_solaris_procopenfiles.c) = efd621e3e9e45ba65e7f2b1f7c94ffdb79b6d199
File Added: pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_netlist.c
$NetBSD: patch-sysdeps_solaris_netlist.c,v 1.1 2016/04/28 22:18:58 jperkin Exp $

Find correct network interfaces.

--- sysdeps/solaris/netlist.c.orig	2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/solaris/netlist.c
@@ -57,7 +57,7 @@ glibtop_get_netlist_s (glibtop *server,
 	
 	for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next)
 	{
-		if (strcmp(ksp->ks_class, "net") != 0)
+		if (strcmp(ksp->ks_module, "link") != 0)
 			continue;
 
 		g_ptr_array_add(devices, g_strdup(ksp->ks_name));
File Added: pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_netload.c
$NetBSD: patch-sysdeps_solaris_netload.c,v 1.1 2016/04/28 22:18:58 jperkin Exp $

Find correct network interfaces.

--- sysdeps/solaris/netload.c.orig	2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/solaris/netload.c
@@ -105,7 +105,7 @@ solaris_stats(glibtop *server,
 	/*
 	 *  chop off the trailing interface
 	 */
-	module = strdup( name );
+	module = strdup( "link" );
 	ptr = module + strlen( module ) - 1;
 	while( (ptr > module) && isdigit( (int) *ptr ) ) {
 		*ptr = '\0';
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c 2013/02/26 15:54:16 1.1
+++ pkgsrc/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c 2016/04/28 22:18:58 1.2
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-sysdeps_solaris_procopenfiles.c,v 1.1 2013/02/26 15:54:16 jperkin Exp $ 1$NetBSD: patch-sysdeps_solaris_procopenfiles.c,v 1.2 2016/04/28 22:18:58 jperkin Exp $
2 2
3Implement stub functions for Solaris to at least get the package to 3Implement stub functions for Solaris to at least get the package to
4build. Help filling them out with actual data would be very welcome. 4build. Help filling them out with actual data would be very welcome.
5 5
6--- sysdeps/solaris/procopenfiles.c.orig 2011-06-01 15:40:47.000000000 +0000 6--- sysdeps/solaris/procopenfiles.c.orig 2011-06-01 15:40:47.000000000 +0000
7+++ sysdeps/solaris/procopenfiles.c 7+++ sysdeps/solaris/procopenfiles.c
8@@ -22,7 +22,10 @@ 8@@ -22,7 +22,10 @@
9 #include <config.h> 9 #include <config.h>
10 #include <glibtop.h> 10 #include <glibtop.h>
11 #include <glibtop/error.h> 11 #include <glibtop/error.h>
12+#include <glibtop/procaffinity.h> 12+#include <glibtop/procaffinity.h>
13 #include <glibtop/procopenfiles.h> 13 #include <glibtop/procopenfiles.h>
14+#include <glibtop/procwd.h> 14+#include <glibtop/procwd.h>
15+#include <glibtop/sysinfo.h> 15+#include <glibtop/sysinfo.h>
16 #include <sys/types.h> 16 #include <sys/types.h>
17 #include <fcntl.h> 17 #include <fcntl.h>
18 #include <sys/stat.h> 18 #include <sys/stat.h>
19@@ -126,3 +129,46 @@ glibtop_get_proc_open_files_s (glibtop * 19@@ -126,3 +129,67 @@ glibtop_get_proc_open_files_s (glibtop *
20  20
21 return (glibtop_open_files_entry*)g_array_free(entries, FALSE); 21 return (glibtop_open_files_entry*)g_array_free(entries, FALSE);
22 } 22 }
23+ 23+
24+/* 24+/*
25+ * Stub functions, currently unimplemented on Solaris 25+ * Stub functions, currently unimplemented on Solaris
26+ */ 26+ */
27+void 27+void
28+_glibtop_init_proc_wd_s (glibtop *server) 28+_glibtop_init_proc_wd_s (glibtop *server)
29+{ 29+{
30+ server->sysdeps.proc_wd = 30+ server->sysdeps.proc_wd =
31+ (1 << GLIBTOP_PROC_WD_EXE) | 31+ (1 << GLIBTOP_PROC_WD_EXE) |
32+ (1 << GLIBTOP_PROC_WD_ROOT) | 32+ (1 << GLIBTOP_PROC_WD_ROOT) |
@@ -43,23 +43,44 @@ build. Help filling them out with actua @@ -43,23 +43,44 @@ build. Help filling them out with actua
43+_glibtop_init_proc_affinity_s(glibtop *server) 43+_glibtop_init_proc_affinity_s(glibtop *server)
44+{ 44+{
45+ server->sysdeps.proc_affinity = 45+ server->sysdeps.proc_affinity =
46+ (1 << GLIBTOP_PROC_AFFINITY_NUMBER) | 46+ (1 << GLIBTOP_PROC_AFFINITY_NUMBER) |
47+ (1 << GLIBTOP_PROC_AFFINITY_ALL); 47+ (1 << GLIBTOP_PROC_AFFINITY_ALL);
48+} 48+}
49+guint16 * 49+guint16 *
50+glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid) 50+glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid)
51+{ 51+{
52+ memset(buf, 0, sizeof (glibtop_proc_affinity)); 52+ memset(buf, 0, sizeof (glibtop_proc_affinity));
53+ return NULL; 53+ return NULL;
54+} 54+}
55+ 55+
 56+static const unsigned long _glibtop_sysdeps_sysinfo =
 57+(1L << GLIBTOP_SYSINFO_CPUINFO);
 58+
56+static glibtop_sysinfo sysinfo = { .flags = 0 }; 59+static glibtop_sysinfo sysinfo = { .flags = 0 };
57+ 60+
 61+static void
 62+init_sysinfo (glibtop *server)
 63+{
 64+ guint ncpus = sysconf(_SC_NPROCESSORS_CONF);
 65+
 66+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
 67+
 68+ for (sysinfo.ncpu = 0;
 69+ sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus;
 70+ sysinfo.ncpu++) {
 71+ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
 72+ cpuinfo->labels = g_ptr_array_new ();
 73+ cpuinfo->values = g_hash_table_new_full(g_str_hash,
 74+ g_str_equal,
 75+ NULL, g_free);
 76+ }
 77+
 78+ sysinfo.flags = _glibtop_sysdeps_sysinfo;
 79+}
 80+
58+const glibtop_sysinfo * 81+const glibtop_sysinfo *
59+glibtop_get_sysinfo_s (glibtop *server) 82+glibtop_get_sysinfo_s (glibtop *server)
60+{ 83+{
61+ server->sysdeps.flags = 84+ init_sysinfo (server);
62+ (1L << GLIBTOP_SYSINFO_CPUINFO); 85+ return &sysinfo;
63+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); 
64+ return NULL; 
65+} 86+}