rpms/clamav/FC-3 clamav-notify-servers, 1.1, 1.2 clamav.spec, 1.15, 1.16 freshclam-sleep, 1.1, 1.2

[Enrico Scholz (ensc)]

Author: ensc

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

Modified Files:
	clamav-notify-servers clamav.spec freshclam-sleep 
Log Message:
synced with devel/


Index: clamav-notify-servers
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav-notify-servers,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamav-notify-servers	8 Nov 2004 04:10:52 -0000	1.1
+++ clamav-notify-servers	28 Jul 2005 15:37:20 -0000	1.2
@@ -23,6 +23,9 @@
 
 ok=1
 
+f=/usr/sbin/clamav-notify-servers.local
+test ! -e "$f" || . "$f"
+
 for i in ${BASE}*; do
     test -e "$i" || continue
 


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- clamav.spec	25 Jul 2005 17:56:55 -0000	1.15
+++ clamav.spec	28 Jul 2005 15:37:20 -0000	1.16
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.86.2
-Release:	%release_func 2
+Release:	%release_func 3
 
 License:	GPL
 Group:		Applications/File
@@ -422,6 +422,17 @@
 %endif	# _without_milter
 
 %changelog
+* 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
+  modulo-operation. So the sleep may get a negative number of seconds
+  being interpreted as an option. This version makes sure that the
+  module-operations returns a non-negative value. [BZ #164494, James
+  Wilkinson]
+- added support for a /usr/sbin/clamav-notify-servers.local hook; this
+  file will be executed (source'd) before all other actions and can
+  abort the entire processing by invoking 'exit'
+
 * Mon Jul 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.86.2-2
 - updated to 0.86.2 (SECURITY)
 - changed the freshclam updating mechanism (again); now, it consists


Index: freshclam-sleep
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/freshclam-sleep,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freshclam-sleep	25 Jul 2005 17:47:53 -0000	1.1
+++ freshclam-sleep	28 Jul 2005 15:37:20 -0000	1.2
@@ -44,7 +44,8 @@
 	;;
 
     (*)
-	sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ]
+	let FRESHCLAM_MOD*=60
+	sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ]
 	;;
 esac