rpms/clamav/devel clamd.scan.upstart, 1.3, 1.4 clamav.spec, 1.95, 1.96 clamav-milter.upstart, 1.4, 1.5

[ensc]

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22661

Modified Files:
	clamd.scan.upstart clamav.spec clamav-milter.upstart 
Log Message:
updated -upstart to upstart 0.6.3



Index: clamd.scan.upstart
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamd.scan.upstart,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clamd.scan.upstart	22 Nov 2009 10:47:15 -0000	1.3
+++ clamd.scan.upstart	6 Dec 2009 11:18:53 -0000	1.4
@@ -1,14 +1,16 @@
-### Uncomment these lines when you want clamd.scan to be a scanner
-### for a locally running clamav-milter
+### !!! Uncomment only *one* of the 'start on' statements !!!
+
+### Uncomment this line when you want clamd.scan to be a scanner for a
+### locally running clamav-milter
 #start on starting clamav-milter
 
-### Uncomment these lines when you want clamd.scan to be a generic
+### Uncomment this line when you want clamd.scan to be a generic
 ### scanner service
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+	  runlevel 1 or
+	  runlevel 6)
 
 respawn
 exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- clamav.spec	21 Nov 2009 20:18:21 -0000	1.95
+++ clamav.spec	6 Dec 2009 11:18:53 -0000	1.96
@@ -26,7 +26,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.3
-Release:	%release_func 1300%{?snapshot:.%snapshot}
+Release:	%release_func 1301%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -162,8 +162,7 @@ Group:		System Environment/Daemons
 Source410:	clamd.scan.upstart
 Provides:	init(clamav-scanner) = upstart
 Requires:	clamav-scanner = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -211,8 +210,7 @@ Group:		System Environment/Daemons
 Source310:	clamav-milter.upstart
 Provides:	init(clamav-milter) = upstart
 Requires:	clamav-milter = %version-%release
-# implicates a conflict with upstart 0.5+
-Requires(pre):		/etc/event.d
+Requires(pre):		/etc/init
 Requires(post):		/usr/bin/killall
 Requires(postun):	/sbin/initctl
 %{?noarch}
@@ -389,7 +387,7 @@ function smartsubst() {
 
 
 install -d -m755 \
-	${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \
+	${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,init} \
 	${RPM_BUILD_ROOT}%_var/log \
 	${RPM_BUILD_ROOT}%milterstatedir \
 	${RPM_BUILD_ROOT}%pkgdatadir/template \
@@ -445,7 +443,7 @@ sed -e 's!<SERVICE>!scan!g;s!<USER>!%sca
 sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \
     > $RPM_BUILD_ROOT%_initrddir/clamd.scan
 
-install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan
+install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf
 
 touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock
 
@@ -459,14 +457,14 @@ sed -r \
     -e 's! /tmp/clamav-milter.log! %milterlog!g' \
     etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf
 
-install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter
+install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf
 install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter
 
 
 rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf
 touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog}
 
-%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d}
+%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
 
 ## ------------------------------------------------------------
 
@@ -671,7 +669,7 @@ test "$1" != "0" || /sbin/initctl -q sto
 %if 0%{?with_upstart:1}
 %files scanner-upstart
 %defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/event.d/clamd.scan
+%config(noreplace) %_sysconfdir/init/clamd.scan*
 %endif
 
 ## -----------------------
@@ -693,11 +691,14 @@ test "$1" != "0" || /sbin/initctl -q sto
 %if 0%{?with_upstart:1}
 %files milter-upstart
 %defattr(-,root,root,-)
-%config(noreplace) %_sysconfdir/event.d/clamav-milter
+%config(noreplace) %_sysconfdir/init/clamav-milter*
 %endif
 
 
 %changelog
+* Sun Dec  6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.3-1301
+- updated -upstart to upstart 0.6.3
+
 * Sat Nov 21 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 - adjusted chkconfig positions for clamav-milter (#530101)
 - use %%apply instead of %%patch


Index: clamav-milter.upstart
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav-milter.upstart,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- clamav-milter.upstart	22 Nov 2009 10:47:15 -0000	1.4
+++ clamav-milter.upstart	6 Dec 2009 11:18:53 -0000	1.5
@@ -1,15 +1,16 @@
+### !!! Uncomment only *one* of the 'start on' statements !!!
+
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a locally running MTA
-#start on starting sendmail
-#start on starting postfix
+#start on (starting sendmail or starting postfix)
 
 ### Uncomment these lines when you want clamav-milter to be a milter
 ### for a remotely running MTA
 #start on starting local
 
-stop  on runlevel 0
-stop  on runlevel 1
-stop  on runlevel 6
+stop  on (runlevel 0 or
+          runlevel 1 or
+          runlevel 6)
 
 respawn
 exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes