[Pkg-net-snmp-commits] r329 - branches/net-snmp54/debian branches/net-snmp54/debian/patches branches/net-snmp54-dev/debian/patches trunk/debian/patches
Jochen Friedrich
jochen at alioth.debian.org
Fri Jun 4 16:53:05 UTC 2010
Author: jochen
Date: 2010-06-04 16:52:58 +0000 (Fri, 04 Jun 2010)
New Revision: 329
Removed:
branches/net-snmp54/debian/patches/31_silence_subcontainer.README
branches/net-snmp54/debian/patches/31_silence_subcontainer.patch
branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.README
branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.patch
branches/net-snmp54/debian/patches/59_fix_python.README
branches/net-snmp54/debian/patches/59_fix_python.patch
Modified:
branches/net-snmp54-dev/debian/patches/03_makefiles.patch
branches/net-snmp54-dev/debian/patches/07_docfiles.patch
branches/net-snmp54-dev/debian/patches/32_mnttab_path.patch
branches/net-snmp54-dev/debian/patches/56_manpage.patch
branches/net-snmp54/debian/changelog
branches/net-snmp54/debian/patches/02_statistics.patch
branches/net-snmp54/debian/patches/03_makefiles.patch
branches/net-snmp54/debian/patches/07_docfiles.patch
branches/net-snmp54/debian/patches/08_defaultconfig.patch
branches/net-snmp54/debian/patches/32_mnttab_path.patch
branches/net-snmp54/debian/patches/56_manpage.patch
branches/net-snmp54/debian/patches/60_libsensors_api.patch
branches/net-snmp54/debian/patches/series
trunk/debian/patches/03_makefiles.patch
trunk/debian/patches/07_docfiles.patch
trunk/debian/patches/56_manpage.patch
Log:
Update to NetSNMP 5.4.3.
Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/changelog 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,3 +1,24 @@
+net-snmp (5.4.3~dfsg-1) unstable; urgency=low
+
+ * New upstream version (Closes: #559109)
+ - includes fix for CVE-2008-4309
+ - includes fix for CVE-2008-6123 (Closes: #516801)
+ - AgentX support listens on localhost (only) by default
+ - support for monitoring large disks (>2Tb)
+ - improved handling of multiple matching access control entries
+ * Remove patches included upstream:
+ - 31_silence_subcontainer.patch
+ - 57_fix_ipv6_memleak.patch
+ - 59_fix_python.patch
+ * Update patches:
+ - 03_makefiles.patch
+ - 07_docfiles.patch
+ - 32_mnttab_path.patch
+ - 56_manpage.patch (Closes: #582400)
+ - 60_libsensors_api.patch (Closes: #575810)
+
+ -- Jochen Friedrich <jochen at scram.de> Fri, 04 Jun 2010 17:03:40 +0200
+
net-snmp (5.4.2.1~dfsg-5) unstable; urgency=low
* Add conditional depends back that were lost in the build system
Modified: branches/net-snmp54/debian/patches/02_statistics.patch
===================================================================
--- branches/net-snmp54/debian/patches/02_statistics.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/02_statistics.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,6 +1,8 @@
---- net-snmp-5.1.2.orig/agent/mibgroup/mibII/interfaces.c
-+++ net-snmp-5.1.2/agent/mibgroup/mibII/interfaces.c
-@@ -1598,6 +1612,10 @@
+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;
@@ -11,7 +13,7 @@
if (line[strlen(line) - 1] == '\n')
line[strlen(line) - 1] = '\0';
-@@ -1631,7 +1649,7 @@
+@@ -1584,7 +1588,7 @@
&coll) != 5)) {
if ((scan_line_to_use == scan_line_2_2)
&& !strstr(line, "No statistics available"))
Modified: branches/net-snmp54/debian/patches/03_makefiles.patch
===================================================================
--- branches/net-snmp54/debian/patches/03_makefiles.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/03_makefiles.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
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 @@
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 @@
- 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 @@
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
Modified: branches/net-snmp54/debian/patches/07_docfiles.patch
===================================================================
--- branches/net-snmp54/debian/patches/07_docfiles.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/07_docfiles.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
+ to a particular user, and should probably go in a personal snmp.conf
+@@ -2655,7 +2655,7 @@
+ createUser {myUser} MD5 {myPassword} DES
- 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 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.
- There are three ways to configure SNMPv3 users:
-
-- 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
-
- 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.
+
Modified: branches/net-snmp54/debian/patches/08_defaultconfig.patch
===================================================================
--- branches/net-snmp54/debian/patches/08_defaultconfig.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/08_defaultconfig.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,127 +1,20 @@
---- net-snmp-5.1.2.orig/EXAMPLE.conf.def
-+++ net-snmp-5.1.2/EXAMPLE.conf.def
-@@ -6,7 +6,7 @@
- ###############################################################################
+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
#
- # This file is intended to only be an example. If, however, you want
--# to use it, it should be placed in SYSCONFDIR/snmp/snmpd.conf.
-+# to use it, it should be placed in /etc/snmp/snmpd.conf.
- # When the snmpd agent starts up, this is where it will look for it.
- #
- # You might be interested in generating your own snmpd.conf file using
-@@ -58,31 +58,38 @@
- # from):
+ # 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
- # sec.name source community
--com2sec local localhost COMMUNITY
--com2sec mynetwork NETWORK/24 COMMUNITY
-+com2sec paranoid default public
-+#com2sec readonly default public
-+#com2sec readwrite default private
-
- ####
- # Second, map the security names into group names:
-
- # sec.model sec.name
--group MyRWGroup v1 local
--group MyRWGroup v2c local
--group MyRWGroup usm local
--group MyROGroup v1 mynetwork
--group MyROGroup v2c mynetwork
--group MyROGroup usm mynetwork
-+group MyROSystem v1 paranoid
-+group MyROSystem v2c paranoid
-+group MyROSystem usm paranoid
-+group MyROGroup v1 readonly
-+group MyROGroup v2c readonly
-+group MyROGroup usm readonly
-+group MyRWGroup v1 readwrite
-+group MyRWGroup v2c readwrite
-+group MyRWGroup usm readwrite
-
- ####
- # Third, create a view for us to let the groups have rights to:
-
- # incl/excl subtree mask
- view all included .1 80
-+view system included .1.3.6.1.2.1.1
-+#view system included .iso.org.dod.internet.mgmt.mib-2.system
-
- ####
- # Finally, grant the 2 groups access to the 1 view with different
- # write permissions:
-
- # context sec.model sec.level match read write notif
-+access MyROSystem "" any noauth exact system none none
- access MyROGroup "" any noauth exact all none none
- access MyRWGroup "" any noauth exact all all none
-
-@@ -100,8 +106,8 @@
- # value of an object whose value is given here will fail with an error
- # status of notWritable.
-
--syslocation Right here, right now.
--syscontact Me <me at somewhere.org>
-+syslocation Unknown (configure /etc/snmp/snmpd.local.conf)
-+syscontact Root <root at localhost> (configure /etc/snmp/snmpd.local.conf)
-
- # Example output of snmpwalk:
- # % snmpwalk -v 1 -c public localhost system
-@@ -135,13 +141,13 @@
- #
-
- # Make sure mountd is running
--proc mountd
-+#proc mountd
-
- # Make sure there are no more than 4 ntalkds running, but 0 is ok too.
--proc ntalkd 4
-+#proc ntalkd 4
-
- # Make sure at least one sendmail, but less than or equal to 10 are running.
--proc sendmail 10 1
-+#proc sendmail 10 1
-
- # A snmpwalk of the prTable would look something like this:
- #
-@@ -199,7 +205,7 @@
- # ARGS: optional arguments to be passed to the program
-
- # a simple hello world
--exec echotest /bin/echo hello world
-+#exec echotest /bin/echo hello world
-
- # Run a shell script containing:
- #
-@@ -250,7 +256,7 @@
-
- # Check the / partition and make sure it contains at least 10 megs.
-
--disk / 10000
-+#disk / 10000
-
- # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.DISKMIBNUM
- # enterprises.ucdavis.diskTable.dskEntry.diskIndex.1 = 0
-@@ -279,7 +285,7 @@
- # 15MAX: Similar, but for 15 min average.
-
- # Check for loads:
--load 12 14 14
-+#load 12 14 14
-
- # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.LOADAVEMIBNUM
- # enterprises.ucdavis.loadTable.laEntry.loadaveIndex.1 = 1
-@@ -365,7 +371,7 @@
- # (commented out here since it requires that you place the
- # script in the right location. (its not installed by default))
-
--# pass .EXTENSIBLEDOTMIB.255 /bin/sh PREFIX/local/passtest
-+# pass .EXTENSIBLEDOTMIB.255 /bin/sh /usr/local/passtest
-
- # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.255
- # enterprises.ucdavis.255.1 = "life the universe and everything"
---- net-snmp-5.1.2.orig/EXAMPLE-trap.conf
-+++ net-snmp-5.1.2/EXAMPLE-trap.conf
+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 @@
+###############################################################################
+#
Deleted: branches/net-snmp54/debian/patches/31_silence_subcontainer.README
===================================================================
--- branches/net-snmp54/debian/patches/31_silence_subcontainer.README 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/31_silence_subcontainer.README 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,3 +0,0 @@
-Upstream Change 17254:
-
-CHANGES: snmpd: BUG: 1693039: be silent when insert fails.
Deleted: branches/net-snmp54/debian/patches/31_silence_subcontainer.patch
===================================================================
--- branches/net-snmp54/debian/patches/31_silence_subcontainer.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/31_silence_subcontainer.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,26 +0,0 @@
-Index: snmplib/container.c
-===================================================================
---- net-snmp-5.4.2.1.orig/snmplib/container.c (Revision 17253)
-+++ net-snmp-5.4.2.1/snmplib/container.c (Revision 17254)
-@@ -275,7 +275,7 @@
- if(x) {
- int rc = x->insert(x,k);
- if(rc)
-- snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
-+ snmp_log(LOG_DEBUG,"error on subcontainer '%s' insert (%d)\n",
- x->container_name ? x->container_name : "", rc);
- else {
- rc = CONTAINER_INSERT_HELPER(x->next, k);
-Index: include/net-snmp/library/container.h
-===================================================================
---- net-snmp-5.4.2.1.orig/include/net-snmp/library/container.h (Revision 17253)
-+++ net-snmp-5.4.2.1/include/net-snmp/library/container.h (Revision 17254)
-@@ -358,7 +358,7 @@
- if(x) {
- int rc = x->insert(x,k);
- if(rc)
-- snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
-+ snmp_log(LOG_DEBUG,"error on subcontainer '%s' insert (%d)\n",
- x->container_name ? x->container_name : "", rc);
- else {
- rc = CONTAINER_INSERT_HELPER(x->next, k);
Modified: branches/net-snmp54/debian/patches/32_mnttab_path.patch
===================================================================
--- branches/net-snmp54/debian/patches/32_mnttab_path.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/32_mnttab_path.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,12 +1,14 @@
---- net-snmp-5.2.3.orig/configure.in 2006-07-14 01:29:49.000000000 +0200
-+++ net-snmp-5.2.3/configure.in 2006-12-28 16:07:34.000000000 +0100
-@@ -2102,13 +2102,19 @@
+Index: net-snmp-5.4.3/configure.in
+===================================================================
+--- net-snmp-5.4.3.orig/configure.in 2010-05-23 22:39:44.000000000 +0200
++++ net-snmp-5.4.3/configure.in 2010-06-04 17:27:58.000000000 +0200
+@@ -2609,13 +2609,19 @@
AC_CACHE_CHECK(for mount table location,ac_cv_ETC_MNTTAB,
[ac_cv_ETC_MNTTAB="unknown"
--for i in /etc/mnttab /etc/mtab /etc/filesystems
+-for i in /etc/mnttab /etc/mtab /etc/filesystems /dev/mnttab
- do
-- if test -f $i; then
+- if test -f $i -o -c $i; then
- ac_cv_ETC_MNTTAB="$i"
- break;
- fi
@@ -16,9 +18,9 @@
+ The default is to autodetect this.],
+ [ac_cv_ETC_MNTTAB="$with_mnttab"])
+if test "$ac_cv_ETC_MNTTAB" = "unknown"; then
-+ for i in /etc/mnttab /etc/mtab /etc/filesystems
++ for i in /etc/mnttab /etc/mtab /etc/filesystems /dev/mnttab
+ do
-+ if test -f $i; then
++ if test -f $i -o -c $i; then
+ ac_cv_ETC_MNTTAB="$i"
+ break;
+ fi
Modified: branches/net-snmp54/debian/patches/56_manpage.patch
===================================================================
--- branches/net-snmp54/debian/patches/56_manpage.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/56_manpage.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
.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 @@
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 @@
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,36 +46,23 @@
+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
+--- 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
.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
-@@ -2,7 +2,7 @@
- .ad l
- .nh
- .SH NAME
-container \-
+container \- Net-SNMP null container
.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 @@
-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 @@
.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 @@
+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
+ The snmp agent responds to SNMP queries from management stations.
- .PP
- .SS "Modules"
-Index: net-snmp-5.4.2.1/man/netsnmp_handler.3
+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
+ 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).
- .PP
- .SS "Modules"
+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
Deleted: branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.README
===================================================================
--- branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.README 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.README 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,2 +0,0 @@
-Upstream Changeset 17255: CHANGES: snmpd: fix memory leak when multiple
-interfaces have the same IPv6 address
Deleted: branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.patch
===================================================================
--- branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/57_fix_ipv6_memleak.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,17 +0,0 @@
-Index: net-snmp-5.4.2.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
-===================================================================
---- net-snmp-5.4.2.1.orig/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c (revision 17254)
-+++ net-snmp-5.4.2.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c (revision 17255)
-@@ -325,7 +325,11 @@
- /*
- * add entry to container
- */
-- CONTAINER_INSERT(container, entry);
-+ if (CONTAINER_INSERT(container, entry) < 0) {
-+ DEBUGMSGTL(("access:ipaddress:container","error with ipaddress_entry: insert into container failed.\n"));
-+ netsnmp_access_ipaddress_entry_free(entry);
-+ continue;
-+ }
- }
-
- fclose(in);
Deleted: branches/net-snmp54/debian/patches/59_fix_python.README
===================================================================
--- branches/net-snmp54/debian/patches/59_fix_python.README 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/59_fix_python.README 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,2 +0,0 @@
-Explicitly added key UseNumeric with value 0 and disabled some debug info
-Bug has been fixed upstream with the patch provided at R17470
Deleted: branches/net-snmp54/debian/patches/59_fix_python.patch
===================================================================
--- branches/net-snmp54/debian/patches/59_fix_python.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/59_fix_python.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,21 +0,0 @@
-Index: net-snmp-5.4.2.1/python/netsnmp/client.py
-===================================================================
---- net-snmp-5.4.2.1.orig/python/netsnmp/client.py 2008-03-21 18:45:33.000000000 +0100
-+++ net-snmp-5.4.2.1/python/netsnmp/client.py 2009-11-12 14:03:27.000000000 +0100
-@@ -28,6 +28,7 @@
- 'Context':'',
- 'Engineboots':0,
- 'Enginetime':0,
-+ 'UseNumeric':0,
- }
- keys = kargs.keys()
- for key in keys:
-@@ -234,8 +235,6 @@
- var_list.append(arg)
- else:
- var_list.append(Varbind(arg))
-- for var in var_list:
-- print " ",var.tag, var.iid, "=", var.val, '(',var.type,')'
- res = sess.walk(var_list)
- return res
-
Modified: branches/net-snmp54/debian/patches/60_libsensors_api.patch
===================================================================
--- branches/net-snmp54/debian/patches/60_libsensors_api.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/60_libsensors_api.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,8 +1,50 @@
-diff --git a/agent/mibgroup/ucd-snmp/lmSensors.c b/agent/mibgroup/ucd-snmp/lmSensors.c
-index d7dbd98..8f9fcd2 100644
---- a/agent/mibgroup/ucd-snmp/lmSensors.c
-+++ b/agent/mibgroup/ucd-snmp/lmSensors.c
-@@ -390,7 +390,7 @@ static int
+Index: net-snmp-5.4.3/agent/mibgroup/ucd-snmp/lmSensors.c
+===================================================================
+--- net-snmp-5.4.3.orig/agent/mibgroup/ucd-snmp/lmSensors.c 2010-06-04 18:04:58.000000000 +0200
++++ net-snmp-5.4.3/agent/mibgroup/ucd-snmp/lmSensors.c 2010-06-04 18:06:48.000000000 +0200
+@@ -89,7 +89,6 @@
+ #include </usr/platform/sun4u/include/sys/envctrl.h>
+ #else
+ #include <sensors/sensors.h>
+- #define CONFIG_FILE_NAME "/etc/sensors.conf"
+ #endif
+
+ #include "lmSensors.h"
+@@ -247,7 +246,7 @@
+ size_t * var_len, WriteMethod ** write_method)
+ {
+ static long long_ret;
+- static unsigned char string[SPRINT_MAX_LEN];
++ static char string[SPRINT_MAX_LEN];
+
+ int s_index;
+ int s_type = -1;
+@@ -352,9 +351,7 @@
+ {
+ int res;
+ #ifndef solaris2
+- char filename[] = CONFIG_FILE_NAME;
+ time_t t = time(NULL);
+- FILE *fp = fopen(filename, "r");
+ int i = 0;
+
+ DEBUGMSG(("ucd-snmp/lmSensors", "=> sensor_init\n"));
+@@ -366,13 +363,7 @@
+ sensor_array[i].sensor = NULL;
+ }
+
+- if (!fp)
+- {
+- res = 1;
+- goto leaving;
+- }
+-
+- if (sensors_init(fp))
++ if (sensors_init(NULL))
+ {
+ res = 2;
+ goto leaving;
+@@ -390,7 +381,7 @@
sensor_load(void)
{
int rc = 0;
@@ -11,22 +53,28 @@
if (t > timestamp + 7) /* this may require some tuning - currently 7 seconds*/
{
-@@ -962,77 +962,78 @@ else{
+@@ -940,7 +931,8 @@
+ #else /* end solaris2 only ie. ifdef everything else */
+
+ const sensors_chip_name *chip;
+- const sensors_feature_data *data;
++ const sensors_feature *feature;
++ const sensors_subfeature *subfeature;
+ int chip_nr = 0;
+ int rc = 0;
+ unsigned int i = 0;
+@@ -961,78 +953,80 @@
+ sensor_array[i].current_len = DEFAULT_SENSORS;
} /* end for */
- while ((chip = sensors_get_detected_chips(&chip_nr))) {
+- while ((chip = sensors_get_detected_chips(&chip_nr))) {
- int a = 0;
- int b = 0;
-+ int a = 0;
-+ int b = 0;
-
+-
- while ((data = sensors_get_all_features(*chip, &a, &b))) {
- char *label = NULL;
- double val;
-+ while ((data = sensors_get_all_features(*chip, &a, &b))) {
-+ char *label = NULL;
-+ double val;
-
+-
- if ((data->mode & SENSORS_MODE_R) &&
- (data->mapping == SENSORS_NO_MAPPING) &&
- !sensors_get_label(*chip, data->number, &label) &&
@@ -34,28 +82,14 @@
- int type = -1;
- float mul;
- _sensor_array *array;
-+ if ((data->mode & SENSORS_MODE_R) &&
-+ (data->mapping == SENSORS_NO_MAPPING) &&
-+ !sensors_get_label(*chip, data->number, &label) &&
-+ !sensors_get_feature(*chip, data->number, &val)) {
-+ int type = -1;
-+ float mul;
-+ _sensor_array *array;
-
+-
- /* The label, as determined for a given chip in sensors.conf,
- * is used to place each sensor in the appropriate bucket.
- * Volt, Fan, Temp, and Misc. If the text being looked for below
- * is not in the label of a given sensor (e.g., the temp1 sensor
- * has been labeled 'CPU' and not 'CPU temp') it will end up being
- * lumped in the MISC bucket. */
-+ /* The label, as determined for a given chip in
-+ * sensors.conf, is used to place each sensor in the
-+ * appropriate bucket. Volt, Fan, Temp, and Misc.
-+ * If the text being looked for below is not in the
-+ * label of a given sensor (e.g., the temp1 sensor
-+ * has been labeled 'CPU' and not 'CPU temp') it
-+ * will end up being lumped in the MISC bucket. */
-
+-
- if (strstr(label, "V")) {
- type = VOLT_TYPE;
- mul = 1000.0;
@@ -72,23 +106,7 @@
- type = MISC_TYPE;
- mul = 1000.0;
- }
-+ if (strstr(label, "V")) {
-+ type = VOLT_TYPE;
-+ mul = 1000.0;
-+ }
-+ if (strstr(label, "fan") || strstr(label, "Fan")) {
-+ type = FAN_TYPE;
-+ mul = 1.0;
-+ }
-+ if (strstr(label, "temp") || strstr(label, "Temp")) {
-+ type = TEMP_TYPE;
-+ mul = 1000.0;
-+ }
-+ if (type == -1) {
-+ type = MISC_TYPE;
-+ mul = 1000.0;
-+ }
-
+-
- array = &sensor_array[type];
- if ( array->current_len <= array->n) {
- _sensor* old_buffer = array->sensor;
@@ -121,6 +139,47 @@
- label = NULL;
- } /* end if label */
- } /* end while data */
++ while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
++ int a = 0;
++ while ((feature = sensors_get_features(chip, &a))) {
++ int b = 0;
++ while ((subfeature = sensors_get_all_subfeatures(chip,
++ feature, &b))) {
++ char *label = NULL;
++ double val;
++
++ if ((subfeature->flags & SENSORS_MODE_R) &&
++ (label = sensors_get_label(chip, feature)) &&
++ !sensors_get_value(chip, subfeature->number, &val)) {
++ int type = -1;
++ float mul;
++ _sensor_array *array;
++
++ /* The label, as determined for a given chip in
++ * sensors.conf, is used to place each sensor in the
++ * appropriate bucket. Volt, Fan, Temp, and Misc.
++ * If the text being looked for below is not in the
++ * label of a given sensor (e.g., the temp1 sensor
++ * has been labeled 'CPU' and not 'CPU temp') it
++ * will end up being lumped in the MISC bucket. */
++
++ if (strstr(label, "V")) {
++ type = VOLT_TYPE;
++ mul = 1000.0;
++ }
++ if (strstr(label, "fan") || strstr(label, "Fan")) {
++ type = FAN_TYPE;
++ mul = 1.0;
++ }
++ if (strstr(label, "temp") || strstr(label, "Temp")) {
++ type = TEMP_TYPE;
++ mul = 1000.0;
++ }
++ if (type == -1) {
++ type = MISC_TYPE;
++ mul = 1000.0;
++ }
++
+ array = &sensor_array[type];
+ if ( array->current_len <= array->n) {
+ _sensor* old_buffer = array->sensor;
@@ -152,98 +211,6 @@
+ free(label);
+ label = NULL;
+ } /* end if label */
-+ } /* end while data */
- } /* end while chip */
- return rc;
- #endif /* end else ie. ifdef everything else */
-diff --git a/agent/mibgroup/ucd-snmp/lmSensors.c b/agent/mibgroup/ucd-snmp/lmSensors.c
-index 8f9fcd2..e42e0e2 100644
---- a/agent/mibgroup/ucd-snmp/lmSensors.c
-+++ b/agent/mibgroup/ucd-snmp/lmSensors.c
-@@ -89,7 +89,6 @@
- #include </usr/platform/sun4u/include/sys/envctrl.h>
- #else
- #include <sensors/sensors.h>
-- #define CONFIG_FILE_NAME "/etc/sensors.conf"
- #endif
-
- #include "lmSensors.h"
-@@ -247,7 +246,7 @@ var_lmSensorsTable(struct variable *vp,
- size_t * var_len, WriteMethod ** write_method)
- {
- static long long_ret;
-- static unsigned char string[SPRINT_MAX_LEN];
-+ static char string[SPRINT_MAX_LEN];
-
- int s_index;
- int s_type = -1;
-@@ -352,9 +351,7 @@ sensor_init(void)
- {
- int res;
- #ifndef solaris2
-- char filename[] = CONFIG_FILE_NAME;
- time_t t = time(NULL);
-- FILE *fp = fopen(filename, "r");
- int i = 0;
-
- DEBUGMSG(("ucd-snmp/lmSensors", "=> sensor_init\n"));
-@@ -366,13 +363,7 @@ sensor_init(void)
- sensor_array[i].sensor = NULL;
- }
-
-- if (!fp)
-- {
-- res = 1;
-- goto leaving;
-- }
--
-- if (sensors_init(fp))
-+ if (sensors_init(NULL))
- {
- res = 2;
- goto leaving;
-@@ -940,7 +931,8 @@ else{
- #else /* end solaris2 only ie. ifdef everything else */
-
- const sensors_chip_name *chip;
-- const sensors_feature_data *data;
-+ const sensors_feature *feature;
-+ const sensors_subfeature *subfeature;
- int chip_nr = 0;
- int rc = 0;
- unsigned int i = 0;
-@@ -961,18 +953,19 @@ else{
- sensor_array[i].current_len = DEFAULT_SENSORS;
- } /* end for */
-
-- while ((chip = sensors_get_detected_chips(&chip_nr))) {
-+ while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
- int a = 0;
-+ while ((feature = sensors_get_features(chip, &a))) {
- int b = 0;
--
-- while ((data = sensors_get_all_features(*chip, &a, &b))) {
-+ while ((subfeature = sensors_get_all_subfeatures(chip,
-+ feature, &b))) {
- char *label = NULL;
- double val;
-
-- if ((data->mode & SENSORS_MODE_R) &&
-- (data->mapping == SENSORS_NO_MAPPING) &&
-- !sensors_get_label(*chip, data->number, &label) &&
-- !sensors_get_feature(*chip, data->number, &val)) {
-+ if ((subfeature->flags & SENSORS_MODE_R) &&
-+ (subfeature->mapping == 0) &&
-+ (label = sensors_get_label(chip, feature)) &&
-+ !sensors_get_value(chip, subfeature->number, &val)) {
- int type = -1;
- float mul;
- _sensor_array *array;
-@@ -1033,7 +1026,8 @@ else{
- free(label);
- label = NULL;
- } /* end if label */
-- } /* end while data */
+ } /* end while subfeature */
+ } /* end while feature */
} /* end while chip */
Modified: branches/net-snmp54/debian/patches/series
===================================================================
--- branches/net-snmp54/debian/patches/series 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54/debian/patches/series 2010-06-04 16:52:58 UTC (rev 329)
@@ -6,12 +6,9 @@
08_defaultconfig.patch
25_duplicate_iftable.patch
26_kfreebsd.patch
-31_silence_subcontainer.patch
32_mnttab_path.patch
44_nlist_kvm.patch
56_manpage.patch
-57_fix_ipv6_memleak.patch
-59_fix_python.patch
60_libsensors_api.patch
61_vacm_missing_dependency_check.patch
62_add_lib_cflags.patch
Modified: branches/net-snmp54-dev/debian/patches/03_makefiles.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/03_makefiles.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54-dev/debian/patches/03_makefiles.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
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 @@
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 @@
- 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 @@
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
Modified: branches/net-snmp54-dev/debian/patches/07_docfiles.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/07_docfiles.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54-dev/debian/patches/07_docfiles.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
+ to a particular user, and should probably go in a personal snmp.conf
+@@ -2655,7 +2655,7 @@
+ createUser {myUser} MD5 {myPassword} DES
- 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 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.
- There are three ways to configure SNMPv3 users:
-
-- 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
-
- 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.
+
Modified: branches/net-snmp54-dev/debian/patches/32_mnttab_path.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/32_mnttab_path.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54-dev/debian/patches/32_mnttab_path.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -1,12 +1,14 @@
---- net-snmp-5.2.3.orig/configure.in 2006-07-14 01:29:49.000000000 +0200
-+++ net-snmp-5.2.3/configure.in 2006-12-28 16:07:34.000000000 +0100
-@@ -2102,13 +2102,19 @@
+Index: net-snmp-5.4.3/configure.in
+===================================================================
+--- net-snmp-5.4.3.orig/configure.in 2010-05-23 22:39:44.000000000 +0200
++++ net-snmp-5.4.3/configure.in 2010-06-04 17:27:58.000000000 +0200
+@@ -2609,13 +2609,19 @@
AC_CACHE_CHECK(for mount table location,ac_cv_ETC_MNTTAB,
[ac_cv_ETC_MNTTAB="unknown"
--for i in /etc/mnttab /etc/mtab /etc/filesystems
+-for i in /etc/mnttab /etc/mtab /etc/filesystems /dev/mnttab
- do
-- if test -f $i; then
+- if test -f $i -o -c $i; then
- ac_cv_ETC_MNTTAB="$i"
- break;
- fi
@@ -16,9 +18,9 @@
+ The default is to autodetect this.],
+ [ac_cv_ETC_MNTTAB="$with_mnttab"])
+if test "$ac_cv_ETC_MNTTAB" = "unknown"; then
-+ for i in /etc/mnttab /etc/mtab /etc/filesystems
++ for i in /etc/mnttab /etc/mtab /etc/filesystems /dev/mnttab
+ do
-+ if test -f $i; then
++ if test -f $i -o -c $i; then
+ ac_cv_ETC_MNTTAB="$i"
+ break;
+ fi
Modified: branches/net-snmp54-dev/debian/patches/56_manpage.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/56_manpage.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ branches/net-snmp54-dev/debian/patches/56_manpage.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
.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 @@
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 @@
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,36 +46,23 @@
+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
+--- 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
.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
-@@ -2,7 +2,7 @@
- .ad l
- .nh
- .SH NAME
-container \-
+container \- Net-SNMP null container
.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 @@
-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 @@
.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 @@
+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
+ The snmp agent responds to SNMP queries from management stations.
- .PP
- .SS "Modules"
-Index: net-snmp-5.4.2.1/man/netsnmp_handler.3
+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
+ 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).
- .PP
- .SS "Modules"
+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
Modified: trunk/debian/patches/03_makefiles.patch
===================================================================
--- trunk/debian/patches/03_makefiles.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ trunk/debian/patches/03_makefiles.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
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 @@
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 @@
- 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 @@
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
Modified: trunk/debian/patches/07_docfiles.patch
===================================================================
--- trunk/debian/patches/07_docfiles.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ trunk/debian/patches/07_docfiles.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
+ to a particular user, and should probably go in a personal snmp.conf
+@@ -2655,7 +2655,7 @@
+ createUser {myUser} MD5 {myPassword} DES
- 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 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.
- There are three ways to configure SNMPv3 users:
-
-- 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
-
- 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.
+
Modified: trunk/debian/patches/56_manpage.patch
===================================================================
--- trunk/debian/patches/56_manpage.patch 2009-12-15 16:29:09 UTC (rev 328)
+++ trunk/debian/patches/56_manpage.patch 2010-06-04 16:52:58 UTC (rev 329)
@@ -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 @@
.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 @@
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 @@
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,36 +46,23 @@
+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
+--- 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
.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
-@@ -2,7 +2,7 @@
- .ad l
- .nh
- .SH NAME
-container \-
+container \- Net-SNMP null container
.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 @@
-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 @@
.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 @@
+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
+ The snmp agent responds to SNMP queries from management stations.
- .PP
- .SS "Modules"
-Index: net-snmp-5.4.2.1/man/netsnmp_handler.3
+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
+ 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).
- .PP
- .SS "Modules"
+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
More information about the Pkg-net-snmp-commits
mailing list