Merge branch 'master' into epel7

.gitignore

@@ -8,3 +8,4 @@ fail2ban-0.8.4.tar.bz2
 /fail2ban-0.9-1f1a561.tar.xz
 /fail2ban-0.9.tar.gz
 /fail2ban-0.9.1.tar.gz
+/fail2ban-0.9.2.tar.gz

0001-Separate-php-url-fopen-logpath-by-newline.patch

@@ -1,26 +0,0 @@
-From d8867807f560838e70375cc9ca90585179700fe6 Mon Sep 17 00:00:00 2001
-From: Orion Poplawski <orion@cora.nwra.com>
-Date: Fri, 28 Nov 2014 22:04:09 -0700
-Subject: [PATCH] Separate php-url-fopen logpath by newline
-
----
- config/jail.conf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/config/jail.conf b/config/jail.conf
-index d119d22..6a95aa1 100644
---- a/config/jail.conf
-+++ b/config/jail.conf
-@@ -302,7 +302,8 @@ logpath = %(nginx_error_log)s
- [php-url-fopen]
- 
- port    = http,https
--logpath = %(nginx_access_log)s %(apache_access_log)s
-+logpath = %(nginx_access_log)s
-+          %(apache_access_log)s
- 
- 
- [suhosin]
--- 
-2.1.0
-

fail2ban.spec

@@ -1,12 +1,10 @@
 Summary: Daemon to ban hosts that cause multiple authentication errors
 Name: fail2ban
-Version: 0.9.1
+Version: 0.9.2
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://fail2ban.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# https://bugzilla.redhat.com/show_bug.cgi?id=1169026
-Patch0: 0001-Separate-php-url-fopen-logpath-by-newline.patch
 
 BuildRequires: python2-devel
 # For testcases
@@ -139,7 +137,6 @@ by default.
 
 %prep
 %setup -q
-%patch0 -p1
 # Use Fedora paths
 sed -i -e 's/^before = paths-.*/before = paths-fedora.conf/' config/jail.conf
 # Start after firewalld (https://bugzilla.redhat.com/show_bug.cgi?id=1067147)
@@ -196,6 +193,8 @@ EOF
 rm -r %{buildroot}%{_docdir}/%{name}
 
 %check
+# Need a UTF-8 locale to work
+export LANG=en_US.UTF-8
 ./fail2ban-testcases-all --no-network
 
 %post server
@@ -271,6 +270,9 @@ fi
 
 
 %changelog
+* Thu Apr 30 2015 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-1
+- Update to 0.9.2
+
 * Mon Mar 16 2015 Orion Poplawski <orion@cora.nwra.com> - 0.9.1-4
 - Do not load user paths for fail2ban-{client,server} (bug #1202151)
 

sources

@@ -1 +1 @@
-3554cc3de3f06ddfd7f90f8305b765b8  fail2ban-0.9.1.tar.gz
+bcdc9ef9f02c6fe8e43bb391835c65d6  fail2ban-0.9.2.tar.gz