From 696e343d98eafcadd1f0fb5625bb64558579ba2070458e27dd33cb36bab110fe Mon Sep 17 00:00:00 2001 From: Mohd Saquib Date: Tue, 3 Oct 2023 06:46:08 +0000 Subject: [PATCH] Accepting request 1114900 from home:msaquib:branches:security:netfilter - update to 2.0.1: * fix(cli): all --list-all-zones output identical (d30bc61) * fix(cli): properly show default zone attribute (ea8d9a8) * fix(cli): properly show active attribute for zones and policies (b202403) * fix(cli): --get-active-zones should include the default zone (dae9112) * fix(nftables): always flush main table on start (cd20981) * fix(runtimeToPermanent): deepcopy settings before mangling (9c53639) * docs: fix reference to lockdown-whitelist.xml in SYNOPSIS section (1c77205) * fix(firewall-config): escape markup stored in bindings store (c876fd0) * fix(tests): avoid deprecated assertRaisesRegexp for assertRaisesRegex (2935119) * fix(icmp): fix check_icmpv6_name() to use correct IPv6 names (af3c35b) * fix(ipset): fix configuring IP range for ipsets with nftables (6a050ec) * fix(ipset): fix configuring "timeout","maxelem" values for ipsets with nftables (7d3340c) * fix(core): fix exception while parsing invalid "tcp-mss-clamp" in policy (ff61209) * docs(policy): fix wrong documentation of in man firewalld.policy (21026d9) - removed following patch: [- fix_list_all_zones_output.patch] OBS-URL: https://build.opensuse.org/request/show/1114900 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=154 --- firewalld-2.0.0.tar.bz2 | 3 --- firewalld-2.0.1.tar.bz2 | 3 +++ firewalld.changes | 21 +++++++++++++++++++++ firewalld.spec | 3 +-- fix_list_all_zones_output.patch | 22 ---------------------- 5 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 firewalld-2.0.0.tar.bz2 create mode 100644 firewalld-2.0.1.tar.bz2 delete mode 100644 fix_list_all_zones_output.patch diff --git a/firewalld-2.0.0.tar.bz2 b/firewalld-2.0.0.tar.bz2 deleted file mode 100644 index c42fa77..0000000 --- a/firewalld-2.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89a736515921e0dcc983e4206bcd958576c6023bcb9314096d3f8c1f7897301f -size 1260018 diff --git a/firewalld-2.0.1.tar.bz2 b/firewalld-2.0.1.tar.bz2 new file mode 100644 index 0000000..2951a67 --- /dev/null +++ b/firewalld-2.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40ca4742ad13bcedbce1dbbebb1ddf944582d579b42512763dae4ed589f09914 +size 1257251 diff --git a/firewalld.changes b/firewalld.changes index a095be5..fb53dba 100644 --- a/firewalld.changes +++ b/firewalld.changes @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Tue Oct 3 06:42:21 UTC 2023 - Mohd Saquib + +- update to 2.0.1: + * fix(cli): all --list-all-zones output identical (d30bc61) + * fix(cli): properly show default zone attribute (ea8d9a8) + * fix(cli): properly show active attribute for zones and policies (b202403) + * fix(cli): --get-active-zones should include the default zone (dae9112) + * fix(nftables): always flush main table on start (cd20981) + * fix(runtimeToPermanent): deepcopy settings before mangling (9c53639) + * docs: fix reference to lockdown-whitelist.xml in SYNOPSIS section (1c77205) + * fix(firewall-config): escape markup stored in bindings store (c876fd0) + * fix(tests): avoid deprecated assertRaisesRegexp for assertRaisesRegex (2935119) + * fix(icmp): fix check_icmpv6_name() to use correct IPv6 names (af3c35b) + * fix(ipset): fix configuring IP range for ipsets with nftables (6a050ec) + * fix(ipset): fix configuring "timeout","maxelem" values for ipsets with nftables (7d3340c) + * fix(core): fix exception while parsing invalid "tcp-mss-clamp" in policy (ff61209) + * docs(policy): fix wrong documentation of in man firewalld.policy (21026d9) + +- removed following patch: + [- fix_list_all_zones_output.patch] +------------------------------------------------------------------- Mon Sep 25 01:29:47 UTC 2023 - Steve Kowalik - python3-dbus isn't correct either, it's python3-dbus-python. diff --git a/firewalld.spec b/firewalld.spec index fc2f838..45e4ac0 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -27,7 +27,7 @@ %global modprobe_d_files firewalld-sysctls.conf Name: firewalld -Version: 2.0.0 +Version: 2.0.1 Release: 0 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall License: GPL-2.0-or-later @@ -37,7 +37,6 @@ 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 deleted file mode 100644 index 3b79c61..0000000 --- a/fix_list_all_zones_output.patch +++ /dev/null @@ -1,22 +0,0 @@ -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) -