- upstart: SERVICE=syslog -> SERVICE_syslog=y

Changed files:
    net-snmp.spec -> 1.179
    snmpd.upstart -> 1.2

diff --git a/net-snmp.spec b/net-snmp.spec
index 7d3b75cef78de66a4a43c91e83aab1eb2da7133d..d330ed283dde027ae36e32c20157348b237f584e 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -28,7 +28,7 @@ Summary(ru.UTF-8):    Набор утилит для протокола SNMP от U
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
 Version:       5.6.1.1
-Release:       2
+Release:       3
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -508,18 +508,18 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,snmp},/var/log,/var/lib/n
        mibdir=%{_datadir}/mibs \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
 :> $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.local.conf
 :> $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmp.conf
 :> $RPM_BUILD_ROOT%{logfile}
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmpd
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/snmpd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmpd.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/snmpd
 
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/snmptrapd
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmptrapd.conf
-cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/snmp/snmptrapd.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/snmptrapd
 
 install -d $RPM_BUILD_ROOT/etc/init
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/snmpd.conf

diff --git a/snmpd.upstart b/snmpd.upstart
index c8613fb77cdfc0980bf838523785db5e540bb981..e312501950fda7eaf732775188aaf4a400937824 100644 (file)
--- a/snmpd.upstart
+++ b/snmpd.upstart
@@ -1,6 +1,6 @@
 description "SNMP Daemon"
 
-start on local-filesystems and pld.network-started and started SERVICE=syslog
+start on local-filesystems and pld.network-started and started SERVICE_syslog=y
 stop on pld.shutdown-started
 
 env SNMPD_LISTEN_ADDRS=
@@ -10,7 +10,7 @@ respawn
 script
        # Source old-style snmpd service configuration
        [ -f /etc/sysconfig/snmpd ] && . /etc/sysconfig/snmpd
-               
+
        SNMPD_LISTEN_ADDRS=""
        exec /usr/sbin/snmpd -f -p /var/run/snmpd.pid $SNMPD_LISTEN_ADDRS
 end script