1 |
commit: b1241030001d3607fe1724f0e77f4545576b5848 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jul 1 19:48:58 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 3 11:28:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1241030 |
7 |
|
8 |
app-antivirus/clamav: remove unused initd files |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/1812 |
11 |
|
12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
13 |
|
14 |
app-antivirus/clamav/files/clamd.initd-r3 | 121 ---------------------------- |
15 |
app-antivirus/clamav/files/clamd.initd-r5 | 126 ------------------------------ |
16 |
2 files changed, 247 deletions(-) |
17 |
|
18 |
diff --git a/app-antivirus/clamav/files/clamd.initd-r3 b/app-antivirus/clamav/files/clamd.initd-r3 |
19 |
deleted file mode 100644 |
20 |
index 134a701..0000000 |
21 |
--- a/app-antivirus/clamav/files/clamd.initd-r3 |
22 |
+++ /dev/null |
23 |
@@ -1,121 +0,0 @@ |
24 |
-#!/sbin/openrc-run |
25 |
-# Copyright 1999-2013 Gentoo Foundation |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Id$ |
28 |
- |
29 |
-daemon_clamd="/usr/sbin/clamd" |
30 |
-daemon_freshclam="/usr/bin/freshclam" |
31 |
-daemon_milter="/usr/sbin/clamav-milter" |
32 |
- |
33 |
-extra_commands="logfix" |
34 |
- |
35 |
-depend() { |
36 |
- use net |
37 |
- provide antivirus |
38 |
-} |
39 |
- |
40 |
-get_config() { |
41 |
- clamconf | sed 's/["=]//g' | \ |
42 |
- awk "{ |
43 |
- if(\$0==\"Config file: $1.conf\") S=1 |
44 |
- if(S==1&&\$0==\"\") { |
45 |
- print \"$3\" |
46 |
- exit |
47 |
- } |
48 |
- if(S==1&&\$1~\"^$2\$\") { |
49 |
- print \$2!=\"disabled\"?\$2:\"$3\" |
50 |
- exit |
51 |
- } |
52 |
- }" |
53 |
-} |
54 |
- |
55 |
-start() { |
56 |
- local clamd_socket=$(get_config clamd LocalSocket /var/run/clamav/clamd.sock) |
57 |
- local clamd_user=$(get_config clamd User clamav) |
58 |
- local freshclam_user=$(get_config freshclam DatabaseOwner clamav) |
59 |
- logfix |
60 |
- |
61 |
- if [ "${START_CLAMD}" = "yes" ]; then |
62 |
- checkpath --quiet --mode 755 \ |
63 |
- --owner "${clamd_user}":"${clamd_user}" \ |
64 |
- --directory `dirname ${clamd_socket}` |
65 |
- if [ -S "${clamd_socket}" ]; then |
66 |
- rm -f ${clamd_socket} |
67 |
- fi |
68 |
- ebegin "Starting clamd" |
69 |
- start-stop-daemon --start --quiet \ |
70 |
- --nicelevel ${CLAMD_NICELEVEL:-0} \ |
71 |
- --exec ${daemon_clamd} |
72 |
- eend $? "Failed to start clamd" |
73 |
- fi |
74 |
- |
75 |
- if [ "${START_FRESHCLAM}" = "yes" ]; then |
76 |
- ebegin "Starting freshclam" |
77 |
- start-stop-daemon --start --quiet \ |
78 |
- --nicelevel ${FRESHCLAM_NICELEVEL:-0} \ |
79 |
- --exec ${daemon_freshclam} -- -d |
80 |
- retcode=$? |
81 |
- if [ ${retcode} = 1 ]; then |
82 |
- eend 0 |
83 |
- einfo "Virus databases are already up to date." |
84 |
- else |
85 |
- eend ${retcode} "Failed to start freshclam" |
86 |
- fi |
87 |
- fi |
88 |
- |
89 |
- if [ "${START_MILTER}" = "yes" ]; then |
90 |
- if [ -z "${MILTER_CONF_FILE}" ]; then |
91 |
- MILTER_CONF_FILE="/etc/clamav-milter.conf" |
92 |
- fi |
93 |
- |
94 |
- ebegin "Starting clamav-milter" |
95 |
- start-stop-daemon --start --quiet \ |
96 |
- --nicelevel ${MILTER_NICELEVEL:-0} \ |
97 |
- --exec ${daemon_milter} -- -c ${MILTER_CONF_FILE} |
98 |
- eend $? "Failed to start clamav-milter" |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-stop() { |
103 |
- if [ "${START_CLAMD}" = "yes" ]; then |
104 |
- ebegin "Stopping clamd" |
105 |
- start-stop-daemon --stop --quiet --name clamd |
106 |
- eend $? "Failed to stop clamd" |
107 |
- fi |
108 |
- if [ "${START_FRESHCLAM}" = "yes" ]; then |
109 |
- ebegin "Stopping freshclam" |
110 |
- start-stop-daemon --stop --quiet --name freshclam |
111 |
- eend $? "Failed to stop freshclam" |
112 |
- fi |
113 |
- if [ "${START_MILTER}" = "yes" ]; then |
114 |
- ebegin "Stopping clamav-milter" |
115 |
- start-stop-daemon --stop --quiet --name clamav-milter |
116 |
- eend $? "Failed to stop clamav-milter" |
117 |
- fi |
118 |
-} |
119 |
- |
120 |
-logfix() { |
121 |
- if [ "${START_CLAMD}" = "yes" ]; then |
122 |
- # fix clamd log permissions |
123 |
- # (might be clobbered by logrotate or something) |
124 |
- local logfile=$(get_config clamd LogFile) |
125 |
- if [ -n "${logfile}" ]; then |
126 |
- checkpath --quiet \ |
127 |
- --owner "${clamd_user}":"${clamd_user}" \ |
128 |
- --mode 640 \ |
129 |
- --file ${logfile} |
130 |
- fi |
131 |
- fi |
132 |
- |
133 |
- if [ "${START_FRESHCLAM}" = "yes" ]; then |
134 |
- # fix freshclam log permissions |
135 |
- # (might be clobbered by logrotate or something) |
136 |
- local logfile=$(get_config freshclam UpdateLogFile) |
137 |
- if [ -n "${logfile}" ]; then |
138 |
- checkpath --quiet \ |
139 |
- --owner "${freshclam_user}":"${freshclam_user}" \ |
140 |
- --mode 640 \ |
141 |
- --file ${logfile} |
142 |
- fi |
143 |
- fi |
144 |
-} |
145 |
|
146 |
diff --git a/app-antivirus/clamav/files/clamd.initd-r5 b/app-antivirus/clamav/files/clamd.initd-r5 |
147 |
deleted file mode 100644 |
148 |
index 87171ae..0000000 |
149 |
--- a/app-antivirus/clamav/files/clamd.initd-r5 |
150 |
+++ /dev/null |
151 |
@@ -1,126 +0,0 @@ |
152 |
-#!/sbin/openrc-run |
153 |
-# Copyright 1999-2013 Gentoo Foundation |
154 |
-# Distributed under the terms of the GNU General Public License v2 |
155 |
-# $Id$ |
156 |
- |
157 |
-daemon_clamd="/usr/sbin/clamd" |
158 |
-daemon_freshclam="/usr/bin/freshclam" |
159 |
-daemon_milter="/usr/sbin/clamav-milter" |
160 |
- |
161 |
-extra_commands="logfix" |
162 |
- |
163 |
-depend() { |
164 |
- use net |
165 |
- provide antivirus |
166 |
-} |
167 |
- |
168 |
-get_config() { |
169 |
- clamconf | sed 's/["=]//g' | \ |
170 |
- awk "{ |
171 |
- if(\$0==\"Config file: $1.conf\") S=1 |
172 |
- if(S==1&&\$0==\"\") { |
173 |
- print \"$3\" |
174 |
- exit |
175 |
- } |
176 |
- if(S==1&&\$1~\"^$2\$\") { |
177 |
- print \$2!=\"disabled\"?\$2:\"$3\" |
178 |
- exit |
179 |
- } |
180 |
- }" |
181 |
-} |
182 |
- |
183 |
-start() { |
184 |
- # populate variables and fix log file permissions |
185 |
- logfix |
186 |
- |
187 |
- if [ "${START_CLAMD}" = "yes" ]; then |
188 |
- checkpath --quiet --mode 755 \ |
189 |
- --owner "${clamd_user}":"${clamd_user}" \ |
190 |
- --directory `dirname ${clamd_socket}` |
191 |
- if [ -S "${clamd_socket}" ]; then |
192 |
- rm -f ${clamd_socket} |
193 |
- fi |
194 |
- ebegin "Starting clamd" |
195 |
- start-stop-daemon --start --quiet \ |
196 |
- --nicelevel ${CLAMD_NICELEVEL:-0} \ |
197 |
- --exec ${daemon_clamd} |
198 |
- eend $? "Failed to start clamd" |
199 |
- fi |
200 |
- |
201 |
- if [ "${START_FRESHCLAM}" = "yes" ]; then |
202 |
- checkpath --quiet --mode 755 \ |
203 |
- --owner "${clamd_user}":"${clamd_user}" \ |
204 |
- --directory `dirname ${clamd_socket}` |
205 |
- ebegin "Starting freshclam" |
206 |
- start-stop-daemon --start --quiet \ |
207 |
- --nicelevel ${FRESHCLAM_NICELEVEL:-0} \ |
208 |
- --exec ${daemon_freshclam} -- -d |
209 |
- retcode=$? |
210 |
- if [ ${retcode} = 1 ]; then |
211 |
- eend 0 |
212 |
- einfo "Virus databases are already up to date." |
213 |
- else |
214 |
- eend ${retcode} "Failed to start freshclam" |
215 |
- fi |
216 |
- fi |
217 |
- |
218 |
- if [ "${START_MILTER}" = "yes" ]; then |
219 |
- if [ -z "${MILTER_CONF_FILE}" ]; then |
220 |
- MILTER_CONF_FILE="/etc/clamav-milter.conf" |
221 |
- fi |
222 |
- |
223 |
- ebegin "Starting clamav-milter" |
224 |
- start-stop-daemon --start --quiet \ |
225 |
- --nicelevel ${MILTER_NICELEVEL:-0} \ |
226 |
- --exec ${daemon_milter} -- -c ${MILTER_CONF_FILE} |
227 |
- eend $? "Failed to start clamav-milter" |
228 |
- fi |
229 |
-} |
230 |
- |
231 |
-stop() { |
232 |
- if [ "${START_CLAMD}" = "yes" ]; then |
233 |
- ebegin "Stopping clamd" |
234 |
- start-stop-daemon --stop --quiet --name clamd |
235 |
- eend $? "Failed to stop clamd" |
236 |
- fi |
237 |
- if [ "${START_FRESHCLAM}" = "yes" ]; then |
238 |
- ebegin "Stopping freshclam" |
239 |
- start-stop-daemon --stop --quiet --name freshclam |
240 |
- eend $? "Failed to stop freshclam" |
241 |
- fi |
242 |
- if [ "${START_MILTER}" = "yes" ]; then |
243 |
- ebegin "Stopping clamav-milter" |
244 |
- start-stop-daemon --stop --quiet --name clamav-milter |
245 |
- eend $? "Failed to stop clamav-milter" |
246 |
- fi |
247 |
-} |
248 |
- |
249 |
-logfix() { |
250 |
- clamd_socket=$(get_config clamd LocalSocket /run/clamav/clamd.sock) |
251 |
- clamd_user=$(get_config clamd User clamav) |
252 |
- freshclam_user=$(get_config freshclam DatabaseOwner clamav) |
253 |
- |
254 |
- if [ "${START_CLAMD}" = "yes" ]; then |
255 |
- # fix clamd log permissions |
256 |
- # (might be clobbered by logrotate or something) |
257 |
- local logfile=$(get_config clamd LogFile) |
258 |
- if [ -n "${logfile}" ]; then |
259 |
- checkpath --quiet \ |
260 |
- --owner "${clamd_user}":"${clamd_user}" \ |
261 |
- --mode 640 \ |
262 |
- --file ${logfile} |
263 |
- fi |
264 |
- fi |
265 |
- |
266 |
- if [ "${START_FRESHCLAM}" = "yes" ]; then |
267 |
- # fix freshclam log permissions |
268 |
- # (might be clobbered by logrotate or something) |
269 |
- local logfile=$(get_config freshclam UpdateLogFile) |
270 |
- if [ -n "${logfile}" ]; then |
271 |
- checkpath --quiet \ |
272 |
- --owner "${freshclam_user}":"${freshclam_user}" \ |
273 |
- --mode 640 \ |
274 |
- --file ${logfile} |
275 |
- fi |
276 |
- fi |
277 |
-} |