diff --git a/.gitignore b/.gitignore index fc9ed14..ffc3ada 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,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 adbe7e6..ba82b17 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: 4%{?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: python-devel # For testcases @@ -145,7 +142,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 @@ -273,6 +269,10 @@ fi %changelog +* Sun Sep 25 2016 Orion Poplawski - 0.9.5-1 +- Update to 0.9.5 +- Drop mysql patch applied upstream + * Sun Mar 27 2016 Orion Poplawski - 0.9.4-4 - Use %%{_tmpfilesdir} for systemd tmpfile config 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