From f918a8706c05dc692107f93d15fd81a884ceaee0 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Sun, 25 Sep 2016 09:47:36 -0600
Subject: [PATCH] Update to 0.9.5

- Drop mysql patch applied upstream
---
 .gitignore           |  1 +
 fail2ban-mysql.patch | 19 -------------------
 fail2ban.spec        | 12 ++++++------
 sources              |  2 +-
 4 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 fail2ban-mysql.patch

diff --git a/.gitignore b/.gitignore
index bf86dda..000a84c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ fail2ban-0.8.4.tar.bz2
 /fail2ban-0.9.2.tar.gz
 /fail2ban-0.9.3.tar.gz
 /fail2ban-0.9.4.tar.gz
+/fail2ban-0.9.5.tar.gz
diff --git a/fail2ban-mysql.patch b/fail2ban-mysql.patch
deleted file mode 100644
index 4eb52a3..0000000
--- a/fail2ban-mysql.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/config/paths-fedora.conf b/config/paths-fedora.conf
-index b3c978c..d13645b 100644
---- a/config/paths-fedora.conf
-+++ b/config/paths-fedora.conf
-@@ -34,7 +34,8 @@ apache_access_log = /var/log/httpd/*access_log
- 
- exim_main_log = /var/log/exim/main.log
- 
--mysql_log = /var/lib/mysql/mysqld.log
-+mysql_log = /var/log/mariadb/mariadb.log
-+            /var/log/mysqld.log
- 
- roundcube_errors_log = /var/log/roundcubemail/errors
- 
-@@ -48,4 +49,3 @@ pureftpd_backend = systemd
- wuftpd_backend = systemd
- postfix_backend = systemd
- dovecot_backend = systemd
--mysql_backend = systemd
diff --git a/fail2ban.spec b/fail2ban.spec
index fabcb96..9fa8d9b 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,7 +1,7 @@
 Summary: Daemon to ban hosts that cause multiple authentication errors
 Name: fail2ban
-Version: 0.9.4
-Release: 6%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://fail2ban.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -9,9 +9,6 @@ Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%
 # Fix failing test
 # https://github.com/fail2ban/fail2ban/issues/1353
 Patch0: fail2ban-test.patch
-# Fix mysql log path
-# https://github.com/fail2ban/fail2ban/issues/1354
-Patch1: fail2ban-mysql.patch
 
 BuildRequires: python3-devel
 # For 2to3
@@ -149,7 +146,6 @@ by default.
 %prep
 %setup -q
 %patch0 -p1 -b .test
-%patch1 -p1 -b .mysql
 # Use Fedora paths
 sed -i -e 's/^before = paths-.*/before = paths-fedora.conf/' config/jail.conf
 2to3 --write --nobackups .
@@ -279,6 +275,10 @@ fi
 
 
 %changelog
+* Sun Sep 25 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-1
+- Update to 0.9.5
+- Drop mysql patch applied upstream
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-6
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 6113bd9..7cb27dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2dc93dff03c4da9fb95d4695e07b65d8  fail2ban-0.9.4.tar.gz
+1b59fc84a40b790e3f959257d64ab313  fail2ban-0.9.5.tar.gz