From 3f5426f44a4135122b46e657cb4a2f07eb08fe55 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 25 Apr 2011 04:59:43 +0000 Subject: Use the correct init.d file, and RDEPEND on openrc, by Johan Bergström (bug #351665). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686 --- app-admin/sshguard/ChangeLog | 9 +++++- app-admin/sshguard/Manifest | 12 ++++---- app-admin/sshguard/files/sshguard.initd | 14 +++------ app-admin/sshguard/sshguard-1.5-r1.ebuild | 50 +++++++++++++++++++++++++++++++ app-admin/sshguard/sshguard-1.5.ebuild | 49 ------------------------------ 5 files changed, 68 insertions(+), 66 deletions(-) create mode 100644 app-admin/sshguard/sshguard-1.5-r1.ebuild delete mode 100644 app-admin/sshguard/sshguard-1.5.ebuild (limited to 'app-admin') 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 -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 files/sshguard.confd, files/sshguard.initd: diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest index e1efa7a5ef45..bb514c4f79c1 100644 --- a/app-admin/sshguard/Manifest +++ b/app-admin/sshguard/Manifest @@ -2,7 +2,7 @@ Hash: SHA1 AUX sshguard.confd 745 RMD160 7eb778fe7797379ebde5fdb501461e6945f9f9e7 SHA1 7f0906752a27b8f88acbe6d5b15ded6be7feecb6 SHA256 0db6bedcabe9c262d60186a6de7e62c6e425f782d39c49e8a5a9cc52f35f6a8e -AUX sshguard.initd 743 RMD160 a6e56a4a4ed3d8d7c52a3269e0606043fa23e55e SHA1 8d2b0c66c8d89b02f8c35d86fd8c748eed7285e1 SHA256 e5e067a1ffe205e023d26f5edfa311ee77a3c97ad06df883a4f3db39d58197ba +AUX sshguard.initd 682 RMD160 9019e41ce3e9135f45cfda544504da8c30c11ed6 SHA1 ea6cab23ca5debbf9b3874d82b77e44db8644ca2 SHA256 79479dc76c37f7d3903058ce8e769d4e39e162462a0584704e528a6b3cb782d6 DIST sshguard-1.0.tar.bz2 118988 RMD160 436516e14a72845e7eb5325d6f55496eec9d1762 SHA1 968275288a1aec06737e70cde61fe99063081adc SHA256 33a9fe9d2360e9a5c357e269353d4157270171ff975bcf649f5f99b1aa8dcc08 DIST sshguard-1.1.tar.bz2 233308 RMD160 e6e7d6e54b32d67583b0f4140ef8905ef5f5567f SHA1 912c151232bc6b23ce400ef92270c9a7f87a60d1 SHA256 c1b2fcd7c402725958e62808829c82bb4445dcf6a9b27ee07e2ab8a3417bb96f DIST sshguard-1.3.tar.bz2 140745 RMD160 792431d6d1c7437734bccca4ec6e1ae1b9c4891c SHA1 4c073086406901bbd55ab669b295a3f12f67994e SHA256 1ff0ea3349c67fdab8f8046eeae6a96046a752ae7458c2259cb31b78c2de08ac @@ -12,13 +12,13 @@ EBUILD sshguard-1.0.ebuild 1066 RMD160 0e96edf14ae738dd6c1a19275c7914b3e2c422e0 EBUILD sshguard-1.1.ebuild 1072 RMD160 09c5507cfcec6779cb447c19eea8e695287d389b SHA1 2259e00937144265a0c019e069e242c6528ffa18 SHA256 7ed2bd8fd6a6350a2bcee6ed75ed350137f81ebd65e6260f9b74ade861f94fa9 EBUILD sshguard-1.3.ebuild 1075 RMD160 5bef10b93187deeab4748585490fb76879c30a89 SHA1 1741b1ab664372e6ac85c4fecd91ac759c2e5632 SHA256 d248e8208fb6fa3f00fef4cc4bf694d530dc1e537c09c98fd334b933c5761254 EBUILD sshguard-1.4.ebuild 1070 RMD160 9cd23da73bfde2a54eceb2cac742990840a576ea SHA1 3473f36fcefb20f603eb37f582d7ef84d33e5a48 SHA256 5395c7e2808403dd90862c4fbd532457378cc01356b4590a5a1a088c45cb02ff -EBUILD sshguard-1.5.ebuild 1339 RMD160 b1a19e5573467058d10b68937e2d87c08ff563dc SHA1 c5ff4316a5bc9474c959c859d4a40504795bf46a SHA256 8c5575a69ade4cc842e7173283db3f6305ef9bfde0b93eb6d7292951302b3f3f -MISC ChangeLog 2030 RMD160 95876ba1a0854d4934abf9daa2b66e16a27d35ea SHA1 29c09ca23d05f7c0662bc7101094a7cc93fbd09c SHA256 cd74b2ee18ccd5510045a0692b5adfee7fe1a6b26ed5c01421613a978e35b420 +EBUILD sshguard-1.5-r1.ebuild 1359 RMD160 7775044d727bcf8af62ba6a2c982f7f60282096c SHA1 a83f45ef9bd5a44a78d64c6b150650fb9a9c94a8 SHA256 bbc0794701e08cee65f188e69e9bdc67a02d5e73397aaca8428a10c341ca444f +MISC ChangeLog 2272 RMD160 afd99f4c45146f780f75d051338f03602f07e6b3 SHA1 f8116f8e77b28d21e01b1799c2a04c2993a79d0f SHA256 ca5f51f887c56fa7a1ca5e048ba7d8257bf28d8cf45f3fb52baf3f5d9ebf7fe2 MISC metadata.xml 260 RMD160 51c67b148d7da0cb8dc4b0fba9d8d23fa441daa0 SHA1 75b3b65d68d937c2ce2053638478a2cd35650bd7 SHA256 e99c431a125115a8fe9a5906741216d32c2f18ce3f9137cb7f90100f20e9a73a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2zBZQACgkQVWmRsqeSphMZhACdFFL8cjc+gtI/P8WCnFG/+qWF -EQoAn1GP1EnsueG7+o8MPKLlxfkeSLbR -=8N+f +iEYEARECAAYFAk20/8QACgkQVWmRsqeSphN8SQCfUuQfrfyDB4jaUR55IZL6phoA +kgwAnjTbwslyQIlsybd7zK+It5ZWSCpI +=SpTF -----END PGP SIGNATURE----- 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-r1.ebuild b/app-admin/sshguard/sshguard-1.5-r1.ebuild new file mode 100644 index 000000000000..c1b576a27e7b --- /dev/null +++ b/app-admin/sshguard/sshguard-1.5-r1.ebuild @@ -0,0 +1,50 @@ +# 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-r1.ebuild,v 1.1 2011/04/25 04:59:42 jer Exp $ + +EAPI="2" + +inherit flag-o-matic + +DESCRIPTION="protects hosts from brute force attacks against ssh" +HOMEPAGE="http://sshguard.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="ipfilter kernel_FreeBSD kernel_linux" + +CDEPEND="kernel_linux? ( net-firewall/iptables ) + kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )" +DEPEND="${CDEPEND} + sys-devel/flex" +RDEPEND="${CDEPEND} + sys-apps/openrc + virtual/logger" + +src_prepare() { + sed -i configure -e '/OPTIMIZER_CFLAGS=/d' || die +} + +src_configure() { + # Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c + append-flags -D_BSD_SOURCE + + local myconf + if use kernel_linux; then + myconf="--with-firewall=iptables" + elif use kernel_FreeBSD; then + use ipfilter && myconf="--with-firewall=ipfw" \ + || myconf="--with-firewall=pf" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + newinitd "${FILESDIR}"/${PN}.initd ${PN} || die + newconfd "${FILESDIR}"/${PN}.confd ${PN} || die + dodoc README Changes scripts/sshguard_backendgen.sh examples/* || die +} diff --git a/app-admin/sshguard/sshguard-1.5.ebuild b/app-admin/sshguard/sshguard-1.5.ebuild deleted file mode 100644 index c8d81d88dc2a..000000000000 --- a/app-admin/sshguard/sshguard-1.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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 $ - -EAPI="2" - -inherit flag-o-matic - -DESCRIPTION="protects hosts from brute force attacks against ssh" -HOMEPAGE="http://sshguard.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" -IUSE="ipfilter kernel_FreeBSD kernel_linux" - -CDEPEND="kernel_linux? ( net-firewall/iptables ) - kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) )" -DEPEND="${CDEPEND} - sys-devel/flex" -RDEPEND="${CDEPEND} - virtual/logger" - -src_prepare() { - sed -i configure -e '/OPTIMIZER_CFLAGS=/d' || die -} - -src_configure() { - # Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c - append-flags -D_BSD_SOURCE - - local myconf - if use kernel_linux; then - myconf="--with-firewall=iptables" - elif use kernel_FreeBSD; then - use ipfilter && myconf="--with-firewall=ipfw" \ - || myconf="--with-firewall=pf" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/${PN}.initd ${PN} || die - newconfd "${FILESDIR}"/${PN}.confd ${PN} || die - dodoc README Changes scripts/sshguard_backendgen.sh examples/* || die -} -- cgit v1.2.3-65-gdbad