Imported Upstream version 5.4.3~dfsgupstream/5.4.3_dfsg

15 files changed, 0 insertions, 480 deletions

diff --git a/debian/patches/02_statistics.README b/debian/patches/02_statistics.README
deleted file mode 100644
index eca1db7..0000000
--- a/debian/patches/02_statistics.README
+++ /dev/null
@@ -1 +0,0 @@
-This patch ignores interfaces without statistics.
diff --git a/debian/patches/02_statistics.patch b/debian/patches/02_statistics.patch
deleted file mode 100644
index 1d05728..0000000
--- a/debian/patches/02_statistics.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: net-snmp-5.4.3/agent/mibgroup/mibII/interfaces.c
-===================================================================
---- net-snmp-5.4.3.orig/agent/mibgroup/mibII/interfaces.c	2010-06-04 17:10:29.000000000 +0200
-+++ net-snmp-5.4.3/agent/mibgroup/mibII/interfaces.c	2010-06-04 17:10:33.000000000 +0200
-@@ -1551,6 +1551,10 @@
-         struct ifnet   *nnew;
-         char           *stats, *ifstart = line;
- 
-+	/* Ignore interfaces with no statistics. */
-+	if (strstr(line, "No statistics available."))
-+	    continue;
-+
-         if (line[strlen(line) - 1] == '\n')
-             line[strlen(line) - 1] = '\0';
- 
-@@ -1584,7 +1588,7 @@
-                                                &coll) != 5)) {
-             if ((scan_line_to_use == scan_line_2_2)
-                 && !strstr(line, "No statistics available"))
--                snmp_log(LOG_ERR,
-+                snmp_log(LOG_DEBUG,
-                          "/proc/net/dev data format error, line ==|%s|",
-                          line);
-             continue;
diff --git a/debian/patches/03_makefiles.README b/debian/patches/03_makefiles.README
deleted file mode 100644
index 3691a14..0000000
--- a/debian/patches/03_makefiles.README
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile patch to include libwrap and libsensors libraries and install extra
-MIB files.
diff --git a/debian/patches/03_makefiles.patch b/debian/patches/03_makefiles.patch
deleted file mode 100644
index ebfea3e..0000000
--- a/debian/patches/03_makefiles.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -u -r net-snmp-5.7.1.pre2.orig/local/Makefile.in net-snmp-5.7.1.pre2/local/Makefile.in
---- net-snmp-5.7.1.pre2.orig/local/Makefile.in	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/local/Makefile.in	2011-08-23 00:21:24.000000000 +0200
-@@ -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
-diff -u -r net-snmp-5.7.1.pre2.orig/Makefile.in net-snmp-5.7.1.pre2/Makefile.in
---- net-snmp-5.7.1.pre2.orig/Makefile.in	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/Makefile.in	2011-08-23 00:21:24.000000000 +0200
-@@ -168,7 +168,7 @@
- #
- # override LD_RUN_PATH to avoid dependencies on the build directory
- perlmodules: perlmakefiles subdirs
--	@(cd perl ; $(MAKE) LD_RUN_PATH="$(libdir):`$(PERL) -e 'use Config; print qq($$Config{archlibexp}/CORE);'`") ; \
-+	@(cd perl ; $(MAKE) LD_RUN_PATH="") ; \
-         if test $$? != 0 ; then \
-            exit 1 ; \
-         fi
-diff -u -r net-snmp-5.7.1.pre2.orig/Makefile.top net-snmp-5.7.1.pre2/Makefile.top
---- net-snmp-5.7.1.pre2.orig/Makefile.top	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/Makefile.top	2011-08-23 00:21:24.000000000 +0200
-@@ -25,8 +25,9 @@
- man5dir		= $(mandir)/man5
- man8dir		= $(mandir)/man8
- snmplibdir	= $(datadir)/snmp
--mibdir		= $(snmplibdir)/mibs
-+mibdir		= $(datadir)/mibs/netsnmp
- persistentdir	= @PERSISTENT_DIRECTORY@
-+sysconfdir	= @sysconfdir@
- DESTDIR         = @INSTALL_PREFIX@
- INSTALL_PREFIX  = $(DESTDIR)
- 
-diff -u -r net-snmp-5.7.1.pre2.orig/mibs/Makefile.in net-snmp-5.7.1.pre2/mibs/Makefile.in
---- net-snmp-5.7.1.pre2.orig/mibs/Makefile.in	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/mibs/Makefile.in	2011-08-23 00:29:32.000000000 +0200
-@@ -13,53 +13,22 @@
- OTHERUNINSTALL=mibsuninstall
- 
- 
--V1MIBS	= RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
-+NETSNMPMIBS = NET-SNMP-TC NET-SNMP-MIB NET-SNMP-AGENT-MIB \
-+	NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB NET-SNMP-PASS-MIB
- 
--V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
--	SNMPv2-MIB.txt
-+UCDMIBS = UCD-SNMP-MIB UCD-DEMO-MIB UCD-IPFWACC-MIB \
-+	UCD-DLMOD-MIB UCD-DISKIO-MIB
- 
--V3MIBS	= SNMP-FRAMEWORK-MIB.txt SNMP-MPD-MIB.txt SNMP-TARGET-MIB.txt \
--	SNMP-NOTIFICATION-MIB.txt SNMP-PROXY-MIB.txt \
--	SNMP-USER-BASED-SM-MIB.txt SNMP-VIEW-BASED-ACM-MIB.txt \
--	SNMP-COMMUNITY-MIB.txt TRANSPORT-ADDRESS-MIB.txt
--
--AGENTMIBS = AGENTX-MIB.txt SMUX-MIB.txt
--
--IANAMIBS = IANAifType-MIB.txt IANA-LANGUAGE-MIB.txt \
--	IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
--
--RFCMIBS	= IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
--	EtherLike-MIB.txt \
--	IP-MIB.txt IP-FORWARD-MIB.txt IANA-RTPROTO-MIB.txt \
--	TCP-MIB.txt UDP-MIB.txt \
--	INET-ADDRESS-MIB.txt HCNUM-TC.txt \
--	HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt \
--	RMON-MIB.txt \
--	IPV6-TC.txt IPV6-MIB.txt IPV6-ICMP-MIB.txt IPV6-TCP-MIB.txt \
--	IPV6-UDP-MIB.txt IPV6-FLOW-LABEL-MIB.txt TUNNEL-MIB.txt \
--	DISMAN-EVENT-MIB.txt DISMAN-SCRIPT-MIB.txt DISMAN-SCHEDULE-MIB.txt \
--	NOTIFICATION-LOG-MIB.txt SNMP-USM-AES-MIB.txt \
--	SNMP-USM-DH-OBJECTS-MIB.txt \
--	SCTP-MIB.txt BRIDGE-MIB.txt
--
--NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
--	NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt NET-SNMP-PASS-MIB.txt
--
--UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
--	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
--
--DEFAULTMIBS = @default_mibs_install@
--
--MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
--	$(AGENTMIBS) $(IANAMIBS) \
--	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
-+EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
-+
-+MIBS  = $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
- 
- all: standardall
- 
- mibsinstall: installdirs
- 	@for i in $(MIBS) ; do \
--		$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
--		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
-+		$(INSTALL_DATA) $(srcdir)/$$i.txt $(INSTALL_PREFIX)$(mibdir)/$$i ; \
-+		echo "install: installed $$i.txt in $(INSTALL_PREFIX)$(mibdir)/$$i" ; \
- 	done
- 
- mibsuninstall: installdirs
diff --git a/debian/patches/05_searchdirs.README b/debian/patches/05_searchdirs.README
deleted file mode 100644
index 4b623a7..0000000
--- a/debian/patches/05_searchdirs.README
+++ /dev/null
@@ -1 +0,0 @@
-Debian patch to add search path for mib2c
diff --git a/debian/patches/05_searchdirs.patch b/debian/patches/05_searchdirs.patch
deleted file mode 100644
index cb1bade..0000000
--- a/debian/patches/05_searchdirs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- net-snmp-5.1.2.orig/local/mib2c
-+++ net-snmp-5.1.2/local/mib2c
-@@ -60,8 +60,9 @@
- if($ENV{MIB2C_DIR}) {
-    push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR});
- }
--push @def_search_dirs, "/usr/local/share/snmp/";
--push @def_search_dirs, "/usr/local/share/snmp/mib2c-data";
-+push @def_search_dirs, "/etc/snmp/";
-+push @def_search_dirs, "/usr/share/snmp/";
-+push @def_search_dirs, "/usr/share/snmp/mib2c-data";
- push @def_search_dirs, "./mib2c-conf.d";
- 
- sub usage {
diff --git a/debian/patches/06_extramibs.README b/debian/patches/06_extramibs.README
deleted file mode 100644
index 7e029a4..0000000
--- a/debian/patches/06_extramibs.README
+++ /dev/null
@@ -1 +0,0 @@
-Extra MIB files shipped with Debian.
diff --git a/debian/patches/06_extramibs.patch b/debian/patches/06_extramibs.patch
deleted file mode 100644
index a777b3a..0000000
--- a/debian/patches/06_extramibs.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-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
-@@ -0,0 +1,88 @@
-+GNOME-SMI DEFINITIONS ::= BEGIN
-+
-+IMPORTS
-+	MODULE-IDENTITY,
-+	OBJECT-IDENTITY,
-+	enterprises
-+		FROM SNMPv2-SMI;
-+
-+gnome MODULE-IDENTITY
-+	LAST-UPDATED "200709070000Z"
-+	ORGANIZATION "GNOME project"
-+	CONTACT-INFO
-+		"GNU Network Object Model Environment project
-+		
-+		see http://www.gnome.org for contact persons of a particular
-+		area or subproject of GNOME.
-+
-+		Administrative contact for MIB module:
-+
-+		Jochen Friedrich
-+		Ramsaystr. 9
-+		63450 Hanau
-+		Germany 
-+
-+		email: jochen@scram.de"
-+	DESCRIPTION
-+		"The Structure of GNOME."
-+
-+	-- revision history
-+
-+	REVISION "200709070000Z"  -- Sep 07, 2007
-+	DESCRIPTION
-+		"Fixed wrong enterprise number (how comes this
-+		typo was unnoticed for so long?)."
-+
-+	REVISION "200505070000Z"  -- May 07, 2005
-+	DESCRIPTION
-+		"Added gnomeLDAP subtree for LDAP definitions."
-+
-+	REVISION "200312070000Z"  -- December 07, 2003
-+	DESCRIPTION
-+		"Added gnomeSysadmin subtree for GNOME project system administration.
-+		Updated contact info."
-+
-+	REVISION "9809010000Z"  -- September 01, 1998
-+	DESCRIPTION
-+		"Initial version."
-+
-+	::= { enterprises 3319 }	-- assigned by IANA
-+
-+gnomeProducts OBJECT-IDENTITY
-+	STATUS	current
-+	DESCRIPTION
-+		"gnomeProducts is the root OBJECT IDENTIFIER from
-+		which sysObjectID values are assigned."
-+	::= { gnome 1 }
-+
-+gnomeMgmt OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeMgmt defines the subtree for production GNOME related
-+		MIB registrations."
-+	::= { gnome 2 }
-+
-+gnomeTest OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeTest defines the subtree for testing GNOME related
-+		MIB registrations."
-+	::= { gnome 3 }
-+
-+gnomeSysadmin OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeSysadmin defines the subtree for GNOME related Sysadmin
-+		MIB registrations."
-+	::= { gnome 4 }
-+
-+gnomeLDAP OBJECT-IDENTITY
-+	STATUS  current
-+	DESCRIPTION
-+		"gnomeLDAP defines the subtree for GNOME related LDAP
-+		registrations."
-+	::= { gnome 5 }
-+
-+-- more to come if necessary.
-+
-+END
diff --git a/debian/patches/07_docfiles.README b/debian/patches/07_docfiles.README
deleted file mode 100644
index 7b6cfd4..0000000
--- a/debian/patches/07_docfiles.README
+++ /dev/null
@@ -1 +0,0 @@
-Patch documentation files to change paths to Debian specific locations.
diff --git a/debian/patches/07_docfiles.patch b/debian/patches/07_docfiles.patch
deleted file mode 100644
index 999509d..0000000
--- a/debian/patches/07_docfiles.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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
-@@ -108,7 +108,7 @@
-    How do I configure access control?
-    How do I configure SNMPv3 users?
-    The 'createUser' line disappears when I start the agent.  Why?
--   What's the difference between /var/net-snmp and /usr/local/share/snmp?
-+   What's the difference between /var/lib/snmp and /usr/share/snmp?
-    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 @@
-   There are two steps required to add a new MIB file to the tools.
-   Firstly, copy the MIB file into the appropriate location:
- 
--	cp MY-MIB.txt /usr/local/share/snmp/mibs
-+	cp MY-MIB.txt /usr/share/snmp/mibs
-             (which makes it available to everyone on the system)
-     or
-         mkdir $HOME/.snmp
-@@ -1396,7 +1396,7 @@
-   If this is the case, then you can specify this interpreter
-   explicitly as part of the trap handle directive:
- 
--	traphandle default /usr/bin/perl /usr/local/bin/log_it
-+	traphandle default /usr/bin/perl /usr/bin/log_it
- 
-     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 @@
-   string to use.
- 
-     Some of these (such as MIB information), might be best put in a
--  shared snmp.conf file (typically /usr/local/share/snmp/snmp.conf or
-+  shared snmp.conf file (typically /usr/share/snmp/snmp.conf or
-   /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 @@
- 
- 	createUser {myUser} MD5 {myPassword} DES
- 
--    to the file /var/net-snmp/snmpd.conf (where {myUser} and
-+    to the file /var/lib/snmp/snmpd.conf (where {myUser} and
-     {myPassword} are the appropriate values for username and password,
-     _without_ the braces!).  Then re-start the snmpd agent.
- 
-@@ -2664,7 +2664,7 @@
-         net-snmp-config --create-snmpv3-user
- 
-      and follow the prompts given.  This will create an entry
--     in the /var/net-snmp/snmpd.conf file similar to the above.
-+     in the /var/lib/snmp/snmpd.conf file similar to the above.
-      Then re-start the snmpd agent.
- 
-   3) Make sure the agent is running, and will respond to an SNMPv3
-@@ -2698,16 +2698,16 @@
- 
- 
- 
--What's the difference between /var/net-snmp and /usr/local/share/snmp?
-----------------------------------------------------------------------
-+What's the difference between /var/lib/snmp and /usr/share/snmp?
-+----------------------------------------------------------------
- 
--    The /var/net-snmp location is primarily used for information set
-+    The /var/lib/snmp location is primarily used for information set
-   during the running of the agent, which needs to be persistent between
-   one run of the agent and the next.   Apart from "createUser" (see
-   the previous entry), you shouldn't need to touch this file.
- 
-   All other user-provided configuration should go in the traditional
--  location (typically /usr/local/share/snmp/snmpd.conf or /etc/snmp).
-+  location (typically /usr/share/snmp or /etc/snmp).
- 
- 
- 
-@@ -2728,7 +2728,7 @@
- -----------------------------------
- 
-     The default location for this file with the basic distribution is
--  /usr/local/share/snmp/snmpd.conf (or PREFIX/share/snmp/snmpd.conf).
-+  /usr/share/snmp/snmpd.conf (or PREFIX/share/snmp/snmpd.conf).
-   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
-@@ -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/08_defaultconfig.README b/debian/patches/08_defaultconfig.README
deleted file mode 100644
index cceb830..0000000
--- a/debian/patches/08_defaultconfig.README
+++ /dev/null
@@ -1 +0,0 @@
-Default snmpd.config file used by Debian
diff --git a/debian/patches/08_defaultconfig.patch b/debian/patches/08_defaultconfig.patch
deleted file mode 100644
index b16c8a6..0000000
--- a/debian/patches/08_defaultconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: net-snmp-5.4.3/EXAMPLE-trap.conf
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ net-snmp-5.4.3/EXAMPLE-trap.conf	2010-06-04 17:15:48.000000000 +0200
-@@ -0,0 +1,18 @@
-+###############################################################################
-+#
-+# EXAMPLE-trap.conf:
-+#   An example configuration file for configuring the Net-SNMP snmptrapd agent.
-+#
-+###############################################################################
-+#
-+# This file is intended to only be an example.  If, however, you want
-+# to use it, it should be placed in /etc/snmp/snmptrapd.conf.
-+# When the snmptrapd agent starts up, this is where it will look for it.
-+#
-+# All lines beginning with a '#' are comments and are intended for you
-+# to read.  All other lines are configuration commands for the agent.
-+
-+#
-+# PLEASE: read the snmptrapd.conf(5) manual page as well!
-+#
-+
diff --git a/debian/patches/25_duplicate_iftable.README b/debian/patches/25_duplicate_iftable.README
deleted file mode 100644
index 1ea7085..0000000
--- a/debian/patches/25_duplicate_iftable.README
+++ /dev/null
@@ -1,11 +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@gmx.de>
diff --git a/debian/patches/25_duplicate_iftable.patch b/debian/patches/25_duplicate_iftable.patch
deleted file mode 100644
index 104d7f1..0000000
--- a/debian/patches/25_duplicate_iftable.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -u -r net-snmp-5.7.1.pre2.orig/agent/mibgroup/if-mib/data_access/interface.c net-snmp-5.7.1.pre2/agent/mibgroup/if-mib/data_access/interface.c
---- net-snmp-5.7.1.pre2.orig/agent/mibgroup/if-mib/data_access/interface.c	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/agent/mibgroup/if-mib/data_access/interface.c	2011-08-23 00:52:25.000000000 +0200
-@@ -484,11 +484,10 @@
-     }
-     else
-         if (index != (oid)tmp) {
--            NETSNMP_LOGONCE((LOG_ERR, "IfIndex of an interface changed. Such " \
--                         "interfaces will appear multiple times in IF-MIB.\n"));
--            DEBUGMSGTL(("access:interface:ifIndex",
--                        "index %" NETSNMP_PRIo "u != tmp for %s\n",
--                        index, name));
-+            NETSNMP_LOGONCE((LOG_ERR, "IfIndex of an interface changed.\n"));
-+            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 %" NETSNMP_PRIo "u\n", name, tmp, index));
-         }
- }
- 
-diff -u -r net-snmp-5.7.1.pre2.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c net-snmp-5.7.1.pre2/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
---- net-snmp-5.7.1.pre2.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	2011-08-23 00:42:41.000000000 +0200
-@@ -485,8 +485,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"));
- 
-     /*
-diff -u -r net-snmp-5.7.1.pre2.orig/snmplib/snmp_enum.c net-snmp-5.7.1.pre2/snmplib/snmp_enum.c
---- net-snmp-5.7.1.pre2.orig/snmplib/snmp_enum.c	2011-08-18 21:28:07.000000000 +0200
-+++ net-snmp-5.7.1.pre2/snmplib/snmp_enum.c	2011-08-23 00:42:41.000000000 +0200
-@@ -227,6 +227,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)
- {
-@@ -346,6 +367,19 @@
-     return (se_find_label_in_list(se_find_slist(listname), value));
- }
- 
-+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_value_in_slist(const char *listname, const char *label)
- {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0593b8d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-02_statistics.patch
-03_makefiles.patch
-05_searchdirs.patch
-06_extramibs.patch
-07_docfiles.patch
-08_defaultconfig.patch
-25_duplicate_iftable.patch