[Pkg-net-snmp-commits] r111 - in trunk/debian: . patches

Sat Nov 25 01:04:52 CET 2006

Author: anders-guest
Date: 2006-11-25 01:04:52 +0100 (Sat, 25 Nov 2006)
New Revision: 111

Modified:
   trunk/debian/changelog
   trunk/debian/patches/07_docfiles.patch
Log:
update for 5.4

Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2006-11-24 12:31:00 UTC (rev 110)
+++ trunk/debian/changelog	2006-11-25 00:04:52 UTC (rev 111)
@@ -1,4 +1,4 @@
-net-snmp (5.4+rc3-1) experimental; urgency=low
+net-snmp (5.4-1) experimental; urgency=low
 
   [ Jochen Friedrich ]
   * New upstream version
@@ -12,6 +12,7 @@
 
   [ Thomas Anders ]
   * Change makefile patch for 5.4.rc3
+  * Change docfile patch for 5.4
   * Add missing copyrights to copyright file.
   * Fix spelling errors and wrong path names in documentation.
 

Modified: trunk/debian/patches/07_docfiles.patch
===================================================================
--- trunk/debian/patches/07_docfiles.patch	2006-11-24 12:31:00 UTC (rev 110)
+++ trunk/debian/patches/07_docfiles.patch	2006-11-25 00:04:52 UTC (rev 111)
@@ -1,76 +1,42 @@
---- net-snmp-5.1.2.orig/man/mib2c.1.def
-+++ net-snmp-5.1.2/man/mib2c.1.def
-@@ -72,8 +72,9 @@
- .TP
- .BI -c " CONFIGFILE"
- Use CONFIGFILE when generating code.  These files will be searched for
--first in the current directory and then in the DATADIR directory
--(which is where the default mib2c configuration files can be found).
-+first in the current directory and then in /etc/snmp
-+(which is where the default mib2c configuration files can be found)
-+and finally in the DATADIR directory.
- Running mib2c without the -c CONFIGFILE option will display
- a description of the valid values for CONFIGFILE, that is,
- the available config files, including new ones that you might
---- net-snmp-5.1.2.orig/man/snmp_config.5.def
-+++ net-snmp-5.1.2/man/snmp_config.5.def
-@@ -11,7 +11,7 @@
- found and read from.  By default, the applications look for
- configuration files in the following 4 directories, in order:
- SYSCONFDIR/snmp,
--DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp.  In each of these
-+/etc/snmp, LIBDIR/snmp, and $HOME/.snmp.  In each of these
- directories, it looks for files with the extension of both
- .IR conf " and " local.conf
- (reading the second ones last).  In this manner, there are
---- net-snmp-5.1.2.orig/FAQ
-+++ net-snmp-5.1.2/FAQ
-@@ -104,7 +104,7 @@
+--- 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?
     How do I configure SNMPv3 users?
     The 'createUser' line disappears when I start the agent.  Why?
--   What's the difference between /var/ucd-snmp and /usr/local/share/snmp?
-+   What's the difference between /var/ucd-snmp and /usr/share/snmp?
+-   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?
     Why am I getting "Connection refused"?
-    I'm getting errors about "bad security model" - why?
-@@ -620,7 +620,7 @@
+    Why can't I see values in the UCDavis 'extensible' or 'disk' trees?
+@@ -630,7 +630,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,
- 
 -	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
- 
-@@ -639,7 +639,7 @@
-   Note that you need *both* steps.
-   The first command copies the file defining the new MIB to a
-   expected location for MIB files.  This defaults to
--  /usr/local/share/snmp/mibs (or PREFIX/share/snmp/mibs if the the
-+  /usr/share/snmp/mibs (or PREFIX/share/snmp/mibs if the the
-   suite was installed into a different base location).  Some
-   ready-packaged distributions (such as Linux RPM packages) may look
-   for MIB files in a different location, such as /etc/snmp/mibs - put
-@@ -1111,7 +1111,7 @@
+@@ -1158,7 +1158,7 @@
    If this is the case, then you can specify this interpreter
    explicitly as part of the trap handle directive:
  
 -	traphandle default /usr/bin/perl /usr/local/bin/log_it
 +	traphandle default /usr/bin/perl /usr/bin/log_it
  
-   Note that in this case, it's almost certain that you'll also
+     In this case, it's almost certain that you'll also
    need to give the full path to the traphandle script (as shown)
-@@ -1263,7 +1263,7 @@
-   (if appropriate) the community string to use.
+@@ -1232,7 +1232,7 @@
+   string to use.
  
-     Some of these (such as the MIB file location), might belong 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
+     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
    /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
-@@ -1522,7 +1522,7 @@
+@@ -1455,7 +1455,7 @@
  
  
      Alternatively, the tools may be looking in the wrong place.
@@ -79,21 +45,46 @@
    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'.
-@@ -2507,11 +2507,11 @@
+@@ -2409,7 +2409,7 @@
  
+   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
  
--What's the difference between /var/ucd-snmp and /usr/local/share/snmp?
-+What's the difference between /var/ucd-snmp and /usr/share/snmp?
- ---------------------------------------------------------------------
+ 	createUser {myUser} MD5 {myPassword} DES
+@@ -2422,7 +2422,7 @@
+         net-snmp-config --create-snmpv3-user
  
-     Most "static" agent configuration should go in the traditional location
--  (typically /usr/local/share/snmp/snmpd.conf or /etc/snmp).   The
-+  (typically /usr/share/snmp/snmpd.conf or /etc/snmp).   The
-   /var/ucd-snmp (or /var/net-snmp) location is used for information set during
-   the running of the agent, which needs to be persistent between one run of
-   the agent and the next.
-@@ -2531,7 +2531,7 @@
+      and follow the instructions.  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 @@
+ 
+ 
+ 
+-What's the difference between /var/net-snmp and /usr/local/share/snmp?
+----------------------------------------------------------------------
++What's the difference between /var/lib/snmp and /usr/share/snmp?
++----------------------------------------------------------------
+ 
+-    The /var/net-snmp location is primarily used for information set
++    The /var/lib/snmp location is primarily used for information set
+   during the running of the agent, which needs to be persistent between
+   one run of the agent and the next.   Apart from "createUser" (see
+   the previous entry), you shouldn't need to touch this file.
+ 
+   All other user-provided configuration should go in the traditional
+-  location (typically /usr/local/share/snmp/snmpd.conf or /etc/snmp).
++  location (typically /usr/share/snmp or /etc/snmp).
+ 
+ 
+ 
+@@ -2477,7 +2477,7 @@
    distribution), with the current release installed from the source.
  
      The default location for this file with the basic distribution is


