summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Banck <mbanck@debian.org>2012-11-24 13:30:51 +0100
committerHideki Yamane <henrich@debian.org>2013-04-11 10:21:24 +0900
commit9c90d287bee24712eabc1c1175afc13db1ccb30a (patch)
tree418a7b7f92b39a4cbec27f419519e1c9e550f2dc
parenta98c94ceb87dd9d946415e44d66e593297bb9652 (diff)
downloadpkg-net-snmp-9c90d287bee24712eabc1c1175afc13db1ccb30a.tar.gz
Imported Debian patch 5.4.3~dfsg-2.7debian/5.4.3_dfsg-2.7
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/27_kfreebsd_bug625985.patch18
-rw-r--r--debian/patches/series1
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3fcf33a..bb2dce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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 --git a/debian/patches/27_kfreebsd_bug625985.patch b/debian/patches/27_kfreebsd_bug625985.patch
new file mode 100644
index 0000000..37e512f
--- /dev/null
+++ b/debian/patches/27_kfreebsd_bug625985.patch
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 3628693..ee92653 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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