Merge branch 'master' into epel7

Conflicts:
	fail2ban.spec

fail2ban-partof.patch

@@ -0,0 +1,12 @@
+diff -up fail2ban-0.9.5/files/fail2ban.service.partof fail2ban-0.9.5/files/fail2ban.service
+--- fail2ban-0.9.5/files/fail2ban.service.partof	2016-07-14 20:25:07.000000000 -0600
++++ fail2ban-0.9.5/files/fail2ban.service	2016-10-03 15:59:24.761782253 -0600
+@@ -2,7 +2,7 @@
+ Description=Fail2Ban Service
+ Documentation=man:fail2ban(1)
+ After=network.target iptables.service firewalld.service
+-PartOf=iptables.service firewalld.service
++PartOf=firewalld.service
+ 
+ [Service]
+ Type=forking

fail2ban-sendmail.patch

@@ -0,0 +1,34 @@
+commit 6a5f8ddf63658f3645a88988641c06d5a9625c00
+Author: Orion Poplawski <orion@cora.nwra.com>
+Date:   Mon Oct 3 16:26:11 2016 -0600
+
+    Add sendmail journalmatch options
+
+diff --git a/config/filter.d/sendmail-auth.conf b/config/filter.d/sendmail-auth.conf
+index 138fbb8..7886e60 100644
+--- a/config/filter.d/sendmail-auth.conf
++++ b/config/filter.d/sendmail-auth.conf
+@@ -13,6 +13,10 @@ failregex = ^%(__prefix_line)s\w{14}: (\S+ )?\[<HOST>\]( \(may be forged\))?: po
+ 
+ ignoreregex =
+ 
++[Init]
++
++journalmatch = _SYSTEMD_UNIT=sendmail.service
++
+ # DEV Notes:
+ #
+ # Author: Daniel Black
+diff --git a/config/filter.d/sendmail-reject.conf b/config/filter.d/sendmail-reject.conf
+index 93b8343..219d910 100644
+--- a/config/filter.d/sendmail-reject.conf
++++ b/config/filter.d/sendmail-reject.conf
+@@ -33,6 +33,8 @@ ignoreregex =
+ 
+ [Init]
+ 
++journalmatch = _SYSTEMD_UNIT=sendmail.service
++
+ # "maxlines" is number of log lines to buffer for multi-line regex searches
+ maxlines = 10
+ 

fail2ban.spec

@@ -1,7 +1,7 @@
 Summary: Daemon to ban hosts that cause multiple authentication errors
 Name: fail2ban
 Version: 0.9.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://fail2ban.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -12,6 +12,13 @@ Patch0: fail2ban-test.patch
 # Upstream patch to fix failing tests
 # https://github.com/fail2ban/fail2ban/commit/c49fe12f701807a8d89bfe57c9f7f492375a0a53
 Patch1: https://github.com/fail2ban/fail2ban/commit/c49fe12f701807a8d89bfe57c9f7f492375a0a53.patch
+# Give up being PartOf iptables for now
+# https://bugzilla.redhat.com/show_bug.cgi?id=1379141
+Patch2: fail2ban-partof.patch
+# Add journalmatch entries for sendmail
+# https://bugzilla.redhat.com/show_bug.cgi?id=1329919
+# https://github.com/fail2ban/fail2ban/pull/1566
+Patch3: fail2ban-sendmail.patch
 
 BuildRequires: python-devel
 # For testcases
@@ -146,6 +153,8 @@ by default.
 %setup -q
 %patch0 -p1 -b .test
 %patch1 -p1
+%patch2 -p1 -b .partof
+%patch3 -p1 -b .sendmail
 # Use Fedora paths
 sed -i -e 's/^before = paths-.*/before = paths-fedora.conf/' config/jail.conf
 
@@ -273,6 +282,13 @@ fi
 
 
 %changelog
+* Mon Oct 3 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-3
+- Add journalmatch entries for sendmail (bug #1329919)
+
+* Mon Oct 3 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-2
+- Give up being PartOf iptables to allow firewalld restarts to work
+  (bug #1379141)
+
 * Mon Oct 3 2016 Orion Poplawski <orion@cora.nwra.com> - 0.9.5-1
 - Add patch to fix failing test