packages: clamav/clamav-cron-updatedb, clamav/clamav.spec - drop dependency...

[glen]

Author: glen                         Date: Mon Sep 14 17:19:39 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop dependency on bc

---- Files affected:
packages/clamav:
   clamav-cron-updatedb (1.7 -> 1.8) , clamav.spec (1.271 -> 1.272) 

---- Diffs:

================================================================
Index: packages/clamav/clamav-cron-updatedb
diff -u packages/clamav/clamav-cron-updatedb:1.7 packages/clamav/clamav-cron-updatedb:1.8
--- packages/clamav/clamav-cron-updatedb:1.7	Sun Jun  8 13:39:27 2008
+++ packages/clamav/clamav-cron-updatedb	Mon Sep 14 19:19:34 2009
@@ -1,18 +1,24 @@
 #!/bin/sh
 
-[ -f /etc/sysconfig/clamd ] && . /etc/sysconfig/clamd
+# default as often as two hours
+UPDATE_HOUR=2
 
-[ -z "$UPDATE_HOUR" ] && UPDATE_HOUR=2
-DIV="$(echo "$(LC_ALL=C date "+%H % ${UPDATE_HOUR}")" | bc)"
-[ "$DIV" = "0" ] || exit 0
+if [ -f /etc/sysconfig/clamd ]; then
+	. /etc/sysconfig/clamd
+fi
+
+hour=$(LC_ALL=C date '+%H')
+
+div=$((hour % $UPDATE_HOUR))
+[ "$div" = "0" ] || exit 0
 
 # sleep random amount to avoid all servers hitting clamav servers at same time
 # but at most 1800 seconds (half hour)
 rand=${RANDOM:-$$}
-rand="$(echo "$rand % 1800" | bc)"
+rand=$((rand % 1800))
 sleep $rand
 
-[ -z "$UPDATE_MAIL_MESSAGES" ] && UPDATE_MAIL_MESSAGES="errors"
+[ "$UPDATE_MAIL_MESSAGES" ] || UPDATE_MAIL_MESSAGES="errors"
 [ "$UPDATE_MAIL_MESSAGES" = "errors" ] && freshclamopt="--quiet"
 
 notify=

================================================================
Index: packages/clamav/clamav.spec
diff -u packages/clamav/clamav.spec:1.271 packages/clamav/clamav.spec:1.272
--- packages/clamav/clamav.spec:1.271	Sun Aug 30 08:27:43 2009
+++ packages/clamav/clamav.spec	Mon Sep 14 19:19:34 2009
@@ -47,7 +47,6 @@
 Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	/usr/sbin/usermod
-Requires:	bc
 Requires:	rc-scripts >= 0.4.1.23
 Provides:	group(clamav)
 Provides:	user(clamav)
@@ -346,6 +345,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.272  2009/09/14 17:19:34  glen
+- drop dependency on bc
+
 Revision 1.271  2009/08/30 06:27:43  glen
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clamav/clamav-cron-updatedb?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clamav/clamav.spec?r1=1.271&r2=1.272&f=u