1 |
commit: 577b994e0f43d9e4b772774e462793aea86f7414 |
2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 6 14:11:50 2016 +0000 |
4 |
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 6 14:12:19 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=577b994e |
7 |
|
8 |
mail-filter/amavisd-new: Fix depend and conf.d setting in amavisd-snmp |
9 |
|
10 |
Package-Manager: portage-2.3.0_rc1 |
11 |
|
12 |
...w-2.10.1-r3.ebuild => amavisd-new-2.10.1-r4.ebuild} | 0 |
13 |
...-new-2.11.0.ebuild => amavisd-new-2.11.0-r1.ebuild} | 0 |
14 |
...new-2.9.1-r1.ebuild => amavisd-new-2.9.1-r2.ebuild} | 0 |
15 |
mail-filter/amavisd-new/files/amavisd-snmp.initd | 18 ++++++++++++++---- |
16 |
4 files changed, 14 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild |
19 |
similarity index 100% |
20 |
rename from mail-filter/amavisd-new/amavisd-new-2.10.1-r3.ebuild |
21 |
rename to mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild |
22 |
|
23 |
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r1.ebuild |
24 |
similarity index 100% |
25 |
rename from mail-filter/amavisd-new/amavisd-new-2.11.0.ebuild |
26 |
rename to mail-filter/amavisd-new/amavisd-new-2.11.0-r1.ebuild |
27 |
|
28 |
diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild |
29 |
similarity index 100% |
30 |
rename from mail-filter/amavisd-new/amavisd-new-2.9.1-r1.ebuild |
31 |
rename to mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild |
32 |
|
33 |
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp.initd b/mail-filter/amavisd-new/files/amavisd-snmp.initd |
34 |
index 9732419..fca5f12 100644 |
35 |
--- a/mail-filter/amavisd-new/files/amavisd-snmp.initd |
36 |
+++ b/mail-filter/amavisd-new/files/amavisd-snmp.initd |
37 |
@@ -1,5 +1,5 @@ |
38 |
#!/sbin/openrc-run |
39 |
-# Copyright 1999-2015 Gentoo Foundation |
40 |
+# Copyright 1999-2016 Gentoo Foundation |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
# $Id$ |
43 |
|
44 |
@@ -9,14 +9,24 @@ command="/usr/sbin/${name}-subagent" |
45 |
command_args="${amavis_snmp_args} -P ${pidfile}" |
46 |
start_stop_daemon_args="--interpreted" |
47 |
|
48 |
+update_command() { |
49 |
+ if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then |
50 |
+ command="${command}-zmq" |
51 |
+ elif [[ $amavisd_snmp_command ]]; then |
52 |
+ command="$amavisd_snmp_command" |
53 |
+ fi |
54 |
+} |
55 |
+ |
56 |
depend() { |
57 |
use logger |
58 |
before amavisd-new snmpd |
59 |
+ update_command |
60 |
+ if [[ ${command##*-} == "zmq" ]]; then |
61 |
+ need amavis-mc |
62 |
+ fi |
63 |
} |
64 |
|
65 |
start_pre() { |
66 |
- if [[ -x ${command}-zmq && ! $amavisd_snmp_command ]]; then |
67 |
- command="${command}-zmq" |
68 |
- fi |
69 |
+ update_command |
70 |
checkpath -d -o amavis /run/amavis |
71 |
} |