Version bump. Add patch for loglevel expected to be an int (bug #520536 by Fabio Scaccabarozzi).

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

5 files changed, 111 insertions, 8 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 1f27df2d4ca9..73d1c4663609 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.141 2014/07/12 13:59:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.142 2014/08/22 15:15:59 jer Exp $
+
+*fail2ban-0.9.0-r2 (22 Aug 2014)
+*fail2ban-0.8.14 (22 Aug 2014)
+
+  22 Aug 2014; Jeroen Roovers <jer@gentoo.org> +fail2ban-0.8.14.ebuild,
+  -fail2ban-0.9.0-r1.ebuild, +fail2ban-0.9.0-r2.ebuild,
+  +files/fail2ban-0.9.0-loglevel-int.patch:
+  Version bump. Add patch for loglevel expected to be an int (bug #520536 by
+  Fabio Scaccabarozzi).
 
   12 Jul 2014; Jeroen Roovers <jer@gentoo.org> fail2ban-0.9.0-r1.ebuild:
   Set USE=sqlite dependency on dev-lang/python (bug #507306).
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 7be189fcfa84..efbf95835b97 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA256
 
 AUX fail2ban-0.9.0-empty-run-dir.patch 203 SHA256 1d598060f7b631e0e9841d17c1d6a27a0894118768fdf29f1e4428a8bae63630 SHA512 78c0fe591539ae25c388ae2096326299b47280f686578f5582da4903672d7cd93cc675acac31a1cc5fae626148269323bd39dfd03dedf46f24b0018e2f6cbf4d WHIRLPOOL 9e2cff388542cf56813a4c8f5bfaa5f0dca916078f6d99fc5db2e05b73365334728ca4bc78b3c0e96ff38b0eef2e6010598e95509bacc5ee26add084ce1d571f
+AUX fail2ban-0.9.0-loglevel-int.patch 410 SHA256 de6d4a9e15512468879cdbdb5c1df28dc66a23f12d87eb59ce6dd4a91cd5dac0 SHA512 4e0f0fb68226856002ae180ed9959d4eb67605e69199eeabaab267b667d5452492cfd48af6f10be1ffc224752d10f50c51582205f1d3ff55f40426cf969d1cea WHIRLPOOL 0673afae846344079cb0ecb493d1365e637fe9ae531afcf50fefa554ceea4854cecc79ba4dc6999a11ffe447850d4e640c839e6ed88968a479c0d750a843d670
 AUX fail2ban-0.9.0-python3-regex.patch 1415 SHA256 fcd61ca6f367c90ebca8c4159ee8e487b3aac727a4691bf6e9e1a622d067b0ac SHA512 581b64795ff89d3b30e4b56d50e5a1ce960bc661f3f393f5150a7e0cb05d43e8928d03211f09754e37e86deb0fedde6a7bc1a99c9644cae5d93a22a8fe636abe WHIRLPOOL c1f02c5a776d428edf6734fd6280dae5e2476156c849a0e581dd674b34229ae66f0ae3ff6a456c4bb797ad829a1a0f7ff4f9df0625534d360184ca7914ec9174
 DIST fail2ban-0.8.13.tar.gz 226759 SHA256 94977b9d8070a5e2480e5b6e3abd4bf288567ad6c2c5ab78e3a9fbb712f46090 SHA512 c93f5ff70064e31f419bb1b2153e7b350f3723b926bab46d28dda02f66eb580ac5762154fec33d9963bae41c999bee35b111d2ba188ff600512c824e32dabb24 WHIRLPOOL 28650f5109c91cad380e518a937d7003be56ed1a9930742297976f724b3940d892122ff2dc776d6d1d52ae75293807e8772de3d44e65ea6530126d792758df2d
+DIST fail2ban-0.8.14.tar.gz 228146 SHA256 6331b6330380157a7f4addbc5f6d81225927857c882b877e9c3401025fe821f0 SHA512 bc747faf467bf9b4988299add32775c5b120b2bb18836aae0e8af8094ed90d304cdd100d6a1d0e61819d46afc281d8f1856783ff77abc622f2921a13773893d0 WHIRLPOOL 0c21692163eea4c5d0f31ab45e8437b57b8da7823cb1946113870c1763a29413a10baa9c74af861a4604ee8e5f3b213c5685479f6839a1460347adb87aff0064
 DIST fail2ban-0.9.0.tar.gz 274108 SHA256 981d2461a75d818934e2dcacf618ad9460ac4a6c05956f845f4d51c4d88000e0 SHA512 92b031a904cd3ed9fe88a60c5cfbe7b0cfc614055f6fbcc6953a9dfa560cdd38f3e8e9664bbb38622fdb62450d69c0f4343c7204f7bfd13aea2eb59646be232d WHIRLPOOL 772c16bd949d6ae2758d78a3ff5ab87faf71d1d6f5d2332e71dddd7ad7684a29974dae064200e60a72a1ceb39df2547ff70681bdc646b24f1d029119d2e82d22
 EBUILD fail2ban-0.8.13.ebuild 2348 SHA256 0f2490899c5a9c52bbbbe9c2c592acbacd35ea93bca361e7ba1c303027d68857 SHA512 a5d20b18d0f47fceb5fea72479b2ae3cd708cdc45d6d2572e9664af358c203e702cacfc169e8c795a6cbffb18c2f5302d3cf0b20ffe7adb05f22a6e7b79f1d41 WHIRLPOOL 40778439f38282f93b3e362d3545538d93ea1969c9bdb095abd57b2b382929c77a66845fe520d4de90e28102a994c0a36c0cc73e1ddf51c657916375669437d0
-EBUILD fail2ban-0.9.0-r1.ebuild 3020 SHA256 954c376a2aab696c7e0e56118b7bcfa432ed94a1123b406fd6884e0bb52961c8 SHA512 0a30777509c163ea84a9765c981fcbec6e8035acca0c6d98bb4b7cca5dfe351a8d13231e92ec9d377a38d27a52c72015826643c95bdd44ca4ef9f4a82880f3ed WHIRLPOOL 8d9cf61cf96b5eac53f7bd326cd27ba5465996d30256d292acc01e1aac8787352ecd08eb2970f1ba4521f8325661a53fa73fece2e6f81f587d5ba7ec6ebb9bbb
-MISC ChangeLog 20528 SHA256 c2fb215c7e6d045bc37963ffd474639bbaa43a5f39abba51176ccdc4ac020f70 SHA512 51a62de5ef7d8c73ffa072442577f5b53b3eee81cf39b780a0a401fb32ef49f356453ace36f40aeec0443a819693bdd091b29699098adf7826b0a6ea058c4c1a WHIRLPOOL 140cdbcfd8161f6ad99dd1fe2b90d79eb1bdccba01a09b723fa4804d62aadbc763c2fd9c094448451dea06f77cd93cd4066d2c29907915eff027eb1480be195b
+EBUILD fail2ban-0.8.14.ebuild 2353 SHA256 ebae2a57f30f33e96db04237ddf9654fac90f7a739019d24e908aaf198cb38fa SHA512 c452819f8a6d2a9aebdb7ce8f3cc91906edde74eb38572218f59c7027680c9fb58612cc68ee42cc63c2698233ef9067c13a8e87426f31b4f58620cadd5ca5b1e WHIRLPOOL d7eff97b0a44f50f59d89abae8e512479c22a8b082d8473f5f851fbfaa20767f5eeb42952873be2c39c430fb919b7c47b52b7d7895f66818a7c67ca137faf976
+EBUILD fail2ban-0.9.0-r2.ebuild 3068 SHA256 ed09c5bf52fbce7dd4eb0ada7851705d7b02fd1e2f050be2ca69731a87738d34 SHA512 ae423ccf789bbc7f6edc90270d7ce876e8726d7c6ed39865530a9702ceed62982cb25d28d7d2f9c04f5a04bf0a232442e5364e4869b9a5266dee0547e4c63bb4 WHIRLPOOL 49bd886bc942f912a6cc27ed8345bf8d046be287be01c14af6eeff8a657e53fa9fa19169fddd52e49442f8488d3e9dc3e100ed7f58258cb58be9078d2fd92bea
+MISC ChangeLog 20867 SHA256 ffc8ad0147340e4f0d8910b566e9a064ffd1d4d958ee24c8014078f017aaf797 SHA512 dbf765c51c7bc38dc800ab06cb4ef9629a1ac4c15b827ef64d3dc6357c423c5dd57fffe00e7859908a80ffdef706a594b6cf1a0d6d287a819c73a2b4bcc2960c WHIRLPOOL 3bafca81b129ba01cce5ca301386d1a1ccb528f95d4fb4014667c7ad25b96c09b558b5d81166e4d206c6d347b1a277ad787cd19d6810a581cad73269a62f5448
 MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEUEAREIAAYFAlPBP1QACgkQVWmRsqeSphPJ3gCfZUrivnje5YiymQT0/lXjRG4b
-agoAl0uG0pFo2WsGy28n+vrV3XIWs+o=
-=V4Yk
+iEYEAREIAAYFAlP3XrEACgkQVWmRsqeSphMRZgCfUSrLywuAKhnYwrDVk58JaBcs
+FCYAmQFEghWdsUpPFXW7WVczn/cISCTT
+=f1jc
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.14.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.14.ebuild
new file mode 100644
index 000000000000..0c9bb2dbc14d
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.8.14.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.14.ebuild,v 1.1 2014/08/22 15:15:59 jer Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+DISTUTILS_SINGLE_IMPL=yes
+
+inherit distutils-r1 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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="selinux? ( sec-policy/selinux-fail2ban )"
+RDEPEND="net-misc/whois
+	virtual/mta
+	virtual/logger
+	net-firewall/iptables
+	selinux? ( sec-policy/selinux-fail2ban )"
+
+src_prepare() {
+	sed -i -e 's|/var\(/run/fail2ban\)|\1|g' $( find . -type f ) || die
+}
+
+src_test() {
+	./${PN}-testcases-all
+}
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+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} && \
+		! 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
+}
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild
index efd604bf0251..67610e34aa7d 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild,v 1.5 2014/07/12 13:59:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.0-r2.ebuild,v 1.1 2014/08/22 15:15:59 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
@@ -33,8 +33,9 @@ src_prepare() {
 	# Do not install /run/fail2ban
 	epatch "${FILESDIR}"/${P}-empty-run-dir.patch
 
-	# Upstream patch
+	# Upstream patches
 	epatch "${FILESDIR}"/${P}-python3-regex.patch
+	epatch "${FILESDIR}"/${P}-loglevel-int.patch
 
 	distutils-r1_src_prepare
 }
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.0-loglevel-int.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.0-loglevel-int.patch
new file mode 100644
index 000000000000..ce4f50606b44
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.9.0-loglevel-int.patch
@@ -0,0 +1,11 @@
+--- a/fail2ban/client/fail2banreader.py
++++ b/fail2ban/client/fail2banreader.py
+@@ -45,7 +45,7 @@
+ 		return ConfigReader.getOptions(self, "Definition", opts)
+ 	
+ 	def getOptions(self):
+-		opts = [["int", "loglevel", "INFO" ],
++		opts = [["string", "loglevel", "INFO" ],
+ 				["string", "logtarget", "STDERR"],
+ 				["string", "dbfile", "/var/lib/fail2ban/fail2ban.sqlite3"],
+ 				["int", "dbpurgeage", 86400]]