summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2013-03-27 08:52:03 +0000
committerEray Aslan <eras@gentoo.org>2013-03-27 08:52:03 +0000
commit0b316ca85bf750460145e1540bf7bdfb81b2b175 (patch)
tree2982a54ea4bef96f39b99212435fd22ba83ec01e /app-antivirus
parentRemove install-man3 target to remove empty /usr/share/man/man3 directory (rel... (diff)
downloadgentoo-2-0b316ca85bf750460145e1540bf7bdfb81b2b175.tar.gz
gentoo-2-0b316ca85bf750460145e1540bf7bdfb81b2b175.tar.bz2
gentoo-2-0b316ca85bf750460145e1540bf7bdfb81b2b175.zip
Populate variables at the top
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
Diffstat (limited to 'app-antivirus')
-rw-r--r--app-antivirus/clamav/ChangeLog5
-rwxr-xr-xapp-antivirus/clamav/files/clamd.initd-r48
2 files changed, 8 insertions, 5 deletions
diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 306eb2b7bdf4..37c5c49a03c8 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-antivirus/clamav
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.450 2013/03/25 14:34:52 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.451 2013/03/27 08:52:03 eras Exp $
+
+ 27 Mar 2013; Eray Aslan <eras@gentoo.org> files/clamd.initd-r4:
+ Populate variables at the top
*clamav-0.97.7-r1 (25 Mar 2013)
diff --git a/app-antivirus/clamav/files/clamd.initd-r4 b/app-antivirus/clamav/files/clamd.initd-r4
index 70ea22a75457..e54aba48db7e 100755
--- a/app-antivirus/clamav/files/clamd.initd-r4
+++ b/app-antivirus/clamav/files/clamd.initd-r4
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4,v 1.1 2013/03/25 14:34:52 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4,v 1.2 2013/03/27 08:52:03 eras Exp $
daemon_clamd="/usr/sbin/clamd"
daemon_freshclam="/usr/bin/freshclam"
@@ -30,6 +30,9 @@ get_config() {
}
start() {
+ clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
+ clamd_user=$(get_config clamd User clamav)
+ freshclam_user=$(get_config freshclam DatabaseOwner clamav)
logfix
if [ "${START_CLAMD}" = "yes" ]; then
@@ -92,9 +95,6 @@ stop() {
}
logfix() {
- clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
- clamd_user=$(get_config clamd User clamav)
- freshclam_user=$(get_config freshclam DatabaseOwner clamav)
if [ "${START_CLAMD}" = "yes" ]; then
# fix clamd log permissions
# (might be clobbered by logrotate or something)