[Pkg-net-snmp-commits] [SCM] Git repository for pkg-net-snmp branch, master, updated. debian/5.7.2_dfsg-1_0.2-10-gbadb701

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 112f53c3108f7a42f44b39a8739fd72dfd071c44
Author: Hideki Yamane <henrich at debian.org>
Date:   Wed May 15 22:20:16 2013 +0900

    fix /var/run/agentx dir handle

diff --git a/debian/changelog b/debian/changelog
index bedf07f..aba9f24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+net-snmp (5.7.2~dfsg-4) UNRELEASED; urgency=low
+
+  * debian/snmpd.{init,default,postinst}
+    - silly bug related to handle /var/run/agentx directory 
+      (Closes: #708335, #708328) Thanks to Hilmar Preuße <hille42 at web.de> and
+      Vincent Bernat <bernat at debian.org> for reporting
+
+ -- Hideki Yamane <henrich at debian.org>  Wed, 15 May 2013 21:40:10 +0900
+
 net-snmp (5.7.2~dfsg-3) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/snmpd.default b/debian/snmpd.default
index d67821b..0a21978 100644
--- a/debian/snmpd.default
+++ b/debian/snmpd.default
@@ -17,6 +17,3 @@ TRAPDRUN=no
 
 # snmptrapd options (use syslog).
 TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid'
-
-# create symlink on Debian legacy location to official RFC path
-SNMPDCOMPAT=yes
diff --git a/debian/snmpd.init b/debian/snmpd.init
index 053a54c..dc11bea 100644
--- a/debian/snmpd.init
+++ b/debian/snmpd.init
@@ -38,14 +38,13 @@ TRAPDOPTS="-Lsd -p $TRAPD_PID"
 # Cd to / before starting any daemons.
 cd /
 
-# Create compatibility link to old AgentX socket location
-if [ "$SNMPDCOMPAT" = "yes" ] && [ "$1" != status ]; then
-  ln -sf /var/agentx/master /var/run/agentx
-fi
-
 case "$1" in
   start)
     echo -n "Starting network management services:"
+    # remove old symlink with previous version
+    if [ -L /var/run/agentx ]; then
+	    rm -f /var/run/agentx
+    fi
     if [ ! -d /var/run/agentx ]; then
 	    mkdir -p /var/run/agentx
     fi
diff --git a/debian/snmpd.postinst b/debian/snmpd.postinst
index ed72c9e..c98fbeb 100644
--- a/debian/snmpd.postinst
+++ b/debian/snmpd.postinst
@@ -13,14 +13,6 @@ if [ "x$1" = xconfigure ]; then
 	chown -R snmp:snmp /var/lib/snmp
 fi
 
-if [ -f /var/run/agentx ]; then
-	rm -f /var/run/agentx
-fi
-
-if [ ! -d /var/run/agentx ]; then
-	mkdir -p /var/run/agentx
-fi
-
 #DEBHELPER#
 
 exit 0

-- 
Git repository for pkg-net-snmp