From 04054064c91bb5584c06e93bbfdad547df89ec1a61cbafa6395256efbfd49f9f Mon Sep 17 00:00:00 2001
From: Johannes Weberhofer <jweberhofer@weberhofer.at>
Date: Wed, 26 Jan 2022 07:56:20 +0000
Subject: [PATCH] Accepting request 948093 from home:adkorte

- Fail2ban can't be PartOf ipset.service and nftables.service that
  conflict with firewalld.service (as it will prevent restarting the
  latter and which are not provided anymore)
  * fail2ban-opensuse-service.patch
  * harden_fail2ban.service.patch

OBS-URL: https://build.opensuse.org/request/show/948093
OBS-URL: https://build.opensuse.org/package/show/security/fail2ban?expand=0&rev=110
---
 fail2ban-opensuse-service.patch | 2 +-
 fail2ban.changes                | 9 +++++++++
 fail2ban.spec                   | 2 +-
 harden_fail2ban.service.patch   | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/fail2ban-opensuse-service.patch b/fail2ban-opensuse-service.patch
index a938f5f..089d45f 100644
--- a/fail2ban-opensuse-service.patch
+++ b/fail2ban-opensuse-service.patch
@@ -6,7 +6,7 @@ diff -ur fail2ban-0.11.2-orig/files/fail2ban.service.in fail2ban-0.11.2/files/fa
  Documentation=man:fail2ban(1)
  After=network.target iptables.service firewalld.service ip6tables.service ipset.service nftables.service
 -PartOf=iptables.service firewalld.service ip6tables.service ipset.service nftables.service
-+PartOf=firewalld.service ipset.service nftables.service
++PartOf=firewalld.service
  
  [Service]
  Type=simple
diff --git a/fail2ban.changes b/fail2ban.changes
index 6d7ecfa..0deb75b 100644
--- a/fail2ban.changes
+++ b/fail2ban.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jan 22 11:17:48 UTC 2022 - Arjen de Korte <suse+build@de-korte.org>
+
+- Fail2ban can't be PartOf ipset.service and nftables.service that
+  conflict with firewalld.service (as it will prevent restarting the
+  latter and which are not provided anymore)
+  * fail2ban-opensuse-service.patch
+  * harden_fail2ban.service.patch
+
 -------------------------------------------------------------------
 Fri Nov 12 10:49:20 UTC 2021 - Johannes Weberhofer <jweberhofer@weberhofer.at>
 
diff --git a/fail2ban.spec b/fail2ban.spec
index d61d9f9..30ede88 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fail2ban
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/harden_fail2ban.service.patch b/harden_fail2ban.service.patch
index 1402b50..515729f 100644
--- a/harden_fail2ban.service.patch
+++ b/harden_fail2ban.service.patch
@@ -3,7 +3,7 @@ Index: fail2ban-0.11.2/files/fail2ban.service.in
 --- fail2ban-0.11.2.orig/files/fail2ban.service.in
 +++ fail2ban-0.11.2/files/fail2ban.service.in
 @@ -5,6 +5,18 @@ After=network.target iptables.service fi
- PartOf=firewalld.service ipset.service nftables.service
+ PartOf=firewalld.service
  
  [Service]
 +# added automatically, for details please see