Fix bashisms and do not direct useful output to /dev/null (bug #536320). Remove global logrotate settings (bug #549856).

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 167 insertions, 9 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 8bca27a7d559..1c60cd8e6975 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.167 2015/08/04 05:57:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.168 2015/08/04 06:22:14 jer Exp $
+
+*fail2ban-0.9.2-r1 (04 Aug 2015)
+
+  04 Aug 2015; Jeroen Roovers <jer@gentoo.org> +fail2ban-0.9.2-r1.ebuild,
+  fail2ban-99999999.ebuild, +files/fail2ban-0.9.2-initd.patch,
+  +files/fail2ban-0.9.2-logrotate.patch:
+  Fix bashisms and do not direct useful output to /dev/null (bug #536320).
+  Remove global logrotate settings (bug #549856).
 
   04 Aug 2015; Jeroen Roovers <jer@gentoo.org> -fail2ban-0.8.13.ebuild,
   -fail2ban-0.8.14.ebuild, -fail2ban-0.9.1.ebuild:
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 91566b0e4481..b2596f71dee9 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fail2ban-0.9.2-initd.patch 506 SHA256 7ae3b72f0c9dc2b562d75e84197b41ce52813d875bf6c5ed18b078c66cfc20ef SHA512 38154b951291d088d177a0e87d244d25e7aaf0e8153eaf6d169f25f11d3fa4e2a13242d8352f44c40a46dbf207b404e6227802a1378749771682b6ee2a697e28 WHIRLPOOL 31f5df68bcadf6bb0aa9e3d0d41fcd379e45d0c9067c2e720361d080fdfe18a1bafa46de5fe9392e1269d3e58cd108b7fd2f5b3f8e77e7a6ece7f9770e268ecc
+AUX fail2ban-0.9.2-logrotate.patch 318 SHA256 42e10ef0530d23ba1afb35329a529a9cc95ef3d7aae37db24c2c5a9d89a76d16 SHA512 93ea2c83a07718dc2c8bf3dc96d4724ce67348b60a995e6f0a36e67989c06fe268f2106e83f5f609074269f5b1b877dd3c210b6d775900883b12b75c6cabaf6b WHIRLPOOL f762b58a85c39d73498fd54edc15e6ceec9054ffc0a03088552ffd300301e79af76fc49f21bbdabb35225fbc04bea59a1d2fe8299cd1b4cc83f8a29a9f32b72c
 DIST fail2ban-0.9.2.tar.gz 314919 SHA256 3e002f916e71128d4d7a97354b3e9b3bc20add878c9aa29c4034744de6156893 SHA512 c0fe3b126bcab34599661eaba9a84a8748e1450de57bc43cf91434d478463af1f60dc2bd2b50f7419fb1020ed63d398ca8493bd156cf1905767dbb8f79d0fda1 WHIRLPOOL 11264467e1465ad8697e174dcc751a63c0f550a01d381981f0b8bbc6f6c8f1b2ab13c2df205b08662e0e4bf983a139211932942795693c2c2cca71da9ddb833d
+EBUILD fail2ban-0.9.2-r1.ebuild 3260 SHA256 c104b9ad70c1ecdb4f8d6cedafa87936135dd8e1abd68664bc64c8111631c60a SHA512 593d661964da95871ebd1d5c0676e0955f6c8692ffb40a2e4b6efef652d689e2183c466af3188a65f6dd7fff83ef3e39eb593226161da95cb7926222b48d7b9d WHIRLPOOL cf806a259774eac518c095f0895596096438986769cb8fd862df056167e337573f037d57b2722408d4fb2fdb03a6c08b28b435f12778382228afe4ea829b7d1b
 EBUILD fail2ban-0.9.2.ebuild 3036 SHA256 47052ddd76de7ce33331d194707b5b2052a7ae8550a8006c21f6e9aa6caff1a2 SHA512 796913981593f21497820f9c5c9279b3442274f6818e87a2efa340467d43117529fe27763fd7fb2739599fb6a0c604db823a5b51e34627a1b840bc6d9232663a WHIRLPOOL 18dc7ff715c73bf388fe527b31873e050dc9925551d9f7283c9614528cbfca520bb896717cfab6960df9a63a751d1c0561991349a5514e5177da9e6fb52fd21b
-EBUILD fail2ban-99999999.ebuild 2960 SHA256 a9bf631ccc1bcd676b5de8ec3fea1fee65ac8d84eb46a5b663e504574a22f34c SHA512 b372479706b8894ef2761469e634adc7ea9a2396e7ceefc134c472c8283ef1b285ba1117c46c402d3081f6b65466c03a9e201765e1c3230ef6dcaea75bdd63dc WHIRLPOOL efa728a813a25df23aaaab0c3b8c7d3d1be8ed0c51fbb32edfd17dcde9f0e4f7428dfd40ed53a97bcefac8a7e5dcf93ba25c50e60c947ff8885ca8491ba1248f
-MISC ChangeLog 24132 SHA256 b30e7f1fbc39a6635e192b0b721f856e2bbcf1fc16f2ad8bf1c59b15545988e1 SHA512 0c1bef07ab1d657b89a4540a0f6b8d43467d88a655d3c1462d485b19ed396195c95ab51ab0f13383d26eef1f241a33fcede9a2d50b012fc602db9c74b52c9d0d WHIRLPOOL 9f4f44dca99a4ef55bcb2ba116a3721afe6e7ff3e95a144161c186147b4d885de1fd0a0f8cf2004b38f75916b2d59be4c4146d66f38e90162e22b2b50e32d673
+EBUILD fail2ban-99999999.ebuild 3175 SHA256 b231d9b1fd9ca5735c38230c5f6789d455c6df5ce70077104fdd67c9368fcdcd SHA512 18faa76cad43e6098a1aa2e7c90cd2da7b4c9d20fe4f37c746be8cfaa69aa28e8d24724eca556e5bbf9b420c3f4e5e5cf970d95347960050d773d1d28c76a7b9 WHIRLPOOL bdba4aa825381a6db591a5e231d32c094d8f66bac99821be43189b7530d96eaf9d57ae6f83f723bfd3a52a57c1ef6369ada43b0bff3cd62814042917afd88b0c
+MISC ChangeLog 24470 SHA256 e4471d518720a3b53bc7af982d77e29613cd1dc1608c4c68ec01ff0fcae4f946 SHA512 37d74d9f29067fc52ac31975c3f6085b5c6b00f97008c081827da63fcee4b45e1b349842c2c80125bb54de646413192aacccb9ff20e1ba9394f578bf48b7f454 WHIRLPOOL 3cc2b36c3fcbca942a83991049f3f3b2f8ca8c2edbc57a45e6f8a12553b9c3ce7d9c3b39a22d50cd50385679bbce399b4c7ee8852deb52f2a9d341dd1eb76a43
 MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlXAVEkACgkQVWmRsqeSphMqugCaA/JEbBUK6pTNcL+0mwjkIcdW
-hZ0AnR6M9CjAcd9jIq6C6ZHaQzt7fFS3
-=1Ay9
+iEYEAREIAAYFAlXAWhgACgkQVWmRsqeSphMrIwCeIcZ9pS/aitnrBfJ5RcZooz3S
+cAgAn0qvR7mbwq96wQolw7Pyn6b5pZiR
+=NoES
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..ccd699ae83f0
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.9.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.2-r1.ebuild,v 1.1 2015/08/04 06:22:14 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils systemd vcs-snapshot
+
+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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux systemd"
+
+RDEPEND="
+	net-firewall/iptables
+	net-misc/whois
+	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 )"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+src_prepare() {
+	# Replace /var/run with /run, but not in the top source directory
+	sed -i -e 's|/var\(/run/fail2ban\)|\1|g' $( find . -type f -mindepth 2 ) || die
+
+	# Fix bashisms and do not direct useful output to /dev/null (bug #536320)
+	# Remove global logrotate settings (bug #549856)
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.2-initd.patch \
+		"${FILESDIR}"/${PN}-0.9.2-logrotate.patch
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	${EPYTHON} bin/${PN}-testcases
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -rf "${D}"/usr/share/doc/${PN}
+
+	# not FILESDIR
+	newconfd files/gentoo-confd ${PN}
+	newinitd files/gentoo-initd ${PN}
+	systemd_dounit files/${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}
+}
+
+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 ${CATEGORY}/${PN}; then
+		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
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index d25bf236ff5c..326c90ac088a 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-99999999.ebuild,v 1.7 2015/07/31 13:53:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-99999999.ebuild,v 1.8 2015/08/04 06:22:14 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1 git-r3 systemd vcs-snapshot
+inherit distutils-r1 eutils git-r3 systemd vcs-snapshot
 
 DESCRIPTION="scans log files and bans IPs that show malicious signs"
 HOMEPAGE="http://www.fail2ban.org/"
@@ -17,7 +17,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="selinux systemd"
 
-DEPEND=""
 RDEPEND="
 	net-firewall/iptables
 	net-misc/whois
@@ -40,6 +39,12 @@ src_prepare() {
 	# Replace /var/run with /run, but not in the top source directory
 	sed -i -e 's|/var\(/run/fail2ban\)|\1|g' $( find . -type f -mindepth 2 ) || die
 
+	# Fix bashisms and do not direct useful output to /dev/null (bug #536320)
+	# Remove global logrotate settings (bug #549856)
+	epatch \
+		"${FILESDIR}"/${PN}-0.9.2-initd.patch \
+		"${FILESDIR}"/${PN}-0.9.2-logrotate.patch
+
 	distutils-r1_src_prepare
 }
 
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.2-initd.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.2-initd.patch
new file mode 100644
index 000000000000..47bffe6af9fe
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.9.2-initd.patch
@@ -0,0 +1,25 @@
+--- a/files/gentoo-initd
++++ b/files/gentoo-initd
+@@ -38,19 +38,19 @@
+ 		# bug 347477
+ 		rm -rf /run/fail2ban/fail2ban.sock || return 1
+ 	fi
+-	${FAIL2BAN} start &> /dev/null
++	${FAIL2BAN} start
+ 	eend $? "Failed to start fail2ban"
+ }
+ 
+ stop() {
+ 	ebegin "Stopping fail2ban"
+-	${FAIL2BAN} stop &> /dev/null
++	${FAIL2BAN} stop
+ 	eend $? "Failed to stop fail2ban"
+ }
+ 
+ reload() {
+ 	ebegin "Reloading fail2ban"
+-	${FAIL2BAN} reload > /dev/null
++	${FAIL2BAN} reload
+ 	eend $? "Failed to reload fail2ban"
+ }
+ 
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.2-logrotate.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.2-logrotate.patch
new file mode 100644
index 000000000000..65354a2a025f
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.9.2-logrotate.patch
@@ -0,0 +1,12 @@
+--- a/files/fail2ban-logrotate
++++ b/files/fail2ban-logrotate
+@@ -9,9 +9,7 @@
+ #  http://pkgs.fedoraproject.org/cgit/fail2ban.git/tree/fail2ban-logrotate
+ 
+ /var/log/fail2ban.log {
+-    rotate 7
+     missingok
+-    compress
+     postrotate
+       /usr/bin/fail2ban-client flushlogs  1>/dev/null || true
+     endscript