packages: net-snmp/net-snmp.spec, net-snmp/snmpd.upstart - upstart: SERVICE...

[glen]

Author: glen                         Date: Sat Jul 30 13:39:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstart: SERVICE=syslog -> SERVICE_syslog=y

---- Files affected:
packages/net-snmp:
   net-snmp.spec (1.178 -> 1.179) , snmpd.upstart (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.178 packages/net-snmp/net-snmp.spec:1.179
--- packages/net-snmp/net-snmp.spec:1.178	Fri Jul 29 19:39:33 2011
+++ packages/net-snmp/net-snmp.spec	Sat Jul 30 15:39:20 2011
@@ -29,7 +29,7 @@
 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
@@ -509,18 +509,18 @@
 	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
@@ -814,6 +814,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2011/07/30 13:39:20  glen
+- upstart: SERVICE=syslog -> SERVICE_syslog=y
+
 Revision 1.178  2011/07/29 17:39:33  qboosh
 - -compat-devel R: -devel, not just -libs
 - release 2: needs rebuild with rpm 4.5-55 to avoid libtool(/usr/lib/libnetsnmp.la) Provides in -compat-devel

================================================================
Index: packages/net-snmp/snmpd.upstart
diff -u packages/net-snmp/snmpd.upstart:1.1 packages/net-snmp/snmpd.upstart:1.2
--- packages/net-snmp/snmpd.upstart:1.1	Thu Jan 27 23:00:49 2011
+++ packages/net-snmp/snmpd.upstart	Sat Jul 30 15:39:20 2011
@@ -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 @@
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.178&r2=1.179&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/snmpd.upstart?r1=1.1&r2=1.2&f=u