Gentoo Archives: gentoo-commits

From: "Eray Aslan (eras)" <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-antivirus/clamav/files: clamd.initd-r4
Date: Wed, 27 Mar 2013 08:52:07
Message-Id: 20130327085203.34EBC2171D@flycatcher.gentoo.org
1 eras 13/03/27 08:52:03
2
3 Modified: clamd.initd-r4
4 Log:
5 Populate variables at the top
6
7 (Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
8
9 Revision Changes Path
10 1.2 app-antivirus/clamav/files/clamd.initd-r4
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4?r1=1.1&r2=1.2
15
16 Index: clamd.initd-r4
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- clamd.initd-r4 25 Mar 2013 14:34:52 -0000 1.1
23 +++ clamd.initd-r4 27 Mar 2013 08:52:03 -0000 1.2
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4,v 1.1 2013/03/25 14:34:52 eras Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.initd-r4,v 1.2 2013/03/27 08:52:03 eras Exp $
30
31 daemon_clamd="/usr/sbin/clamd"
32 daemon_freshclam="/usr/bin/freshclam"
33 @@ -30,6 +30,9 @@
34 }
35
36 start() {
37 + clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
38 + clamd_user=$(get_config clamd User clamav)
39 + freshclam_user=$(get_config freshclam DatabaseOwner clamav)
40 logfix
41
42 if [ "${START_CLAMD}" = "yes" ]; then
43 @@ -92,9 +95,6 @@
44 }
45
46 logfix() {
47 - clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock)
48 - clamd_user=$(get_config clamd User clamav)
49 - freshclam_user=$(get_config freshclam DatabaseOwner clamav)
50 if [ "${START_CLAMD}" = "yes" ]; then
51 # fix clamd log permissions
52 # (might be clobbered by logrotate or something)