gentoo resync : 14.04.2018

6 files changed, 30 insertions, 130 deletions

diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index f4013b0435ee..29ba7064a5ba 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,12 +1,8 @@
 AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a639a85d712a1adfe253fed735a1b85d83b0b0297db96fada22e61e332f5847b2815280f8ddda105cbe6d9194bf6c SHA512 5edfbf3a6955d86233de10665bea527a2e8ebaaeb505d16073c861fa2883b32d0c655f5d4c99145af63df95612129dcd25ffae3710c8615709768bdcff9ef5bc
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a19615a05815f3507a11a41ec5290830f299e96fee8c7203831f6e91b11faa6a6f07eaec68f98e9bf0f SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7
-DIST sshguard-1.7.1.tar.gz 832220 BLAKE2B 1aca38b571ee3bf98b659a1a378de8d2dfd46453c9caacc868606f6ad9baf97892d6dcf852ed028f265c67029f59c3c19a48f1c369abeb406eae7e2c5ad54f2b SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1
-DIST sshguard-2.0.0.tar.gz 886995 BLAKE2B 35fe8008aa55ab07a3a500a5676483b79d4693aa22e762e846d3c4f5a95b8c3851e16a5c746a818455c66621f3c7da9d713979f2fef737f87ca5feb81ff048e8 SHA512 c9f7ef4b8d4b1ecbcee33b95e013c51f37b4a05226c6cd1f3c85006c83a32cf555644069d529a7317dcf6616f86a399d7338a5a414238de05bd41dc3005488e4
-DIST sshguard-2.0.99.tar.gz 1110725 BLAKE2B b3c2ccf389b08c3d35700b3bc46a6df820bf51c940e418def4ea66b4d2d8cd8aca5b3f284fc49a93b73e69adcffdc845c0988750e714fbe8e5a5bd50fc3d11aa SHA512 776a241b7af9a4afb048c99791202c0bf0f5130e265116a0f049853f8eb3d108e056c75f9dc009cf93a0dffe8d34b18b6fddc63febd54cc35bb6e71d6d2e77bb
+AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f425823bfaab1119d5862654babdce2e33ab530d41943f4e62f983e0d48ff38d319a85382e3c680e5e22 SHA512 1d73ee8e244f8318a4488aa9cf404d619da893828201215de741cea20cbb99dbce44caaefae6ab407146ca05d1ced61a03228fe60b9fa0beb152bcd8098ea86b
 DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
-EBUILD sshguard-1.7.1.ebuild 1226 BLAKE2B 2f9e967c832fdf3e0fc5a3bd1d1c7e18f54b5210ba1a7b3a5b39a49ee8bef6f1ccdc812e3fa5886b7760c023dba971b23aa10ed50132e51a3aa149b494911e42 SHA512 c0e4e5219c2e95e07d83cdb8b2d9fc9efdc666b74eca4de0adea96fe50539da23d5e143d81dfc2c71e738fd5ba182309c0b51530bafe19b6ee6fc2c96d063973
-EBUILD sshguard-2.0.0.ebuild 891 BLAKE2B ad8dbd8fe855078c1699aefa4e41436f453a0ce458f954cb910603aceadaef2d3241f1db343a03ac33be4c016b1c21a661ea3644f9dbbdecd9fbbaaaad3384c8 SHA512 9fe8e23d3ff513956d40835a93e97f008ffdecd989a4602bf2069505bda63df62fd854756e90a1ab04536943a5832416ad74e6dcea765be2780a910f04b42965
-EBUILD sshguard-2.0.99.ebuild 710 BLAKE2B eb05727f0a20c707f402ca0411b11f968ec451f5239d45d17a5d4fb2b7cc114c4616e5fe942304636e33a2c4e1035a7d864a74886786bc1fc43766a43dd9a19a SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268
 EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
-MISC metadata.xml 467 BLAKE2B f64fc0f6c5d090ccb435bc562fc601bd86631855b48bb8354833928782b66ad00dcd26bcbcabb0f5e7a94351acdd98eee558ed281917a447f318a6abf4619da8 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9
+EBUILD sshguard-2.1.0-r2.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
+MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/files/sshguard.initd-r1 b/app-admin/sshguard/files/sshguard.initd-r1
new file mode 100644
index 000000000000..e7b5ca7428b3
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+depend() {
+	after iptables
+	use logger
+}
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
index d74b83ce78bc..0daba0da53ea 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>netmon@gentoo.org</email>
-    <name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-  <use>
-    <flag name="ipfilter">Enable ipfilter firewall support (only for *bsd)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">sshguard</remote-id>
-  </upstream>
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<upstream>
+<remote-id type="sourceforge">sshguard</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-admin/sshguard/sshguard-1.7.1.ebuild b/app-admin/sshguard/sshguard-1.7.1.ebuild
deleted file mode 100644
index a730edfc107c..000000000000
--- a/app-admin/sshguard/sshguard-1.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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.gz"
-
-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
-"
-
-DOCS=(
-	CHANGELOG.rst
-	README.rst
-	examples/sshguard.service
-	examples/whitelistfile.example
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/OPTIMIZER_CFLAGS=/d' configure || die
-}
-
-src_configure() {
-	# Needed for usleep(3), see "nasty" in src/sshguard_logsuck.c
-	append-cppflags -D_DEFAULT_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
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-admin/sshguard/sshguard-2.0.0.ebuild b/app-admin/sshguard/sshguard-2.0.0.ebuild
deleted file mode 100644
index 5ff11bd2529b..000000000000
--- a/app-admin/sshguard/sshguard-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-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
-"
-
-DOCS=(
-	CHANGELOG.rst
-	CONTRIBUTING.rst
-	README.rst
-	examples/net.sshguard.plist
-	examples/sshguard.service
-	examples/whitelistfile.example
-)
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto /etc
-	newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.0.99.ebuild b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
index 1e45c36ba086..7faed8b68c9c 100644
--- a/app-admin/sshguard/sshguard-2.0.99.ebuild
+++ b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 
 DEPEND="
 	sys-devel/flex
@@ -25,11 +25,14 @@ DOCS=(
 	examples/sshguard.service
 	examples/whitelistfile.example
 )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
 
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	insinto /etc