aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/clamav/APKBUILD8
-rwxr-xr-xmain/clamav/clamd.initd28
2 files changed, 19 insertions, 17 deletions
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 4b59e0cc99..7b3d8bb5dd 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=clamav
pkgver=0.98.1
-pkgrel=1
+pkgrel=2
pkgusers="clamav"
pkggroups="clamav"
pkgdesc="An anti-virus toolkit for UNIX"
@@ -187,7 +187,7 @@ daemon() {
md5sums="b1ec7b19dea8385954515ef1d63576d8 clamav-0.98.1.tar.gz
104d062d384e9fada1812d08dc433ed8 arm.patch
-252190c7bd6ec77e4867fe2bfdff5d71 clamd.initd
+3c5e2a5cbab6155e09ee6255fed49dbb clamd.initd
e8a03fad6ce603631e8fe71a24d387c6 clamd.confd
401fe30d9af2fea3151f938b26ff01c0 freshclam.initd
e48466ddfb56f66c623b83e58777b778 freshclam.confd
@@ -195,7 +195,7 @@ ae1e48ab56a0fff1acdde023c1f6f350 clamd.logrotate
226824214c021b2366f0be1289561d17 freshclam.logrotate"
sha256sums="35f5e84d734cdd4532c1cc6c92560c5b31d1c24f2e1e203bef0ca1351eb223dc clamav-0.98.1.tar.gz
989e41505f5287e7b01c8e4657078e147fe7751e9d2bf64f8c2abad63ea45e6c arm.patch
-ce74f9a3c795206a1381c9b97cd131b3d2265ecac6017a96e9e4b388ee8d1db4 clamd.initd
+b88f2a678ba831a901142c874594eaa7f4c8b6232bc041bf5fc614308e05b741 clamd.initd
4d978313004f66d871564b873df27c5459d3cc504788b179e41edba0f04b74dc clamd.confd
f69a8741f0165a1edd7558ce6c3ea8411fc2bc6e433a1636c25c366a057134d0 freshclam.initd
75551ce7e04bbef4a889bc94a357b160d9da88f06eba32df594ba3cbb2c81ed1 freshclam.confd
@@ -203,7 +203,7 @@ ec5e60f7efca02ed151f625e9a44404346991ed6608c6e2088db2436bbd03d49 clamd.logrotat
84006ac3d2e8dc2e13a01f5e313c20e4978cdc93d831c181e0075badcbf4ada0 freshclam.logrotate"
sha512sums="5daac24d346a03acc7e4d8f9e5962a009a908326663008557cbc2af4426e6059cbebbb8fac6d718edf9a567075b823c457f3f9a3aea3c558f5ee272274030b42 clamav-0.98.1.tar.gz
20374e90aa6dcac08eb7e2fb09531f2044181103a3733ada4d9b79c051507f02cd1bb5f28f1b4b4870b82ef9746949d4e0a266c0bc4249aef9029299b28f5082 arm.patch
-7b5e1ab606e746719aa2a12d51338eaeafdda00b487e29e3ac7b211ea4f42413ffdd13602158405722b01393e200432f35fe27b1269894029c6edbda3ef8b3a5 clamd.initd
+ea78b98520f61e9c8a7ecf3158296aec329979b9db20c6ecb94c88d6b183beaa5c8706ea77d005783afba924172e9e7fa948998c60f5f8c99e030e630a0944ba clamd.initd
59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
e192f89d6591c0601f828da368a8a21eb7ed14c50757630896fbbb3582c2660ad562760b28979904f1a4a21eecc320f2e6f7f0c7b673f89c6d2af83d2d4b280c freshclam.initd
ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
index 03f44c943f..d8c8f4549d 100755
--- a/main/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
@@ -23,21 +23,23 @@ start() {
local dbdir=$(awk '$1 == "DatabaseDirectory" { print $2 }' $CONF)
local timeout=${FRESHCLAM_TIMEOUT:-120}
- local cvd="${dbdir:-/var/lib/clamav}"/main.cld
+ local cvd="${dbdir:-/var/lib/clamav}"/main.cvd
+ local cld="${dbdir:-/var/lib/clamav}"/main.cld
- if ! [ -e "$cvd" ]; then
- ebegin "Waiting for clamav database download"
- while ! [ -e "$cvd" ]; do
- timeout=$(( $timeout - 1 ))
- if [ $timeout -eq 0 ]; then
- eend 1 "Timed out"
- return 1
- fi
- sleep 1
- done
- eend 0
+ if ! [ -e "$cld" ]; then
+ if ! [ -e "$cvd" ]; then
+ ebegin "Waiting for clamav database download"
+ while ! [ -e "$cvd" ]; do
+ timeout=$(( $timeout - 1 ))
+ if [ $timeout -eq 0 ]; then
+ eend 1 "Timed out"
+ return 1
+ fi
+ sleep 1
+ done
+ eend 0
+ fi
fi
-
ebegin "Starting ${NAME}"
start-stop-daemon --start --quiet \
--nicelevel ${CLAMD_NICELEVEL:-0} \