Accepting request 1095079 from security:netfilter

OBS-URL: https://build.opensuse.org/request/show/1095079
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/firewalld?expand=0&rev=81

0002-Disable-FlushAllOnReload-option.patch

@@ -14,10 +14,10 @@ Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
  src/firewall/config/__init__.py.in | 2 +-
  3 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: firewalld-1.2.1/config/firewalld.conf
-===================================================================
---- firewalld-1.2.1.orig/config/firewalld.conf
-+++ firewalld-1.2.1/config/firewalld.conf
+diff --git a/config/firewalld.conf b/config/firewalld.conf
+index 7c9305e..43663b3 100644
+--- a/config/firewalld.conf
++++ b/config/firewalld.conf
 @@ -63,8 +63,8 @@ FirewallBackend=nftables
  # configuration was retained during a reload, namely; interface to zone
  # assignment, and direct rules. This was confusing to users. To get the old
@@ -29,10 +29,10 @@ Index: firewalld-1.2.1/config/firewalld.conf
  
  # RFC3964_IPv4
  # As per RFC 3964, filter IPv6 traffic with 6to4 destination addresses that
-Index: firewalld-1.2.1/doc/xml/firewalld.conf.xml
-===================================================================
---- firewalld-1.2.1.orig/doc/xml/firewalld.conf.xml
-+++ firewalld-1.2.1/doc/xml/firewalld.conf.xml
+diff --git a/doc/xml/firewalld.conf.xml b/doc/xml/firewalld.conf.xml
+index 1b74f70..a45c8df 100644
+--- a/doc/xml/firewalld.conf.xml
++++ b/doc/xml/firewalld.conf.xml
 @@ -190,7 +190,7 @@
                  runtime configuration was retained during a reload, namely;
                  interface to zone assignment, and direct rules. This was
@@ -42,11 +42,11 @@ Index: firewalld-1.2.1/doc/xml/firewalld.conf.xml
                  </para>
              </listitem>
          </varlistentry>
-Index: firewalld-1.2.1/src/firewall/config/__init__.py.in
-===================================================================
---- firewalld-1.2.1.orig/src/firewall/config/__init__.py.in
-+++ firewalld-1.2.1/src/firewall/config/__init__.py.in
-@@ -132,6 +132,6 @@ FALLBACK_INDIVIDUAL_CALLS = False
+diff --git a/src/firewall/config/__init__.py.in b/src/firewall/config/__init__.py.in
+index 468daf5..5ec116c 100644
+--- a/src/firewall/config/__init__.py.in
++++ b/src/firewall/config/__init__.py.in
+@@ -132,7 +132,7 @@ FALLBACK_INDIVIDUAL_CALLS = False
  FALLBACK_LOG_DENIED = "off"
  FALLBACK_AUTOMATIC_HELPERS = "no"
  FALLBACK_FIREWALL_BACKEND = "nftables"
@@ -54,3 +54,4 @@ Index: firewalld-1.2.1/src/firewall/config/__init__.py.in
 +FALLBACK_FLUSH_ALL_ON_RELOAD = False
  FALLBACK_RFC3964_IPV4 = True
  FALLBACK_ALLOW_ZONE_DRIFTING = False
+ FALLBACK_NFTABLES_FLOWTABLE = "off"

firewalld-1.3.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6e271ec7a1cd22d29ad1ec008f60d3141f3e7123fab9c365eb4d1183d3d759d
-size 1218890

firewalld.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Jun 24 14:20:24 UTC 2023 - Mohd Saquib <mohd.saquib@suse.com>
+
+- update to version 2.0.0:
+  * This is a major release. The major version is being bumped symbolically
+    to reflect significant changes done in commit f4d2b80 ("fix(policy):
+    disallow zone drifting"). It does not contain any deliberate breaking
+    changes. 
+  * Complete changelog:
+    https://github.com/firewalld/firewalld/releases/tag/v2.0.0 
+
 -------------------------------------------------------------------
 Thu Jun 15 07:48:48 UTC 2023 - Mohd Saquib <mohd.saquib@suse.com>
 

firewalld.spec

@@ -27,7 +27,7 @@
 %global modprobe_d_files firewalld-sysctls.conf
 
 Name:           firewalld
-Version:        1.3.3
+Version:        2.0.0
 Release:        0
 Summary:        A firewall daemon with D-Bus interface providing a dynamic firewall
 License:        GPL-2.0-or-later