There have been numerous fixes to net-snmp since the last release
in Dec 2014. Some of them have been backported to patches/ but we
could do with updating more pieces (e.g. to get the fix for
https://sourceforge.net/p/net-snmp/bugs/2821/) and it's not looking
very pretty in there, so I think switching to a tar generated from
the 5.7-patches branch makes sense.
Looking at this diff at present. It needs a wider build of dependent
ports which I'll do, but if anyone has places where they're using
net-snmp it would be nice to have some tests from users.
(There are some removed functions in the library but not mentioned
in headers, I'll check in my saved nm output for things using those
functions, but the ABI is not expected to be changed and avoiding
a major bump is helpful for backport-to-stable purposes).
(There are some net-snmp 5.8 prereleases now, but I had some hangs
with utilities in the first one, and the second doesn't make it
through "make install" without patching Makefiles, so seems a bit
premature to consider at this stage).
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/net-snmp/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile 11 Jan 2018 19:27:06 -0000 1.97
+++ Makefile 9 Mar 2018 15:23:10 -0000
@@ -3,21 +3,23 @@
COMMENT-main= extendable SNMP implementation
COMMENT-tkmib= graphical SNMP MIB browser
-V= 5.7.3
-REVISION-main= 14
-
-DISTNAME= net-snmp-$V
+V= 5.7.3pl20180309
+DISTNAME= net-snmp-5.7-patches-20180309
+EXTRACT_SUFX= .tar.xz
+#DISTNAME= net-snmp-$V
MULTI_PACKAGES= -main -tkmib
PKGNAME-main= net-snmp-$V
PKGNAME-tkmib= net-snmp-tkmib-$V
-LIBV= 14.0
+LIBV= 14.1
.for i in netsnmp netsnmpagent netsnmphelpers netsnmpmibs netsnmptrapd
SHARED_LIBS += $i ${LIBV}
.endfor
CATEGORIES= net perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
+
+#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
+MASTER_SITES= https://spacehopper.org/mirrors/
HOMEPAGE= http://www.net-snmp.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/net-snmp/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 9 Dec 2014 15:20:06 -0000 1.19
+++ distinfo 9 Mar 2018 15:23:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (net-snmp-5.7.3.tar.gz) = Eu+JYTx3B9yW0TM18VPBkh78nWHTcI7wnz/EpwFPtPA=
-SIZE (net-snmp-5.7.3.tar.gz) = 6382428
+SHA256 (net-snmp-5.7-patches-20180309.tar.xz) = aBTmUvF6qrFJLzdE7I5Rrt+dZU7PwRUgYK9/UsV/nEo=
+SIZE (net-snmp-5.7-patches-20180309.tar.xz) = 6041012
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/net-snmp/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 12 May 2016 22:00:14 -0000 1.3
+++ patches/patch-Makefile_in 9 Mar 2018 15:23:10 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.3 2016/05/12 22:00:14 sthen Exp $
---- Makefile.in.orig Thu May 12 22:55:09 2016
-+++ Makefile.in Thu May 12 22:55:14 2016
-@@ -24,7 +24,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -26,7 +26,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi
freebsd12.h freebsd.h \
generic.h \
hpux.h irix.h linux.h mingw32.h mips.h netbsd.h osf5.h \
Index: patches/patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c
===================================================================
RCS file: patches/patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c
diff -N patches/patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c
--- patches/patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c 9 Dec 2014 15:20:06 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c,v 1.6 2014/12/09 15:20:06 sthen Exp $
-
-swapins/swapouts were removed from struct uvmexp in uvm_extern.h 1.105
-
---- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig Tue Feb 25 20:50:16 2014
-+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c Thu Mar 20 12:52:45 2014
-@@ -127,6 +127,10 @@ void init_cpu_sysctl( void ) {
- #else /* VM_UVMEXP */ /* OpenBSD 3+, NetBSD 1.6+ */
- #define NETSNMP_VM_STATS VM_UVMEXP
- #define NETSNMP_VM_STATS_TYPE struct uvmexp
-+#if defined(openbsd5)
-+ #undef NS_VM_SWAPIN
-+ #undef NS_VM_SWAPOUT
-+
No comments:
Post a Comment