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 + +- 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 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 +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) +