Update to NetSNMP 5.4.3.

git-svn-id: svn://svn.debian.org/pkg-net-snmp/trunk@329 db575a87-f10d-0410-9662-f1d5ac62e4ba

3 files changed, 110 insertions, 108 deletions

diff --git a/debian/patches/03_makefiles.patch b/debian/patches/03_makefiles.patch
index 3cc21fe..d844cc2 100644
--- a/debian/patches/03_makefiles.patch
+++ b/debian/patches/03_makefiles.patch
@@ -1,7 +1,7 @@
-Index: net-snmp-5.4.2.1/local/Makefile.in
+Index: net-snmp-5.4.3/local/Makefile.in
 ===================================================================
---- net-snmp-5.4.2.1.orig/local/Makefile.in	2009-12-14 18:40:54.000000000 +0100
-+++ net-snmp-5.4.2.1/local/Makefile.in	2009-12-14 18:42:44.000000000 +0100
+--- net-snmp-5.4.3.orig/local/Makefile.in	2008-03-21 18:22:57.000000000 +0100
++++ net-snmp-5.4.3/local/Makefile.in	2010-06-04 17:10:51.000000000 +0200
 @@ -100,7 +100,7 @@
  
  mib2c.made: $(srcdir)/mib2c
@@ -11,10 +11,10 @@ Index: net-snmp-5.4.2.1/local/Makefile.in
  	else \
  	  touch mib2c.made; \
          fi
-Index: net-snmp-5.4.2.1/Makefile.top
+Index: net-snmp-5.4.3/Makefile.top
 ===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.top	2009-12-14 18:40:54.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.top	2009-12-14 18:42:44.000000000 +0100
+--- net-snmp-5.4.3.orig/Makefile.top	2009-10-29 10:55:42.000000000 +0100
++++ net-snmp-5.4.3/Makefile.top	2010-06-04 17:10:51.000000000 +0200
 @@ -24,8 +24,9 @@
  man5dir		= $(mandir)/man5
  man8dir		= $(mandir)/man8
@@ -26,17 +26,17 @@ Index: net-snmp-5.4.2.1/Makefile.top
  DESTDIR         = @INSTALL_PREFIX@
  INSTALL_PREFIX  = $(DESTDIR)
  
-Index: net-snmp-5.4.2.1/mibs/Makefile.in
+Index: net-snmp-5.4.3/mibs/Makefile.in
 ===================================================================
---- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2009-12-14 18:40:54.000000000 +0100
-+++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-12-14 18:48:11.000000000 +0100
+--- net-snmp-5.4.3.orig/mibs/Makefile.in	2009-05-29 11:08:28.000000000 +0200
++++ net-snmp-5.4.3/mibs/Makefile.in	2010-06-04 17:13:21.000000000 +0200
 @@ -13,53 +13,24 @@
  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-EXAMPLES-MIB NET-SNMP-EXTEND-MIB NET-SNMP-PASS-MIB \
 +	NET-SNMP-MONITOR-MIB NET-SNMP-SYSTEM-MIB \
 +	NET-SNMP-VACM-MIB
  
@@ -70,7 +70,7 @@ Index: net-snmp-5.4.2.1/mibs/Makefile.in
 -	SCTP-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-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
@@ -96,10 +96,10 @@ Index: net-snmp-5.4.2.1/mibs/Makefile.in
  	done
  
  mibsuninstall: installdirs
-Index: net-snmp-5.4.2.1/Makefile.in
+Index: net-snmp-5.4.3/Makefile.in
 ===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.in	2009-12-14 18:40:54.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.in	2009-12-14 18:42:44.000000000 +0100
+--- net-snmp-5.4.3.orig/Makefile.in	2007-06-08 22:32:56.000000000 +0200
++++ net-snmp-5.4.3/Makefile.in	2010-06-04 17:10:51.000000000 +0200
 @@ -156,7 +156,7 @@
  #
  # override LD_RUN_PATH to avoid dependencies on the build directory
diff --git a/debian/patches/07_docfiles.patch b/debian/patches/07_docfiles.patch
index a6cb10c..daff2f8 100644
--- a/debian/patches/07_docfiles.patch
+++ b/debian/patches/07_docfiles.patch
@@ -1,24 +1,26 @@
---- net-snmp-5.4.orig/FAQ	2006-11-25 00:34:18.000000000 +0100
-+++ net-snmp-5.4/FAQ	2006-11-25 00:37:09.000000000 +0100
-@@ -98,7 +98,7 @@
-    I don't understand the new access control stuff - what does it mean?
+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"?
-    Why can't I see values in the UCDavis 'extensible' or 'disk' trees?
-@@ -630,7 +630,7 @@
+@@ -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 appropiate location:
+   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
-@@ -1158,7 +1158,7 @@
+     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:
  
@@ -27,43 +29,34 @@
  
      In this case, it's almost certain that you'll also
    need to give the full path to the traphandle script (as shown)
-@@ -1232,7 +1232,7 @@
+@@ -1490,7 +1490,7 @@
    string to use.
  
-     Some of these (such as the MIB file location), might be best put in
--  a shared snmp.conf file (typically /usr/local/share/snmp/snmp.conf or
-+  a shared snmp.conf file (typically /usr/share/snmp/snmp.conf or
+     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 go in a personal snmp.conf file
-@@ -1455,7 +1455,7 @@
- 
- 
-     Alternatively, the tools may be looking in the wrong place.
--  The default location for the mib files is /usr/local/share/snmp/mibs.
-+  The default location for the mib files is /usr/share/snmp/mibs.
-   Again, this is set when the suite is first configured and compiled.
-   This can be changed using the environmental variable 'MIBDIRS'
-   or the snmp.conf directive 'mibdirs'.
-@@ -2409,7 +2409,7 @@
+   to a particular user, and should probably go in a personal snmp.conf
+@@ -2655,7 +2655,7 @@
  
-   There are three ways to configure SNMPv3 users:
+ 	createUser {myUser} MD5 {myPassword} DES
  
--  1) Stop the agent, and create a file /var/net-snmp/snmpd.conf,
-+  1) Stop the agent, and create a file /var/lib/snmp/snmpd.conf,
-      containing the line
+-    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.
  
- 	createUser {myUser} MD5 {myPassword} DES
-@@ -2422,7 +2422,7 @@
+@@ -2664,7 +2664,7 @@
          net-snmp-config --create-snmpv3-user
  
-      and follow the instructions.  This will create an entry
+      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 a suitable
-@@ -2455,16 +2455,16 @@
+   3) Make sure the agent is running, and will respond to an SNMPv3
+@@ -2698,16 +2698,16 @@
  
  
  
@@ -84,12 +77,12 @@
  
  
  
-@@ -2477,7 +2477,7 @@
-   distribution), with the current release installed from the source.
+@@ -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.  Try moving the old config file to the new
-   location, and restart the agent.
+   or /etc/snmp/snmpd.conf.
+ 
diff --git a/debian/patches/56_manpage.patch b/debian/patches/56_manpage.patch
index dbdc10d..b3bc3b0 100644
--- a/debian/patches/56_manpage.patch
+++ b/debian/patches/56_manpage.patch
@@ -1,7 +1,7 @@
-Index: net-snmp-5.4.2.1/man/snmpd.conf.5.def
+Index: net-snmp-5.4.3/man/snmpd.conf.5.def
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/snmpd.conf.5.def	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/snmpd.conf.5.def	2009-11-06 10:49:16.000000000 +0100
+--- net-snmp-5.4.3.orig/man/snmpd.conf.5.def	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/snmpd.conf.5.def	2010-06-04 17:49:43.000000000 +0200
 @@ -419,7 +419,7 @@
  Historically, the Net-SNMP agent has reported such file systems
  as 'Fixed Disks', and this is still the default behaviour.
@@ -11,10 +11,10 @@ Index: net-snmp-5.4.2.1/man/snmpd.conf.5.def
  .SS Process Monitoring 
  The \fChrSWRun\fR group of the Host Resources MIB provides
  information about individual processes running on the local system.
-Index: net-snmp-5.4.2.1/man/snmptrapd.conf.5.def
+Index: net-snmp-5.4.3/man/snmptrapd.conf.5.def
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/snmptrapd.conf.5.def	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/snmptrapd.conf.5.def	2009-11-06 10:49:16.000000000 +0100
+--- net-snmp-5.4.3.orig/man/snmptrapd.conf.5.def	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/snmptrapd.conf.5.def	2010-06-04 17:49:43.000000000 +0200
 @@ -179,7 +179,7 @@
  NOTIFICATION-TYPE object, and the specified program will be invoked for
  notifications that match this OID exactly.  However this token also
@@ -24,10 +24,10 @@ Index: net-snmp-5.4.2.1/man/snmptrapd.conf.5.def
  notification based within subtree rooted at the specified OID.
  For example, an OID token of \fC.1.3.6.1.4.1*\fP would match any enterprise
  specific notification (including the specified OID itself).
-Index: net-snmp-5.4.2.1/man/mib_api.3.def
+Index: net-snmp-5.4.3/man/mib_api.3.def
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/mib_api.3.def	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/mib_api.3.def	2009-11-06 10:49:16.000000000 +0100
+--- net-snmp-5.4.3.orig/man/mib_api.3.def	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/mib_api.3.def	2010-06-04 17:49:43.000000000 +0200
 @@ -124,7 +124,8 @@
  lb lb lb
  l  l  l.
@@ -38,7 +38,7 @@ Index: net-snmp-5.4.2.1/man/mib_api.3.def
  name + 0 + for the given tag only
  name + non-0 + for any identifier with this prefix
  .TE
-@@ -319,6 +320,6 @@
+@@ -317,6 +318,6 @@
  .TP 10
  MIBS
  A colon separated list of MIB modules to load.
@@ -46,23 +46,10 @@ Index: net-snmp-5.4.2.1/man/mib_api.3.def
 +Default: IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:SNMPv2-MIB: RFC1213-MIB:UCD-SNMP-MIB.
  .SH "SEE ALSO"
  .BR snmp_api "(3)"
-Index: net-snmp-5.4.2.1/man/netsnmp_Container_iterator.3
+Index: net-snmp-5.4.3/man/netsnmp_container.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_Container_iterator.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_Container_iterator.3	2009-11-06 10:49:16.000000000 +0100
-@@ -2,7 +2,7 @@
- .ad l
- .nh
- .SH NAME
--Container_iterator \- 
-+Container_iterator \- the Net-SNMP container iterator
- .SS "Typedefs"
- 
- .in +1c
-Index: net-snmp-5.4.2.1/man/netsnmp_container.3
-===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_container.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_container.3	2009-11-06 10:49:16.000000000 +0100
+--- net-snmp-5.4.3.orig/man/netsnmp_container.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_container.3	2010-06-04 17:49:43.000000000 +0200
 @@ -2,7 +2,7 @@
  .ad l
  .nh
@@ -72,10 +59,10 @@ Index: net-snmp-5.4.2.1/man/netsnmp_container.3
  .SS "Modules"
  
  .in +1c
-Index: net-snmp-5.4.2.1/man/netsnmp_example_scalar_int.3
+Index: net-snmp-5.4.3/man/netsnmp_example_scalar_int.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_example_scalar_int.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_example_scalar_int.3	2009-11-06 10:49:16.000000000 +0100
+--- net-snmp-5.4.3.orig/man/netsnmp_example_scalar_int.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_example_scalar_int.3	2010-06-04 17:49:43.000000000 +0200
 @@ -2,7 +2,7 @@
  .ad l
  .nh
@@ -92,23 +79,23 @@ Index: net-snmp-5.4.2.1/man/netsnmp_example_scalar_int.3
 -snmpget localhost netSnmpExampleInteger.0 netSnmpExampleScalars = 1234 
 \ No newline at end of file
 +snmpget localhost netSnmpExampleInteger.0 netSnmpExampleScalars = 1234
-Index: net-snmp-5.4.2.1/man/netsnmp_library.3
+Index: net-snmp-5.4.3/man/netsnmp_library.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_library.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_library.3	2009-11-06 12:45:23.000000000 +0100
+--- net-snmp-5.4.3.orig/man/netsnmp_library.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_library.3	2010-06-04 17:49:43.000000000 +0200
 @@ -2,7 +2,7 @@
  .ad l
  .nh
  .SH NAME
 -The Net-SNMP library \- 
 +netsnmp_library \- the Net-SNMP library
- .SS "Modules"
+ .SS "Data Structures"
  
  .in +1c
-Index: net-snmp-5.4.2.1/man/netsnmp_mib_utilities.3
+Index: net-snmp-5.4.3/man/netsnmp_mib_utilities.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_mib_utilities.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_mib_utilities.3	2009-11-06 12:45:48.000000000 +0100
+--- net-snmp-5.4.3.orig/man/netsnmp_mib_utilities.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_mib_utilities.3	2010-06-04 17:49:43.000000000 +0200
 @@ -2,7 +2,7 @@
  .ad l
  .nh
@@ -118,13 +105,13 @@ Index: net-snmp-5.4.2.1/man/netsnmp_mib_utilities.3
  .SS "Data Structures"
  
  .in +1c
-Index: net-snmp-5.4.2.1/man/netsnmp_table.3
+Index: net-snmp-5.4.3/man/netsnmp_table.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_table.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_table.3	2009-11-06 10:49:16.000000000 +0100
-@@ -226,9 +226,9 @@
+--- net-snmp-5.4.3.orig/man/netsnmp_table.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_table.3	2010-06-04 17:49:43.000000000 +0200
+@@ -191,9 +191,9 @@
  .PP
- Index values are extracted from the table_info varbinds. 
+ given a registration info object, a request object and the table info object it builds the request->requestvb->name oid from the index values and column information found in the table_info object. Index values are extracted from the table_info varbinds. 
  .PP
 -.Entry
 +Entry
@@ -133,30 +120,52 @@ Index: net-snmp-5.4.2.1/man/netsnmp_table.3
 +column
  .PP
  Definition at line 784 of file table.c.
- .PP
-Index: net-snmp-5.4.2.1/man/netsnmp_agent.3
+ .SS "int netsnmp_table_build_oid_from_index (\fBnetsnmp_handler_registration\fP * reginfo, \fBnetsnmp_request_info\fP * reqinfo, \fBnetsnmp_table_request_info\fP * table_info)"
+Index: net-snmp-5.4.3/man/netsnmp_agent.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_agent.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_agent.3	2009-11-06 12:44:31.000000000 +0100
+--- net-snmp-5.4.3.orig/man/netsnmp_agent.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_agent.3	2010-06-04 17:49:43.000000000 +0200
 @@ -2,7 +2,7 @@
  .ad l
  .nh
  .SH NAME
--The Net-SNMP agent \- The snmp agent responds to SNMP queries from management stations.  
-+netsnmp_agent \- The snmp agent responds to SNMP queries from management stations.
- 
+-The Net-SNMP agent \- 
++netsnmp_agent \- 
  .PP
- .SS "Modules"
-Index: net-snmp-5.4.2.1/man/netsnmp_handler.3
+ The snmp agent responds to SNMP queries from management stations.  
+ 
+Index: net-snmp-5.4.3/man/netsnmp_handler.3
 ===================================================================
---- net-snmp-5.4.2.1.orig/man/netsnmp_handler.3	2009-11-06 10:48:24.000000000 +0100
-+++ net-snmp-5.4.2.1/man/netsnmp_handler.3	2009-11-06 12:44:56.000000000 +0100
+--- net-snmp-5.4.3.orig/man/netsnmp_handler.3	2010-06-04 17:49:31.000000000 +0200
++++ net-snmp-5.4.3/man/netsnmp_handler.3	2010-06-04 17:49:43.000000000 +0200
 @@ -2,7 +2,7 @@
  .ad l
  .nh
  .SH NAME
--Net-SNMP Agent handler and extensibility API \- The basic theory goes something like this: In the past, with the original mib module api (which derived from the original CMU SNMP code) the underlying mib modules were passed very little information (only the truly most basic information about a request).  
-+netsnmp_handler \- The basic theory goes something like this: In the past, with the original mib module api (which derived from the original CMU SNMP code) the underlying mib modules were passed very little information (only the truly most basic information about a request).
- 
+-Net-SNMP Agent handler and extensibility API \- 
++netsnmp_handler \- 
  .PP
- .SS "Modules"
+ The basic theory goes something like this: In the past, with the original mib \fBmodule\fP api (which derived from the original CMU SNMP code) the underlying mib modules were passed very little information (only the truly most basic information about a request).  
+ 
+Index: net-snmp-5.4.3/man/snmpcmd.1.def
+===================================================================
+--- net-snmp-5.4.3.orig/man/snmpcmd.1.def	2010-06-04 17:50:02.000000000 +0200
++++ net-snmp-5.4.3/man/snmpcmd.1.def	2010-06-04 17:52:49.000000000 +0200
+@@ -562,7 +562,7 @@
+ Display the varbind value only, not the OID:
+ .RS
+ .nf
+-\fC    $ snmpget -c public -v 1 \fB-Oe\fP localhost ipForwarding.0
++\fC    $ snmpget -c public -v 1 \fB-Ov\fP localhost ipForwarding.0
+     INTEGER: forwarding(1)\fR
+ .fi
+ .RE
+@@ -582,7 +582,7 @@
+ .nf
+ \fC    $ snmpgetnext -c public -v 1 localhost ipv6RouteTable
+     IPv6-MIB::ipv6RouteIfIndex.63.254.1.0.255.0.0.0.0.0.0.0.0.0.0.0.64.1 = INTEGER: 2
+-    $ snmpgetnext -c public -v 1 \fB-OE\fP localhost ipv6RouteTable
++    $ snmpgetnext -c public -v 1 \fB-OX\fP localhost ipv6RouteTable
+     IPv6-MIB::ipv6RouteIfIndex[3ffe:100:ff00:0:0:0:0:0][64][1] = INTEGER: 2
+ .fi
+ .RE