This commit was manufactured by cvs2git to create tag 'auto-ac-net-snmp-

5_1_2-4'.

Sprout from master 2004-12-09 19:55:29 UTC Elan Ruusamäe <glen@pld-linux.org> '- disable echotest per default'
Cherrypick from master 2005-06-15 21:18:40 UTC Elan Ruusamäe <glen@pld-linux.org> '- having signal as last argument to killproc seems to work a lot better':
    net-snmpd.init -> 1.11
    net-snmpd.sysconfig -> 1.2
Cherrypick from unlabeled-1.40.2 2005-06-17 16:30:00 UTC Jan Rękorajski <baggins@pld-linux.org> '- release 4 to rebuild with rpm 4.4.1':
    net-snmp.spec -> 1.40.2.4

diff --git a/net-snmp.spec b/net-snmp.spec
index de3a8d02967bb2657b9ccc0ae2029cab948d74ac..fd5dc25cc2cc150425242de4fa156d276c7ce8c0 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -15,7 +15,7 @@ Summary(ru):  
 Summary(uk):   îÁÂ¦Ò ÕÔÉÌ¦Ô ÄÌÑ ÐÒÏÔÏËÏÌÕ SNMP ×¦Ä UC-Davis
 Name:          net-snmp
 Version:       5.1.2
-Release:       1
+Release:       4
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -408,6 +408,7 @@ chmod +x net-snmp-config
 
 PATH=`pwd`:$PATH \
 %{__perl} Makefile.PL \
+       -NET-SNMP-CONFIG="sh ../../net-snmp-config" -NET-SNMP-IN-SOURCE=true \
        INSTALLDIRS=vendor \
        OPTIMIZE="%{rpmcflags} -I`pwd`/../include" \
        </dev/null

diff --git a/net-snmpd.init b/net-snmpd.init
index cd98e778fc1708f0ebf2303d2ebf308003287e56..3041b4a0360ab12ba74a8c50fb9d10ff37e7f87a 100644 (file)
--- a/net-snmpd.init
+++ b/net-snmpd.init
@@ -21,8 +21,8 @@
 # Get network config
 . /etc/sysconfig/network
 
-CONF_FILE=/etc/snmp/snmpd.conf
-LOG_WARNINGS_MESSAGES_TO_SYSLOG=yes
+CONF_FILE=""
+LOG_WARNINGS_MESSAGES_TO_SYSLOG="yes"
 
 # Get service config
 [ -f /etc/sysconfig/snmpd ] && . /etc/sysconfig/snmpd
@@ -61,7 +61,15 @@ case "$1" in
                rm -f /var/lock/subsys/snmpd >/dev/null 2>&1
        else
                msg_not_running "snmpd"
-       fi      
+       fi
+       ;;
+  reload)
+       if [ -f /var/lock/subsys/snmpd ]; then
+               msg_reloading "snmpd"
+               killproc snmpd -HUP
+       else
+               msg_not_running "snmpd"
+       fi
        ;;
   restart|force-reload)
        $0 stop

diff --git a/net-snmpd.sysconfig b/net-snmpd.sysconfig
index c2812462fd803f482672924b45ce5932bf0e5ba4..64f678dc8e05efd97e737c8c40b44a8a0831fb97 100644 (file)
--- a/net-snmpd.sysconfig
+++ b/net-snmpd.sysconfig
@@ -3,8 +3,10 @@
 # Define nice level for snmpd
 SERVICE_RUN_NICE_LEVEL="+0"
 
-# Default configuration file name
-CONF_FILE=/etc/snmp/snmpd.conf
+# Default configuration file name.
+# IMPORTANT:
+#  If you enable this, snmpd will not read additionally /etc/snmp/snmpd.local.conf
+# CONF_FILE=/etc/snmp/snmpd.conf
 
 # Log warnings/messages to syslog (otherwise to /var/log/snmpd.log)
 LOG_WARNINGS_MESSAGES_TO_SYSLOG=yes