app-admin/sshguard: Fix init.d script

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/688820
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/app-admin/sshguard/files/sshguard.initd-r1 b/app-admin/sshguard/files/sshguard.initd-r2
similarity index 65%
rename from app-admin/sshguard/files/sshguard.initd-r1
rename to app-admin/sshguard/files/sshguard.initd-r2
index e7b5ca7428b3f30d2eca7e05b5f503e1ae407eac..4404566eb1170152a1860eff91679771d16c9407 100644 (file)
--- a/app-admin/sshguard/files/sshguard.initd-r1
+++ b/app-admin/sshguard/files/sshguard.initd-r2
@@ -1,12 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/sbin/sshguard"
 pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}"
 command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}"
-command_background=1
-start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
+start_stop_daemon_args="--background --wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
 
 depend() {
        after iptables

diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild
index 2d18f329df5619ba12c30861d32c2dc31d83a454..8926537ef84c5be4e72f7b5769fd98dabcb70f6c 100644 (file)
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 src_install() {
        default
 
-       newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+       newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
        newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
        insinto /etc