rpms/clamav/F-11 clamav-milter.sysv,1.3,1.4 clamav.spec,1.88,1.89

[ensc]

Author: ensc

Update of /cvs/extras/rpms/clamav/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17816/F-11

Modified Files:
	clamav-milter.sysv clamav.spec 
Log Message:
- disabled LocalSocket option in sample configuration
- fixed clamav-milter sysv initscript to use bash interpreter and to
  be disabled by default



Index: clamav-milter.sysv
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav-milter.sysv,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clamav-milter.sysv	11 Jun 2009 07:27:38 -0000	1.3
+++ clamav-milter.sysv	9 Aug 2009 11:25:07 -0000	1.4
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # clamav-milter Starts/stop the "clamav-milter" daemon
 #
-# chkconfig:   345 99 1
+# chkconfig:   - 99 1
 # description: A virus scanning milter
 
 # Source function library.


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-11/clamav.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- clamav.spec	11 Jun 2009 07:27:38 -0000	1.88
+++ clamav.spec	9 Aug 2009 11:25:07 -0000	1.89
@@ -21,7 +21,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.95.2
-Release:	%release_func 1%{?snapshot:.%snapshot}
+Release:	%release_func 2%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -321,7 +321,7 @@ mkdir -p libclamunrar{,_iface}
 
 sed -ri \
     -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \
-    -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
+    -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \
     -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \
     -e 's!^#?(User ).*!\1<USER>!g' \
     -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \
@@ -666,6 +666,11 @@ test "$1" != "0" || /sbin/initctl -q sto
 
 
 %changelog
+* Sun Aug  9 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-2
+- disabled LocalSocket option in sample configuration
+- fixed clamav-milter sysv initscript to use bash interpreter and to
+  be disabled by default
+
 * Thu Jun 11 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.95.2-1
 - updated to 0.95.2