rpms/clamav/FC-4 clamav.spec, 1.19, 1.20 clamd-README, 1.2, 1.3 sources, 1.8, 1.9

[Enrico Scholz (ensc)]

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27852/FC-4

Modified Files:
	clamav.spec clamd-README sources 
Log Message:
synced with devel/


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clamav.spec	19 May 2005 07:45:09 -0000	1.19
+++ clamav.spec	21 Jun 2005 07:31:55 -0000	1.20
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.85.1
-Release:	%release_func 4
+Version:	0.86
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -70,7 +70,7 @@
 Requires:	clamav-data = %{version}-%{release}
 Requires(pre):		/etc/cron.d
 Requires(postun):	/etc/cron.d
-Requires(post):		%{__chown} %{__chmod}
+Requires(post):		%__chown %__chmod %__sed diffutils
 
 %package server
 Summary:	Clam Antivirus scanner server
@@ -247,8 +247,7 @@
 
 ## It is ok to execute it as root; freshclam drops privileges and becomes
 ## user 'clamav' as soon as possible
-## Note: replace 'MIN' and 'HOUR' with random values
-# MIN  HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
+# @MIN@  @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; }
 
 ## Comment out or remove this line...
 1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2'
@@ -296,6 +295,15 @@
 	%{__chown} root:%{username} %{freshclamlog}
 }
 
+min=$[ RANDOM % 60 ]
+hour=$[ RANDOM % 24 ]
+tmp=$(mktemp /tmp/freshclam-cron.XXXXXX)
+src=%_sysconfdir/cron.d/clamav-update
+%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp
+cmp -s $tmp "$src" || cat "$tmp" >"$src"
+rm -f $tmp
+
+
 %postun data
 test "$1" != 0 || /usr/sbin/fedora-userdel  %{username} &>/dev/null || :
 test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || :
@@ -406,6 +414,11 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jun 21 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.86-1
+- updated to 0.86
+- randomize freshclam startup times in -update's %%post script (suggested
+  by Stephen Smoogen); this requires some more Requires(post): also
+
 * Wed May 18 2005 Warren Togami <wtogami at redhat.com> - 0.85.1-4
 - fix dist tagging the way Enrico wants it
 


Index: clamd-README
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamd-README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clamd-README	3 Feb 2005 08:40:44 -0000	1.2
+++ clamd-README	21 Jun 2005 07:31:55 -0000	1.3
@@ -3,7 +3,7 @@
 
 clamd.conf:
   * set LogFile, PidFile, LocalSocket and User to suitable values
-  * place this file into /etc/clamd.d with a unique service-name;
+  * place this file into /etc/clamd.d with an unique service-name;
     e.g. as /etc/clamd.d/<SERVICE>.conf
 
   To make logfile rotation work properly, the LogFile should be


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	17 May 2005 06:41:27 -0000	1.8
+++ sources	21 Jun 2005 07:31:55 -0000	1.9
@@ -1,2 +1,2 @@
-b0675c3273785d61eefc1afa304745c0  clamav-0.85.1.tar.gz
-a7472bf7044adf4b21be39d7b93360f0  clamav-0.85.1.tar.gz.sig
+1c886e4f4f4c3e4e76250b7b52c000b4  clamav-0.86.tar.gz
+57948dbd3a9093265fe0ac4abd40c4c2  clamav-0.86.tar.gz.sig