Merge pull request #586 from teclator/firewalld_zones

Do not depend on SuSEFirewall to set firewalld interface zone (fate#323460)
yast · Nov 24, 2017 · 82e264e · 82e264e
2 parents b3ee895 + def209e
commit 82e264e
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 672 deletions.
diff --git a/doc/features.md b/doc/features.md
@@ -65,7 +65,6 @@ s390 Devices
 Firewall Parts
 --------------
 
-- stage1 proposal + write it down ( firewall enable/disable, sshd enable/disable, ssh port open/close, vnc enable/disable)
 - assign network device to firewall zone
 
 Network Storage Devices

diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 24 11:57:33 UTC 2017 - knut.anderssen@suse.com
+
+- Do not depend on SuSEFirewall for zone interface change. The zone
+  is now written in the ifcfg-file and wicked takes care of calling
+  firewalld commandline. (fate#323460)
+- 4.0.10
+
 -------------------------------------------------------------------
 Wed Nov 22 11:59:22 UTC 2017 - knut.anderssen@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.0.9
+Version:        4.0.10
 Release:        0
 BuildArch:      noarch
 
@@ -30,9 +30,9 @@ Requires:       yast2-proxy
 #for install task
 BuildRequires:  rubygem(yast-rake)
 
-# yast2 v3.1.86: Added ServicesProposal library
-BuildRequires:  yast2 >= 4.0.1
-Requires:       yast2 >= 4.0.1
+# yast2 v4.0.17: Y2Firewall::Firewalld::Zone.known_zones (fate#323460)
+BuildRequires:  yast2 >= 4.0.17
+Requires:       yast2 >= 4.0.17
 
 # Product control need xml agent
 BuildRequires:  yast2-xml

diff --git a/src/clients/firewall_stage1_finish.rb b/src/clients/firewall_stage1_finish.rb