1 |
commit: dc154eaae27ee058f7c6153df327bd46a540ce50 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 8 07:10:59 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 8 07:14:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc154eaa |
7 |
|
8 |
app-admin/sshguard: Fix init.d script |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Fixes: https://bugs.gentoo.org/688820 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
app-admin/sshguard/files/{sshguard.initd-r1 => sshguard.initd-r2} | 5 ++--- |
15 |
app-admin/sshguard/sshguard-2.4.0.ebuild | 2 +- |
16 |
2 files changed, 3 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/sshguard/files/sshguard.initd-r1 b/app-admin/sshguard/files/sshguard.initd-r2 |
19 |
similarity index 65% |
20 |
rename from app-admin/sshguard/files/sshguard.initd-r1 |
21 |
rename to app-admin/sshguard/files/sshguard.initd-r2 |
22 |
index e7b5ca7428b..4404566eb11 100644 |
23 |
--- a/app-admin/sshguard/files/sshguard.initd-r1 |
24 |
+++ b/app-admin/sshguard/files/sshguard.initd-r2 |
25 |
@@ -1,12 +1,11 @@ |
26 |
#!/sbin/openrc-run |
27 |
-# Copyright 1999-2018 Gentoo Foundation |
28 |
+# Copyright 1999-2019 Gentoo Authors |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
command="/usr/sbin/sshguard" |
32 |
pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}" |
33 |
command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}" |
34 |
-command_background=1 |
35 |
-start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet" |
36 |
+start_stop_daemon_args="--background --wait ${SSHGUARD_WAIT:-999} --interpreted --quiet" |
37 |
|
38 |
depend() { |
39 |
after iptables |
40 |
|
41 |
diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild |
42 |
index 2d18f329df5..8926537ef84 100644 |
43 |
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild |
44 |
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild |
45 |
@@ -32,7 +32,7 @@ PATCHES=( |
46 |
src_install() { |
47 |
default |
48 |
|
49 |
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} |
50 |
+ newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN} |
51 |
newconfd "${FILESDIR}"/${PN}.confd ${PN} |
52 |
|
53 |
insinto /etc |