rpms/clamav/devel clamav.spec,1.26,1.27

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1714

Modified Files:
	clamav.spec 
Log Message:
- [milter] create the milter-logfile in the %%post scriptlet
- [milter] reverted the change of the default child_timeout value; it
  was set to 5 minutes in 0.86.2 which conflicts with the internal
  mode where a timeout must not be set. So, the clamav-milter would
  not run with the default configuration



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- clamav.spec	28 Jul 2005 15:35:10 -0000	1.26
+++ clamav.spec	29 Jul 2005 16:29:09 -0000	1.27
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 3
+Release:	%release_func 4
 
 License:	GPL
 Group:		Applications/File
@@ -39,6 +39,7 @@
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
+Patch23:	clamav-0.86.2-timeout.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	clamav-lib = %{version}-%{release}
 Requires:	data(clamav)
@@ -100,11 +101,9 @@
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
-Requires(postun):	%_initrddir
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
+Requires(postun):	%_initrddir initscripts
+Requires(post):		chkconfig coreutils
+Requires(preun):	chkconfig initscripts
 Requires(pre):		fedora-usermgmt >= 0.7
 Requires(postun):	fedora-usermgmt >= 0.7
 
@@ -167,6 +166,7 @@
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
+%patch23 -p1 -b .timeout
 
 perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
 	     s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
@@ -177,6 +177,7 @@
 
 perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf
 
+
 ## ------------------------------------------------------------
 
 %build
@@ -321,6 +322,11 @@
 
 %post milter
 /sbin/chkconfig --add clamav-milter
+test -e %milterlog || {
+	touch %milterlog
+	chmod 0620             %milterlog
+	chown root:%milteruser %milterlog
+}
 
 %preun milter
 test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || :
@@ -422,6 +428,13 @@
 %endif	# _without_milter
 
 %changelog
+* Fri Jul 29 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.86.2-4
+- [milter] create the milter-logfile in the %%post scriptlet
+- [milter] reverted the change of the default child_timeout value; it
+  was set to 5 minutes in 0.86.2 which conflicts with the internal
+  mode where a timeout must not be set. So, the clamav-milter would
+  not run with the default configuration
+
 * Thu Jul 28 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.86.2-3
 - Fixed calculation of sleep duration; on some systems/IPs, `hostid`
   results in a negative number which is retained by the bash