NetBSD Problem Report #49934
From www@NetBSD.org Sat May 30 17:15:32 2015
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 35976A5858
for <gnats-bugs@gnats.NetBSD.org>; Sat, 30 May 2015 17:15:32 +0000 (UTC)
Message-Id: <20150530171528.B4DA6A65BC@mollari.NetBSD.org>
Date: Sat, 30 May 2015 17:15:28 +0000 (UTC)
From: n54@gmx.com
Reply-To: n54@gmx.com
To: gnats-bugs@NetBSD.org
Subject: libgtop doesn't build after the sysvcompat modularization
X-Send-Pr-Version: www-1.0
>Number: 49934
>Category: pkg
>Synopsis: libgtop doesn't build after the sysvcompat modularization
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sat May 30 17:20:00 +0000 2015
>Closed-Date: Sat Jul 11 09:50:13 +0000 2015
>Last-Modified: Sat Jul 11 09:50:13 +0000 2015
>Originator: Kamil Rytarowski
>Release: pkgsrc-current, pkgsrc-wip, src-current
>Organization:
>Environment:
NetBSD chieftec 7.99.18 NetBSD 7.99.18 (GENERIC) #0: Sat May 30 14:51:33 UTC 2015 root@chieftec:/tmp/netbsd-tmp/sys/arch/amd64/compile/GENERIC amd64
>Description:
After the modularization of sysv compat layer it's not possible to build sysutils/gtop.
The reason is as follows:
- including <sys/sysctl.h> with _KERNEL undefined
- later including <sys/ipc.h> with _KERNEL defined
In the result:
void sysvipc50_set_compat_sysctl(int (*)(SYSCTLFN_PROTO));
The above code isn't buildable, as SYSCTLFN_PROTO is undefined.
>How-To-Repeat:
Get current
try to build sysutils/libgtop
>Fix:
I'm attaching a patch.
I'm also removing CONFLICTS with libgtop2 removed ~7 years ago.
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/sysutils/libgtop2/Attic/
mkpatches rediffed older patches I leave it as it is.
Index: Makefile
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile 29 May 2014 23:37:29 -0000 1.47
+++ Makefile 30 May 2015 16:51:54 -0000
@@ -25,8 +25,6 @@
CONFIGURE_ARGS+= --without-x
CONFIGURE_ENV+= LN_S="${LN} -s"
-CONFLICTS+= libgtop2-[0-9]*
-
post-patch:
${CP} ${FILESDIR}/procaffinity.c ${WRKSRC}/sysdeps/bsd/
Index: distinfo
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo 26 Feb 2013 15:54:16 -0000 1.28
+++ distinfo 30 May 2015 16:47:54 -0000
@@ -3,39 +3,41 @@
SHA1 (libgtop-2.28.4.tar.bz2) = b6f002cc80a61dc0908dd96e0b543113a46bc4b7
RMD160 (libgtop-2.28.4.tar.bz2) = 96ac76aa409bbd202bedacd94df14cd549e10d6b
Size (libgtop-2.28.4.tar.bz2) = 819576 bytes
-SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc
-SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161
-SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77
-SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e
-SHA1 (patch-ae) = 6e8386473dde21f316f867b5212d8c3324abb747
-SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf
-SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1
-SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422
-SHA1 (patch-al) = 8d69828a73fd8f87cef08786bc5c3cd864210da6
-SHA1 (patch-am) = e69e9fd4ea90d2bb467050b5b4e8490baa162ef7
-SHA1 (patch-an) = 169366e6dc034db05eb54d6abb1416889f17a8e2
-SHA1 (patch-ao) = f58a1bd19d63377b86478e72f23bd5a4cca5af76
+SHA1 (patch-aa) = 7c1e1fe329189152e1addd683a0a336d8c637493
+SHA1 (patch-ab) = 814bab015e4be25c3f4c6d098b3ae56837abcdd4
+SHA1 (patch-ac) = 8a2a7125bfaee12b790512bd7aef06dcb3895657
+SHA1 (patch-ad) = 3e5cc002775850287ee4f5300f8bc39d2d354d49
+SHA1 (patch-ae) = 430f13e581c1b7f1caf423d63509998673cff80a
+SHA1 (patch-ag) = 9bb523e40197a9a9634f67eaab95dbd3eea1a3af
+SHA1 (patch-ai) = aa8bc604b3495a94ddb32bf825ff7b08e759e2cd
+SHA1 (patch-aj) = 7962fc48dc99473ed0d84533505d7d33f6dbe5cc
+SHA1 (patch-al) = 0733f4752ccc70a06681db5428887e2754ca5eeb
+SHA1 (patch-am) = 74a4898b3d53288583534495613d093c03b90ce0
+SHA1 (patch-an) = 14adda1eae7f85fb696198eb299fa2e0ab4175b3
+SHA1 (patch-ao) = fe07ba5329f41f0b2a6135cb9bf6d025d9f6bc31
SHA1 (patch-aq) = 1d6f04fa2674f66a5702847c03f4740074b5dd24
-SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
-SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
-SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7
-SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec
-SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2
-SHA1 (patch-cd) = cf96896ddde9c830c1e808d8bf37b9fdb611ed24
+SHA1 (patch-bc) = d43ea32ddbd85003cbe475381d3c6272a544e3a3
+SHA1 (patch-bd) = c332eac7563bc119d780c9886b3697f5011d8ca1
+SHA1 (patch-ca) = 480381df0430cc7372f9dbde8f4eaad87c78a4bf
+SHA1 (patch-cb) = d2109d0ce4accf43e8e8c6bd29efb62169c4eedb
+SHA1 (patch-cc) = aa0d73f2419766e8e6142a7e7ab8eb70949d2d33
+SHA1 (patch-cd) = eb08611fb163700812c06f5bb9fc849c422864f1
SHA1 (patch-da) = 62c34addf08890cf1aa28a2604347f69e2c8ad0c
SHA1 (patch-db) = 35174f7d45aeae95c33e440cae59830f7a964915
SHA1 (patch-dc) = 3922128034b005f0b86c98abb3e10c1b1d5107ac
SHA1 (patch-dd) = 7f35b3263189d43473adc0ac13244159b58ac9ff
-SHA1 (patch-de) = 85c5cb3d1185c8cc68ab09c7d16ed39e22a12093
-SHA1 (patch-df) = 8c1dab41b7449a2c706792036cf393553cebf9f0
-SHA1 (patch-dg) = b10933f50a1561d211afb6e817be9613cab37607
-SHA1 (patch-dh) = 1c07bccae7a69974e4ab38ffc9ee74b3f10c4ba4
-SHA1 (patch-di) = 95a8566cc319f6f00510135902f921e3e0686ad4
-SHA1 (patch-dj) = 8389a0c6ca45e509022aa6bdbba51800bb57c4db
-SHA1 (patch-dk) = c95e5aa709dff7685af03f19e830d15fd17c0315
-SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
-SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
-SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
-SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
+SHA1 (patch-de) = 37dff37e53485d83f94a6dcbe67ee776db81e9bc
+SHA1 (patch-df) = aabc7e55148d7dd713dcd03c707b928f4d2d6735
+SHA1 (patch-dg) = efeb9adcb3c163cf419bdab709b613be823bc081
+SHA1 (patch-dh) = 91e405c4c344db0efedcb7ff3cd79ce347eb640c
+SHA1 (patch-di) = 8f2d602c170e77f04f9fb308eedbd99ed079865a
+SHA1 (patch-dj) = 1dd5274fb3a2e6b1ae2491a86e57c211fa7a65fe
+SHA1 (patch-dk) = 264519394e4e7d107257d65916c375cc6d72ae54
+SHA1 (patch-dl) = ce6bf3706901817f2bbf906aeb974d447a5b7334
+SHA1 (patch-dm) = 0d2be5bec2e62a9713a1a8b0e674358f3f33f553
+SHA1 (patch-dn) = 12d67ca5dd3a3e4e15c9b14151fd14ae4bd53885
+SHA1 (patch-sysdeps_bsd_sem__limits.c) = 4f21d01b86f415e42fc5d4d0b6446ae8d3e8fee8
+SHA1 (patch-sysdeps_bsd_shm__limits.c) = 7b96f6b3084354dc105cececba0b1a0ce7704151
+SHA1 (patch-sysdeps_freebsd_procwd.c) = 61f19a54347eded1c2eb301ec6e8754b57d53160
SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5
Index: patches/patch-aa
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patches/patch-aa 13 Jan 2009 13:53:13 -0000 1.8
+++ patches/patch-aa 30 May 2015 16:47:50 -0000
@@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.8 2009/01/13 13:53:13 wiz Exp $
---- sysdeps/bsd/Makefile.in.orig 2009-01-12 22:07:39.000000000 +0100
+--- sysdeps/bsd/Makefile.in.orig 2011-08-30 11:25:45.000000000 +0000
+++ sysdeps/bsd/Makefile.in
-@@ -59,7 +59,8 @@ am_libgtop_sysdeps_suid_2_0_la_OBJECTS =
+@@ -65,7 +65,8 @@ am_libgtop_sysdeps_suid_2_0_la_OBJECTS =
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 \
@@ -12,7 +12,7 @@
libgtop_sysdeps_suid_2_0_la_OBJECTS = \
$(am_libgtop_sysdeps_suid_2_0_la_OBJECTS)
libgtop_sysdeps_suid_2_0_la_LINK = $(LIBTOOL) --tag=CC \
-@@ -298,7 +299,8 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = op
+@@ -315,7 +316,8 @@ libgtop_sysdeps_suid_2_0_la_SOURCES = op
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 \
@@ -22,7 +22,7 @@
libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \
-@@ -370,6 +372,7 @@ distclean-compile:
+@@ -388,6 +390,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procargs.Plo@am__quote@
Index: patches/patch-ab
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ab,v
retrieving revision 1.7
diff -u -r1.7 patch-ab
--- patches/patch-ab 5 Nov 2007 19:06:03 -0000 1.7
+++ patches/patch-ab 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.7 2007/11/05 19:06:03 drochner Exp $
---- sysdeps/bsd/proctime.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/proctime.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/proctime.c
@@ -40,11 +40,25 @@ static const unsigned long _glibtop_sysd
Index: patches/patch-ac
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ac,v
retrieving revision 1.6
diff -u -r1.6 patch-ac
--- patches/patch-ac 5 Nov 2007 19:06:03 -0000 1.6
+++ patches/patch-ac 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ac,v 1.6 2007/11/05 19:06:03 drochner Exp $
---- sysdeps/common/mountlist.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/common/mountlist.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/common/mountlist.c
@@ -106,7 +106,7 @@ static struct mount_entry *read_filesyst
#endif
Index: patches/patch-ad
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ad,v
retrieving revision 1.9
diff -u -r1.9 patch-ad
--- patches/patch-ad 27 Aug 2009 20:03:17 -0000 1.9
+++ patches/patch-ad 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ad,v 1.9 2009/08/27 20:03:17 ahoka Exp $
---- sysdeps/bsd/sysinfo.c.orig 2009-08-27 14:29:56.000000000 +0200
+--- sysdeps/bsd/sysinfo.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/sysinfo.c
@@ -36,6 +36,7 @@ static void
init_sysinfo (glibtop *server)
Index: patches/patch-ae
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ae,v
retrieving revision 1.8
diff -u -r1.8 patch-ae
--- patches/patch-ae 30 Oct 2009 21:41:20 -0000 1.8
+++ patches/patch-ae 30 May 2015 16:47:50 -0000
@@ -2,7 +2,7 @@
https://bugzilla.gnome.org/show_bug.cgi?id=600172
---- sysdeps/bsd/swap.c.orig 2008-05-24 00:13:21.000000000 +0200
+--- sysdeps/bsd/swap.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/swap.c
@@ -195,29 +195,32 @@ glibtop_get_swap_p (glibtop *server, gli
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
Index: patches/patch-ag
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ag,v
retrieving revision 1.6
diff -u -r1.6 patch-ag
--- patches/patch-ag 5 Nov 2007 19:06:04 -0000 1.6
+++ patches/patch-ag 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ag,v 1.6 2007/11/05 19:06:04 drochner Exp $
---- sysdeps/bsd/mem.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/mem.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/mem.c
@@ -81,7 +81,9 @@ static int mib [] = { CTL_VM, VM_TOTAL }
static int mib [] = { CTL_VM, VM_METER };
Index: patches/patch-ai
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ai,v
retrieving revision 1.4
diff -u -r1.4 patch-ai
--- patches/patch-ai 5 Nov 2007 19:06:04 -0000 1.4
+++ patches/patch-ai 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ai,v 1.4 2007/11/05 19:06:04 drochner Exp $
---- sysdeps/bsd/prockernel.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/prockernel.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/prockernel.c
@@ -45,6 +45,7 @@
#include <osreldate.h>
Index: patches/patch-aj
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-aj,v
retrieving revision 1.4
diff -u -r1.4 patch-aj
--- patches/patch-aj 5 Nov 2007 19:06:04 -0000 1.4
+++ patches/patch-aj 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-aj,v 1.4 2007/11/05 19:06:04 drochner Exp $
---- sysdeps/bsd/proclist.c.orig 2007-05-19 20:59:37.000000000 +0200
+--- sysdeps/bsd/proclist.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/proclist.c
@@ -56,11 +56,15 @@ _glibtop_init_proclist_p (glibtop *serve
server->sysdeps.proclist = _glibtop_sysdeps_proclist;
Index: patches/patch-al
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-al,v
retrieving revision 1.6
diff -u -r1.6 patch-al
--- patches/patch-al 5 Nov 2007 19:06:05 -0000 1.6
+++ patches/patch-al 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-al,v 1.6 2007/11/05 19:06:05 drochner Exp $
---- sysdeps/bsd/procmem.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/procmem.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procmem.c
@@ -116,6 +116,9 @@ void
glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
Index: patches/patch-am
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-am,v
retrieving revision 1.5
diff -u -r1.5 patch-am
--- patches/patch-am 5 Nov 2007 19:06:05 -0000 1.5
+++ patches/patch-am 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-am,v 1.5 2007/11/05 19:06:05 drochner Exp $
---- sysdeps/bsd/procsignal.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/procsignal.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procsignal.c
@@ -51,7 +51,11 @@ glibtop_get_proc_signal_p (glibtop *serv
glibtop_proc_signal *buf,
Index: patches/patch-an
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-an,v
retrieving revision 1.4
diff -u -r1.4 patch-an
--- patches/patch-an 5 Nov 2007 19:06:05 -0000 1.4
+++ patches/patch-an 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-an,v 1.4 2007/11/05 19:06:05 drochner Exp $
---- sysdeps/bsd/procstate.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/procstate.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procstate.c
@@ -54,7 +54,11 @@ glibtop_get_proc_state_p (glibtop *serve
glibtop_proc_state *buf,
Index: patches/patch-ao
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ao,v
retrieving revision 1.4
diff -u -r1.4 patch-ao
--- patches/patch-ao 5 Nov 2007 19:06:05 -0000 1.4
+++ patches/patch-ao 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ao,v 1.4 2007/11/05 19:06:05 drochner Exp $
---- sysdeps/bsd/procuid.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/procuid.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procuid.c
@@ -28,6 +28,7 @@
Index: patches/patch-bc
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-bc,v
retrieving revision 1.1
diff -u -r1.1 patch-bc
--- patches/patch-bc 20 Sep 2007 21:12:13 -0000 1.1
+++ patches/patch-bc 30 May 2015 16:47:50 -0000
@@ -2,9 +2,9 @@
From FreeBSD's GNOME development repository.
---- src/daemon/io.c.orig 2005-12-12 11:09:38.000000000 +0100
+--- src/daemon/io.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ src/daemon/io.c
-@@ -22,6 +22,7 @@
+@@ -20,6 +20,7 @@
*/
#include <config.h>
@@ -12,7 +12,7 @@
#include "daemon.h"
#include <glibtop/error.h>
-@@ -37,9 +38,13 @@ do_output (int s, glibtop_response *resp
+@@ -35,9 +36,13 @@ do_output (int s, glibtop_response *resp
resp->offset = offset;
resp->data_size = data_size;
@@ -27,7 +27,7 @@
} else {
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
glibtop_warn_io ("send");
-@@ -50,9 +55,13 @@ do_output (int s, glibtop_response *resp
+@@ -48,9 +53,13 @@ do_output (int s, glibtop_response *resp
fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
#endif
@@ -42,7 +42,7 @@
} else {
if (send (s, data, resp->data_size, 0) , 0)
glibtop_warn_io ("send");
-@@ -68,6 +77,7 @@ do_read (int s, void *ptr, size_t total_
+@@ -66,6 +75,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 @@
if (s)
nread = recv (s, ptr, remaining, 0);
else
-@@ -79,6 +89,8 @@ do_read (int s, void *ptr, size_t total_
+@@ -77,6 +87,8 @@ do_read (int s, void *ptr, size_t total_
}
if (nread <= 0) {
Index: patches/patch-bd
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-bd,v
retrieving revision 1.1
diff -u -r1.1 patch-bd
--- patches/patch-bd 20 Sep 2007 21:12:14 -0000 1.1
+++ patches/patch-bd 30 May 2015 16:47:50 -0000
@@ -2,9 +2,9 @@
From FreeBSD's GNOME development repository.
---- src/daemon/server.c.orig 2004-06-09 20:52:21.000000000 +0200
+--- src/daemon/server.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ src/daemon/server.c
-@@ -88,11 +88,13 @@ main(int argc, char *argv[])
+@@ -90,11 +90,13 @@ main(int argc, char *argv[])
if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
Index: patches/patch-ca
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-ca,v
retrieving revision 1.2
diff -u -r1.2 patch-ca
--- patches/patch-ca 7 Apr 2009 11:26:48 -0000 1.2
+++ patches/patch-ca 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-ca,v 1.2 2009/04/07 11:26:48 drochner Exp $
---- sysdeps/bsd/netload.c.orig 2008-05-24 00:13:21.000000000 +0200
+--- sysdeps/bsd/netload.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/netload.c
@@ -220,8 +220,12 @@ glibtop_get_netload_p (glibtop *server,
sin = (struct sockaddr_in *)sa;
Index: patches/patch-cb
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-cb,v
retrieving revision 1.2
diff -u -r1.2 patch-cb
--- patches/patch-cb 15 Nov 2008 19:34:11 -0000 1.2
+++ patches/patch-cb 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-cb,v 1.2 2008/11/15 19:34:11 wiz Exp $
---- sysdeps/bsd/glibtop_server.h.orig 2008-05-23 22:13:21.000000000 +0000
+--- sysdeps/bsd/glibtop_server.h.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/glibtop_server.h
@@ -45,6 +45,8 @@ G_BEGIN_DECLS
#define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD)
Index: patches/patch-cc
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-cc,v
retrieving revision 1.1
diff -u -r1.1 patch-cc
--- patches/patch-cc 5 Nov 2007 19:06:06 -0000 1.1
+++ patches/patch-cc 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-cc,v 1.1 2007/11/05 19:06:06 drochner Exp $
---- sysdeps/bsd/procopenfiles.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/procopenfiles.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procopenfiles.c
@@ -47,5 +47,30 @@ _glibtop_init_proc_open_files_s (glibtop
glibtop_open_files_entry *
Index: patches/patch-cd
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-cd,v
retrieving revision 1.1
diff -u -r1.1 patch-cd
--- patches/patch-cd 5 Nov 2007 19:06:06 -0000 1.1
+++ patches/patch-cd 30 May 2015 16:47:50 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-cd,v 1.1 2007/11/05 19:06:06 drochner Exp $
---- sysdeps/bsd/procargs.c.orig 2007-04-27 00:27:34.000000000 +0200
+--- sysdeps/bsd/procargs.c.orig 2011-06-01 15:40:47.000000000 +0000
+++ sysdeps/bsd/procargs.c
@@ -47,12 +47,16 @@ char *
glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
Index: patches/patch-de
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-de,v
retrieving revision 1.1
diff -u -r1.1 patch-de
--- patches/patch-de 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-de 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-de,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/proclist.c.orig 2009-07-10 23:21:10 +0300
-+++ sysdeps/freebsd/proclist.c 2009-07-10 23:30:28 +0300
+--- sysdeps/freebsd/proclist.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/proclist.c
@@ -95,7 +95,11 @@ glibtop_get_proclist_p (glibtop *server,
for (i = 0; i < len; i++) {
pid_t pid;
Index: patches/patch-df
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-df,v
retrieving revision 1.1
diff -u -r1.1 patch-df
--- patches/patch-df 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-df 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-df,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/procstate.c.orig 2008-05-24 01:13:23 +0300
-+++ sysdeps/freebsd/procstate.c 2009-07-11 15:26:10 +0300
+--- sysdeps/freebsd/procstate.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/procstate.c
@@ -64,6 +64,37 @@ glibtop_get_proc_state_p (glibtop *serve
return;
}
Index: patches/patch-dg
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dg,v
retrieving revision 1.1
diff -u -r1.1 patch-dg
--- patches/patch-dg 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dg 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dg,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/procuid.c.orig 2009-07-10 23:41:21 +0300
-+++ sysdeps/freebsd/procuid.c 2009-07-10 23:43:41 +0300
+--- sysdeps/freebsd/procuid.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/procuid.c
@@ -64,6 +64,17 @@ glibtop_get_proc_uid_p (glibtop *server,
return;
}
Index: patches/patch-dh
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dh,v
retrieving revision 1.1
diff -u -r1.1 patch-dh
--- patches/patch-dh 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dh 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dh,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/proctime.c.orig 2009-07-10 23:46:59 +0300
-+++ sysdeps/freebsd/proctime.c 2009-07-10 23:53:38 +0300
+--- sysdeps/freebsd/proctime.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/proctime.c
@@ -80,7 +80,9 @@ glibtop_get_proc_time_p (glibtop *server
glibtop_suid_leave (server);
Index: patches/patch-di
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-di,v
retrieving revision 1.1
diff -u -r1.1 patch-di
--- patches/patch-di 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-di 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-di,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/procmem.c.orig 2009-07-10 23:55:49 +0300
-+++ sysdeps/freebsd/procmem.c 2009-07-11 00:04:52 +0300
+--- sysdeps/freebsd/procmem.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/procmem.c
@@ -34,8 +34,10 @@
#include <vm/vm_map.h>
Index: patches/patch-dj
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dj,v
retrieving revision 1.1
diff -u -r1.1 patch-dj
--- patches/patch-dj 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dj 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dj,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/procsignal.c.orig 2009-07-11 00:06:33 +0300
-+++ sysdeps/freebsd/procsignal.c 2009-07-11 00:08:36 +0300
+--- sysdeps/freebsd/procsignal.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/procsignal.c
@@ -66,10 +66,17 @@ glibtop_get_proc_signal_p (glibtop *serv
return;
}
Index: patches/patch-dk
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dk,v
retrieving revision 1.1
diff -u -r1.1 patch-dk
--- patches/patch-dk 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dk 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dk,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/procmap.c.orig 2008-08-18 18:23:36 +0300
-+++ sysdeps/freebsd/procmap.c 2009-07-11 14:53:45 +0300
+--- sysdeps/freebsd/procmap.c.orig 2011-07-24 19:13:56.000000000 +0000
++++ sysdeps/freebsd/procmap.c
@@ -19,6 +19,8 @@
Boston, MA 02111-1307, USA.
*/
@@ -11,7 +11,7 @@
#include <config.h>
#include <glibtop.h>
#include <glibtop/error.h>
-@@ -299,3 +301,29 @@ glibtop_get_proc_map_p (glibtop *server,
+@@ -301,3 +303,29 @@ glibtop_get_proc_map_p (glibtop *server,
return (glibtop_map_entry*) g_array_free(maps, FALSE);
}
Index: patches/patch-dl
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dl,v
retrieving revision 1.1
diff -u -r1.1 patch-dl
--- patches/patch-dl 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dl 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dl,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/procsegment.c.orig 2009-07-11 00:17:02 +0300
-+++ sysdeps/freebsd/procsegment.c 2009-07-11 00:18:25 +0300
+--- sysdeps/freebsd/procsegment.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/procsegment.c
@@ -69,8 +69,13 @@ glibtop_get_proc_segment_p (glibtop *ser
return;
}
Index: patches/patch-dm
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dm,v
retrieving revision 1.1
diff -u -r1.1 patch-dm
--- patches/patch-dm 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dm 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dm,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/netload.c.orig 2009-07-11 13:42:20 +0300
-+++ sysdeps/freebsd/netload.c 2009-07-11 14:01:00 +0300
+--- sysdeps/freebsd/netload.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/netload.c
@@ -91,6 +91,7 @@ void
glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
const char *interface)
Index: patches/patch-dn
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-dn,v
retrieving revision 1.1
diff -u -r1.1 patch-dn
--- patches/patch-dn 11 Jul 2009 13:14:13 -0000 1.1
+++ patches/patch-dn 30 May 2015 16:47:51 -0000
@@ -1,7 +1,7 @@
$NetBSD: patch-dn,v 1.1 2009/07/11 13:14:13 hasso Exp $
---- sysdeps/freebsd/prockernel.c.orig 2009-07-11 14:07:07 +0300
-+++ sysdeps/freebsd/prockernel.c 2009-07-11 14:11:59 +0300
+--- sysdeps/freebsd/prockernel.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/freebsd/prockernel.c
@@ -91,9 +91,13 @@ glibtop_get_proc_kernel_p (glibtop *serv
glibtop_suid_leave (server);
Index: patches/patch-sysdeps_bsd_sem__limits.c
===================================================================
RCS file: patches/patch-sysdeps_bsd_sem__limits.c
diff -N patches/patch-sysdeps_bsd_sem__limits.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysdeps_bsd_sem__limits.c 30 May 2015 16:47:50 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- sysdeps/bsd/sem_limits.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/sem_limits.c
+@@ -47,7 +47,9 @@ glibtop_get_sem_limits_p (glibtop *serve
+
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+-#else
++#elif !defined(__NetBSD__)
++/* it's public on NetBSD, defining it here intruduces problems,
++ * including <sys/sysctl.h> without _KERNEL defined and then <sys/ipc.h> with _KERNEL defined is fatal */
+ #define _KERNEL 1
+ #endif
+
Index: patches/patch-sysdeps_bsd_shm__limits.c
===================================================================
RCS file: patches/patch-sysdeps_bsd_shm__limits.c
diff -N patches/patch-sysdeps_bsd_shm__limits.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysdeps_bsd_shm__limits.c 30 May 2015 16:47:50 -0000
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- sysdeps/bsd/shm_limits.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/shm_limits.c
+@@ -47,7 +47,9 @@ glibtop_get_shm_limits_p (glibtop *serve
+
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+-#else
++#elif !defined(__NetBSD__)
++/* it's public on NetBSD, defining it here intruduces problems,
++ * including <sys/sysctl.h> without _KERNEL defined and then <sys/ipc.h> with _KERNEL defined is fatal */
+ #define _KERNEL 1
+ #endif
+
+@@ -111,4 +113,3 @@ glibtop_get_shm_limits_p (glibtop *serve
+ }
+
+ #endif /* either a newer BSDI or no BSDI at all. */
+-
Index: patches/patch-sysdeps_freebsd_procwd.c
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/patches/patch-sysdeps_freebsd_procwd.c,v
retrieving revision 1.1
diff -u -r1.1 patch-sysdeps_freebsd_procwd.c
--- patches/patch-sysdeps_freebsd_procwd.c 23 Mar 2012 17:29:52 -0000 1.1
+++ patches/patch-sysdeps_freebsd_procwd.c 30 May 2015 16:47:51 -0000
@@ -1,6 +1,6 @@
$NetBSD: patch-sysdeps_freebsd_procwd.c,v 1.1 2012/03/23 17:29:52 marino Exp $
---- sysdeps/freebsd/procwd.c.orig 2012-03-23 16:53:25.085432000 +0000
+--- sysdeps/freebsd/procwd.c.orig 2011-07-24 19:13:56.000000000 +0000
+++ sysdeps/freebsd/procwd.c
@@ -100,8 +100,6 @@ parse_output(const char *output, glibtop
char**
>Release-Note:
>Audit-Trail:
From: "Kamil Rytarowski" <n54@gmx.com>
To: gnats-bugs@NetBSD.org
Cc: pgoyette@NetBSD.org
Subject: Re: pkg/49934: libgtop doesn't build after the sysvcompat
modularization
Date: Sat, 30 May 2015 21:11:34 +0200
I was asked to clean up the patch.
Index: distinfo
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/sysutils/libgtop/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo 26 Feb 2013 15:54:16 -0000 1.28
+++ distinfo 30 May 2015 17:16:12 -0000
@@ -36,6 +36,8 @@
SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
+SHA1 (patch-sysdeps_bsd_sem__limits.c) = 4f21d01b86f415e42fc5d4d0b6446ae8d3e8fee8
+SHA1 (patch-sysdeps_bsd_shm__limits.c) = 7b96f6b3084354dc105cececba0b1a0ce7704151
SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5
Index: patches/patch-sysdeps_bsd_sem__limits.c
===================================================================
RCS file: patches/patch-sysdeps_bsd_sem__limits.c
diff -N patches/patch-sysdeps_bsd_sem__limits.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysdeps_bsd_sem__limits.c 30 May 2015 16:47:50 -0000
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- sysdeps/bsd/sem_limits.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/sem_limits.c
+@@ -47,7 +47,9 @@ glibtop_get_sem_limits_p (glibtop *serve
+
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+-#else
++#elif !defined(__NetBSD__)
++/* it's public on NetBSD, defining it here intruduces problems,
++ * including <sys/sysctl.h> without _KERNEL defined and then <sys/ipc.h> with _KERNEL defined is fatal */
+ #define _KERNEL 1
+ #endif
+
Index: patches/patch-sysdeps_bsd_shm__limits.c
===================================================================
RCS file: patches/patch-sysdeps_bsd_shm__limits.c
diff -N patches/patch-sysdeps_bsd_shm__limits.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysdeps_bsd_shm__limits.c 30 May 2015 16:47:50 -0000
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- sysdeps/bsd/shm_limits.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/shm_limits.c
+@@ -47,7 +47,9 @@ glibtop_get_shm_limits_p (glibtop *serve
+
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+-#else
++#elif !defined(__NetBSD__)
++/* it's public on NetBSD, defining it here intruduces problems,
++ * including <sys/sysctl.h> without _KERNEL defined and then <sys/ipc.h> with _KERNEL defined is fatal */
+ #define _KERNEL 1
+ #endif
+
+@@ -111,4 +113,3 @@ glibtop_get_shm_limits_p (glibtop *serve
+ }
+
+ #endif /* either a newer BSDI or no BSDI at all. */
+-
From: Patrick Welche <prlw1@cam.ac.uk>
To: gnats-bugs@NetBSD.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,
n54@gmx.com
Subject: Re: pkg/49934: libgtop doesn't build after the sysvcompat
modularization
Date: Fri, 5 Jun 2015 17:08:42 +0100
--0OAP2g/MAC+5xKAE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Looks good to me.
_KERNEL hasn't been needed for struct {shm,sem}info since
/* $NetBSD: sem.h,v 1.12 2000/06/02 15:53:05 simonb Exp $ */
/* $NetBSD: shm.h,v 1.26 2000/06/02 15:53:05 simonb Exp $ */
commit 752750474bdbaefdc14dc629933e21fbef37a00e
Author: simonb <simonb>
Date: Fri Jun 2 15:53:03 2000 +0000
Add new sysctl node "KERN_SYSVIPC_INFO" with "KERN_SYSVIPC_MSG_INFO",
"KERN_SYSVIPC_SEM_INFO" and "KERN_SYSVIPC_SHM_INFO" to return the
info and data structures for the relevent SysV IPC types. The return
structures use fixed-size types and should be compat32 safe. All
user-visible changes are protected with
#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
Make all variable declarations extern in msg.h, sem.h and shm.h and
add relevent variable declarations to sysv_*.c and remove unneeded
header files from those .c files.
Make compat14 SysV IPC conversion functions and sysctl_file() static.
Change the data pointer to "void *" in sysctl_clockrate(),
sysctl_ntptime(), sysctl_file() and sysctl_doeproc().
Upstream libgtop is in a sorry state, e.g., Juan Pardines' processor
affinity support patch from 2008 is still sitting in bugzilla.gnome.org.
I went for a possibly slightly more blunt patch (attached).
Thoughts?
--0OAP2g/MAC+5xKAE
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libgtop.diff"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/libgtop/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- distinfo 26 Feb 2013 15:54:16 -0000 1.28
+++ distinfo 5 Jun 2015 16:07:38 -0000
@@ -36,6 +36,8 @@
SHA1 (patch-dl) = 9d6a44be02ec21d195076125c0cdfe5b51a0ab0a
SHA1 (patch-dm) = ef08973aecacb1fb69f258632dd36edfdafd8c50
SHA1 (patch-dn) = 66f66731a3abd1290f67d62f9ef654f68756bccb
+SHA1 (patch-sysdeps_bsd_sem_limits.c) = 0cdc5e85a4d8d1297f2f658c1f345bf54abfb02c
+SHA1 (patch-sysdeps_bsd_shm_limits.c) = 2750d6b5c440f6071111c62ef1069d07867edcf2
SHA1 (patch-sysdeps_freebsd_procwd.c) = 89961a4115785809b1a1dc5dd07f263cf35cf1b8
SHA1 (patch-sysdeps_solaris_glibtop__server.h) = ed3a657ecc024d0d5edc3d436e593b86ed39d726
SHA1 (patch-sysdeps_solaris_procopenfiles.c) = 8aef9e53cdd9d2e13a964e0cde43e71b507fcfa5
Index: patches/patch-sysdeps_bsd_sem_limits.c
===================================================================
RCS file: patches/patch-sysdeps_bsd_sem_limits.c
diff -N patches/patch-sysdeps_bsd_sem_limits.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysdeps_bsd_sem_limits.c 5 Jun 2015 16:07:38 -0000
@@ -0,0 +1,20 @@
+$NetBSD$
+
+struct seminfo is available without the need for _KERNEL.
+
+--- sysdeps/bsd/sem_limits.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/sem_limits.c
+@@ -45,11 +45,13 @@ glibtop_get_sem_limits_p (glibtop *serve
+
+ /* #define KERNEL to get declaration of `struct seminfo'. */
+
++#ifndef __NetBSD__
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+ #else
+ #define _KERNEL 1
+ #endif
++#endif
+
+ #include <sys/ipc.h>
+ #include <sys/sem.h>
Index: patches/patch-sysdeps_bsd_shm_limits.c
===================================================================
RCS file: patches/patch-sysdeps_bsd_shm_limits.c
diff -N patches/patch-sysdeps_bsd_shm_limits.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sysdeps_bsd_shm_limits.c 5 Jun 2015 16:07:38 -0000
@@ -0,0 +1,20 @@
+$NetBSD$
+
+struct shminfo is available without the need for _KERNEL.
+
+--- sysdeps/bsd/shm_limits.c.orig 2011-06-01 15:40:47.000000000 +0000
++++ sysdeps/bsd/shm_limits.c
+@@ -45,11 +45,13 @@ glibtop_get_shm_limits_p (glibtop *serve
+
+ /* #define KERNEL to get declaration of `struct shminfo'. */
+
++#ifndef __NetBSD__
+ #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
+ #define KERNEL 1
+ #else
+ #define _KERNEL 1
+ #endif
++#endif
+
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
--0OAP2g/MAC+5xKAE--
From: Kamil Rytarowski <n54@gmx.com>
To: Patrick Welche <prlw1@cam.ac.uk>, gnats-bugs@NetBSD.org
Cc: pkg-manager@netbsd.org, gnats-admin@netbsd.org,
pkgsrc-bugs@netbsd.org
Subject: Re: pkg/49934: libgtop doesn't build after the sysvcompat modularization
Date: Fri, 05 Jun 2015 22:06:32 +0000
On 05.06.2015 16:08, Patrick Welche wrote:
> Looks good to me.
>
> _KERNEL hasn't been needed for struct {shm,sem}info since
> /* $NetBSD: sem.h,v 1.12 2000/06/02 15:53:05 simonb Exp $ */
> /* $NetBSD: shm.h,v 1.26 2000/06/02 15:53:05 simonb Exp $ */
>
>
> commit 752750474bdbaefdc14dc629933e21fbef37a00e
> Author: simonb <simonb>
> Date: Fri Jun 2 15:53:03 2000 +0000
>
> Add new sysctl node "KERN_SYSVIPC_INFO" with "KERN_SYSVIPC_MSG_INFO",
> "KERN_SYSVIPC_SEM_INFO" and "KERN_SYSVIPC_SHM_INFO" to return the
> info and data structures for the relevent SysV IPC types. The return
> structures use fixed-size types and should be compat32 safe. All
> user-visible changes are protected with
> #if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
>
> Make all variable declarations extern in msg.h, sem.h and shm.h and
> add relevent variable declarations to sysv_*.c and remove unneeded
> header files from those .c files.
>
> Make compat14 SysV IPC conversion functions and sysctl_file() static.
>
> Change the data pointer to "void *" in sysctl_clockrate(),
> sysctl_ntptime(), sysctl_file() and sysctl_doeproc().
>
> Upstream libgtop is in a sorry state, e.g., Juan Pardines' processor
> affinity support patch from 2008 is still sitting in bugzilla.gnome.org.
>
> I went for a possibly slightly more blunt patch (attached).
>
> Thoughts?
>
Looks good to me.
From: "Patrick Welche" <prlw1@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/49934 CVS commit: pkgsrc/sysutils/libgtop
Date: Sat, 6 Jun 2015 10:59:57 +0000
Module Name: pkgsrc
Committed By: prlw1
Date: Sat Jun 6 10:59:57 UTC 2015
Modified Files:
pkgsrc/sysutils/libgtop: Makefile distinfo
Added Files:
pkgsrc/sysutils/libgtop/patches: patch-sysdeps_bsd_sem_limits.c
patch-sysdeps_bsd_shm_limits.c
Log Message:
Build fix from Kamil Rytarowski in PR pkg/49934.
While here set LICENSE.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/sysutils/libgtop/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/libgtop/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/libgtop/patches/patch-sysdeps_bsd_sem_limits.c \
pkgsrc/sysutils/libgtop/patches/patch-sysdeps_bsd_shm_limits.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: kamil@NetBSD.org
State-Changed-When: Sat, 11 Jul 2015 11:50:13 +0200
State-Changed-Why:
Patch applied.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2014
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.
Home