From 64d45110bb6b8dbe0b74b4bf0ebbed7b85a4e216 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 3 Oct 2016 16:01:29 -0600
Subject: [PATCH] Give up being PartOf iptables to allow firewalld restarts to
 work

  (bug #1379141)
---
 fail2ban-partof.patch | 12 ++++++++++++
 fail2ban.spec         | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 fail2ban-partof.patch

diff --git a/fail2ban-partof.patch b/fail2ban-partof.patch
new file mode 100644
index 0000000..d634668
--- /dev/null
+++ b/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
diff --git a/fail2ban.spec b/fail2ban.spec
index 59e1410..fd3c1b5 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.5
-Release: 1%{?dist}
+Release: 2%{?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,9 @@ 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
 
 BuildRequires: python3-devel
 # For 2to3
@@ -150,6 +153,7 @@ by default.
 %setup -q
 %patch0 -p1 -b .test
 %patch1 -p1
+%patch2 -p1 -b .partof
 # Use Fedora paths
 sed -i -e 's/^before = paths-.*/before = paths-fedora.conf/' config/jail.conf
 2to3 --write --nobackups .
@@ -279,6 +283,10 @@ fi
 
 
 %changelog
+* 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