diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-04-25 04:59:43 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-04-25 04:59:43 +0000 |
| commit | 46b3ed7128df67734dc28a9c972be92e8c4c0698 (patch) | |
| tree | bb60674643f1eff611bd79a85a8dfe0e48c54162 /app-admin | |
| parent | Fix missing define. (diff) | |
| download | gentoo-2-46b3ed7128df67734dc28a9c972be92e8c4c0698.tar.gz gentoo-2-46b3ed7128df67734dc28a9c972be92e8c4c0698.tar.bz2 gentoo-2-46b3ed7128df67734dc28a9c972be92e8c4c0698.zip | |
Use the correct init.d file, and RDEPEND on openrc, by Johan Bergström (bug #351665).
(Portage version: 2.2.0_alpha30/cvs/Linux i686)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/sshguard/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/sshguard/files/sshguard.initd | 14 | ||||
| -rw-r--r-- | app-admin/sshguard/sshguard-1.5-r1.ebuild (renamed from app-admin/sshguard/sshguard-1.5.ebuild) | 3 |
3 files changed, 14 insertions, 12 deletions
diff --git a/app-admin/sshguard/ChangeLog b/app-admin/sshguard/ChangeLog index 6599e0bfed0b..d42f58de7c39 100644 --- a/app-admin/sshguard/ChangeLog +++ b/app-admin/sshguard/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/sshguard # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/ChangeLog,v 1.13 2011/04/23 16:59:59 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/ChangeLog,v 1.14 2011/04/25 04:59:42 jer Exp $ + +*sshguard-1.5-r1 (25 Apr 2011) + + 25 Apr 2011; Jeroen Roovers <jer@gentoo.org> -sshguard-1.5.ebuild, + +sshguard-1.5-r1.ebuild, files/sshguard.initd: + Use the correct init.d file, and RDEPEND on openrc, by Johan Bergström (bug + #351665). 23 Apr 2011; Jeroen Roovers <jer@gentoo.org> files/sshguard.confd, files/sshguard.initd: diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd index 09711cd28c92..89ec7d592c25 100644 --- a/app-admin/sshguard/files/sshguard.initd +++ b/app-admin/sshguard/files/sshguard.initd @@ -1,26 +1,20 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.2 2011/04/23 16:59:59 jer Exp $ - -: ${SSHGUARD_PIDFILE:='/var/run/sshguard.pid'} +# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.3 2011/04/25 04:59:43 jer Exp $ depend() { after iptables use logger } +SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid} start() { - local LOGS= - for l in ${SSHGUARD_LOGFILES} ; do - LOGS="${LOGS} -l ${l}" - done - ebegin "Starting sshguard" [[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999 - start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet \ - --exec /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${LOGS} + start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \ + /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS} eend $? } diff --git a/app-admin/sshguard/sshguard-1.5.ebuild b/app-admin/sshguard/sshguard-1.5-r1.ebuild index c8d81d88dc2a..c1b576a27e7b 100644 --- a/app-admin/sshguard/sshguard-1.5.ebuild +++ b/app-admin/sshguard/sshguard-1.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.5.ebuild,v 1.1 2011/04/23 14:44:44 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/sshguard-1.5-r1.ebuild,v 1.1 2011/04/25 04:59:42 jer Exp $ EAPI="2" @@ -20,6 +20,7 @@ CDEPEND="kernel_linux? ( net-firewall/iptables ) DEPEND="${CDEPEND} sys-devel/flex" RDEPEND="${CDEPEND} + sys-apps/openrc virtual/logger" src_prepare() { |