[Pkg-net-snmp-commits] [pkg-net-snmp] 02/05: add 0026-fix-Bug-785380-incorrect-date-format.patch
Hideki Yamane
henrich at moszumanska.debian.org
Fri Jan 29 23:46:16 UTC 2016
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 b4db266177fff4d9c4053ca37bf3e716e6d6cfda
Author: Hideki Yamane <henrich at debian.org>
Date: Thu Jan 28 21:39:20 2016 +0900
add 0026-fix-Bug-785380-incorrect-date-format.patch
---
...5-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch} | 0
...0026-fix-Bug-785380-incorrect-date-format.patch | 22 ++++
debian/patches/02_statistics.patch | 13 ++-
debian/patches/03_makefiles.patch | 66 +++++++-----
debian/patches/05_searchdirs.patch | 11 +-
debian/patches/06_extramibs.patch | 11 ++
debian/patches/07_docfiles.patch | 50 +++++----
debian/patches/26_kfreebsd.patch | 20 +++-
debian/patches/60_libsensors_api.patch | 21 ++--
.../patches/61_vacm_missing_dependency_check.patch | 34 ++++--
debian/patches/62_add_lib_cflags.patch | 15 ++-
debian/patches/64_missing_lib.patch | 21 +++-
...ix-kfreebsd-builds-with-kernel-headers-10.patch | 8 +-
debian/patches/add_rocommunity6.patch | 12 ++-
debian/patches/after_RFC5378 | 13 ++-
debian/patches/agentx-crash.patch | 20 ++--
debian/patches/dropped_25_duplicate_iftable.patch | 115 ---------------------
debian/patches/dropped_44_nlist_kvm.patch | 17 ---
debian/patches/fix-request-id-0.patch | 20 ++--
debian/patches/fix_logging_option.patch | 15 +--
debian/patches/fix_man_error.patch | 16 ++-
.../patches/fix_manpage-has-errors-from-man.patch | 11 +-
.../fix_manpage-has-errors_break_line.patch | 63 ++++++-----
debian/patches/fix_regular_expression.patch | 18 ++--
debian/patches/fix_snmpcheck_perl_path.patch | 14 +--
debian/patches/fix_spelling_error.patch | 49 +++++----
debian/patches/fix_typo_in_snmpd.conf.patch | 16 +--
debian/patches/net-snmp-config_multi-arch.patch | 32 ------
debian/patches/series | 4 +-
debian/patches/snmptranslate.1.patch | 17 +--
30 files changed, 379 insertions(+), 365 deletions(-)
diff --git a/debian/patches/Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch b/debian/patches/0025-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
similarity index 100%
rename from debian/patches/Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
rename to debian/patches/0025-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
diff --git a/debian/patches/0026-fix-Bug-785380-incorrect-date-format.patch b/debian/patches/0026-fix-Bug-785380-incorrect-date-format.patch
new file mode 100644
index 0000000..cd5ecf6
--- /dev/null
+++ b/debian/patches/0026-fix-Bug-785380-incorrect-date-format.patch
@@ -0,0 +1,22 @@
+From: Hideki Yamane <henrich at debian.org>
+Date: Thu, 28 Jan 2016 21:38:09 +0900
+Subject: fix Bug#785380 incorrect date format
+
+---
+ local/traptoemail | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/local/traptoemail b/local/traptoemail
+index e738ba7..cadc18b 100755
+--- a/local/traptoemail
++++ b/local/traptoemail
+@@ -13,6 +13,9 @@ use Net::SMTP;
+ use Getopt::Std;
+ use POSIX qw(strftime);
+
++# for sane timestamp format
++$ENV{LANG} = 'C';
++
+ $opts{'s'} = "localhost";
+ $opts{'f'} = 'root@' . `hostname`;
+ chomp($opts{'f'});
diff --git a/debian/patches/02_statistics.patch b/debian/patches/02_statistics.patch
index 9649954..20d2476 100644
--- a/debian/patches/02_statistics.patch
+++ b/debian/patches/02_statistics.patch
@@ -1,8 +1,17 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:04 +0900
+Subject: _statistics
+
This patch ignores interfaces without statistics.
+---
+ agent/mibgroup/mibII/interfaces.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+diff --git a/agent/mibgroup/mibII/interfaces.c b/agent/mibgroup/mibII/interfaces.c
+index 26ffebb..43f7427 100644
--- a/agent/mibgroup/mibII/interfaces.c
+++ b/agent/mibgroup/mibII/interfaces.c
-@@ -1590,6 +1590,10 @@
+@@ -1590,6 +1590,10 @@ Interface_Scan_Init(void)
struct ifnet *nnew;
char *stats, *ifstart = line;
@@ -13,7 +22,7 @@ This patch ignores interfaces without statistics.
if (line[strlen(line) - 1] == '\n')
line[strlen(line) - 1] = '\0';
-@@ -1622,7 +1626,7 @@
+@@ -1622,7 +1626,7 @@ Interface_Scan_Init(void)
&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 77ab9bb..a5ef82a 100644
--- a/debian/patches/03_makefiles.patch
+++ b/debian/patches/03_makefiles.patch
@@ -1,30 +1,21 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:04 +0900
+Subject: _makefiles
+
Makefile patch to include libwrap and libsensors libraries and install extra
MIB files.
+---
+ Makefile.in | 4 ++--
+ Makefile.top | 1 +
+ local/Makefile.in | 2 +-
+ mibs/Makefile.in | 6 +++---
+ 4 files changed, 7 insertions(+), 6 deletions(-)
---- a/local/Makefile.in
-+++ b/local/Makefile.in
-@@ -103,7 +103,7 @@
-
- mib2c.made: $(srcdir)/mib2c
- if test "x$(PERL)" != "x" ; then \
-- $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \
-+ $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \
- else \
- touch mib2c.made; \
- fi
---- a/Makefile.top
-+++ b/Makefile.top
-@@ -27,6 +27,7 @@
- snmplibdir = $(datadir)/snmp
- mibdir = $(snmplibdir)/mibs
- persistentdir = @PERSISTENT_DIRECTORY@
-+sysconfdir = @sysconfdir@
- DESTDIR = @INSTALL_PREFIX@
- INSTALL_PREFIX = $(DESTDIR)
-
+diff --git a/Makefile.in b/Makefile.in
+index cfcdf73..10f36f3 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ CPP = @CPP@ \
INSTALLHEADERS=version.h net-snmp-features.h
INCLUDESUBDIR=system
@@ -33,7 +24,7 @@ MIB files.
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 freebsd11.h \
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt
#
# override LD_RUN_PATH to avoid dependencies on the build directory
perlmodules: perlmakefiles subdirs
@@ -42,9 +33,36 @@ MIB files.
if test $$? != 0 ; then \
exit 1 ; \
fi
+diff --git a/Makefile.top b/Makefile.top
+index 503f61e..bf32f3c 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -27,6 +27,7 @@ man8dir = $(mandir)/man8
+ snmplibdir = $(datadir)/snmp
+ mibdir = $(snmplibdir)/mibs
+ persistentdir = @PERSISTENT_DIRECTORY@
++sysconfdir = @sysconfdir@
+ DESTDIR = @INSTALL_PREFIX@
+ INSTALL_PREFIX = $(DESTDIR)
+
+diff --git a/local/Makefile.in b/local/Makefile.in
+index cb84afc..12d7132 100644
+--- a/local/Makefile.in
++++ b/local/Makefile.in
+@@ -103,7 +103,7 @@ tkmib.made: $(srcdir)/tkmib
+
+ mib2c.made: $(srcdir)/mib2c
+ if test "x$(PERL)" != "x" ; then \
+- $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \
++ $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \
+ else \
+ touch mib2c.made; \
+ fi
+diff --git a/mibs/Makefile.in b/mibs/Makefile.in
+index f185002..1ad4558 100644
--- a/mibs/Makefile.in
+++ b/mibs/Makefile.in
-@@ -49,11 +49,11 @@
+@@ -49,11 +49,11 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
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 7ca282a..266a901 100644
--- a/debian/patches/05_searchdirs.patch
+++ b/debian/patches/05_searchdirs.patch
@@ -1,9 +1,18 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:04 +0900
+Subject: _searchdirs
+
Makefile patch to include libwrap and libsensors libraries and install extra
MIB files.
+---
+ local/mib2c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+diff --git a/local/mib2c b/local/mib2c
+index 2016f06..6926321 100755
--- a/local/mib2c
+++ b/local/mib2c
-@@ -61,8 +61,9 @@
+@@ -61,8 +61,9 @@ $currentlevel = -1;
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 8b2c546..8676219 100644
--- a/debian/patches/06_extramibs.patch
+++ b/debian/patches/06_extramibs.patch
@@ -1,5 +1,16 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:04 +0900
+Subject: _extramibs
+
Extra MIB files shipped with Debian.
+---
+ mibs/GNOME-SMI.txt | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 88 insertions(+)
+ create mode 100644 mibs/GNOME-SMI.txt
+diff --git a/mibs/GNOME-SMI.txt b/mibs/GNOME-SMI.txt
+new file mode 100644
+index 0000000..a496ee4
--- /dev/null
+++ b/mibs/GNOME-SMI.txt
@@ -0,0 +1,88 @@
diff --git a/debian/patches/07_docfiles.patch b/debian/patches/07_docfiles.patch
index af29175..540372a 100644
--- a/debian/patches/07_docfiles.patch
+++ b/debian/patches/07_docfiles.patch
@@ -1,8 +1,31 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: _docfiles
+
Patch documentation files to change paths to Debian specific locations.
+---
+ EXAMPLE.conf.def | 2 +-
+ FAQ | 22 +++++++++++-----------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+diff --git a/EXAMPLE.conf.def b/EXAMPLE.conf.def
+index 8f4a197..180713c 100644
+--- a/EXAMPLE.conf.def
++++ b/EXAMPLE.conf.def
+@@ -23,7 +23,7 @@ agentAddress udp:127.0.0.1:161
+ # SNMPv3 AUTHENTICATION
+ #
+ # Note that these particular settings don't actually belong here.
+-# They should be copied to the file /var/net-snmp/snmpd.conf
++# They should be copied to the file /var/lib/snmp/snmpd.conf
+ # and the passwords changed, before being uncommented in that file *only*.
+ # Then restart the agent
+
+diff --git a/FAQ b/FAQ
+index 2844d33..47b07e6 100644
--- a/FAQ
+++ b/FAQ
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ TABLE OF CONTENTS
How do I configure access control?
How do I configure SNMPv3 users?
The 'createUser' line disappears when I start the agent. Why?
@@ -11,7 +34,7 @@ Patch documentation files to change paths to Debian specific locations.
My new agent is ignoring the old snmpd.conf file. Why?
Where should the snmpd.conf file go?
Why am I getting "Connection refused"?
-@@ -703,7 +703,7 @@
+@@ -703,7 +703,7 @@ How do I add a MIB to the tools?
There are two steps required to add a new MIB file to the tools.
Firstly, copy the MIB file into the appropriate location:
@@ -20,7 +43,7 @@ Patch documentation files to change paths to Debian specific locations.
(which makes it available to everyone on the system)
or
mkdir $HOME/.snmp
-@@ -1399,7 +1399,7 @@
+@@ -1399,7 +1399,7 @@ My traphandler script doesn't work when run like this - why not?
If this is the case, then you can specify this interpreter
explicitly as part of the trap handle directive:
@@ -29,7 +52,7 @@ Patch documentation files to change paths to Debian specific locations.
In this case, it's almost certain that you'll also
need to give the full path to the traphandle script (as shown)
-@@ -1493,7 +1493,7 @@
+@@ -1493,7 +1493,7 @@ OK, what should I put in snmp.conf?
string to use.
Some of these (such as MIB information), might be best put in a
@@ -38,7 +61,7 @@ Patch documentation files to change paths to Debian specific locations.
/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
-@@ -2667,7 +2667,7 @@
+@@ -2667,7 +2667,7 @@ How do I configure SNMPv3 users?
createUser {myUser} MD5 {myPassword} DES
@@ -47,7 +70,7 @@ Patch documentation files to change paths to Debian specific locations.
{myPassword} are the appropriate values for username and password,
_without_ the braces!). Then re-start the snmpd agent.
-@@ -2676,7 +2676,7 @@
+@@ -2676,7 +2676,7 @@ How do I configure SNMPv3 users?
net-snmp-config --create-snmpv3-user
and follow the prompts given. This will create an entry
@@ -56,7 +79,7 @@ Patch documentation files to change paths to Debian specific locations.
Then re-start the snmpd agent.
3) Make sure the agent is running, and will respond to an SNMPv3
-@@ -2710,16 +2710,16 @@
+@@ -2710,16 +2710,16 @@ The 'createUser' line disappears when I start the agent. Why?
@@ -77,7 +100,7 @@ Patch documentation files to change paths to Debian specific locations.
-@@ -2740,7 +2740,7 @@
+@@ -2740,7 +2740,7 @@ Where should the snmpd.conf file go?
-----------------------------------
The default location for this file with the basic distribution is
@@ -86,14 +109,3 @@ Patch documentation files to change paths to Debian specific locations.
Ready-installed versions often look for the file as /etc/snmpd.conf,
or /etc/snmp/snmpd.conf.
---- a/EXAMPLE.conf.def
-+++ b/EXAMPLE.conf.def
-@@ -23,7 +23,7 @@
- # SNMPv3 AUTHENTICATION
- #
- # Note that these particular settings don't actually belong here.
--# They should be copied to the file /var/net-snmp/snmpd.conf
-+# They should be copied to the file /var/lib/snmp/snmpd.conf
- # and the passwords changed, before being uncommented in that file *only*.
- # Then restart the agent
-
diff --git a/debian/patches/26_kfreebsd.patch b/debian/patches/26_kfreebsd.patch
index 3205d65..d758e17 100644
--- a/debian/patches/26_kfreebsd.patch
+++ b/debian/patches/26_kfreebsd.patch
@@ -1,4 +1,14 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: _kfreebsd
+
Preliminary support for kfreebsd.
+---
+ agent/mibgroup/hardware/cpu/cpu_sysctl.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/agent/mibgroup/hardware/cpu/cpu_sysctl.c b/agent/mibgroup/hardware/cpu/cpu_sysctl.c
+index 5ecb68e..f0899c2 100644
--- a/agent/mibgroup/hardware/cpu/cpu_sysctl.c
+++ b/agent/mibgroup/hardware/cpu/cpu_sysctl.c
@@ -12,7 +12,7 @@
@@ -10,7 +20,7 @@ Preliminary support for kfreebsd.
#include <sys/resource.h>
#if !defined(CPUSTATES)
#include <sys/dkstat.h>
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ void init_cpu_sysctl( void ) {
#elif defined(KERN_CPTIME) /* OpenBSD */
#define NETSNMP_KERN_CPU KERN_CPTIME
@@ -19,7 +29,7 @@ Preliminary support for kfreebsd.
#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
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ void init_cpu_sysctl( void ) {
#define NETSNMP_VM_STATS_TYPE struct uvmexp
#endif /* VM_UVMEXP2 || VM_UVMEXP */
@@ -28,7 +38,7 @@ Preliminary support for kfreebsd.
#define NETSNMP_VM_STATS VM_METER
#define NETSNMP_VM_STATS_TYPE struct vmmeter
#define NS_VM_INTR v_intr
-@@ -169,10 +169,10 @@
+@@ -169,10 +169,10 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
*/
NETSNMP_CPU_STATS cpu_stats[CPUSTATES];
size_t cpu_size = sizeof(cpu_stats);
@@ -41,7 +51,7 @@ Preliminary support for kfreebsd.
static int cp_times = -1;
#endif
#ifdef KERN_CPTIME2
-@@ -189,7 +189,7 @@
+@@ -189,7 +189,7 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
size_t mem_size = sizeof(NETSNMP_VM_STATS_TYPE);
netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
@@ -50,7 +60,7 @@ Preliminary support for kfreebsd.
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 @@
+@@ -226,7 +226,7 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void *magic ) {
mcpu_size = cpu_num*sizeof(cpu_stats);
mcpu_stats = malloc(mcpu_size);
sysctlbyname("kern.cp_time", mcpu_stats, &mcpu_size, NULL, 0);
diff --git a/debian/patches/60_libsensors_api.patch b/debian/patches/60_libsensors_api.patch
index a908669..41baedd 100644
--- a/debian/patches/60_libsensors_api.patch
+++ b/debian/patches/60_libsensors_api.patch
@@ -1,8 +1,17 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: _libsensors_api
+
Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libsensors4.
+---
+ agent/mibgroup/ucd-snmp/lmSensors.c | 162 +++++++++++++++++-------------------
+ 1 file changed, 78 insertions(+), 84 deletions(-)
+diff --git a/agent/mibgroup/ucd-snmp/lmSensors.c b/agent/mibgroup/ucd-snmp/lmSensors.c
+index 05c60b7..888731f 100644
--- a/agent/mibgroup/ucd-snmp/lmSensors.c
+++ b/agent/mibgroup/ucd-snmp/lmSensors.c
-@@ -94,7 +94,6 @@
+@@ -94,7 +94,6 @@ netsnmp_feature_require(table_container)
#endif
#else
#include <sensors/sensors.h>
@@ -10,7 +19,7 @@ Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libse
#endif
#include "lmSensors.h"
-@@ -357,9 +356,7 @@
+@@ -357,9 +356,7 @@ sensor_init(void)
{
int res;
#ifndef solaris2
@@ -20,7 +29,7 @@ Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libse
int i = 0;
DEBUGMSG(("ucd-snmp/lmSensors", "=> sensor_init\n"));
-@@ -371,13 +368,7 @@
+@@ -371,13 +368,7 @@ sensor_init(void)
sensor_array[i].sensor = NULL;
}
@@ -35,7 +44,7 @@ Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libse
{
res = 2;
goto leaving;
-@@ -395,7 +386,7 @@
+@@ -395,7 +386,7 @@ static int
sensor_load(void)
{
int rc = 0;
@@ -44,7 +53,7 @@ Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libse
if (t > timestamp + 7) /* this may require some tuning - currently 7 seconds*/
{
-@@ -947,7 +938,8 @@
+@@ -947,7 +938,8 @@ else{
#else /* end solaris2 only ie. ifdef everything else */
const sensors_chip_name *chip;
@@ -54,7 +63,7 @@ Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libse
int chip_nr = 0;
unsigned int i = 0;
-@@ -969,78 +961,80 @@
+@@ -969,78 +961,80 @@ else{
sensor_array[i].current_len = DEFAULT_SENSORS;
} /* end for */
diff --git a/debian/patches/61_vacm_missing_dependency_check.patch b/debian/patches/61_vacm_missing_dependency_check.patch
index 58b016b..4024622 100644
--- a/debian/patches/61_vacm_missing_dependency_check.patch
+++ b/debian/patches/61_vacm_missing_dependency_check.patch
@@ -1,23 +1,23 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: _vacm_missing_dependency_check
+
Do not call vacm_standard_views() if the corresponding module was not compiled.
(applied upstream in changeset 19116)
http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp/net-snmp;a=commitdiff;h=93161743ab8caa5259a945a8d890ae96a99f0b1c;hp=2299559c29fc6493ac2f8836b82683c0904a9b9d
However, it isn't applied newest 5.7.2 source tree... why?
+---
+ agent/agent_read_config.c | 3 +++
+ apps/snmptrapd_auth.c | 1 +
+ 2 files changed, 4 insertions(+)
---- a/apps/snmptrapd_auth.c
-+++ b/apps/snmptrapd_auth.c
-@@ -27,6 +27,7 @@
- #endif
-
- #include <net-snmp/agent/agent_trap.h>
-+#include <net-snmp/agent/net-snmp-agent-includes.h>
-
- /**
- * initializes the snmptrapd authorization code registering needed
+diff --git a/agent/agent_read_config.c b/agent/agent_read_config.c
+index f9ef1af..68a3bd8 100644
--- a/agent/agent_read_config.c
+++ b/agent/agent_read_config.c
-@@ -290,6 +290,9 @@
+@@ -290,6 +290,9 @@ update_config(void)
snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
free_config();
@@ -27,3 +27,15 @@ However, it isn't applied newest 5.7.2 source tree... why?
read_configs();
}
+diff --git a/apps/snmptrapd_auth.c b/apps/snmptrapd_auth.c
+index be21e5e..10765ce 100644
+--- a/apps/snmptrapd_auth.c
++++ b/apps/snmptrapd_auth.c
+@@ -27,6 +27,7 @@
+ #endif
+
+ #include <net-snmp/agent/agent_trap.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+ /**
+ * initializes the snmptrapd authorization code registering needed
diff --git a/debian/patches/62_add_lib_cflags.patch b/debian/patches/62_add_lib_cflags.patch
index 68f0b59..1cc259c 100644
--- a/debian/patches/62_add_lib_cflags.patch
+++ b/debian/patches/62_add_lib_cflags.patch
@@ -1,15 +1,22 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: _add_lib_cflags
+
Patch to add option "--base-lib-cflags" to net-snmp-config. This flag returns options needed to link
against libnetsnmp. In particular, no perl specific options are provided.
It was reported in
"libsnmp-base: forcing perl headers in net-snmp-config --cflags breaks perl builds"
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502806
+---
+ net-snmp-config.in | 5 +++++
+ 1 file changed, 5 insertions(+)
-
-
+diff --git a/net-snmp-config.in b/net-snmp-config.in
+index d55872c..0831fa0 100644
--- a/net-snmp-config.in
+++ b/net-snmp-config.in
-@@ -140,6 +140,9 @@
+@@ -140,6 +140,9 @@ else
--base-cflags)
echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
;;
@@ -19,7 +26,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502806
--cflags|--cf*)
echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
;;
-@@ -643,6 +646,8 @@
+@@ -643,6 +646,8 @@ if test "x$usage" = "xyes"; then
echo " These options produce the various compilation flags needed when"
echo " building external SNMP applications:"
echo ""
diff --git a/debian/patches/64_missing_lib.patch b/debian/patches/64_missing_lib.patch
index 0300c7f..bc2baed 100644
--- a/debian/patches/64_missing_lib.patch
+++ b/debian/patches/64_missing_lib.patch
@@ -1,6 +1,17 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: _missing_lib
+
+---
+ apps/Makefile.in | 6 ++++--
+ configure.ac | 3 +++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/apps/Makefile.in b/apps/Makefile.in
+index 77404dd..c611e01 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
-@@ -83,6 +83,8 @@
+@@ -83,6 +83,8 @@ MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(USELIBS)
MYSQL_LIBS = @MYSQL_LIBS@
MYSQL_INCLUDES = @MYSQL_INCLUDES@
@@ -9,7 +20,7 @@
VAL_LIBS = @VAL_LIBS@
LIBS = $(USELIBS) $(VAL_LIBS) @LIBS@
-@@ -170,7 +172,7 @@
+@@ -170,7 +172,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS}
snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
@@ -18,7 +29,7 @@
snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS}
-@@ -183,7 +185,7 @@
+@@ -183,7 +185,7 @@ snmpset$(EXEEXT): snmpset.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS}
snmpusm$(EXEEXT): snmpusm.$(OSUFFIX) $(USELIBS)
@@ -27,9 +38,11 @@
snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS}
+diff --git a/configure.ac b/configure.ac
+index ecf761f..6d28e67 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -78,6 +78,9 @@
+@@ -78,6 +78,9 @@ AC_SUBST(DLLIBS)
AC_SUBST(PARTIALTARGETFLAGS)
AC_SUBST(ac_cv_NETSNMP_SYSTEM_INCLUDE_FILE)
diff --git a/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch b/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch
index 1929ee8..c878ee3 100644
--- a/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch
+++ b/debian/patches/Fix-kfreebsd-builds-with-kernel-headers-10.patch
@@ -1,7 +1,6 @@
-From a2f2f610b56c7d6bce88a8dab54a1f09bcd6f5b7 Mon Sep 17 00:00:00 2001
From: Niko Tyni <ntyni at debian.org>
Date: Wed, 16 Jul 2014 21:42:30 +0000
-Subject: [PATCH] Fix kfreebsd builds with kernel headers >= 10
+Subject: Fix kfreebsd builds with kernel headers >= 10
This fixes warnings like
@@ -23,7 +22,7 @@ kinfo_proc field names.
Bug-Debian: http://bugs.debian.org/753144
---
- include/net-snmp/system/kfreebsd.h | 2 ++
+ 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
@@ -40,6 +39,3 @@ index dbf7024..cb32758 100644
#include <sys/queue.h>
#include <sys/_types.h>
---
-1.7.10.4
-
diff --git a/debian/patches/add_rocommunity6.patch b/debian/patches/add_rocommunity6.patch
index c196ce9..a829c4a 100644
--- a/debian/patches/add_rocommunity6.patch
+++ b/debian/patches/add_rocommunity6.patch
@@ -1,6 +1,16 @@
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: add_rocommunity6
+
+---
+ EXAMPLE.conf.def | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/EXAMPLE.conf.def b/EXAMPLE.conf.def
+index f619c8e..0c21dee 100644
--- a/EXAMPLE.conf.def
+++ b/EXAMPLE.conf.def
-@@ -49,6 +49,8 @@
+@@ -49,6 +49,8 @@ view systemonly included .1.3.6.1.2.1.25.1
#rocommunity public localhost
# Default access to basic system info
rocommunity public default -V systemonly
diff --git a/debian/patches/after_RFC5378 b/debian/patches/after_RFC5378
index 61f5fef..ba4f65d 100644
--- a/debian/patches/after_RFC5378
+++ b/debian/patches/after_RFC5378
@@ -1,10 +1,13 @@
-Description: exclude under RFC5378 modules
-Author: Hideki Yamane <henrich at debian.org>
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: after_RFC5378
+
---
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2013-02-08
+ mibs/rfclist | 45 ---------------------------------------------
+ 1 file changed, 45 deletions(-)
+diff --git a/mibs/rfclist b/mibs/rfclist
+index e0d3eef..9cca4cc 100644
--- a/mibs/rfclist
+++ b/mibs/rfclist
@@ -232,48 +232,3 @@
diff --git a/debian/patches/agentx-crash.patch b/debian/patches/agentx-crash.patch
index 47fec85..c00763a 100644
--- a/debian/patches/agentx-crash.patch
+++ b/debian/patches/agentx-crash.patch
@@ -1,6 +1,6 @@
-Description: fix snmpd crash via AgentX connection
-
- taken from Fedora, net-snmp-5.7-agentx-crash.patch
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: agentx-crash
bz729738 - net-snmp dumps core in netsnmp_oid_find_prefix
bz1038011 - net-snmp: snmpd crashes/hangs when AgentX subagent times-out
@@ -17,10 +17,16 @@ Date: Tue Feb 7 14:53:44 2012 +0100
Origin: vendor
Forwarded: not-needed
Last-Update: <YYYY-MM-DD>
+---
+ agent/mibgroup/agentx/master.c | 5 +++++
+ agent/mibgroup/agentx/master_admin.c | 9 +++++++--
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+diff --git a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c
+index c42a42a..baeebaf 100644
--- a/agent/mibgroup/agentx/master.c
+++ b/agent/mibgroup/agentx/master.c
-@@ -219,6 +219,9 @@
+@@ -219,6 +219,9 @@ agentx_got_response(int operation,
if (!cache) {
DEBUGMSGTL(("agentx/master", "response too late on session %8p\n",
session));
@@ -30,7 +36,7 @@ Last-Update: <YYYY-MM-DD>
return 0;
}
requests = cache->requests;
-@@ -606,6 +609,8 @@
+@@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handler *handler,
result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data);
if (result == 0) {
snmp_free_pdu(pdu);
@@ -39,9 +45,11 @@ Last-Update: <YYYY-MM-DD>
}
return SNMP_ERR_NOERROR;
+diff --git a/agent/mibgroup/agentx/master_admin.c b/agent/mibgroup/agentx/master_admin.c
+index 4eaeab6..4dc1aa7 100644
--- a/agent/mibgroup/agentx/master_admin.c
+++ b/agent/mibgroup/agentx/master_admin.c
-@@ -133,11 +133,16 @@
+@@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * session, int sessid)
* requests, so that the delegated request will be completed and
* further requests can be processed
*/
diff --git a/debian/patches/dropped_25_duplicate_iftable.patch b/debian/patches/dropped_25_duplicate_iftable.patch
deleted file mode 100644
index 6d2e841..0000000
--- a/debian/patches/dropped_25_duplicate_iftable.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Patch from
-http://sourceforge.net/tracker/index.php?func=detail&aid=1513191&group_id=12694&atid=312694 :
-
-This patch fixes bug #1238981 for me. If a new device
-will be added, the old device are first checked. If
-there's an old device with the same name is found, the
-old device is removed from the list. This fixes the
-problem that i have tons of ppp0 interfaces in the
-snmpd ifTable.
-
-Signed-of-by: Sven Schnelle <svens at gmx.de>
-
--> not applied to current code. need to investigate more
- Hideki Yamane <henrich at debian.org>
-
-
-diff -ru net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/data_access/interface.c net-snmp-5.4.2.1/agent/mibgroup/if-mib/data_access/interface.c
---- net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/data_access/interface.c 2008-02-23 00:52:33.000000000 +0100
-+++ net-snmp-5.4.2.1/agent/mibgroup/if-mib/data_access/interface.c 2009-07-31 17:10:49.000000000 +0200
-@@ -469,12 +469,12 @@
- if (index != tmp) {
- static int logged = 0;
- if (!logged) {
-- snmp_log(LOG_ERR, "IfIndex of an interface changed. Such " \
-- "interfaces will appear multiple times in IF-MIB.\n");
-+ snmp_log(LOG_ERR, "IfIndex of an interface changed.\n");
- logged = 1;
- }
-- DEBUGMSGTL(("access:interface:ifIndex", "index %d != tmp for %s\n",
-- index, name));
-+ se_remove_value_from_slist("interfaces", name);
-+ se_add_pair_to_slist("interfaces", strdup(name), index);
-+ DEBUGMSGTL(("access:interface:ifIndex", "ifname %s, old index %d, already existing, replaced with %d\n", name, tmp, index));
- }
- }
-
-diff -ru net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c net-snmp-5.4.2.1/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
---- net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c 2008-02-12 20:05:24.000000000 +0100
-+++ net-snmp-5.4.2.1/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c 2009-07-31 17:04:17.000000000 +0200
-@@ -266,8 +266,21 @@
- _add_new_interface(netsnmp_interface_entry *ifentry,
- netsnmp_container *container)
- {
-- ifTable_rowreq_ctx *rowreq_ctx;
--
-+ ifTable_rowreq_ctx *rowreq_ctx, *container_entry;
-+ netsnmp_iterator *ctxit;
-+ ctxit = CONTAINER_ITERATOR(container);
-+ container_entry = ITERATOR_FIRST(ctxit);
-+
-+ for(; container_entry; container_entry = ITERATOR_NEXT(ctxit)) {
-+ if(!strcmp(ifentry->name, container_entry->data.ifName) && \
-+ ifentry->index != container_entry->data.ifentry->index) {
-+ DEBUGMSGTL(("ifTable:access", "removing old entry %s (index %d != %d)\n",
-+ container_entry->data.ifName, container_entry->data.ifentry->index, ifentry->index));
-+ se_remove_value_from_slist("interfaces", container_entry->data.ifName);
-+ CONTAINER_REMOVE(container, container_entry);
-+ ifTable_release_rowreq_ctx(container_entry);
-+ }
-+ }
- DEBUGMSGTL(("ifTable:access", "creating new entry\n"));
-
- /*
-Nur in net-snmp-5.4.2.1/agent/mibgroup/if-mib/ifTable: ifTable_data_access.c.orig.
-diff -ru net-snmp-5.4.2.1.orig/snmplib/snmp_enum.c net-snmp-5.4.2.1/snmplib/snmp_enum.c
---- net-snmp-5.4.2.1.orig/snmplib/snmp_enum.c 2005-02-09 20:46:35.000000000 +0100
-+++ net-snmp-5.4.2.1/snmplib/snmp_enum.c 2009-07-31 17:04:17.000000000 +0200
-@@ -213,6 +213,27 @@
- return SE_DNE; /* XXX: um, no good solution here */
- }
-
-+int se_remove_value_from_list(struct snmp_enum_list **list, const char *label)
-+{
-+ struct snmp_enum_list *lastlist;
-+ if(!list)
-+ return SE_DNE;
-+
-+ lastlist = NULL;
-+ while(*list) {
-+ if(strcmp((*list)->label, label) == 0) {
-+ free((*list)->label);
-+ if(lastlist)
-+ lastlist->next = (*list)->next;
-+ free(*list);
-+ *list = NULL;
-+ return 0;
-+ }
-+ lastlist = *list;
-+ (*list) = (*list)->next;
-+ }
-+
-+}
- int
- se_find_free_value_in_list(struct snmp_enum_list *list)
- {
-@@ -331,6 +352,19 @@
- return (se_find_value_in_list(se_find_slist(listname), label));
- }
-
-+void se_remove_value_from_slist(const char *listname, const char *label)
-+{
-+ struct snmp_enum_list_str *sptr, *lastp = NULL;
-+ struct snmp_enum_list *list;
-+ if (!listname)
-+ return;
-+
-+ for (sptr = sliststorage;
-+ sptr != NULL; lastp = sptr, sptr = sptr->next)
-+ if (sptr->name && strcmp(sptr->name, listname) == 0)
-+ se_remove_value_from_list(&sptr->list, label);
-+}
-+
- int
- se_find_free_value_in_slist(const char *listname)
- {
diff --git a/debian/patches/dropped_44_nlist_kvm.patch b/debian/patches/dropped_44_nlist_kvm.patch
deleted file mode 100644
index 3ec6670..0000000
--- a/debian/patches/dropped_44_nlist_kvm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Patch from Petr Salinger <Petr.Salinger at seznam.cz>: search nlist() in libkvm.
-
-cannot apply to current code?
-
---- net-snmp-5.4.3~dfsg.orig/configure.in
-+++ net-snmp-5.4.3~dfsg/configure.in
-@@ -2890,6 +2890,9 @@
- AC_DEFINE(HAVE_LIBKVM, 1, [Define to 1 if you have the `kvm' library (-lkvm).])
- LAGENTLIBS="$LAGENTLIBS ${_libkvm}"
- fi
-+AC_CHECK_FUNC(nlist, AC_DEFINE(HAVE_NLIST, 1, [Define to 1 if you have the `nlist' function.]),
-+ AC_CHECK_LIB(bsd, nlist, AC_DEFINE(HAVE_NLIST, 1, [Define to 1 if you have the `nlist' function.])
-+ LAGENTLIBS="$LAGENTLIBS bsd"))
-
- # DYNAMIC MODULE SUPPORT
- AC_CHECK_FUNC(dlopen, AC_DEFINE(HAVE_DLOPEN, 1, [Define to 1 if you have the `dlopen' function.]),
diff --git a/debian/patches/fix-request-id-0.patch b/debian/patches/fix-request-id-0.patch
index 003a1f9..a3c6a76 100644
--- a/debian/patches/fix-request-id-0.patch
+++ b/debian/patches/fix-request-id-0.patch
@@ -1,16 +1,16 @@
-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 <stigge at antcom.de>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-07-18
-Applied-Upstream: http://sourceforge.net/p/net-snmp/patches/1040/
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix-request-id-0
+---
+ snmplib/snmp_api.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
+index 191debf..d2568bf 100644
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
-@@ -5025,6 +5025,9 @@
+@@ -5025,6 +5025,9 @@ _sess_async_send(void *sessp,
/*
* No response expected...
*/
diff --git a/debian/patches/fix_logging_option.patch b/debian/patches/fix_logging_option.patch
index 9c9aab4..3f1055f 100644
--- a/debian/patches/fix_logging_option.patch
+++ b/debian/patches/fix_logging_option.patch
@@ -1,15 +1,16 @@
-Description: fix man description
-Author: Hideki Yamane <henrich at debian.org>
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_logging_option
---
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/616437
-Forwarded: no
-Last-Update: 2013-01-23
+ man/snmpd.8.def | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/man/snmpd.8.def b/man/snmpd.8.def
+index f173396..d86023a 100644
--- a/man/snmpd.8.def
+++ b/man/snmpd.8.def
-@@ -78,9 +78,9 @@
+@@ -78,9 +78,9 @@ To get a list of compiled modules, run the agent with the arguments
.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 354ceb9..9c47e91 100644
--- a/debian/patches/fix_man_error.patch
+++ b/debian/patches/fix_man_error.patch
@@ -1,16 +1,14 @@
-Description: fix man error
-
- - mib2c.conf
- http://lintian.debian.org/tags/manpage-has-bad-whatis-entry.html
-
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_man_error
Author: Hideki Yamane <henrich at debian.org>
-
---
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-01-26
+ man/mib2c.conf.5.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/man/mib2c.conf.5.in b/man/mib2c.conf.5.in
+index 3692a65..d756055 100644
--- a/man/mib2c.conf.5.in
+++ b/man/mib2c.conf.5.in
@@ -1,6 +1,6 @@
diff --git a/debian/patches/fix_manpage-has-errors-from-man.patch b/debian/patches/fix_manpage-has-errors-from-man.patch
index e5e3614..be050db 100644
--- a/debian/patches/fix_manpage-has-errors-from-man.patch
+++ b/debian/patches/fix_manpage-has-errors-from-man.patch
@@ -1,4 +1,6 @@
-Description: variables(5) lines over 80 width
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_manpage-has-errors-from-man
$ LC_ALL=C MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z man/variables.5.def > /dev/null
@@ -6,10 +8,15 @@ $ LC_ALL=C MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z man/va
Forwarded: no
Last-Update: 2014-01-11
+---
+ man/variables.5.def | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+diff --git a/man/variables.5.def b/man/variables.5.def
+index 14ee5e2..ccf8f77 100644
--- a/man/variables.5.def
+++ b/man/variables.5.def
-@@ -84,7 +84,8 @@
+@@ -84,7 +84,8 @@ A variant of this (typically used when writing OIDs in descriptive
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 de39c78..735a87e 100644
--- a/debian/patches/fix_manpage-has-errors_break_line.patch
+++ b/debian/patches/fix_manpage-has-errors_break_line.patch
@@ -1,38 +1,21 @@
-Description: fix manpage error
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_manpage-has-errors_break_line
see http://lintian.debian.org/tags/manpage-has-errors-from-man.html
Author: Hideki Yamane <henrich at debian.org>
-
---
-Forwarded: no
-Last-Update: 2013-04-26
+ man/netsnmp_config_api.3.def | 2 +-
+ man/netsnmp_mib_api.3.def | 2 +-
+ man/snmpcmd.1.def | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
---- 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
--SNMPv2\-TC:SNMPv2\-MIB:IF\-MIB:IP\-MIB:TCP\-MIB:UDP\-MIB:SNMP\-VACM\-MIB.
-+SNMPv2\-TC\:SNMPv2\-MIB:IF\-MIB:IP\-MIB\:TCP\-MIB\:UDP\-MIB\:SNMP\-VACM\-MIB.
- Overridden by the
- .B \-m
- option.
---- 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:
--IP\-MIB:IF\-MIB:TCP\-MIB:UDP\-MIB:SNMPv2\-MIB:RFC1213\-MIB: UCD\-SNMP\-MIB:HOST\-RESOURCES\-MIB
-+IP\-MIB\:IF\-MIB\:TCP\-MIB\:UDP\-MIB\:SNMPv2\-MIB\:RFC1213\-MIB\: UCD\-SNMP\-MIB\:HOST\-RESOURCES\-MIB
- .IP
- If the value of the
- .B MIBS
+diff --git a/man/netsnmp_config_api.3.def b/man/netsnmp_config_api.3.def
+index d009fc5..bb7e80b 100644
--- a/man/netsnmp_config_api.3.def
+++ b/man/netsnmp_config_api.3.def
-@@ -365,7 +365,7 @@
+@@ -365,7 +365,7 @@ function that it should abort the operation of the application.
SNMPCONFPATH
A colon separated list of directories to search for configuration
files in.
@@ -41,3 +24,29 @@ Last-Update: 2013-04-26
.SH "SEE ALSO"
netsnmp_mib_api(3), snmp_api(3)
.\" Local Variables:
+diff --git a/man/netsnmp_mib_api.3.def b/man/netsnmp_mib_api.3.def
+index 2e1da8f..72924ce 100644
+--- a/man/netsnmp_mib_api.3.def
++++ b/man/netsnmp_mib_api.3.def
+@@ -277,7 +277,7 @@ A colon separated list of MIB modules to load.
+ .br
+ The default list of modules will depend on how the Net-SNMP software
+ was originally compiled, but is typically:
+-IP\-MIB:IF\-MIB:TCP\-MIB:UDP\-MIB:SNMPv2\-MIB:RFC1213\-MIB: UCD\-SNMP\-MIB:HOST\-RESOURCES\-MIB
++IP\-MIB\:IF\-MIB\:TCP\-MIB\:UDP\-MIB\:SNMPv2\-MIB\:RFC1213\-MIB\: UCD\-SNMP\-MIB\:HOST\-RESOURCES\-MIB
+ .IP
+ If the value of the
+ .B MIBS
+diff --git a/man/snmpcmd.1.def b/man/snmpcmd.1.def
+index e4df8b2..c41c24a 100644
+--- a/man/snmpcmd.1.def
++++ b/man/snmpcmd.1.def
+@@ -888,7 +888,7 @@ The standard prefix for object identifiers (when using UCD-style output).
+ Defaults to .iso.org.dod.internet.mgmt.mib\-2
+ .IP MIBS
+ The list of MIBs to load. Defaults to
+-SNMPv2\-TC:SNMPv2\-MIB:IF\-MIB:IP\-MIB:TCP\-MIB:UDP\-MIB:SNMP\-VACM\-MIB.
++SNMPv2\-TC\:SNMPv2\-MIB:IF\-MIB:IP\-MIB\:TCP\-MIB\:UDP\-MIB\:SNMP\-VACM\-MIB.
+ Overridden by the
+ .B \-m
+ option.
diff --git a/debian/patches/fix_regular_expression.patch b/debian/patches/fix_regular_expression.patch
index ef78960..86198c7 100644
--- a/debian/patches/fix_regular_expression.patch
+++ b/debian/patches/fix_regular_expression.patch
@@ -1,7 +1,7 @@
-Description: fix regular expression mismatching
- setup.py would find library via net-snmp-config, however, its result also
- matches to "-L/usr/lib/x86_64-linux-gnu" and return "inux-gnu" as library
- in Debian/Ubuntu enabling Multi-Arch environtment as below.
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_regular_expression
+
>>> import os
>>> import re
>>> import string
@@ -17,15 +17,15 @@ Description: fix regular expression mismatching
['netsnmp', 'crypto', 'm']
Author: Hideki Yamane <henrich at debian.org>
-
---
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-01-07
+ python/setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/python/setup.py b/python/setup.py
+index c520df9..0bd3155 100644
--- a/python/setup.py
+++ b/python/setup.py
-@@ -18,14 +18,14 @@
+@@ -18,14 +18,14 @@ if intree:
netsnmp_libs = os.popen(basedir+'/net-snmp-config --libs').read()
libdir = os.popen(basedir+'/net-snmp-config --build-lib-dirs '+basedir).read()
incdir = os.popen(basedir+'/net-snmp-config --build-includes '+basedir).read()
diff --git a/debian/patches/fix_snmpcheck_perl_path.patch b/debian/patches/fix_snmpcheck_perl_path.patch
index 621a7cb..af24956 100644
--- a/debian/patches/fix_snmpcheck_perl_path.patch
+++ b/debian/patches/fix_snmpcheck_perl_path.patch
@@ -1,14 +1,14 @@
-Description: fix snmpcheck shebang
- Just don't use /usr/local/bin/perl...
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_snmpcheck_perl_path
Author: Hideki Yamane <henrich at debian.org>
-
---
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/44373
-Forwarded: not-needed
-Last-Update: 2012-07-17
+ local/snmpcheck.def | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/local/snmpcheck.def b/local/snmpcheck.def
+index ad392ee..df3450e 100755
--- a/local/snmpcheck.def
+++ b/local/snmpcheck.def
@@ -1,4 +1,4 @@
diff --git a/debian/patches/fix_spelling_error.patch b/debian/patches/fix_spelling_error.patch
index 15376f1..e4e46ed 100644
--- a/debian/patches/fix_spelling_error.patch
+++ b/debian/patches/fix_spelling_error.patch
@@ -1,14 +1,19 @@
-Description: fix spelling error
-Author: Hideki Yamane <henrich at debian.org>
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_spelling_error
---
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-01-22
+ apps/encode_keychange.c | 2 +-
+ apps/snmpnetstat/inet.c | 2 +-
+ apps/snmpnetstat/inet6.c | 2 +-
+ apps/snmpusm.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+diff --git a/apps/encode_keychange.c b/apps/encode_keychange.c
+index 5bf8e4c..0ecc51b 100644
--- a/apps/encode_keychange.c
+++ b/apps/encode_keychange.c
-@@ -403,7 +403,7 @@
+@@ -403,7 +403,7 @@ usage_to_file(FILE * ofp)
"-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,20 +22,11 @@ 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");
---- 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");
-- fprintf(stderr, "\t-Ck\t\tAllows to use localized key (must start with 0x)\n");
-+ fprintf(stderr, "\t-Ck\t\tAllows one to use localized key (must start with 0x)\n");
- fprintf(stderr, "\t\t\tinstead of passphrase.\n");
- }
-
+diff --git a/apps/snmpnetstat/inet.c b/apps/snmpnetstat/inet.c
+index 0537340..9224973 100644
--- a/apps/snmpnetstat/inet.c
+++ b/apps/snmpnetstat/inet.c
-@@ -449,7 +449,7 @@
+@@ -449,7 +449,7 @@ icmp_stats(const char *name)
struct stat_table icmpstats_tbl[] = {
{ 1, "%14d total message%s received"},
{ 2, "%14d message%s dropped due to errors"},
@@ -39,9 +35,11 @@ Last-Update: 2013-01-22
{15, "%14d output message%s discarded"},
{ 0, ""}
};
+diff --git a/apps/snmpnetstat/inet6.c b/apps/snmpnetstat/inet6.c
+index 7109b87..f3bf195 100644
--- a/apps/snmpnetstat/inet6.c
+++ b/apps/snmpnetstat/inet6.c
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ icmp6_stats(const char *name)
struct stat_table icmp6stats_tbl[] = {
{ 1, "%14d total message%s received"},
{ 2, "%14d message%s dropped due to errors"},
@@ -50,3 +48,16 @@ Last-Update: 2013-01-22
{19, "%14d output message%s discarded"},
{ 0, ""}
};
+diff --git a/apps/snmpusm.c b/apps/snmpusm.c
+index 42919bd..f0985fd 100644
+--- a/apps/snmpusm.c
++++ b/apps/snmpusm.c
+@@ -150,7 +150,7 @@ usage(void)
+ 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");
+- fprintf(stderr, "\t-Ck\t\tAllows to use localized key (must start with 0x)\n");
++ fprintf(stderr, "\t-Ck\t\tAllows one to use localized key (must start with 0x)\n");
+ fprintf(stderr, "\t\t\tinstead of passphrase.\n");
+ }
+
diff --git a/debian/patches/fix_typo_in_snmpd.conf.patch b/debian/patches/fix_typo_in_snmpd.conf.patch
index 9c5f087..263d7d9 100644
--- a/debian/patches/fix_typo_in_snmpd.conf.patch
+++ b/debian/patches/fix_typo_in_snmpd.conf.patch
@@ -1,14 +1,16 @@
-Description: fix typo
-Author: Hideki Yamane <henrich at debian.org>
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: fix_typo_in_snmpd.conf
+
---
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/603593
-Forwarded: no
-Last-Update: 2013-01-23
+ EXAMPLE.conf.def | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/EXAMPLE.conf.def b/EXAMPLE.conf.def
+index 180713c..f619c8e 100644
--- a/EXAMPLE.conf.def
+++ b/EXAMPLE.conf.def
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ view systemonly included .1.3.6.1.2.1.25.1
#rwuser authPrivUser priv
# It's no longer typically necessary to use the full 'com2sec/group/access' configuration
diff --git a/debian/patches/net-snmp-config_multi-arch.patch b/debian/patches/net-snmp-config_multi-arch.patch
deleted file mode 100644
index 60b653e..0000000
--- a/debian/patches/net-snmp-config_multi-arch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: enable Multi-Arch support in net-snmp-config
- specify $DEB_HOST_MULTIARCH to enable Multi-Arch
-
-Author: Hideki Yamane <henrich at debian.org>
-
----
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-07-18
-
-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 16:10:26.524006164 +0900
-+++ net-snmp-5.7.2~dfsg/net-snmp-config.in 2013-01-14 16:13:34.584345846 +0900
-@@ -90,14 +90,14 @@
- --prefix=*)
- prefix=$optarg
- NSC_PREFIX=${prefix}
-- NSC_INCLUDEDIR=${prefix}/include
-- NSC_LIBDIR=-L${prefix}/lib
-+ NSC_INCLUDEDIR=${prefix}/include/$DEB_HOST_MULTIARC/,${prefix}/include/
-+ NSC_LIBDIR=-L${prefix}/lib/$DEB_HOST_MULTIARCH/,${prefix}/lib/
- ;;
-
- --exec-prefix=*)
- exec_prefix=$optarg
- NSC_EXEC_PREFIX=${exec_prefix}
-- NSC_LIBDIR=-L${exec_prefix}/lib
-+ NSC_LIBDIR=-L${exec_prefix}/lib/$DEB_HOST_MULTIARCH/,${prefix}/lib/
- ;;
-
- --debug-tokens|--deb*|--dbg*)
diff --git a/debian/patches/series b/debian/patches/series
index b7ceeb5..5954b27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@ fix_snmpcheck_perl_path.patch
fix_regular_expression.patch
snmptranslate.1.patch
fix_spelling_error.patch
-#net-snmp-config_multi-arch.patch
fix_logging_option.patch
fix_typo_in_snmpd.conf.patch
fix_man_error.patch
@@ -23,4 +22,5 @@ fix_manpage-has-errors-from-man.patch
agentx-crash.patch
Fix-kfreebsd-builds-with-kernel-headers-10.patch
fix-request-id-0.patch
-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
+0025-Bug-788964-net-snmp-snmp_pdu_parse-DoS.patch
+0026-fix-Bug-785380-incorrect-date-format.patch
diff --git a/debian/patches/snmptranslate.1.patch b/debian/patches/snmptranslate.1.patch
index 11aba4d..05ceb39 100644
--- a/debian/patches/snmptranslate.1.patch
+++ b/debian/patches/snmptranslate.1.patch
@@ -1,16 +1,17 @@
-Description: fix hyphen-used-as-minus-sign
- fix lintian "hyphen-used-as-minus-sign" warnings.
+From: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
+Date: Thu, 18 Jun 2015 06:12:05 +0900
+Subject: snmptranslate.1
Author: Hideki Yamane <henrich at debian.org>
-
---
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-07-17
+ man/snmptranslate.1.def | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+diff --git a/man/snmptranslate.1.def b/man/snmptranslate.1.def
+index 721af99..13da01f 100644
--- a/man/snmptranslate.1.def
+++ b/man/snmptranslate.1.def
-@@ -166,22 +166,22 @@
+@@ -166,22 +166,22 @@ will print the following tree:
.nf
+--system(1)
|
@@ -41,7 +42,7 @@ Last-Update: 2012-07-17
| Textual Convention: TimeStamp
|
+--sysORTable(9)
-@@ -189,11 +189,11 @@
+@@ -189,11 +189,11 @@ will print the following tree:
+--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