[gentoo-commits] repo/gentoo:master commit in: app-admin/sshguard/, app-admin/sshguard/files/

[Jeroen Roovers]

commit:     e92a08bc8829ab7ccf0127e5a653b3cea45b7582
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 08:13:50 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 08:13:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92a08bc

app-admin/sshguard: Version bump (bug #567642 by Noramo).

Package-Manager: portage-2.2.26

 app-admin/sshguard/Manifest              |  1 +
 app-admin/sshguard/files/sshguard.initd  |  2 +-
 app-admin/sshguard/sshguard-1.6.1.ebuild | 62 ++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 4b35a74..47cfb52 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1 +1,2 @@
 DIST sshguard-1.5.tar.bz2 303767 SHA256 b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19 SHA512 6d17abccd94af9e7fb04a54477ff5686caa64dc36e2f2cbc4a8cd7bc293923daf2fee87fa7f2e247eba1b310abe68549e652ab3224c2d19822d2e8a0306e49e6 WHIRLPOOL 7d579f5c9a03d79f7cc7b51b537b91b053faa56653ba7c5182550ddab41c0fbcd12a6cd7a6dfb2d1e2323905ef3e35aaef9ca8175d97e26cb953d57403f46562
+DIST sshguard-1.6.1.tar.xz 416088 SHA256 f431899c20fa2f41fa293605af96ff97d44823b84db41c914ee60da44f1ff6c8 SHA512 a21c28e2efcadeff514c8a5b1ed938ba466f9116b40ee4283ad411fe6248bfa7186d9add9a136399f659a74fb2b517c6033027ec546dae9bec5b47edf32db3ed WHIRLPOOL 22a0ace695e9ab6e173bc0bf2d23d584113be0298253d5a13df3749071c68edcd581f3118c326dc42c8b643420b62d1389534b91a2fc537bb9abca49fb84ffbc

diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
index 03b6a09..659c3f7 100644
--- a/app-admin/sshguard/files/sshguard.initd
+++ b/app-admin/sshguard/files/sshguard.initd
@@ -12,7 +12,7 @@ SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
 
 start() {
 	ebegin "Starting sshguard"
-	[[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999
+	[ -z "${SSHGUARD_WAIT}" ] && SSHGUARD_WAIT=999
 	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.6.1.ebuild b/app-admin/sshguard/sshguard-1.6.1.ebuild
new file mode 100644
index 0000000..7e740f3
--- /dev/null
+++ b/app-admin/sshguard/sshguard-1.6.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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.xz"
+
+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
+"
+
+DOCS=( ChangeLog README.rst scripts/sshguard_backendgen.sh )
+
+src_prepare() {
+	sed -i -e '/OPTIMIZER_CFLAGS=/d' configure || die
+}
+
+src_configure() {
+	# Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c
+	append-cppflags -D_BSD_SOURCE
+
+	local myconf
+	if use kernel_linux; then
+		myconf="--with-firewall=iptables"
+	elif use kernel_FreeBSD; then
+		if use ipfilter; then
+			myconf="--with-firewall=ipfw"
+		else
+			myconf="--with-firewall=pf"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	dodoc -r examples/
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}