aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2014-03-31 08:02:48 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2014-03-31 08:02:48 +0000
commitef9cae4e56d8549aca4705206739c47a8280b438 (patch)
tree3a9bc839584266b81cc591d5f34cb2ec4d2f8053
parente8f74d41f779d7763f3696d4c921bbc884adca02 (diff)
downloadaports-ef9cae4e56d8549aca4705206739c47a8280b438.tar.bz2
aports-ef9cae4e56d8549aca4705206739c47a8280b438.tar.xz
main/clamav: fix endless timeout upon daemon startup
-rw-r--r--main/clamav/APKBUILD20
-rwxr-xr-xmain/clamav/clamd.initd4
2 files changed, 20 insertions, 4 deletions
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index fb3a7387c7..57bd9848b3 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=clamav
pkgver=0.97.8
-pkgrel=0
+pkgrel=1
pkgusers="clamav"
pkggroups="clamav"
pkgdesc="An anti-virus toolkit for UNIX"
@@ -175,10 +175,26 @@ daemon() {
}
md5sums="ac52bcbad3ea72eac08fedb9772f648b clamav-0.97.8.tar.gz
-b4523253843761d7a7e5fa765b3fb2b9 clamd.initd
+252190c7bd6ec77e4867fe2bfdff5d71 clamd.initd
e8a03fad6ce603631e8fe71a24d387c6 clamd.confd
401fe30d9af2fea3151f938b26ff01c0 freshclam.initd
e48466ddfb56f66c623b83e58777b778 freshclam.confd
0d08fd29656bd4b018ecf8ce9706ac55 clamav-0.95.1-nls.patch
ae1e48ab56a0fff1acdde023c1f6f350 clamd.logrotate
226824214c021b2366f0be1289561d17 freshclam.logrotate"
+sha256sums="d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 clamav-0.97.8.tar.gz
+ce74f9a3c795206a1381c9b97cd131b3d2265ecac6017a96e9e4b388ee8d1db4 clamd.initd
+4d978313004f66d871564b873df27c5459d3cc504788b179e41edba0f04b74dc clamd.confd
+f69a8741f0165a1edd7558ce6c3ea8411fc2bc6e433a1636c25c366a057134d0 freshclam.initd
+75551ce7e04bbef4a889bc94a357b160d9da88f06eba32df594ba3cbb2c81ed1 freshclam.confd
+4aa3ba46cdea229355f90e2c6533c0f3c91f52ce869f7bc6dcc870a29450e312 clamav-0.95.1-nls.patch
+ec5e60f7efca02ed151f625e9a44404346991ed6608c6e2088db2436bbd03d49 clamd.logrotate
+84006ac3d2e8dc2e13a01f5e313c20e4978cdc93d831c181e0075badcbf4ada0 freshclam.logrotate"
+sha512sums="e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda clamav-0.97.8.tar.gz
+7b5e1ab606e746719aa2a12d51338eaeafdda00b487e29e3ac7b211ea4f42413ffdd13602158405722b01393e200432f35fe27b1269894029c6edbda3ef8b3a5 clamd.initd
+59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
+e192f89d6591c0601f828da368a8a21eb7ed14c50757630896fbbb3582c2660ad562760b28979904f1a4a21eecc320f2e6f7f0c7b673f89c6d2af83d2d4b280c freshclam.initd
+ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd
+8363ba0e69918ce2cbfef3adf3406d3f73d29adacc1f1382f11c1ef3b55baba96ee581beb5f9eaafbfbad1e00ffb0e4af39cd09b597cdba1e3ab2db39a3c5a04 clamav-0.95.1-nls.patch
+57e5b0c0dc6dc078e0102829e5d36882cff9ae5dd0637c31c7a23ef274dd0a4d967bc036f74c42b4690af511bc0a43fdb6d19b0c307506432577d82de7beff78 clamd.logrotate
+f1cd8df6d47824009a6df130bd60bf5e9f9deaef87fbeaceec8fe71e6c8b2772b5dba017390a2190deee851723256f06e9aef2182b0a2881119f22ba68740554 freshclam.logrotate"
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
index 10c9c6db16..03f44c943f 100755
--- a/main/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
@@ -22,8 +22,8 @@ start() {
fi
local dbdir=$(awk '$1 == "DatabaseDirectory" { print $2 }' $CONF)
- local timout=${FRESHCLAM_TIMEOUT:-120}
- local cvd="${dbdir:-/var/lib/clamav}"/main.cvd
+ local timeout=${FRESHCLAM_TIMEOUT:-120}
+ local cvd="${dbdir:-/var/lib/clamav}"/main.cld
if ! [ -e "$cvd" ]; then
ebegin "Waiting for clamav database download"