tags 746225 + pending tags 751918 + pending tags 753144 + pending thanks Dear maintainer,
I've prepared an NMU for net-snmp (versioned as 5.7.2.1~dfsg-6.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Sinéad O'Connor: Just Like U Said It Would B
diff -Nru net-snmp-5.7.2.1~dfsg/debian/changelog net-snmp-5.7.2.1~dfsg/debian/changelog
--- net-snmp-5.7.2.1~dfsg/debian/changelog 2014-05-15 16:35:02.000000000 +0200
+++ net-snmp-5.7.2.1~dfsg/debian/changelog 2014-07-18 14:48:32.000000000 +0200
@@ -1,3 +1,21 @@
+net-snmp (5.7.2.1~dfsg-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ Make debian/libsnmp-perl.install executable and use $Config{vendorarch} to
+ get the perl library directory. Patch from Niko Tyni.
+ (Closes: #751918)
+ * Fix "FTBFS on kfreebsd-amd64 - 'struct kinfo_proc' has no member
+ named 'kp_eproc'":
+ Add patch from Niko Tyni which fixes a DEFINE that changed between
+ kfreebsd-kernel-headers 9 and 10.
+ (Closes: #753144)
+ * Fix "snmpd: Memory leak when SNMP GET request id is zero":
+ add patch from upstream bug, prepared by Roland Stigge.
+ (Closes: #746225)
+
+ -- gregor herrmann <[email protected]> Fri, 18 Jul 2014 14:48:18 +0200
+
net-snmp (5.7.2.1~dfsg-6) unstable; urgency=medium
* debian/{snmpd.conf,patches/add_rocommunity6.patch}
diff -Nru net-snmp-5.7.2.1~dfsg/debian/libsnmp-perl.install net-snmp-5.7.2.1~dfsg/debian/libsnmp-perl.install
--- net-snmp-5.7.2.1~dfsg/debian/libsnmp-perl.install 2014-05-15 16:35:02.000000000 +0200
+++ net-snmp-5.7.2.1~dfsg/debian/libsnmp-perl.install 2014-07-18 14:37:31.000000000 +0200
@@ -1 +1,5 @@
-usr/lib/perl*
+#!/usr/bin/perl -w
+
+use Config;
+# expand the perl binary module directory at build time
+print substr($Config{vendorarch}, 1) . "\n";
diff -Nru net-snmp-5.7.2.1~dfsg/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch net-snmp-5.7.2.1~dfsg/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch
--- net-snmp-5.7.2.1~dfsg/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch 1970-01-01 01:00:00.000000000 +0100
+++ net-snmp-5.7.2.1~dfsg/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch 2014-07-18 14:41:48.000000000 +0200
@@ -0,0 +1,45 @@
+From a2f2f610b56c7d6bce88a8dab54a1f09bcd6f5b7 Mon Sep 17 00:00:00 2001
+From: Niko Tyni <[email protected]>
+Date: Wed, 16 Jul 2014 21:42:30 +0000
+Subject: [PATCH] Fix kfreebsd builds with kernel headers >= 10
+
+This fixes warnings like
+
+In file included from ../../include/net-snmp/net-snmp-config.h:2085:0,
+ from host/data_access/swinst_apt.c:5:
+../../include/net-snmp/system/kfreebsd.h:5:0: warning: "__FreeBSD_version" redefined [enabled by default]
+ #define __FreeBSD_version __FreeBSD_kernel_version
+ ^
+In file included from /usr/include/sys/kern/param.h:1:0,
+ from /usr/include/osreldate.h:1,
+ from ../../include/net-snmp/system/kfreebsd.h:4,
+ from ../../include/net-snmp/net-snmp-config.h:2085,
+ from host/data_access/swinst_apt.c:5:
+/usr/include/sys/kglue/sys/param.h:67:0: note: this is the location of the previous definition
+ #define __FreeBSD_version 1000510 /* Master, propagated to newvers */
+
+and makes agent/mibgroup/host/data_access/swrun_kinfo.c use the modern
+kinfo_proc field names.
+
+Bug-Debian: http://bugs.debian.org/753144
+---
+ include/net-snmp/system/kfreebsd.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/net-snmp/system/kfreebsd.h b/include/net-snmp/system/kfreebsd.h
+index dbf7024..cb32758 100644
+--- a/include/net-snmp/system/kfreebsd.h
++++ b/include/net-snmp/system/kfreebsd.h
+@@ -2,7 +2,9 @@
+ #define freebsd6 freebsd6
+
+ #include <osreldate.h>
++#if defined(__FreeBSD_kernel_version) && !defined(__FreeBSD_version)
+ #define __FreeBSD_version __FreeBSD_kernel_version
++#endif
+
+ #include <sys/queue.h>
+ #include <sys/_types.h>
+--
+1.7.10.4
+
diff -Nru net-snmp-5.7.2.1~dfsg/debian/patches/fix-request-id-0.patch net-snmp-5.7.2.1~dfsg/debian/patches/fix-request-id-0.patch
--- net-snmp-5.7.2.1~dfsg/debian/patches/fix-request-id-0.patch 1970-01-01 01:00:00.000000000 +0100
+++ net-snmp-5.7.2.1~dfsg/debian/patches/fix-request-id-0.patch 2014-07-18 14:47:32.000000000 +0200
@@ -0,0 +1,22 @@
+Description: SNMP GET REQUESTS with REQUEST ID 0 triggered a memory leak that
+ is fixed by this patch
+Origin: upstream bug tracker
+Bug: http://sourceforge.net/p/net-snmp/bugs/2387/
+Forwarded: https://bugs.debian.org/746225
+Author: Roland Stigge <[email protected]>
+Reviewed-by: gregor herrmann <[email protected]>
+Last-Update: 2014-07-18
+Applied-Upstream: http://sourceforge.net/p/net-snmp/patches/1040/
+
+--- a/snmplib/snmp_api.c
++++ b/snmplib/snmp_api.c
+@@ -4998,6 +4998,9 @@
+ /*
+ * No response expected...
+ */
++ if ((reqid == 0) && (pdu->command == SNMP_MSG_RESPONSE)) {
++ reqid = 2;
++ }
+ if (reqid) {
+ /*
+ * Free v1 or v2 TRAP PDU iff no error
diff -Nru net-snmp-5.7.2.1~dfsg/debian/patches/series net-snmp-5.7.2.1~dfsg/debian/patches/series
--- net-snmp-5.7.2.1~dfsg/debian/patches/series 2014-05-15 16:35:02.000000000 +0200
+++ net-snmp-5.7.2.1~dfsg/debian/patches/series 2014-07-18 14:43:59.000000000 +0200
@@ -24,3 +24,5 @@
agentx-crash.patch
TrapReceiver.patch
ifmib.patch
+Fix-kfreebsd-builds-with-kernel-headers-10.patch
+fix-request-id-0.patch
signature.asc
Description: Digital Signature
