[Pkg-net-snmp-commits] [pkg-net-snmp] 03/06: refresh patches and drop unnecessary one
Hideki Yamane
henrich at moszumanska.debian.org
Thu May 28 13:52:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository pkg-net-snmp.
commit 6dcad7343e3d0ec05a48c72703be36a836938e52
Author: Hideki Yamane <henrich at debian.org>
Date: Tue Apr 28 20:31:02 2015 +0900
refresh patches and drop unnecessary one
---
debian/changelog | 7 +
debian/patches/02_statistics.patch | 10 +-
debian/patches/03_makefiles.patch | 30 +-
debian/patches/05_searchdirs.patch | 6 +-
debian/patches/06_extramibs.patch | 5 +-
debian/patches/07_docfiles.patch | 26 +-
debian/patches/26_kfreebsd.patch | 39 +-
debian/patches/60_libsensors_api.patch | 6 +-
.../patches/61_vacm_missing_dependency_check.patch | 12 +-
debian/patches/62_add_lib_cflags.patch | 6 +-
debian/patches/64_missing_lib.patch | 12 +-
debian/patches/CVE-2014-3565.patch | 455 ---------------------
debian/patches/TrapReceiver.patch | 31 --
debian/patches/add_rocommunity6.patch | 6 +-
debian/patches/after_RFC5378 | 23 +-
debian/patches/agentx-crash.patch | 14 +-
debian/patches/fix-request-id-0.patch | 2 +-
debian/patches/fix_logging_option.patch | 6 +-
debian/patches/fix_man_error.patch | 6 +-
.../patches/fix_manpage-has-errors-from-man.patch | 6 +-
.../fix_manpage-has-errors_break_line.patch | 20 +-
debian/patches/fix_regular_expression.patch | 6 +-
debian/patches/fix_snmpcheck_perl_path.patch | 4 +-
debian/patches/fix_spelling_error.patch | 52 +--
debian/patches/fix_typo_in_snmpd.conf.patch | 6 +-
debian/patches/ifmib.patch | 62 ---
debian/patches/series | 5 +-
debian/patches/snmptranslate.1.patch | 10 +-
28 files changed, 160 insertions(+), 713 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3662047..07de1ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+net-snmp (5.7.3+dfsg-1) UNRELEASED; urgency=medium
+
+ * Imported Upstream version 5.7.3+dfsg
+ * refresh debian/patches and drop unnecessary patches from upstream
+
+ -- Hideki Yamane <henrich at debian.org> Tue, 28 Apr 2015 20:06:08 +0900
+
net-snmp (5.7.2.1+dfsg-1) unstable; urgency=medium
* re-generate upstream source due to accidentally include non-free MIB files.
diff --git a/debian/patches/02_statistics.patch b/debian/patches/02_statistics.patch
index a582476..9649954 100644
--- a/debian/patches/02_statistics.patch
+++ b/debian/patches/02_statistics.patch
@@ -1,10 +1,8 @@
This patch ignores interfaces without statistics.
-Index: net-snmp-5.7.2~dfsg/agent/mibgroup/mibII/interfaces.c
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/mibII/interfaces.c 2013-01-07 12:53:22.545808176 +0900
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/mibII/interfaces.c 2013-01-07 12:53:22.541808167 +0900
-@@ -1592,6 +1592,10 @@
+--- a/agent/mibgroup/mibII/interfaces.c
++++ b/agent/mibgroup/mibII/interfaces.c
+@@ -1590,6 +1590,10 @@
struct ifnet *nnew;
char *stats, *ifstart = line;
@@ -15,7 +13,7 @@ Index: net-snmp-5.7.2~dfsg/agent/mibgroup/mibII/interfaces.c
if (line[strlen(line) - 1] == '\n')
line[strlen(line) - 1] = '\0';
-@@ -1624,7 +1628,7 @@
+@@ -1622,7 +1626,7 @@
&coll) != 5)) {
if ((scan_line_to_use == scan_line_2_2)
&& !strstr(line, "No statistics available"))
diff --git a/debian/patches/03_makefiles.patch b/debian/patches/03_makefiles.patch
index 927c798..77ab9bb 100644
--- a/debian/patches/03_makefiles.patch
+++ b/debian/patches/03_makefiles.patch
@@ -1,10 +1,8 @@
Makefile patch to include libwrap and libsensors libraries and install extra
MIB files.
-Index: net-snmp-5.7.2~dfsg/local/Makefile.in
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/local/Makefile.in 2013-01-15 01:05:58.571396020 +0900
-+++ net-snmp-5.7.2~dfsg/local/Makefile.in 2013-01-15 01:05:58.567396010 +0900
+--- a/local/Makefile.in
++++ b/local/Makefile.in
@@ -103,7 +103,7 @@
mib2c.made: $(srcdir)/mib2c
@@ -14,10 +12,8 @@ Index: net-snmp-5.7.2~dfsg/local/Makefile.in
else \
touch mib2c.made; \
fi
-Index: net-snmp-5.7.2~dfsg/Makefile.top
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/Makefile.top 2013-01-15 01:05:58.571396020 +0900
-+++ net-snmp-5.7.2~dfsg/Makefile.top 2013-01-15 01:11:31.544153075 +0900
+--- a/Makefile.top
++++ b/Makefile.top
@@ -27,6 +27,7 @@
snmplibdir = $(datadir)/snmp
mibdir = $(snmplibdir)/mibs
@@ -26,10 +22,8 @@ Index: net-snmp-5.7.2~dfsg/Makefile.top
DESTDIR = @INSTALL_PREFIX@
INSTALL_PREFIX = $(DESTDIR)
-Index: net-snmp-5.7.2~dfsg/Makefile.in
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/Makefile.in 2013-01-15 01:05:58.571396020 +0900
-+++ net-snmp-5.7.2~dfsg/Makefile.in 2013-01-15 01:09:08.607827737 +0900
+--- a/Makefile.in
++++ b/Makefile.in
@@ -17,7 +17,7 @@
INSTALLHEADERS=version.h net-snmp-features.h
@@ -38,8 +32,8 @@ Index: net-snmp-5.7.2~dfsg/Makefile.in
+INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h kfreebsd.h \
darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \
freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \
- freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd.h \
-@@ -170,7 +170,7 @@
+ freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \
+@@ -171,7 +171,7 @@
#
# override LD_RUN_PATH to avoid dependencies on the build directory
perlmodules: perlmakefiles subdirs
@@ -48,11 +42,9 @@ Index: net-snmp-5.7.2~dfsg/Makefile.in
if test $$? != 0 ; then \
exit 1 ; \
fi
-Index: net-snmp-5.7.2~dfsg/mibs/Makefile.in
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/mibs/Makefile.in 2013-01-15 01:05:58.571396020 +0900
-+++ net-snmp-5.7.2~dfsg/mibs/Makefile.in 2013-01-15 01:17:21.484984229 +0900
-@@ -48,11 +48,11 @@
+--- a/mibs/Makefile.in
++++ b/mibs/Makefile.in
+@@ -49,11 +49,11 @@
UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
diff --git a/debian/patches/05_searchdirs.patch b/debian/patches/05_searchdirs.patch
index 43f96ec..7ca282a 100644
--- a/debian/patches/05_searchdirs.patch
+++ b/debian/patches/05_searchdirs.patch
@@ -1,9 +1,9 @@
Makefile patch to include libwrap and libsensors libraries and install extra
MIB files.
---- net-snmp-5.1.2.orig/local/mib2c
-+++ net-snmp-5.1.2/local/mib2c
-@@ -60,8 +60,9 @@
+--- a/local/mib2c
++++ b/local/mib2c
+@@ -61,8 +61,9 @@
if($ENV{MIB2C_DIR}) {
push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR});
}
diff --git a/debian/patches/06_extramibs.patch b/debian/patches/06_extramibs.patch
index 792d66e..8b2c546 100644
--- a/debian/patches/06_extramibs.patch
+++ b/debian/patches/06_extramibs.patch
@@ -1,8 +1,7 @@
Extra MIB files shipped with Debian.
-diff -ruN net-snmp-5.4.1.orig/mibs/GNOME-SMI.txt net-snmp-5.4.1/mibs/GNOME-SMI.txt
---- net-snmp-5.4.1.orig/mibs/GNOME-SMI.txt 1970-01-01 01:00:00.000000000 +0100
-+++ net-snmp-5.4.1/mibs/GNOME-SMI.txt 2007-09-20 16:33:55.000000000 +0200
+--- /dev/null
++++ b/mibs/GNOME-SMI.txt
@@ -0,0 +1,88 @@
+GNOME-SMI DEFINITIONS ::= BEGIN
+
diff --git a/debian/patches/07_docfiles.patch b/debian/patches/07_docfiles.patch
index 01dbda2..af29175 100644
--- a/debian/patches/07_docfiles.patch
+++ b/debian/patches/07_docfiles.patch
@@ -1,9 +1,7 @@
Patch documentation files to change paths to Debian specific locations.
-Index: net-snmp-5.4.3/FAQ
-===================================================================
---- net-snmp-5.4.3.orig/FAQ 2010-05-23 22:39:44.000000000 +0200
-+++ net-snmp-5.4.3/FAQ 2010-06-04 17:15:28.000000000 +0200
+--- a/FAQ
++++ b/FAQ
@@ -108,7 +108,7 @@
How do I configure access control?
How do I configure SNMPv3 users?
@@ -13,7 +11,7 @@ Index: net-snmp-5.4.3/FAQ
My new agent is ignoring the old snmpd.conf file. Why?
Where should the snmpd.conf file go?
Why am I getting "Connection refused"?
-@@ -700,7 +700,7 @@
+@@ -703,7 +703,7 @@
There are two steps required to add a new MIB file to the tools.
Firstly, copy the MIB file into the appropriate location:
@@ -22,7 +20,7 @@ Index: net-snmp-5.4.3/FAQ
(which makes it available to everyone on the system)
or
mkdir $HOME/.snmp
-@@ -1396,7 +1396,7 @@
+@@ -1399,7 +1399,7 @@
If this is the case, then you can specify this interpreter
explicitly as part of the trap handle directive:
@@ -31,7 +29,7 @@ Index: net-snmp-5.4.3/FAQ
In this case, it's almost certain that you'll also
need to give the full path to the traphandle script (as shown)
-@@ -1490,7 +1490,7 @@
+@@ -1493,7 +1493,7 @@
string to use.
Some of these (such as MIB information), might be best put in a
@@ -40,7 +38,7 @@ Index: net-snmp-5.4.3/FAQ
/etc/snmp/snmp.conf) to apply to all users of the system. Others
(particularly the SNMPv3 security settings), are more likely to refer
to a particular user, and should probably go in a personal snmp.conf
-@@ -2655,7 +2655,7 @@
+@@ -2667,7 +2667,7 @@
createUser {myUser} MD5 {myPassword} DES
@@ -49,7 +47,7 @@ Index: net-snmp-5.4.3/FAQ
{myPassword} are the appropriate values for username and password,
_without_ the braces!). Then re-start the snmpd agent.
-@@ -2664,7 +2664,7 @@
+@@ -2676,7 +2676,7 @@
net-snmp-config --create-snmpv3-user
and follow the prompts given. This will create an entry
@@ -58,7 +56,7 @@ Index: net-snmp-5.4.3/FAQ
Then re-start the snmpd agent.
3) Make sure the agent is running, and will respond to an SNMPv3
-@@ -2698,16 +2698,16 @@
+@@ -2710,16 +2710,16 @@
@@ -79,7 +77,7 @@ Index: net-snmp-5.4.3/FAQ
-@@ -2728,7 +2728,7 @@
+@@ -2740,7 +2740,7 @@
-----------------------------------
The default location for this file with the basic distribution is
@@ -88,10 +86,8 @@ Index: net-snmp-5.4.3/FAQ
Ready-installed versions often look for the file as /etc/snmpd.conf,
or /etc/snmp/snmpd.conf.
-Index: net-snmp-5.4.3/EXAMPLE.conf.def
-===================================================================
---- net-snmp-5.4.3.orig/EXAMPLE.conf.def 2009-06-01 15:11:07.000000000 +0200
-+++ net-snmp-5.4.3/EXAMPLE.conf.def 2010-06-04 17:24:24.000000000 +0200
+--- a/EXAMPLE.conf.def
++++ b/EXAMPLE.conf.def
@@ -23,7 +23,7 @@
# SNMPv3 AUTHENTICATION
#
diff --git a/debian/patches/26_kfreebsd.patch b/debian/patches/26_kfreebsd.patch
index 6ff23f0..3205d65 100644
--- a/debian/patches/26_kfreebsd.patch
+++ b/debian/patches/26_kfreebsd.patch
@@ -1,8 +1,6 @@
Preliminary support for kfreebsd.
-Index: net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/cpu/cpu_sysctl.c
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2013-01-07 13:18:53.861513650 +0900
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/cpu/cpu_sysctl.c 2013-01-07 13:21:32.693902019 +0900
+--- a/agent/mibgroup/hardware/cpu/cpu_sysctl.c
++++ b/agent/mibgroup/hardware/cpu/cpu_sysctl.c
@@ -12,7 +12,7 @@
#include <unistd.h>
#include <sys/types.h>
@@ -12,16 +10,16 @@ Index: net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/cpu/cpu_sysctl.c
#include <sys/resource.h>
#if !defined(CPUSTATES)
#include <sys/dkstat.h>
-@@ -83,7 +83,7 @@
+@@ -89,7 +89,7 @@
#elif defined(KERN_CPTIME) /* OpenBSD */
#define NETSNMP_KERN_CPU KERN_CPTIME
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #define NETSNMP_KERN_CPU 0 /* dummy value - sysctlnametomib(2) should be used */
+ #define NETSNMP_KERN_MCPU 1 /* Enable support for multi-cpu stats. Valid for FreeBSD >=6.4, >=7.1, >=8.0 and beyond */
+ #define NETSNMP_KERN_MCPU_TYPE NETSNMP_CPU_STATS
- #else
-@@ -117,7 +117,7 @@
+@@ -129,7 +129,7 @@
#define NETSNMP_VM_STATS_TYPE struct uvmexp
#endif /* VM_UVMEXP2 || VM_UVMEXP */
@@ -30,21 +28,34 @@ Index: net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/cpu/cpu_sysctl.c
#define NETSNMP_VM_STATS VM_METER
#define NETSNMP_VM_STATS_TYPE struct vmmeter
#define NS_VM_INTR v_intr
-@@ -159,7 +159,7 @@
- * Don't fight it, Dave - go with the flow....
+@@ -169,10 +169,10 @@
*/
NETSNMP_CPU_STATS cpu_stats[CPUSTATES];
+ size_t cpu_size = sizeof(cpu_stats);
-#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if !defined(__FreeBSD__) || defined(__FreeBSD_kernel__) && !defined(__NetBSD__)
int cpu_mib[] = { CTL_KERN, NETSNMP_KERN_CPU };
#endif
- size_t cpu_size = sizeof(cpu_stats);
-@@ -173,7 +173,7 @@
+-#ifdef __FreeBSD__
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__))
+ static int cp_times = -1;
+ #endif
+ #ifdef KERN_CPTIME2
+@@ -189,7 +189,7 @@
size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE);
netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
--#if (defined(__FreeBSD__) || defined(__NetBSD__))
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__))
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
#else
sysctl(cpu_mib, 2, cpu_stats, &cpu_size, NULL, 0);
+@@ -226,7 +226,7 @@
+ mcpu_size = cpu_num*sizeof(cpu_stats);
+ mcpu_stats = malloc(mcpu_size);
+ sysctlbyname("kern.cp_time", mcpu_stats, &mcpu_size, NULL, 0);
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ if (cp_times == -1) {
+ int ret = sysctlbyname("kern.cp_times", NULL, &mcpu_size, NULL, 0);
+ cp_times = ret == -1 ? 0 : 1;
diff --git a/debian/patches/60_libsensors_api.patch b/debian/patches/60_libsensors_api.patch
index 1fd4a56..a908669 100644
--- a/debian/patches/60_libsensors_api.patch
+++ b/debian/patches/60_libsensors_api.patch
@@ -1,9 +1,7 @@
Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libsensors4.
-Index: net-snmp-5.7.2~dfsg/agent/mibgroup/ucd-snmp/lmSensors.c
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/ucd-snmp/lmSensors.c 2013-01-14 15:20:53.481713884 +0900
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/ucd-snmp/lmSensors.c 2013-01-14 15:34:53.367634884 +0900
+--- a/agent/mibgroup/ucd-snmp/lmSensors.c
++++ b/agent/mibgroup/ucd-snmp/lmSensors.c
@@ -94,7 +94,6 @@
#endif
#else
diff --git a/debian/patches/61_vacm_missing_dependency_check.patch b/debian/patches/61_vacm_missing_dependency_check.patch
index dd94576..58b016b 100644
--- a/debian/patches/61_vacm_missing_dependency_check.patch
+++ b/debian/patches/61_vacm_missing_dependency_check.patch
@@ -5,10 +5,8 @@ http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp/net-snmp;a=commitd
However, it isn't applied newest 5.7.2 source tree... why?
-Index: net-snmp-5.7.2~dfsg/apps/snmptrapd_auth.c
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/apps/snmptrapd_auth.c 2013-01-23 11:40:36.267276110 +0900
-+++ net-snmp-5.7.2~dfsg/apps/snmptrapd_auth.c 2013-01-23 11:40:36.263276099 +0900
+--- a/apps/snmptrapd_auth.c
++++ b/apps/snmptrapd_auth.c
@@ -27,6 +27,7 @@
#endif
@@ -17,10 +15,8 @@ Index: net-snmp-5.7.2~dfsg/apps/snmptrapd_auth.c
/**
* initializes the snmptrapd authorization code registering needed
-Index: net-snmp-5.7.2~dfsg/agent/agent_read_config.c
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/agent/agent_read_config.c 2013-01-23 11:38:12.334930631 +0900
-+++ net-snmp-5.7.2~dfsg/agent/agent_read_config.c 2013-01-23 11:41:40.083429045 +0900
+--- a/agent/agent_read_config.c
++++ b/agent/agent_read_config.c
@@ -290,6 +290,9 @@
snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
diff --git a/debian/patches/62_add_lib_cflags.patch b/debian/patches/62_add_lib_cflags.patch
index 305d777..68f0b59 100644
--- a/debian/patches/62_add_lib_cflags.patch
+++ b/debian/patches/62_add_lib_cflags.patch
@@ -7,10 +7,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502806
-Index: net-snmp-5.7.2~dfsg/net-snmp-config.in
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/net-snmp-config.in 2013-01-14 04:28:45.350028570 +0000
-+++ net-snmp-5.7.2~dfsg/net-snmp-config.in 2013-01-14 04:28:45.350028570 +0000
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
@@ -140,6 +140,9 @@
--base-cflags)
echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
diff --git a/debian/patches/64_missing_lib.patch b/debian/patches/64_missing_lib.patch
index f395e9d..0300c7f 100644
--- a/debian/patches/64_missing_lib.patch
+++ b/debian/patches/64_missing_lib.patch
@@ -1,7 +1,5 @@
-Index: net-snmp-5.7.2~dfsg/apps/Makefile.in
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/apps/Makefile.in 2012-10-09 22:28:58.000000000 +0000
-+++ net-snmp-5.7.2~dfsg/apps/Makefile.in 2013-01-14 05:56:10.000000000 +0000
+--- a/apps/Makefile.in
++++ b/apps/Makefile.in
@@ -83,6 +83,8 @@
USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(USELIBS)
MYSQL_LIBS = @MYSQL_LIBS@
@@ -29,10 +27,8 @@ Index: net-snmp-5.7.2~dfsg/apps/Makefile.in
snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS}
-Index: net-snmp-5.7.2~dfsg/configure.ac
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/configure.ac 2012-10-09 22:28:58.000000000 +0000
-+++ net-snmp-5.7.2~dfsg/configure.ac 2013-01-14 05:56:44.894900017 +0000
+--- a/configure.ac
++++ b/configure.ac
@@ -78,6 +78,9 @@
AC_SUBST(PARTIALTARGETFLAGS)
diff --git a/debian/patches/CVE-2014-3565.patch b/debian/patches/CVE-2014-3565.patch
deleted file mode 100644
index ed1587e..0000000
--- a/debian/patches/CVE-2014-3565.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-Description: patch for CVE-2014-3565
- taken from http://sourceforge.net/p/net-snmp/official-patches/48/
-
-Origin: upstream
-Bug-Debian: http://bugs.debian.org/760132
-Last-Update: 2012-07-17
-
-
-
-commit 7f4a7b891332899cea26e95be0337aae01648742
-Author: Jan Safranek <jsafranek at users.sourceforge.net>
-Date: Thu Jul 31 13:46:49 2014 +0200
-
- Added checks for printing variables with wrong types.
-
- When -OQ command line argument is used, variable formatter preffers the type
- of the varible parsed from a MIB file instead of checking type of the variable
- as parsed from SNMP message.
-
- This can lead to crashes when incoming packets contains a variable with
- NULL type, while the MIB says the variable should be non-NULL, like Integer.
- The formatter then tries to interpret the NULL (from packet) as Integer (from
- MIB file).
-
-Index: pkg-net-snmp/snmplib/mib.c
-===================================================================
---- pkg-net-snmp.orig/snmplib/mib.c 2014-05-15 23:29:58.461566805 +0900
-+++ pkg-net-snmp/snmplib/mib.c 2014-09-15 22:50:53.677839395 +0900
-@@ -464,17 +464,16 @@
- u_char *cp;
- int output_format, cnt;
-
-- if ((var->type != ASN_OCTET_STR) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- const char str[] = "Wrong Type (should be OCTET STRING): ";
-- if (snmp_cstrcat
-- (buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_OCTET_STR) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ const char str[] = "Wrong Type (should be OCTET STRING): ";
-+ if (!snmp_cstrcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
-
-@@ -742,16 +741,16 @@
- const struct enum_list *enums,
- const char *hint, const char *units)
- {
-- if ((var->type != ASN_OPAQUE_FLOAT) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc,
-- "Wrong Type (should be Float): ")) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_OPAQUE_FLOAT) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Float): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -812,17 +811,16 @@
- const struct enum_list *enums,
- const char *hint, const char *units)
- {
-- if ((var->type != ASN_OPAQUE_DOUBLE) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- if (snmp_cstrcat
-- (buf, buf_len, out_len, allow_realloc,
-- "Wrong Type (should be Double): ")) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_OPAQUE_DOUBLE) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Double): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -887,20 +885,21 @@
- {
- char a64buf[I64CHARSZ + 1];
-
-- if ((var->type != ASN_COUNTER64
-+ if (var->type != ASN_COUNTER64
- #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
- && var->type != ASN_OPAQUE_COUNTER64
- && var->type != ASN_OPAQUE_I64 && var->type != ASN_OPAQUE_U64
- #endif
-- ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc,
-- "Wrong Type (should be Counter64): ")) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ ) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Counter64): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -988,23 +987,25 @@
- const struct enum_list *enums,
- const char *hint, const char *units)
- {
-- if ((var->type != ASN_OPAQUE
-+ if (var->type != ASN_OPAQUE
- #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
- && var->type != ASN_OPAQUE_COUNTER64
- && var->type != ASN_OPAQUE_U64
- && var->type != ASN_OPAQUE_I64
- && var->type != ASN_OPAQUE_FLOAT && var->type != ASN_OPAQUE_DOUBLE
- #endif /* NETSNMP_WITH_OPAQUE_SPECIAL_TYPES */
-- ) && (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- if (snmp_cstrcat(buf, buf_len, out_len, allow_realloc,
-- "Wrong Type (should be Opaque): ")) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ ) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Opaque): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-+
- #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
- switch (var->type) {
- case ASN_OPAQUE_COUNTER64:
-@@ -1080,17 +1081,16 @@
- {
- int buf_overflow = 0;
-
-- if ((var->type != ASN_OBJECT_ID) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] =
-- "Wrong Type (should be OBJECT IDENTIFIER): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_OBJECT_ID) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be OBJECT IDENTIFIER): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -1150,16 +1150,16 @@
- {
- char timebuf[40];
-
-- if ((var->type != ASN_TIMETICKS) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be Timeticks): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_TIMETICKS) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Timeticks): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_NUMERIC_TIMETICKS)) {
-@@ -1298,17 +1298,18 @@
- {
- char *enum_string = NULL;
-
-- if ((var->type != ASN_INTEGER) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be INTEGER): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_INTEGER) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be INTEGER): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-+
- for (; enums; enums = enums->next) {
- if (enums->value == *var->val.integer) {
- enum_string = enums->label;
-@@ -1401,16 +1402,16 @@
- {
- char *enum_string = NULL;
-
-- if ((var->type != ASN_UINTEGER) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be UInteger32): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_UINTEGER) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be UInteger32): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- for (; enums; enums = enums->next) {
-@@ -1498,17 +1499,16 @@
- {
- char tmp[32];
-
-- if ((var->type != ASN_GAUGE) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] =
-- "Wrong Type (should be Gauge32 or Unsigned32): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_GAUGE) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Gauge32 or Unsigned32): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -1571,16 +1571,16 @@
- {
- char tmp[32];
-
-- if ((var->type != ASN_COUNTER) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be Counter32): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_COUNTER) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be Counter32): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -1634,16 +1634,16 @@
- {
- size_t i;
-
-- if ((var->type != ASN_IPADDRESS) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be NetworkAddress): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_IPADDRESS) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be NetworkAddress): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -1700,16 +1700,16 @@
- {
- u_char *ip = var->val.string;
-
-- if ((var->type != ASN_IPADDRESS) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be IpAddress): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_IPADDRESS) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be IpAddress): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -1758,20 +1758,20 @@
- const struct enum_list *enums,
- const char *hint, const char *units)
- {
-- if ((var->type != ASN_NULL) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be NULL): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_NULL) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be NULL): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
-- } else {
-- u_char str[] = "NULL";
-- return snmp_strcat(buf, buf_len, out_len, allow_realloc, str);
- }
-+
-+ u_char str[] = "NULL";
-+ return snmp_strcat(buf, buf_len, out_len, allow_realloc, str);
- }
-
-
-@@ -1806,16 +1806,16 @@
- u_char *cp;
- char *enum_string;
-
-- if ((var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be BITS): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_BIT_STR && var->type != ASN_OCTET_STR) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be BITS): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
-@@ -1890,16 +1890,16 @@
- const struct enum_list *enums, const char *hint,
- const char *units)
- {
-- if ((var->type != ASN_NSAP) &&
-- (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT))) {
-- u_char str[] = "Wrong Type (should be NsapAddress): ";
-- if (snmp_strcat(buf, buf_len, out_len, allow_realloc, str)) {
-- return sprint_realloc_by_type(buf, buf_len, out_len,
-+ if (var->type != ASN_NSAP) {
-+ if (!netsnmp_ds_get_boolean(
-+ NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICKE_PRINT)) {
-+ u_char str[] = "Wrong Type (should be NsapAddress): ";
-+ if (!snmp_strcat(buf, buf_len, out_len, allow_realloc, str))
-+ return 0;
-+ }
-+ return sprint_realloc_by_type(buf, buf_len, out_len,
- allow_realloc, var, NULL, NULL,
- NULL);
-- } else {
-- return 0;
-- }
- }
-
- if (!netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)) {
diff --git a/debian/patches/TrapReceiver.patch b/debian/patches/TrapReceiver.patch
deleted file mode 100644
index 0973f83..0000000
--- a/debian/patches/TrapReceiver.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fixes Perl Trap Handler Segfault with old Perl (e.g. Perl 5.8.8) (CVE-2014-2285)
-Origin: upstream
-Bug: http://sourceforge.net/p/net-snmp/code/ci/76e8d6d100320629d8a23be4b0128619600c919d/
-Last-Update: 2014-03-30
-
---- net-snmp-5.7.2.1~dfsg.orig/perl/TrapReceiver/TrapReceiver.xs
-+++ net-snmp-5.7.2.1~dfsg/perl/TrapReceiver/TrapReceiver.xs
-@@ -81,18 +81,18 @@ int perl_trapd_handler( netsnmp_pdu
- STOREPDUi("securitymodel", pdu->securityModel);
- STOREPDUi("securitylevel", pdu->securityLevel);
- STOREPDU("contextName",
-- newSVpv(pdu->contextName, pdu->contextNameLen));
-+ newSVpv(pdu->contextName ? pdu->contextName : "", pdu->contextNameLen));
- STOREPDU("contextEngineID",
-- newSVpv((char *) pdu->contextEngineID,
-+ newSVpv(pdu->contextEngineID ? (char *) pdu->contextEngineID : "",
- pdu->contextEngineIDLen));
- STOREPDU("securityEngineID",
-- newSVpv((char *) pdu->securityEngineID,
-+ newSVpv(pdu->securityEngineID ? (char *) pdu->securityEngineID : "",
- pdu->securityEngineIDLen));
- STOREPDU("securityName",
-- newSVpv((char *) pdu->securityName, pdu->securityNameLen));
-+ newSVpv(pdu->securityName ? (char *) pdu->securityName : "", pdu->securityNameLen));
- } else {
- STOREPDU("community",
-- newSVpv((char *) pdu->community, pdu->community_len));
-+ newSVpv(pdu->community ? (char *) pdu->community : "", pdu->community_len));
- }
-
- if (transport && transport->f_fmtaddr) {
diff --git a/debian/patches/add_rocommunity6.patch b/debian/patches/add_rocommunity6.patch
index 782729d..c196ce9 100644
--- a/debian/patches/add_rocommunity6.patch
+++ b/debian/patches/add_rocommunity6.patch
@@ -1,7 +1,5 @@
-Index: pkg-net-snmp/EXAMPLE.conf.def
-===================================================================
---- pkg-net-snmp.orig/EXAMPLE.conf.def 2013-09-04 19:13:13.000000000 +0900
-+++ pkg-net-snmp/EXAMPLE.conf.def 2013-09-04 19:13:13.000000000 +0900
+--- a/EXAMPLE.conf.def
++++ b/EXAMPLE.conf.def
@@ -49,6 +49,8 @@
#rocommunity public localhost
# Default access to basic system info
diff --git a/debian/patches/after_RFC5378 b/debian/patches/after_RFC5378
index 9bb502e..61f5fef 100644
--- a/debian/patches/after_RFC5378
+++ b/debian/patches/after_RFC5378
@@ -5,9 +5,9 @@ Origin: vendor
Forwarded: not-needed
Last-Update: 2013-02-08
---- net-snmp-5.7.2~dfsg.orig/mibs/rfclist
-+++ net-snmp-5.7.2~dfsg/mibs/rfclist
-@@ -233,33 +233,3 @@
+--- a/mibs/rfclist
++++ b/mibs/rfclist
+@@ -232,48 +232,3 @@
5190 MIDCOM-MIB
5240 PIM-BSR-MIB
5324 T11-FC-SP-TC-MIB:T11-FC-SP-AUTHENTICATION-MIB:T11-FC-SP-ZONING-MIB:T11-FC-SP-POLICY-MIB:T11-FC-SP-SA-MIB
@@ -28,7 +28,6 @@ Last-Update: 2013-02-08
-5676 SYSLOG-MSG-MIB
-5728 DVB-RCS-MIB
-5813 FORCES-MIB
--5815 IPFIX-MIB:IPFIX-SELECTOR-MIB
-5833 CAPWAP-BASE-MIB
-5834 CAPWAP-DOT11-MIB
-5907 NTPv4-MIB
@@ -41,3 +40,19 @@ Last-Update: 2013-02-08
-6475 PMIPV6-TC-MIB:PMIPV6-MIB
-6527 VRRPV3-MIB
-6615 IPFIX-MIB:IPFIX-SELECTOR-MIB
+-6727 PSAMP-MIB
+-6765 GBOND-MIB:IANA-GBOND-TC-MIB
+-6766 G9983-MIB
+-6767 G9982-MIB
+-6768 G9981-MIB
+-6779 NHDP-MIB
+-6825 TED-MIB
+-6850 RBRIDGE-MIB
+-6933 ENTITY-MIB:UUID-TC-MIB
+-6945 RPKI-ROUTER-MIB
+-7052 LISP-MIB
+-7147 ISCSI-MIB
+-7184 OLSRv2-MIB
+-7257 VPLS-GENERIC-MIB:VPLS-LDP-MIB:VPLS-BGP-MIB
+-7330 BFD-TC-STD-MIB
+-7331 BFD-STD-MIB
diff --git a/debian/patches/agentx-crash.patch b/debian/patches/agentx-crash.patch
index 00988cc..47fec85 100644
--- a/debian/patches/agentx-crash.patch
+++ b/debian/patches/agentx-crash.patch
@@ -18,9 +18,9 @@ Origin: vendor
Forwarded: not-needed
Last-Update: <YYYY-MM-DD>
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/agentx/master.c
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/agentx/master.c
-@@ -219,6 +219,9 @@ agentx_got_response(int operation,
+--- a/agent/mibgroup/agentx/master.c
++++ b/agent/mibgroup/agentx/master.c
+@@ -219,6 +219,9 @@
if (!cache) {
DEBUGMSGTL(("agentx/master", "response too late on session %8p\n",
session));
@@ -30,7 +30,7 @@ Last-Update: <YYYY-MM-DD>
return 0;
}
requests = cache->requests;
-@@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handle
+@@ -606,6 +609,8 @@
result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data);
if (result == 0) {
snmp_free_pdu(pdu);
@@ -39,9 +39,9 @@ Last-Update: <YYYY-MM-DD>
}
return SNMP_ERR_NOERROR;
---- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/agentx/master_admin.c
-+++ net-snmp-5.7.2~dfsg/agent/mibgroup/agentx/master_admin.c
-@@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * s
+--- a/agent/mibgroup/agentx/master_admin.c
++++ b/agent/mibgroup/agentx/master_admin.c
+@@ -133,11 +133,16 @@
* requests, so that the delegated request will be completed and
* further requests can be processed
*/
diff --git a/debian/patches/fix-request-id-0.patch b/debian/patches/fix-request-id-0.patch
index 57adf44..003a1f9 100644
--- a/debian/patches/fix-request-id-0.patch
+++ b/debian/patches/fix-request-id-0.patch
@@ -10,7 +10,7 @@ Applied-Upstream: http://sourceforge.net/p/net-snmp/patches/1040/
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
-@@ -4998,6 +4998,9 @@
+@@ -5025,6 +5025,9 @@
/*
* No response expected...
*/
diff --git a/debian/patches/fix_logging_option.patch b/debian/patches/fix_logging_option.patch
index 675737f..9c9aab4 100644
--- a/debian/patches/fix_logging_option.patch
+++ b/debian/patches/fix_logging_option.patch
@@ -7,9 +7,9 @@ Bug-Debian: http://bugs.debian.org/616437
Forwarded: no
Last-Update: 2013-01-23
---- net-snmp-5.7.2~dfsg.orig/man/snmpd.8.def
-+++ net-snmp-5.7.2~dfsg/man/snmpd.8.def
-@@ -78,9 +78,9 @@ To get a list of compiled modules, run t
+--- a/man/snmpd.8.def
++++ b/man/snmpd.8.def
+@@ -78,9 +78,9 @@
.I "\-Dmib_init \-H"
(assuming debugging support has been compiled in).
.TP
diff --git a/debian/patches/fix_man_error.patch b/debian/patches/fix_man_error.patch
index 5cbda9c..354ceb9 100644
--- a/debian/patches/fix_man_error.patch
+++ b/debian/patches/fix_man_error.patch
@@ -11,10 +11,8 @@ Origin: vendor
Forwarded: no
Last-Update: 2013-01-26
-Index: net-snmp-5.7.2~dfsg/man/mib2c.conf.5.in
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/man/mib2c.conf.5.in 2013-01-26 19:04:05.000000000 +0900
-+++ net-snmp-5.7.2~dfsg/man/mib2c.conf.5.in 2013-01-26 19:04:05.000000000 +0900
+--- a/man/mib2c.conf.5.in
++++ b/man/mib2c.conf.5.in
@@ -1,6 +1,6 @@
.TH MIB2C.CONF 5 "28 Apr 2004" VVERSIONINFO "Net-SNMP"
.SH NAME
diff --git a/debian/patches/fix_manpage-has-errors-from-man.patch b/debian/patches/fix_manpage-has-errors-from-man.patch
index 54e8a55..e5e3614 100644
--- a/debian/patches/fix_manpage-has-errors-from-man.patch
+++ b/debian/patches/fix_manpage-has-errors-from-man.patch
@@ -7,9 +7,9 @@ $ LC_ALL=C MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z man/va
Forwarded: no
Last-Update: 2014-01-11
---- net-snmp-5.7.2~dfsg.orig/man/variables.5.def
-+++ net-snmp-5.7.2~dfsg/man/variables.5.def
-@@ -84,7 +84,8 @@ A variant of this (typically used when w
+--- a/man/variables.5.def
++++ b/man/variables.5.def
+@@ -84,7 +84,8 @@
text, rather than running programs), is to combine the name and
numeric subidentifier:
.RS
diff --git a/debian/patches/fix_manpage-has-errors_break_line.patch b/debian/patches/fix_manpage-has-errors_break_line.patch
index f642d2b..de39c78 100644
--- a/debian/patches/fix_manpage-has-errors_break_line.patch
+++ b/debian/patches/fix_manpage-has-errors_break_line.patch
@@ -8,9 +8,9 @@ Author: Hideki Yamane <henrich at debian.org>
Forwarded: no
Last-Update: 2013-04-26
---- net-snmp-5.7.2~dfsg.orig/man/snmpcmd.1.def
-+++ net-snmp-5.7.2~dfsg/man/snmpcmd.1.def
-@@ -888,7 +888,7 @@ The standard prefix for object identifie
+--- a/man/snmpcmd.1.def
++++ b/man/snmpcmd.1.def
+@@ -888,7 +888,7 @@
Defaults to .iso.org.dod.internet.mgmt.mib\-2
.IP MIBS
The list of MIBs to load. Defaults to
@@ -19,9 +19,9 @@ Last-Update: 2013-04-26
Overridden by the
.B \-m
option.
---- net-snmp-5.7.2~dfsg.orig/man/netsnmp_mib_api.3.def
-+++ net-snmp-5.7.2~dfsg/man/netsnmp_mib_api.3.def
-@@ -277,7 +277,7 @@ A colon separated list of MIB modules to
+--- a/man/netsnmp_mib_api.3.def
++++ b/man/netsnmp_mib_api.3.def
+@@ -277,7 +277,7 @@
.br
The default list of modules will depend on how the Net-SNMP software
was originally compiled, but is typically:
@@ -30,14 +30,14 @@ Last-Update: 2013-04-26
.IP
If the value of the
.B MIBS
---- net-snmp-5.7.2~dfsg.orig/man/netsnmp_config_api.3.def
-+++ net-snmp-5.7.2~dfsg/man/netsnmp_config_api.3.def
-@@ -365,7 +365,7 @@ function that it should abort the operat
+--- a/man/netsnmp_config_api.3.def
++++ b/man/netsnmp_config_api.3.def
+@@ -365,7 +365,7 @@
SNMPCONFPATH
A colon separated list of directories to search for configuration
files in.
-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp
+Default\: SYSCONFDIR/snmp\:DATADIR/snmp\:LIBDIR/snmp\:$HOME/.snmp
.SH "SEE ALSO"
- .BR mib_api "(3), " snmp_api (3)
+ netsnmp_mib_api(3), snmp_api(3)
.\" Local Variables:
diff --git a/debian/patches/fix_regular_expression.patch b/debian/patches/fix_regular_expression.patch
index 97f79bb..ef78960 100644
--- a/debian/patches/fix_regular_expression.patch
+++ b/debian/patches/fix_regular_expression.patch
@@ -23,10 +23,8 @@ Origin: vendor
Forwarded: no
Last-Update: 2013-01-07
-Index: net-snmp-5.7.1~dfsg/python/setup.py
-===================================================================
---- net-snmp-5.7.1~dfsg.orig/python/setup.py 2013-01-07 11:33:32.346195340 +0900
-+++ net-snmp-5.7.1~dfsg/python/setup.py 2013-01-07 11:33:58.654255360 +0900
+--- a/python/setup.py
++++ b/python/setup.py
@@ -18,14 +18,14 @@
netsnmp_libs = os.popen(basedir+'/net-snmp-config --libs').read()
libdir = os.popen(basedir+'/net-snmp-config --build-lib-dirs '+basedir).read()
diff --git a/debian/patches/fix_snmpcheck_perl_path.patch b/debian/patches/fix_snmpcheck_perl_path.patch
index 7d7b9de..621a7cb 100644
--- a/debian/patches/fix_snmpcheck_perl_path.patch
+++ b/debian/patches/fix_snmpcheck_perl_path.patch
@@ -9,8 +9,8 @@ Bug-Debian: http://bugs.debian.org/44373
Forwarded: not-needed
Last-Update: 2012-07-17
---- net-snmp-5.7.1~dfsg.orig/local/snmpcheck.def
-+++ net-snmp-5.7.1~dfsg/local/snmpcheck.def
+--- a/local/snmpcheck.def
++++ b/local/snmpcheck.def
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
diff --git a/debian/patches/fix_spelling_error.patch b/debian/patches/fix_spelling_error.patch
index b86c706..15376f1 100644
--- a/debian/patches/fix_spelling_error.patch
+++ b/debian/patches/fix_spelling_error.patch
@@ -6,9 +6,9 @@ Origin: vendor
Forwarded: no
Last-Update: 2013-01-22
---- net-snmp-5.7.2~dfsg.orig/apps/encode_keychange.c
-+++ net-snmp-5.7.2~dfsg/apps/encode_keychange.c
-@@ -403,7 +403,7 @@ usage_to_file(FILE * ofp)
+--- a/apps/encode_keychange.c
++++ b/apps/encode_keychange.c
+@@ -403,7 +403,7 @@
"-f will require reading from the stdin/terminal, ignoring a) and b).\n\
-P will prevent prompts for passphrases to stdout from being printed.\n\
\n\
@@ -17,9 +17,9 @@ Last-Update: 2013-01-22
otherwise it is created to contain \"text\". If nothing is given,\n\
<engineID> is constructed from the first IP address for the local host.\n");
---- net-snmp-5.7.2~dfsg.orig/apps/snmpusm.c
-+++ net-snmp-5.7.2~dfsg/apps/snmpusm.c
-@@ -150,7 +150,7 @@ usage(void)
+--- a/apps/snmpusm.c
++++ b/apps/snmpusm.c
+@@ -150,7 +150,7 @@
fprintf(stderr, "\t\t\t(it won't be active until you active it)\n");
fprintf(stderr, "\t-Cx\t\tChange the privacy key.\n");
fprintf(stderr, "\t-Ca\t\tChange the authentication key.\n");
@@ -28,25 +28,25 @@ Last-Update: 2013-01-22
fprintf(stderr, "\t\t\tinstead of passphrase.\n");
}
---- net-snmp-5.7.2~dfsg.orig/apps/snmpnetstat/inet6.c
-+++ net-snmp-5.7.2~dfsg/apps/snmpnetstat/inet6.c
-@@ -333,7 +333,7 @@ icmp6_stats(const char *name)
- struct stat_table icmp6stats_tbl[] = {
- {1, "%d total message%s received"},
- {2, "%d message%s dropped due to errors"},
-- {18, "%d ouput message request%s"},
-+ {18, "%d output message request%s"},
- {19, "%d output message%s discarded"},
- {0, ""}
- };
---- net-snmp-5.7.2~dfsg.orig/apps/snmpnetstat/inet.c
-+++ net-snmp-5.7.2~dfsg/apps/snmpnetstat/inet.c
-@@ -445,7 +445,7 @@ icmp_stats(const char *name)
+--- a/apps/snmpnetstat/inet.c
++++ b/apps/snmpnetstat/inet.c
+@@ -449,7 +449,7 @@
struct stat_table icmpstats_tbl[] = {
- {1, "%d total message%s received"},
- {2, "%d message%s dropped due to errors"},
-- {14, "%d ouput message request%s"},
-+ {14, "%d output message request%s"},
- {15, "%d output message%s discarded"},
- {0, ""}
+ { 1, "%14d total message%s received"},
+ { 2, "%14d message%s dropped due to errors"},
+- {14, "%14d ouput message request%s"},
++ {14, "%14d output message request%s"},
+ {15, "%14d output message%s discarded"},
+ { 0, ""}
+ };
+--- a/apps/snmpnetstat/inet6.c
++++ b/apps/snmpnetstat/inet6.c
+@@ -334,7 +334,7 @@
+ struct stat_table icmp6stats_tbl[] = {
+ { 1, "%14d total message%s received"},
+ { 2, "%14d message%s dropped due to errors"},
+- {18, "%14d ouput message request%s"},
++ {18, "%14d output message request%s"},
+ {19, "%14d output message%s discarded"},
+ { 0, ""}
};
diff --git a/debian/patches/fix_typo_in_snmpd.conf.patch b/debian/patches/fix_typo_in_snmpd.conf.patch
index acab1d6..9c5f087 100644
--- a/debian/patches/fix_typo_in_snmpd.conf.patch
+++ b/debian/patches/fix_typo_in_snmpd.conf.patch
@@ -6,9 +6,9 @@ Bug-Debian: http://bugs.debian.org/603593
Forwarded: no
Last-Update: 2013-01-23
---- net-snmp-5.7.2~dfsg.orig/EXAMPLE.conf.def
-+++ net-snmp-5.7.2~dfsg/EXAMPLE.conf.def
-@@ -63,7 +63,7 @@ view systemonly included .1.3.6.1.2
+--- a/EXAMPLE.conf.def
++++ b/EXAMPLE.conf.def
+@@ -63,7 +63,7 @@
#rwuser authPrivUser priv
# It's no longer typically necessary to use the full 'com2sec/group/access' configuration
diff --git a/debian/patches/ifmib.patch b/debian/patches/ifmib.patch
deleted file mode 100644
index 0204f8a..0000000
--- a/debian/patches/ifmib.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/agent/mibgroup/if-mib/data_access/interface_linux.c b/agent/mibgroup/if-mib/data_access/interface_linux.c
-index 3419811..d6eb91a 100644
---- a/agent/mibgroup/if-mib/data_access/interface_linux.c
-+++ b/agent/mibgroup/if-mib/data_access/interface_linux.c
-@@ -18,7 +18,31 @@ netsnmp_feature_require(interface_ioctl_flags_set)
-
- #ifdef HAVE_PCI_LOOKUP_NAME
- #include <pci/pci.h>
-+#include <setjmp.h>
- static struct pci_access *pci_access;
-+
-+/* Avoid letting libpci call exit(1) when no PCI bus is available. */
-+static int do_longjmp =0;
-+static jmp_buf err_buf;
-+static void
-+netsnmp_pci_error(char *msg, ...)
-+{
-+ va_list args;
-+ char *buf;
-+ int buflen;
-+
-+ va_start(args, msg);
-+ buflen = strlen("pcilib: ")+strlen(msg)+2;
-+ buf = malloc(buflen);
-+ snprintf(buf, buflen, "pcilib: %s\n", msg);
-+ snmp_vlog(LOG_ERR, buf, args);
-+ free(buf);
-+ va_end(args);
-+ if (do_longjmp)
-+ longjmp(err_buf, 1);
-+ else
-+ exit(1);
-+}
- #endif
-
- #ifdef HAVE_LINUX_ETHTOOL_H
-@@ -147,10 +171,22 @@ netsnmp_arch_interface_init(void)
-
- #ifdef HAVE_PCI_LOOKUP_NAME
- pci_access = pci_alloc();
-- if (pci_access)
-+ if (!pci_access) {
-+ snmp_log(LOG_ERR, "pcilib: pci_alloc failed\n");
-+ return;
-+ }
-+
-+ pci_access->error = netsnmp_pci_error;
-+
-+ do_longjmp = 1;
-+ if (setjmp(err_buf)) {
-+ pci_cleanup(pci_access);
-+ snmp_log(LOG_ERR, "pcilib: pci_init failed\n");
-+ pci_access = NULL;
-+ }
-+ else if (pci_access)
- pci_init(pci_access);
-- else
-- snmp_log(LOG_ERR, "Unable to create pci access method\n");
-+ do_longjmp = 0;
- #endif
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 851d31c..a2cfca8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@
06_extramibs.patch
07_docfiles.patch
26_kfreebsd.patch
-27_kfreebsd_bug625985.patch
+#27_kfreebsd_bug625985.patch
60_libsensors_api.patch
61_vacm_missing_dependency_check.patch
62_add_lib_cflags.patch
@@ -22,8 +22,5 @@ fix_manpage-has-errors_break_line.patch
add_rocommunity6.patch
fix_manpage-has-errors-from-man.patch
agentx-crash.patch
-TrapReceiver.patch
-ifmib.patch
Fix-kfreebsd-builds-with-kernel-headers-10.patch
fix-request-id-0.patch
-CVE-2014-3565.patch
diff --git a/debian/patches/snmptranslate.1.patch b/debian/patches/snmptranslate.1.patch
index b95b933..11aba4d 100644
--- a/debian/patches/snmptranslate.1.patch
+++ b/debian/patches/snmptranslate.1.patch
@@ -8,11 +8,9 @@ Origin: vendor
Forwarded: no
Last-Update: 2012-07-17
-Index: net-snmp-5.7.2~dfsg/man/snmptranslate.1.def
-===================================================================
---- net-snmp-5.7.2~dfsg.orig/man/snmptranslate.1.def 2012-10-10 07:28:58.000000000 +0900
-+++ net-snmp-5.7.2~dfsg/man/snmptranslate.1.def 2013-01-15 01:19:05.000000000 +0900
-@@ -163,22 +163,22 @@
+--- a/man/snmptranslate.1.def
++++ b/man/snmptranslate.1.def
+@@ -166,22 +166,22 @@
.nf
+--system(1)
|
@@ -43,7 +41,7 @@ Index: net-snmp-5.7.2~dfsg/man/snmptranslate.1.def
| Textual Convention: TimeStamp
|
+--sysORTable(9)
-@@ -186,11 +186,11 @@
+@@ -189,11 +189,11 @@
+--sysOREntry(1)
|
+-- ---- Integer sysORIndex(1)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git
More information about the Pkg-net-snmp-commits
mailing list