Hello community, here is the log from the commit of package yast2-geo-cluster for openSUSE:Factory checked in at 2018-01-29 14:59:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-geo-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-geo-cluster" Mon Jan 29 14:59:17 2018 rev:18 rq:570455 version:4.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-geo-cluster/yast2-geo-cluster.changes 2017-12-05 01:30:20.821061144 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-geo-cluster.new/yast2-geo-cluster.changes 2018-01-29 15:00:48.841113160 +0100 @@ -1,0 +2,6 @@ +Fri Jan 26 07:09:26 UTC 2018 - [email protected] + +- SuSEFirewall2 replaced by firewalld(fate#323460) +- Version 4.0.3 + +------------------------------------------------------------------- Old: ---- yast2-geo-cluster-4.0.2.tar.bz2 New: ---- yast2-geo-cluster-4.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-geo-cluster.spec ++++++ --- /var/tmp/diff_new_pack.uZscmD/_old 2018-01-29 15:00:49.421086062 +0100 +++ /var/tmp/diff_new_pack.uZscmD/_new 2018-01-29 15:00:49.421086062 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-geo-cluster # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,24 @@ Name: yast2-geo-cluster -Version: 4.0.2 +Version: 4.0.3 Release: 0 -%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: autoyast2-installation -Requires: yast2 BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files -BuildRequires: yast2 +# SuSEFirewall2 replaced by Firewalld(fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite BuildArch: noarch +# SuSEFirewall2 replaced by Firewalld(fate#323460) +Requires: autoyast2-installation +Requires: yast2 >= 4.0.39 Requires: yast2-ruby-bindings >= 1.0.0 Summary: Configuration of booth ++++++ yast2-geo-cluster-4.0.2.tar.bz2 -> yast2-geo-cluster-4.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-4.0.2/package/yast2-geo-cluster.changes new/yast2-geo-cluster-4.0.3/package/yast2-geo-cluster.changes --- old/yast2-geo-cluster-4.0.2/package/yast2-geo-cluster.changes 2017-12-04 10:34:20.000000000 +0100 +++ new/yast2-geo-cluster-4.0.3/package/yast2-geo-cluster.changes 2018-01-29 09:25:43.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 26 07:09:26 UTC 2018 - [email protected] + +- SuSEFirewall2 replaced by firewalld(fate#323460) +- Version 4.0.3 + +------------------------------------------------------------------- Fri Dec 1 06:22:22 UTC 2017 - [email protected] - fate#323526, support python3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-4.0.2/package/yast2-geo-cluster.spec new/yast2-geo-cluster-4.0.3/package/yast2-geo-cluster.spec --- old/yast2-geo-cluster-4.0.2/package/yast2-geo-cluster.spec 2017-12-04 10:34:20.000000000 +0100 +++ new/yast2-geo-cluster-4.0.3/package/yast2-geo-cluster.spec 2018-01-29 09:25:43.000000000 +0100 @@ -17,23 +17,24 @@ Name: yast2-geo-cluster -Version: 4.0.2 +Version: 4.0.3 Release: 0 -%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Requires: yast2 -Requires: autoyast2-installation BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files -BuildRequires: yast2 +# SuSEFirewall2 replaced by Firewalld(fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite BuildArch: noarch +# SuSEFirewall2 replaced by Firewalld(fate#323460) +Requires: yast2 >= 4.0.39 +Requires: autoyast2-installation Requires: yast2-ruby-bindings >= 1.0.0 Summary: Configuration of booth diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-4.0.2/src/include/geo-cluster/dialogs.rb new/yast2-geo-cluster-4.0.3/src/include/geo-cluster/dialogs.rb --- old/yast2-geo-cluster-4.0.2/src/include/geo-cluster/dialogs.rb 2017-12-04 10:34:20.000000000 +0100 +++ new/yast2-geo-cluster-4.0.3/src/include/geo-cluster/dialogs.rb 2018-01-29 09:25:43.000000000 +0100 @@ -439,9 +439,10 @@ caption = _("Firewall Configuration") firewall_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget( { - #servie:geo-cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster + #booth is the name of /usr/lib/firewalld.d/services/booth.xml + #managed by booth package "services" => [ - "service:booth" + "booth" ], "display_details" => true } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-geo-cluster-4.0.2/src/modules/GeoCluster.rb new/yast2-geo-cluster-4.0.3/src/modules/GeoCluster.rb --- old/yast2-geo-cluster-4.0.2/src/modules/GeoCluster.rb 2017-12-04 10:34:20.000000000 +0100 +++ new/yast2-geo-cluster-4.0.3/src/modules/GeoCluster.rb 2018-01-29 09:25:43.000000000 +0100 @@ -29,6 +29,7 @@ # Representation of the configuration of geo-cluster. # Input and output routines. require "yast" +require "y2firewall/firewalld" module Yast class GeoClusterClass < Module @@ -39,8 +40,6 @@ Yast.import "Report" Yast.import "Summary" Yast.import "Message" - Yast.import "SuSEFirewall" - Yast.import "SuSEFirewallServices" # Data was modified? @modified = false @@ -304,10 +303,10 @@ caption, " ", steps, - [_("Read the previous settings"), _("Read SuSEFirewall Settings")], + [_("Read the previous settings"), _("Read Firewall Settings")], [ _("Reading the previous settings..."), - _("Read SuSEFirewall Settings"), + _("Read Firewall Settings"), _("Finished") ], "" @@ -332,8 +331,8 @@ Report.Error(Message.CannotReadCurrentSettings) if false Builtins.sleep(sl) - # read the SuSEfirewall2 - SuSEFirewall.Read + # read the firewalld + firewalld.read return false if Abort() # Progress finished @@ -367,13 +366,13 @@ # Progress stage 1/2 _("Write the settings"), # Progress stage 2/2 - _("Write the SuSEfirewall settings") + _("Write the Firewall settings") ], [ # Progress step 1/2 _("Writing the settings..."), # Progress step 2/2 - _("Writing the SuSEFirewall settings"), + _("Writing the Firewall settings"), # Progress finished _("Finished") ], @@ -412,14 +411,14 @@ end end - SuSEFirewallServices.SetNeededPortsAndProtocols( - "service:booth", - # Use the same udp port for tcp. - { "tcp_ports" => open_ports, - "udp_ports" => open_ports } - ) + # Use the same udp port for tcp. + begin + Y2Firewall::Firewalld::Service.modify_ports(name: "booth", tcp_ports: open_ports, udp_ports: open_ports) + rescue Y2Firewall::Firewalld::Service::NotFound + y2error("Firewalld 'cluster' service is not available.") + end - SuSEFirewall.Write + firewalld.write # Error message Report.Error(Message.SuSEConfigFailed) if false Builtins.sleep(sl) @@ -579,6 +578,13 @@ publish :function => :Summary, :type => "list ()" publish :function => :Overview, :type => "list ()" publish :function => :AutoPackages, :type => "map ()" + + private + + def firewalld + Y2Firewall::Firewalld.instance + end + end GeoCluster = GeoClusterClass.new
