File project.diff of Package firewalld

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package firewalld

--- 0002-Disable-FlushAllOnReload-option.patch.orig
+++ 0002-Disable-FlushAllOnReload-option.patch
@@ -1,24 +1,7 @@
-From b1145d3efc58220f58a4e67189c4ff4a8bd789ce Mon Sep 17 00:00:00 2001
-From: Michal Rostecki <mrostecki@opensuse.org>
-Date: Mon, 25 Jan 2021 12:58:00 +0100
-Subject: [PATCH] Disable FlushAllOnReload option
-
-Disabling the FlushAllOnReload option restores the old behavior where
---reload does not retain interface to zone assignmnets and direct rules.
-We want to keep that behavior in openSUSE and SLE
-
-Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
----
- config/firewalld.conf              | 4 ++--
- doc/xml/firewalld.conf.xml         | 2 +-
- src/firewall/config/__init__.py.in | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/config/firewalld.conf b/config/firewalld.conf
-index 532f0452..e789f2a7 100644
---- a/config/firewalld.conf
-+++ b/config/firewalld.conf
-@@ -52,8 +52,8 @@ FirewallBackend=nftables
+diff -burNE firewalld-1.0.0_orig/config/firewalld.conf firewalld-1.0.0/config/firewalld.conf
+--- firewalld-1.0.0_orig/config/firewalld.conf	2021-08-30 07:24:54.261056436 +0200
++++ firewalld-1.0.0/config/firewalld.conf	2021-08-30 07:25:05.884555025 +0200
+@@ -63,8 +63,8 @@
  # configuration was retained during a reload, namely; interface to zone
  # assignment, and direct rules. This was confusing to users. To get the old
  # behavior set this to "no".
@@ -29,11 +12,10 @@ index 532f0452..e789f2a7 100644
  
  # RFC3964_IPv4
  # As per RFC 3964, filter IPv6 traffic with 6to4 destination addresses that
-diff --git a/doc/xml/firewalld.conf.xml b/doc/xml/firewalld.conf.xml
-index fcfbfd2b..8415ba3e 100644
---- a/doc/xml/firewalld.conf.xml
-+++ b/doc/xml/firewalld.conf.xml
-@@ -166,7 +166,7 @@
+diff -burNE firewalld-1.0.0_orig/doc/xml/firewalld.conf.xml firewalld-1.0.0/doc/xml/firewalld.conf.xml
+--- firewalld-1.0.0_orig/doc/xml/firewalld.conf.xml	2021-08-30 07:24:54.269056091 +0200
++++ firewalld-1.0.0/doc/xml/firewalld.conf.xml	2021-08-30 07:25:05.888554852 +0200
+@@ -190,7 +190,7 @@
                  runtime configuration was retained during a reload, namely;
                  interface to zone assignment, and direct rules. This was
                  confusing to users. To get the old behavior set this to "no".
@@ -42,18 +24,14 @@ index fcfbfd2b..8415ba3e 100644
                  </para>
              </listitem>
          </varlistentry>
-diff --git a/src/firewall/config/__init__.py.in b/src/firewall/config/__init__.py.in
-index e875e849..df6f449b 100644
---- a/src/firewall/config/__init__.py.in
-+++ b/src/firewall/config/__init__.py.in
-@@ -131,6 +131,6 @@ FALLBACK_INDIVIDUAL_CALLS = False
+diff -burNE firewalld-1.0.0_orig/src/firewall/config/__init__.py.in firewalld-1.0.0/src/firewall/config/__init__.py.in
+--- firewalld-1.0.0_orig/src/firewall/config/__init__.py.in	2021-08-30 07:24:54.273055919 +0200
++++ firewalld-1.0.0/src/firewall/config/__init__.py.in	2021-08-30 07:25:05.892554679 +0200
+@@ -130,6 +130,6 @@
  FALLBACK_LOG_DENIED = "off"
  FALLBACK_AUTOMATIC_HELPERS = "no"
- FALLBACK_FIREWALL_BACKEND = "nftables"
+ FALLBACK_FIREWALL_BACKEND = "iptables"
 -FALLBACK_FLUSH_ALL_ON_RELOAD = True
 +FALLBACK_FLUSH_ALL_ON_RELOAD = False
  FALLBACK_RFC3964_IPV4 = True
  FALLBACK_ALLOW_ZONE_DRIFTING = False
--- 
-2.30.0
-
--- firewalld.changes.orig
+++ firewalld.changes
@@ -24,6 +24,11 @@ Wed Apr  7 09:24:28 UTC 2021 - Michał R
 - Remove dependency on firewalld from firewall-macros (bsc#1183404)
 
 -------------------------------------------------------------------
+Wed Feb  3 12:36:15 UTC 2021 - Mathias Homann <Mathias.Homann@opensuse.org>
+
+- And again: we want iptables as backend.
+
+-------------------------------------------------------------------
 Tue Jan 26 16:33:10 UTC 2021 - Michał Rostecki <mrostecki@suse.com>
 
 - Disable FlushAllOnReload option to not retain interface to zone
--- firewalld.spec.orig
+++ firewalld.spec
@@ -29,7 +29,8 @@ Group:          Productivity/Networking/
 URL:            https://www.firewalld.org
 Source0:        https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
 Source1:        docker-zone.xml
-Patch0:         0002-Disable-FlushAllOnReload-option.patch
+Patch1:		0001-firewall-backend-Switch-default-backend-to-iptables.patch
+Patch2:         0002-Disable-FlushAllOnReload-option.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils

Places

File project.diff of Package firewalld

Places