Gentoo Archives: gentoo-commits

From: Marc Schiffbauer <mschiff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/amavisd-milter/, mail-filter/amavisd-milter/files/
Date: Tue, 03 Apr 2018 14:34:03
Message-Id: 1522765896.098b15f499ccd6a622802005c8d37a7a600f2f23.mschiff@gentoo
1 commit: 098b15f499ccd6a622802005c8d37a7a600f2f23
2 Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 3 14:31:15 2018 +0000
4 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 3 14:31:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098b15f4
7
8 mail-filter/amavisd-milter: fix amavisd dep in init script
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 .../amavisd-milter/amavisd-milter-1.6.0-r1.ebuild | 4 +--
13 .../amavisd-milter/amavisd-milter-1.6.0.ebuild | 4 +--
14 .../amavisd-milter/files/amavisd-milter.initd-r1 | 29 ++++++++++++++++++++++
15 3 files changed, 33 insertions(+), 4 deletions(-)
16
17 diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
18 index 157ccb62930..74a12efd464 100644
19 --- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
20 +++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI="5"
27 @@ -28,6 +28,6 @@ src_install() {
28
29 dodoc AUTHORS CHANGES INSTALL README TODO
30
31 - newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
32 + newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
33 newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
34 }
35
36 diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
37 index d0ad1d5fa9f..2ea91b4704b 100644
38 --- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
39 +++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2014 Gentoo Foundation
42 +# Copyright 1999-2018 Gentoo Foundation
43 # Distributed under the terms of the GNU General Public License v2
44
45 EAPI="5"
46 @@ -27,6 +27,6 @@ src_install() {
47
48 dodoc AUTHORS CHANGES INSTALL README TODO
49
50 - newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
51 + newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
52 newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
53 }
54
55 diff --git a/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1 b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
56 new file mode 100644
57 index 00000000000..61ae169e9bb
58 --- /dev/null
59 +++ b/mail-filter/amavisd-milter/files/amavisd-milter.initd-r1
60 @@ -0,0 +1,29 @@
61 +#!/sbin/openrc-run
62 +# Copyright 1999-2018 Gentoo Foundation
63 +# Distributed under the terms of the GNU General Public License v2
64 +
65 +NAME="amavisd-milter"
66 +DAEMON="/usr/sbin/${NAME}"
67 +
68 +depend() {
69 + use logger dns amavisd sendmail
70 +}
71 +
72 +start() {
73 + ebegin "Starting ${NAME}"
74 + start-stop-daemon --start --quiet --exec "${DAEMON}" -p "${PIDFILE}" --user amavis -- ${DOPTIONS}
75 + eend $? "Failed to start ${NAME}"
76 +}
77 +
78 +stop() {
79 + ebegin "Stopping ${NAME}"
80 + start-stop-daemon --stop --name "${NAME}"
81 + eend $? "Failed to stop ${NAME}"
82 +}
83 +
84 +restart() {
85 + svc_stop
86 + # needed to avoid potential mi_stop errors
87 + sleep 4
88 + svc_start
89 +}