Apply upstream patch for broken regex with dev-lang/python:3.

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

4 files changed, 56 insertions, 7 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 278912e71409..991379e4c600 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,12 @@
 # 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.129 2014/03/15 13:45:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.130 2014/03/17 00:43:21 jer Exp $
+
+*fail2ban-0.9.0-r1 (17 Mar 2014)
+
+  17 Mar 2014; Jeroen Roovers <jer@gentoo.org> -fail2ban-0.9.0.ebuild,
+  +fail2ban-0.9.0-r1.ebuild, +files/fail2ban-0.9.0-python3-regex.patch:
+  Apply upstream patch for broken regex with dev-lang/python:3.
 
   15 Mar 2014; Jeroen Roovers <jer@gentoo.org>
   files/fail2ban-0.9.0-empty-run-dir.patch:
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index f1844426bb22..ea87a629f473 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA256
 
 AUX fail2ban-0.9.0-empty-run-dir.patch 203 SHA256 1d598060f7b631e0e9841d17c1d6a27a0894118768fdf29f1e4428a8bae63630 SHA512 78c0fe591539ae25c388ae2096326299b47280f686578f5582da4903672d7cd93cc675acac31a1cc5fae626148269323bd39dfd03dedf46f24b0018e2f6cbf4d WHIRLPOOL 9e2cff388542cf56813a4c8f5bfaa5f0dca916078f6d99fc5db2e05b73365334728ca4bc78b3c0e96ff38b0eef2e6010598e95509bacc5ee26add084ce1d571f
+AUX fail2ban-0.9.0-python3-regex.patch 1415 SHA256 fcd61ca6f367c90ebca8c4159ee8e487b3aac727a4691bf6e9e1a622d067b0ac SHA512 581b64795ff89d3b30e4b56d50e5a1ce960bc661f3f393f5150a7e0cb05d43e8928d03211f09754e37e86deb0fedde6a7bc1a99c9644cae5d93a22a8fe636abe WHIRLPOOL c1f02c5a776d428edf6734fd6280dae5e2476156c849a0e581dd674b34229ae66f0ae3ff6a456c4bb797ad829a1a0f7ff4f9df0625534d360184ca7914ec9174
 DIST fail2ban-0.8.12.tar.gz 221688 SHA256 d03db61265b7ca6e74f087953e8b0b81f2608636ecca7aad8db289c014e3440c SHA512 9244fd7a1caadcc9f63f4af8dcf43a9f90c5010c784e054d45d649fab67488fb1852df60c7cf98d86cc348598730bb8d524c6389b7be1be72ee71eb2c5d98792 WHIRLPOOL edf7b4043a7db15ccda25bf793945d047de1d751c669814e491e96aa4cb211ba61e5715bd40db177f026ab8bf5a31dbf810f3e00218c3f49aa23570a7f319a63
 DIST fail2ban-0.9.0.tar.gz 274108 SHA256 981d2461a75d818934e2dcacf618ad9460ac4a6c05956f845f4d51c4d88000e0 SHA512 92b031a904cd3ed9fe88a60c5cfbe7b0cfc614055f6fbcc6953a9dfa560cdd38f3e8e9664bbb38622fdb62450d69c0f4343c7204f7bfd13aea2eb59646be232d WHIRLPOOL 772c16bd949d6ae2758d78a3ff5ab87faf71d1d6f5d2332e71dddd7ad7684a29974dae064200e60a72a1ceb39df2547ff70681bdc646b24f1d029119d2e82d22
 EBUILD fail2ban-0.8.12-r1.ebuild 2356 SHA256 5c14e748d5feff5a1c529f6944ea7bedc6f167da8bc09fcb07798c4585d71eda SHA512 429228b2cdc9b67e8a497c0ce8290dee53c1d86fb3130b6b9a0dcbe55edebd34101b333dc4614cc1860ac9801eb19ec2bb1722a13a92f8217e9e5604a317d443 WHIRLPOOL 4a556ce88d81d179daa88a84b2ba758b6052e3e9dd5cd76536530913276f39bc39eab18b1634139c841c5822b439e0883c39516458a55baa975a9f3a6b63b2af
 EBUILD fail2ban-0.8.12.ebuild 2344 SHA256 6eded75d8921b2e1f8a81f5e0516ebe8a50a256f7b57fa9d04d598ada5adaeaf SHA512 d95b08ff044dea2e9a8aadb6a9650940d8f9728c07930fa80a075b731a9de76e386596685b0996a3e1a63232c5c8339a210195794876f3b0d1e0722b12aaf3f4 WHIRLPOOL 6ab7f91a763083018b173fbe06b632a5cca89a6849b08f7ec7cdd5fad7b6fc87814ac2489408e228bde92286c78ef8d3d1a3af98aab20bb9d99c4b45f8af59d2
-EBUILD fail2ban-0.9.0.ebuild 2542 SHA256 ec3edd693dc7fbd73222912e2cadb713653a71b9e95f2a0fdfbc20a137c91811 SHA512 d78ab4d41d1442ffd4765604cd4d3fdc6743ff8935cffb6e0f5197c29f6b6632c371617ccce635f000937b70e422d72d5ceaa567313de7bb25833cd8438ed8ca WHIRLPOOL 0f11dc5f61512c14974b6966ce20fd306fe287731e65a8a15877995c0295bce8c2b8f6a245bf43b895d30201e94da824a476169a03059853ffcfafd2c00ae410
-MISC ChangeLog 19004 SHA256 dbdee75df91df865b2c32cc0d326ecd7f18e8addc5b445d8ac9486280ec888bb SHA512 9d35a06b35af63a4d991b456e7e5541a5449fb6e3ef9f5910688bb4aef5a7f9d98fb1ce19e7415a3bde1e4b8298d81bb29c44fb589647c2b53c96eb6d697f358 WHIRLPOOL 66c385106f11eea1a2cbdc8ff8da1139dd18d74fceacb84513e7500759f6470be51f8b40dc29fa2d08ec9e9d9ddd8a9378cb5756e75d936299a9593a0cbbf90c
+EBUILD fail2ban-0.9.0-r1.ebuild 2611 SHA256 b6a46aa3bd0e456d2e0f7955761060d089bf6ef2728611f187c9477547c493c0 SHA512 7d4960f836b76a6972ee786209a00fe37c5b932d55ec9d7f636021af9dc02058678ded846b0c49a5c22d14665fe857438f9a211a293fd9cc7563ab28f52990c6 WHIRLPOOL d36daf66f32b6f9afe4084d077501dbca0dc61bd1e4f59589c8105df59c30ed46232327b0cf6dcd69e1dbad3a8d9c1f4299a69c60a3abac5d8ca85840d6ea7c4
+MISC ChangeLog 19246 SHA256 4ee932165e63dd7fd3ee76b5e3532cf4fe61926f9dfad00c2caabac59440e731 SHA512 c4edf95106104ad2528551eb2029a48e9b3cd688fefcac88974d5b9ffc974c0e19cd1989b51920a6a8b24c4ed3705ebc51750657ea9bb767379221ade471ce02 WHIRLPOOL d07dcccb4d7683ce14a2e1e115fcde6c2c62114a37464d1c3c4fa90f98cb274461e07022ddbfce6df94365256010d9315f3f27a33d64eb29edd7cc6f20a1d922
 MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMkWXIACgkQVWmRsqeSphOv5gCfX8S/I/OrU63e6/i7yIwP8zFi
-Gx0AnRkVZ+eHkDXE2HFqbNmwNH3D7w7X
-=KuAZ
+iEYEAREIAAYFAlMmRSsACgkQVWmRsqeSphMs+ACeJoykfrU1Xhu7qQbJgi+3lghn
+UCcAn3n0svI95bVqlD9mKlX2AM9+ABGT
+=dB5M
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.0.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild
index 4dd1ff0c31b5..34c414800f1c 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.0.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.0-r1.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.ebuild,v 1.1 2014/03/15 13:42:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild,v 1.1 2014/03/17 00:43:21 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -32,6 +32,9 @@ src_prepare() {
 	# Do not install /run/fail2ban
 	epatch "${FILESDIR}"/${P}-empty-run-dir.patch
 
+	# Upstream patch
+	epatch "${FILESDIR}"/${P}-python3-regex.patch
+
 	distutils-r1_src_prepare
 }
 
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.0-python3-regex.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.0-python3-regex.patch
new file mode 100644
index 000000000000..be69ae3b137c
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.9.0-python3-regex.patch
@@ -0,0 +1,39 @@
+From e193e67718b77a1603a91079d7ab4d2307570a8e Mon Sep 17 00:00:00 2001
+From: Steven Hiscocks <steven@hiscocks.me.uk>
+Date: Sun, 16 Mar 2014 18:25:16 +0000
+Subject: [PATCH] BF: fail2ban-regex mix of tabs and spaces
+
+---
+ bin/fail2ban-regex | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex
+index 270b70d..4317d06 100755
+--- a/bin/fail2ban-regex
++++ b/bin/fail2ban-regex
+@@ -395,7 +395,7 @@ class Fail2banRegex(object):
+ 				if lines < self._maxlines or getattr(self, '_print_all_' + ltype):
+ 					ans = [[]]
+ 					for arg in [l, regexlist]:
+-					    ans = [ x + [y] for x in ans for y in arg ]
++						ans = [ x + [y] for x in ans for y in arg ]
+ 					b = map(lambda a: a[0] +  ' | ' + a[1].getFailRegex() + ' |  ' + debuggexURL(a[0], a[1].getFailRegex()), ans)
+ 					pprint_list([x.rstrip() for x in b], header)
+ 				else:
+@@ -466,11 +466,11 @@ if __name__ == "__main__":
+ 	if opts.print_no_missed and opts.print_all_missed:
+ 		sys.stderr.write("ERROR: --print-no-missed and --print-all-missed are mutually exclusive.\n\n")
+ 		parser.print_help()
+-	        sys.exit(-1)
++		sys.exit(-1)
+ 	if opts.print_no_ignored and opts.print_all_ignored:
+ 		sys.stderr.write("ERROR: --print-no-ignored and --print-all-ignored are mutually exclusive.\n\n")
+ 		parser.print_help()
+-	        sys.exit(-1)
++		sys.exit(-1)
+ 
+ 	print
+ 	print "Running tests"
+-- 
+1.8.5.5
+