gentoo resync : 05.04.2019

4 files changed, 117 insertions, 19 deletions

diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 0aaa4be4001c..8aa69394f337 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,5 @@
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
-EBUILD fail2ban-0.10.4.ebuild 3363 BLAKE2B 178fa4a4dee059f63fe8d799ebd5fd54620eb529453f4505266f47358b8cc375cf689cce0310d5cd35bb8fbbd6cc5bb9438232e73e04a075f8059bd854cff65e SHA512 f64f1ba67a5e54ab4f1953438d9d580ae1ffa30e099656c364d3b3f7ff8a20d5cb9736df417dfde36a7a665e43abc68efa5a31f8b329f6950dd713142d677aaa
-EBUILD fail2ban-99999999.ebuild 3165 BLAKE2B 95768a5cf6fde6738496ba9d08294a0f631974a32c0116f589bd0a3c58972886d12d9368b82eab047364cf2d00e20b2e9a6c4d0a0f8507ebf9a8b94dcee6b025 SHA512 4f8245e2662bdee6d736a343e5d507053fe6c649abfdf18e68aeb0be3b1ee0c8002e74d47311af6c2128a8556e14363cad6861374e34c222ea7b8a715decf969
+EBUILD fail2ban-0.10.4-r2.ebuild 3192 BLAKE2B 3484aba0cf700524893a15474baeb6d5c30bd40a64fcb929d8da425350028145f56f161e3eaf5857b0b9d133b8586471ad53ee1c3d6150ed37468b659096da63 SHA512 c1643c7b8836c802356c9b3ae88e556f803b83b4d09ff2ca19d91ec1b2f54f99cff8e4ec3df4c7f531ca5c14a7c168c1b0d71ee8ceba95c1e554bfe600a3b11d
+EBUILD fail2ban-0.10.4.ebuild 3285 BLAKE2B f2f3e6ee392b5b56f116ec8650fa6ed5f529e24ad09de41984e5284ff822d5b360263c5001fac195c66cbbf652cb6f8b47dfdaf578de94694f1c7181df52b8f7 SHA512 adbc4d75a460e69776e923077d8432a75930c15f20bebb9dfb199f5d5600f0572db78c683fe2011c106f08166094be8d8628b53394a9fdf72016f7cde3efac4e
+EBUILD fail2ban-99999999.ebuild 2953 BLAKE2B ed24264dc38f050e9e8216e4253aac70eafb2e9ffb9b6be71ef81c3d6a7fc252abeeadb8dfc400d4b22be94f019129bc47dcbdf9b35aa120539d0c6dd29441f5 SHA512 0007d2d3925128c25cc37ffb28176fd071a742f3402a06410e793f1be1bee192e5ecf1dd5ecae3aa554465c969d0879d4ec4de6d15314f9fcafa811e4a3f0bed
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
new file mode 100644
index 000000000000..1f4495bb15b8
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="http://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+	)' 'python*' ) )
+"
+REQUIRED_USE="systemd? ( !python_single_target_pypy )"
+RESTRICT="test"
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+src_unpack() {
+	default
+	mv ${PN}-${PN}-* ${P} || die
+}
+
+python_prepare_all() {
+	default
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+
+	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if python_is_python3; then
+		./fail2ban-2to3 || die
+	fi
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
+	systemd_dounit "${T}/${PN}.service"
+	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	if [[ $previous_less_than_0_7 = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2ban!"
+		elog
+		elog "Fail2ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+		elog "For most jail.conf configurations, it is recommended you install either"
+		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+		elog "to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite]; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite"
+	fi
+
+	if has_version sys-apps/systemd[-python]; then
+		elog "If you want to track logins through sys-apps/systemd's"
+		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
index 4ba2745237db..55ab05ed1d4e 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,9 +29,8 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-
 REQUIRED_USE="systemd? ( !python_single_target_pypy )"
-
+RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
 python_prepare_all() {
@@ -53,10 +52,6 @@ python_compile() {
 	distutils-r1_python_compile
 }
 
-python_test() {
-	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index c43c91b4673f..0adb597ee8cc 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -16,11 +16,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="selinux systemd"
 
-# TODO support ipfw and ipfilter
 RDEPEND="
-	kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
-	net-misc/whois
 	virtual/logger
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
@@ -29,9 +25,8 @@ RDEPEND="
 		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
 	)' 'python*' ) )
 "
-
 REQUIRED_USE="systemd? ( !python_single_target_pypy )"
-
+RESTRICT="test"
 DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
 
 python_prepare_all() {
@@ -46,10 +41,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_test() {
-	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	distutils-r1_python_install_all