From 2ec7c43968650da16fbdf8411870c61e5cd6e4b3b3ceb926f978e27443dcc526 Mon Sep 17 00:00:00 2001
From: Mohd Saquib <mohd.saquib@suse.com>
Date: Wed, 23 Aug 2023 08:21:51 +0000
Subject: [PATCH] Accepting request 1105432 from
 home:msaquib:branches:security:netfilter

- fix(cli): all --list-all-zones output identical (boo#1213609)
  [+ fix_list_all_zones_output.patch]

OBS-URL: https://build.opensuse.org/request/show/1105432
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=149
---
 firewalld.changes               |  6 ++++++
 firewalld.spec                  |  1 +
 fix_list_all_zones_output.patch | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 fix_list_all_zones_output.patch

diff --git a/firewalld.changes b/firewalld.changes
index 2ca4363..6f9d977 100644
--- a/firewalld.changes
+++ b/firewalld.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 22 10:47:06 UTC 2023 - Mohd Saquib <mohd.saquib@suse.com>
+
+- fix(cli): all --list-all-zones output identical (boo#1213609) 
+  [+ fix_list_all_zones_output.patch]
+
 -------------------------------------------------------------------
 Sat Jun 24 14:20:24 UTC 2023 - Mohd Saquib <mohd.saquib@suse.com>
 
diff --git a/firewalld.spec b/firewalld.spec
index 230b4a8..70dafc9 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -37,6 +37,7 @@ Source0:        https://github.com/firewalld/firewalld/releases/download/v%{vers
 Source1:        docker-zone.xml
 Patch0:         0002-Disable-FlushAllOnReload-option.patch
 Patch1:         firewalld-runstatedir.patch
+Patch2:         fix_list_all_zones_output.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
diff --git a/fix_list_all_zones_output.patch b/fix_list_all_zones_output.patch
new file mode 100644
index 0000000..3b79c61
--- /dev/null
+++ b/fix_list_all_zones_output.patch
@@ -0,0 +1,22 @@
+commit f3cea0e8e2a290d4ce00de936d9b679fbd0e0484	f3cea0e
+Author: Eric Garver <eric@garver.life>
+Date:   Mon Jul 10 15:59:42 2023 -0400
+
+    fix(cli): all --list-all-zones output identical
+    
+    Fixes: #1152
+
+diff --git a/src/firewall-cmd.in b/src/firewall-cmd.in
+index 062909e9..c327763f 100755
+--- a/src/firewall-cmd.in
++++ b/src/firewall-cmd.in
+@@ -2448,7 +2448,8 @@ if a.permanent:
+             names = fw.config().getZoneNames()
+             for zone in sorted(names):
+                 interfaces = try_nm_get_interfaces_in_zone(zone)
+-                cmd.print_zone_info(zone, settings, extra_interfaces=interfaces)
++                cmd.print_zone_info(zone, fw.config().getZoneByName(zone).getSettings(),
++                                    extra_interfaces=interfaces)
+                 cmd.print_msg("")
+             sys.exit(0)
+