---- net-snmp-5.1.2.orig/EXAMPLE.conf.def
-+++ net-snmp-5.1.2/EXAMPLE.conf.def
-@@ -6,7 +6,7 @@
- ###############################################################################
+--- net-snmp-5.5/EXAMPLE.conf.def.org 2009-06-01 15:11:07.000000000 +0200
++++ net-snmp-5.5/EXAMPLE.conf.def 2010-06-05 20:02:19.658299931 +0200
+@@ -74,8 +74,8 @@
+
+ # Note that setting these values here, results in the corresponding MIB objects being 'read-only'
+ # See snmpd.conf(5) for more details
+-sysLocation Sitting on the Dock of the Bay
+-sysContact Me <me@example.org>
++sysLocation Unknown (configure /etc/snmp/snmpd.local.conf)
++sysContact Root <root@localhost> (configure /etc/snmp/snmpd.local.conf)
+ # Application + End-to-End layers
+ sysServices 72
+
+@@ -84,11 +84,11 @@
+ # Process Monitoring
#
- # 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.
+ # At least one 'mountd' process
+-proc mountd
++#proc mountd
+ # No more than 4 'ntalkd' processes - 0 is OK
+-proc ntalkd 4
++#proc ntalkd 4
+ # At least one 'sendmail' process, but no more than 10
+-proc sendmail 10 1
++#proc sendmail 10 1
+
+ # Walk the UCD-SNMP-MIB::prTable to see the resulting output
+ # Note that this table will be empty if there are no "proc" entries in the snmpd.conf file
+@@ -98,9 +98,9 @@
+ # Disk Monitoring
#
- # You might be interested in generating your own snmpd.conf file using
-@@ -58,31 +58,37 @@
- # from):
-
- # 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 .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@somewhere.org>
-+syslocation Unknown (configure /etc/snmp/snmpd.local.conf)
-+syscontact Root <root@localhost> (configure /etc/snmp/snmpd.local.conf)
-
- # Example output of snmpwalk:
- # % snmpwalk -v 1 -c public localhost system
-@@ -135,13 +141,13 @@
+ # 10MBs required on root disk, 5% free on /var, 10% free on all other disks
+-disk / 10000
+-disk /var 5%
+-includeAllDisks 10%
++#disk / 10000
++#disk /var 5%
++#includeAllDisks 10%
+
+ # Walk the UCD-SNMP-MIB::dskTable to see the resulting output
+ # Note that this table will be empty if there are no "disk" entries in the snmpd.conf file
+@@ -110,7 +110,7 @@
+ # System Load
#
+ # Unacceptable 1-, 5-, and 15-minute load averages
+-load 12 10 5
++#load 12 10 5
- # 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:
+ # Walk the UCD-SNMP-MIB::laTable to see the resulting output
+ # Note that this table *will* be populated, even without a "load" entry in the snmpd.conf file
+@@ -154,8 +154,8 @@
#
-@@ -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
+ # Arbitrary extension commands
+ #
+- extend test1 /bin/echo Hello, world!
+- extend-sh test2 echo Hello, world! ; echo Hi there ; exit 35
++#extend test1 /bin/echo Hello, world!
++#extend-sh test2 echo Hello, world! ; echo Hi there ; exit 35
+ #extend-sh test3 /bin/sh /tmp/shtest
- # % 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
-@@ -0,0 +1,18 @@
-+###############################################################################
-+#
-+# EXAMPLE-trap.conf:
-+# An example configuration file for configuring the Net-SNMP snmptrapd agent.
-+#
-+###############################################################################
-+#
-+# This file is intended to only be an example. If, however, you want
-+# to use it, it should be placed in /etc/snmp/snmptrapd.conf.
-+# When the snmptrapd agent starts up, this is where it will look for it.
-+#
-+# All lines beginning with a '#' are comments and are intended for you
-+# to read. All other lines are configuration commands for the agent.
-+
-+#
-+# PLEASE: read the snmptrapd.conf(5) manual page as well!
-+#
-+
+ # Note that this last entry requires the script '/tmp/shtest' to be created first,