[Pkg-net-snmp-commits] r327 - branches/net-snmp54/debian branches/net-snmp54-dev/debian trunk/debian

[Jochen Friedrich]

Author: jochen
Date: 2009-12-15 14:07:17 +0000 (Tue, 15 Dec 2009)
New Revision: 327

Modified:
   branches/net-snmp54-dev/debian/rules
   branches/net-snmp54-dev/debian/snmpd.init
   branches/net-snmp54/debian/changelog
   branches/net-snmp54/debian/rules
   branches/net-snmp54/debian/snmpd.init
   trunk/debian/rules
   trunk/debian/snmpd.init
Log:
Add /usr/share/mibs/site and /usr/share/snmp/mibs to MIB search path


Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog	2009-12-15 14:02:37 UTC (rev 326)
+++ branches/net-snmp54/debian/changelog	2009-12-15 14:07:17 UTC (rev 327)
@@ -5,8 +5,10 @@
   * Install all provided NET-SNMP MIBs.
   * Install snmp.conf with empty MIB list so snmp tools work without
     complaining about missing MIBs. (Closes: #559200)
+  * Add /usr/share/mibs/site and /usr/share/snmp/mibs to MIB search path
+    (Closes: #560371)
 
- -- Jochen Friedrich <jochen at scram.de>  Tue, 15 Dec 2009 14:50:08 +0100
+ -- Jochen Friedrich <jochen at scram.de>  Tue, 15 Dec 2009 14:59:44 +0100
 
 net-snmp (5.4.2.1~dfsg-4) unstable; urgency=low
 

Modified: branches/net-snmp54/debian/rules
===================================================================
--- branches/net-snmp54/debian/rules	2009-12-15 14:02:37 UTC (rev 326)
+++ branches/net-snmp54/debian/rules	2009-12-15 14:07:17 UTC (rev 327)
@@ -53,7 +53,7 @@
 	  --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
 	  --enable-mfd-rewrites \
 	  --with-mnttab=/etc/mtab \
-	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
+	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
 	  --with-defaults
 
 .PHONY: override_dh_clean

Modified: branches/net-snmp54/debian/snmpd.init
===================================================================
--- branches/net-snmp54/debian/snmpd.init	2009-12-15 14:02:37 UTC (rev 326)
+++ branches/net-snmp54/debian/snmpd.init	2009-12-15 14:07:17 UTC (rev 327)
@@ -21,7 +21,7 @@
 test -x /usr/sbin/snmptrapd || exit 0
 
 # Defaults
-export MIBDIRS=/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
+export MIBDIRS=/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
 SNMPDRUN=yes
 SNMPDOPTS='-Lsd -Lf /dev/null -p /var/run/snmpd.pid'
 TRAPDRUN=no

Modified: branches/net-snmp54-dev/debian/rules
===================================================================
--- branches/net-snmp54-dev/debian/rules	2009-12-15 14:02:37 UTC (rev 326)
+++ branches/net-snmp54-dev/debian/rules	2009-12-15 14:07:17 UTC (rev 327)
@@ -53,7 +53,7 @@
 	  --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
 	  --enable-mfd-rewrites \
 	  --with-mnttab=/etc/mtab \
-	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
+	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
 	  --with-defaults
 
 .PHONY: override_dh_clean

Modified: branches/net-snmp54-dev/debian/snmpd.init
===================================================================
--- branches/net-snmp54-dev/debian/snmpd.init	2009-12-15 14:02:37 UTC (rev 326)
+++ branches/net-snmp54-dev/debian/snmpd.init	2009-12-15 14:07:17 UTC (rev 327)
@@ -21,7 +21,7 @@
 test -x /usr/sbin/snmptrapd || exit 0
 
 # Defaults
-export MIBDIRS=/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
+export MIBDIRS=/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
 SNMPDRUN=yes
 SNMPDOPTS='-Lsd -Lf /dev/null -p /var/run/snmpd.pid'
 TRAPDRUN=no

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-12-15 14:02:37 UTC (rev 326)
+++ trunk/debian/rules	2009-12-15 14:07:17 UTC (rev 327)
@@ -53,7 +53,7 @@
 	  --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
 	  --enable-mfd-rewrites \
 	  --with-mnttab=/etc/mtab \
-	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
+	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
 	  --with-defaults
 
 .PHONY: override_dh_clean

Modified: trunk/debian/snmpd.init
===================================================================
--- trunk/debian/snmpd.init	2009-12-15 14:02:37 UTC (rev 326)
+++ trunk/debian/snmpd.init	2009-12-15 14:07:17 UTC (rev 327)
@@ -21,7 +21,7 @@
 test -x /usr/sbin/snmptrapd || exit 0
 
 # Defaults
-export MIBDIRS=/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
+export MIBDIRS=/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
 SNMPDRUN=yes
 SNMPDOPTS='-Lsd -Lf /dev/null -p /var/run/snmpd.pid'
 TRAPDRUN=no