[Pkg-net-snmp-devel] Bug#625985: failed kfreebsd-i386 build of net-snmp 5.4.3~dfsg-2.6

[Michael Banck]

Hi,

On Sat, Nov 24, 2012 at 01:46:14PM +0100, Michael Banck wrote:
> I can't reproduce it on asdfasdf right now, but as the code is in some
> freebsd specific file and it clearly FTBFS on the buildds, I don't see
> how it would hurt to apply this patch.  I have uploaded an NMU for this
> to DELAYED/3-day, the debdiff is attached.

Sorry, that upload didn't close the bug in the changelog, I have
uploaded again, see attached debdiff.

Michael
-------------- next part --------------
diff -Nru net-snmp-5.4.3~dfsg/debian/changelog net-snmp-5.4.3~dfsg/debian/changelog
--- net-snmp-5.4.3~dfsg/debian/changelog	2012-11-18 14:24:32.000000000 +0100
+++ net-snmp-5.4.3~dfsg/debian/changelog	2012-11-24 14:06:46.000000000 +0100
@@ -1,3 +1,11 @@
+net-snmp (5.4.3~dfsg-2.7) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/27_kfreebsd_bug625985.patch: New patch, fix build error on
+    kfreebsd-*, by Steven Chamberlain (closes: #625985).
+
+ -- Michael Banck <mbanck at debian.org>  Sat, 24 Nov 2012 13:30:51 +0100
+
 net-snmp (5.4.3~dfsg-2.6) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru net-snmp-5.4.3~dfsg/debian/patches/27_kfreebsd_bug625985.patch net-snmp-5.4.3~dfsg/debian/patches/27_kfreebsd_bug625985.patch
--- net-snmp-5.4.3~dfsg/debian/patches/27_kfreebsd_bug625985.patch	1970-01-01 01:00:00.000000000 +0100
+++ net-snmp-5.4.3~dfsg/debian/patches/27_kfreebsd_bug625985.patch	2012-11-24 13:29:36.000000000 +0100
@@ -0,0 +1,18 @@
+Index: net-snmp-5.4.3~dfsg/agent/mibgroup/hardware/memory/memory_freebsd.c
+===================================================================
+--- net-snmp-5.4.3~dfsg.orig/agent/mibgroup/hardware/memory/memory_freebsd.c	2008-05-28 12:48:46.000000000 +0100
++++ net-snmp-5.4.3~dfsg/agent/mibgroup/hardware/memory/memory_freebsd.c	2012-11-20 22:23:34.693203872 +0000
+@@ -205,11 +205,12 @@
+ 
+ #include <sys/conf.h>
+ 
++kvm_t   *kd = NULL;
++
+ int
+ swapmode(long pagesize)
+ {
+     int             i, n;
+-    static kvm_t   *kd = NULL;
+     struct kvm_swap kswap[16];
+     netsnmp_memory_info *mem;
+     char buf[1024];
diff -Nru net-snmp-5.4.3~dfsg/debian/patches/series net-snmp-5.4.3~dfsg/debian/patches/series
--- net-snmp-5.4.3~dfsg/debian/patches/series	2012-05-27 17:29:54.000000000 +0200
+++ net-snmp-5.4.3~dfsg/debian/patches/series	2012-11-24 13:30:03.000000000 +0100
@@ -6,6 +6,7 @@
 08_defaultconfig.patch
 25_duplicate_iftable.patch
 26_kfreebsd.patch
+27_kfreebsd_bug625985.patch 
 32_mnttab_path.patch
 44_nlist_kvm.patch
 56_manpage.patch