Merge branch 'SLE-15-SP6' into merge_SLE-15-SP6

yast · Oct 25, 2023 · 07933bc · 07933bc
2 parents b3a2165 + 261c33b
commit 07933bc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/library/network/src/lib/y2firewall/firewalld/zone_reader.rb b/library/network/src/lib/y2firewall/firewalld/zone_reader.rb
@@ -91,8 +91,8 @@ def parse_zones
       end
 
       def current_zone_from(line)
-        attribute, _value = line.split(/\s*\(active\)\s*$/)
-        zone_names.include?(attribute) ? attribute : nil
+        name, *_status = line.split
+        zone_names.include?(name) ? name : nil
       end
 
       ATTRIBUTE_MAPPING = { "summary" => "short" }.freeze

diff --git a/library/network/test/y2firewall/firewalld/zone_reader_test.rb b/library/network/test/y2firewall/firewalld/zone_reader_test.rb
@@ -43,11 +43,11 @@
         "  rich rules: ",
         "\t",
         "",
-        "public (active)",
+        "public (default, active)",
         "  summary: Public",
-        "  description: For use in public areas. You do not trust the other" \
-        " computers on networks to not harm your computer." \
-        " Only selected incoming connections are accepted.",
+        "  description: For use in public areas. You do not trust the other " \
+        "computers on networks to not harm your computer. " \
+        "Only selected incoming connections are accepted.",
         "  target: default",
         "  icmp-block-inversion: no",
         "  interfaces: eth0 ens3",

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 25 11:16:21 UTC 2023 - Knut Anderssen <kanderssen@suse.com>
+
+- Fix firewalld zones reader adapting it to the new firewall-cmd
+  --list-all-zones output format (bsc#1216534)
+- 5.0.2
+
 -------------------------------------------------------------------
 Thu Oct  5 08:50:25 UTC 2023 - Martin Vidner <mvidner@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        5.0.1
+Version:        5.0.2
 
 Release:        0
 Summary:        YaST2 Main Package