[fail2ban/f19] Update to 0.8.11 (#1034355)
Adam Tkac
atkac at fedoraproject.org
Mon Nov 25 17:38:28 UTC 2013
commit 49aafa1d0e90f92241409b1d8b4f81c23e1c42e5
Author: Adam Tkac <vonsch at gmail.com>
Date: Mon Nov 25 18:37:59 2013 +0100
Update to 0.8.11 (#1034355)
- drop part of the fail2ban-0.8.3-init.patch (merged)
- fail2ban-hostsdeny.patch has been merged
- fail2ban-mailx.patch has been merged
- fail2ban-notmp.patch has been merged
Signed-off-by: Adam Tkac <vonsch at gmail.com>
fail2ban-0.8.3-init.patch | 21 ++++----------
fail2ban-0.8.7.1-sshd.patch | 12 ++++----
fail2ban-hostsdeny.patch | 19 -------------
fail2ban-log2syslog.patch | 10 +++---
fail2ban-mailx.patch | 60 -------------------------------------------
fail2ban-notmp.patch | 12 --------
fail2ban.spec | 23 ++++++----------
7 files changed, 26 insertions(+), 131 deletions(-)
---
diff --git a/fail2ban-0.8.3-init.patch b/fail2ban-0.8.3-init.patch
index 3ed8609..c40256a 100644
--- a/fail2ban-0.8.3-init.patch
+++ b/fail2ban-0.8.3-init.patch
@@ -1,20 +1,11 @@
---- fail2ban-0.8.3/files/redhat-initd.init 2008-03-10 23:36:22.000000000 +0100
-+++ fail2ban-0.8.3/files/redhat-initd 2008-08-24 20:46:01.000000000 +0200
+diff -up fail2ban-0.8.11/files/redhat-initd.init fail2ban-0.8.11/files/redhat-initd
+--- fail2ban-0.8.11/files/redhat-initd.init 2013-11-25 18:07:00.191938851 +0100
++++ fail2ban-0.8.11/files/redhat-initd 2013-11-25 18:07:49.576801893 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# chkconfig: 345 92 08
+# chkconfig: - 92 08
- # description: Fail2ban daemon
- # http://fail2ban.sourceforge.net/wiki/index.php/Main_Page
- # process name: fail2ban-server
-@@ -27,8 +27,7 @@
- echo -n $"Starting fail2ban: "
- getpid
- if [ -z "$pid" ]; then
-- rm -rf /var/run/fail2ban/fail2ban.sock # in case of unclean shutdown
-- $FAIL2BAN start > /dev/null
-+ $FAIL2BAN -x start > /dev/null
- RETVAL=$?
- fi
- if [ $RETVAL -eq 0 ]; then
+ # processname: fail2ban-server
+ # config: /etc/fail2ban/fail2ban.conf
+ # pidfile: /var/run/fail2ban/fail2ban.pid
diff --git a/fail2ban-0.8.7.1-sshd.patch b/fail2ban-0.8.7.1-sshd.patch
index aa3773e..1d7fe5f 100644
--- a/fail2ban-0.8.7.1-sshd.patch
+++ b/fail2ban-0.8.7.1-sshd.patch
@@ -1,7 +1,7 @@
-diff -up fail2ban-0.8.7.1/config/jail.conf.sshd fail2ban-0.8.7.1/config/jail.conf
---- fail2ban-0.8.7.1/config/jail.conf.sshd 2012-07-31 19:45:04.000000000 -0600
-+++ fail2ban-0.8.7.1/config/jail.conf 2012-10-11 11:47:33.131451895 -0600
-@@ -62,11 +62,11 @@ usedns = warn
+diff -up fail2ban-0.8.11/config/jail.conf.sshd fail2ban-0.8.11/config/jail.conf
+--- fail2ban-0.8.11/config/jail.conf.sshd 2013-11-25 18:08:08.034123038 +0100
++++ fail2ban-0.8.11/config/jail.conf 2013-11-25 18:16:28.107917373 +0100
+@@ -71,11 +71,11 @@ usedns = warn
[ssh-iptables]
@@ -9,9 +9,9 @@ diff -up fail2ban-0.8.7.1/config/jail.conf.sshd fail2ban-0.8.7.1/config/jail.con
+enabled = true
filter = sshd
action = iptables[name=SSH, port=ssh, protocol=tcp]
-- sendmail-whois[name=SSH, dest=you at example.com, sender=fail2ban at example.com]
+- sendmail-whois[name=SSH, dest=you at example.com, sender=fail2ban at example.com, sendername="Fail2Ban"]
-logpath = /var/log/sshd.log
-+ sendmail-whois[name=SSH, dest=root, sender=fail2ban at example.com]
++ sendmail-whois[name=SSH, dest=root, sender=fail2ban at example.com, sendername="Fail2Ban"]
+logpath = /var/log/secure
maxretry = 5
diff --git a/fail2ban-log2syslog.patch b/fail2ban-log2syslog.patch
index 49c220d..3646a8a 100644
--- a/fail2ban-log2syslog.patch
+++ b/fail2ban-log2syslog.patch
@@ -1,9 +1,9 @@
-diff -up fail2ban-0.8.10/config/fail2ban.conf.log2syslog fail2ban-0.8.10/config/fail2ban.conf
---- fail2ban-0.8.10/config/fail2ban.conf.log2syslog 2013-06-12 11:21:12.000000000 -0600
-+++ fail2ban-0.8.10/config/fail2ban.conf 2013-06-12 16:12:48.233512068 -0600
+diff -up fail2ban-0.8.11/config/fail2ban.conf.log2syslog fail2ban-0.8.11/config/fail2ban.conf
+--- fail2ban-0.8.11/config/fail2ban.conf.log2syslog 2013-11-25 18:23:28.627391472 +0100
++++ fail2ban-0.8.11/config/fail2ban.conf 2013-11-25 18:24:57.633978793 +0100
@@ -30,7 +30,7 @@ loglevel = 3
- # (e.g. /etc/logrotate.d/fail2ban on Debian systems)
- # Values: STDOUT STDERR SYSLOG file Default: /var/log/fail2ban.log
+ # (e.g. /etc/logrotate.d/fail2ban on Debian systems)
+ # Values: [ STDOUT | STDERR | SYSLOG | FILE ] Default: STDERR
#
-logtarget = /var/log/fail2ban.log
+logtarget = SYSLOG
diff --git a/fail2ban.spec b/fail2ban.spec
index 977830f..0f34d7a 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,7 +1,7 @@
Summary: Ban IPs that make too many password failures
Name: fail2ban
-Version: 0.8.10
-Release: 3%{?dist}
+Version: 0.8.11
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://fail2ban.sourceforge.net/
@@ -9,16 +9,7 @@ Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%
Source1: fail2ban-logrotate
Patch0: fail2ban-0.8.3-init.patch
Patch1: fail2ban-0.8.7.1-sshd.patch
-# Upstream patch to fix hostsdeny permission issue
-# https://github.com/fail2ban/fail2ban/issues/266
-# https://bugzilla.redhat.com/show_bug.cgi?id=997863
-Patch2: fail2ban-hostsdeny.patch
-# Upstream patch to fix mailx argument ordering
-# https://github.com/fail2ban/fail2ban/issues/328
-# https://bugzilla.redhat.com/show_bug.cgi?id=998020
-Patch3: fail2ban-mailx.patch
Patch6: fail2ban-log2syslog.patch
-Patch8: fail2ban-notmp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python-devel >= 2.3
# For testcases
@@ -53,10 +44,7 @@ and shorewall respectively.
%setup -q
%patch0 -p1 -b .init
%patch1 -p1 -b .sshd
-%patch2 -p1 -b .hostsdeny
-%patch3 -p1 -b .mailx
%patch6 -p1 -b .log2syslog
-%patch8 -p1 -b .notmp
%build
python setup.py build
@@ -138,6 +126,13 @@ fi
%dir %{_localstatedir}/lib/fail2ban/
%changelog
+* Mon Nov 25 2013 Adam Tkac <vonsch at gmail.com> - 0.8.11-1
+- update to 0.8.11 (#1034355)
+- drop part of the fail2ban-0.8.3-init.patch (merged)
+- fail2ban-hostsdeny.patch has been merged
+- fail2ban-mailx.patch has been merged
+- fail2ban-notmp.patch has been merged
+
* Wed Aug 28 2013 Orion Poplawski <orion at cora.nwra.com> - 0.8.10-3
- Add upstream patch to fix mailx argument ordering (bug #998020)
More information about the scm-commits
mailing list