Hello community, here is the log from the commit of package yast2-instserver for openSUSE:Factory checked in at 2018-02-06 16:49:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-instserver (Old) and /work/SRC/openSUSE:Factory/.yast2-instserver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-instserver" Tue Feb 6 16:49:02 2018 rev:50 rq:573062 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-instserver/yast2-instserver.changes 2017-10-07 17:50:56.662568548 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-instserver.new/yast2-instserver.changes 2018-02-06 16:49:10.352016767 +0100 @@ -1,0 +2,6 @@ +Mon Feb 5 13:39:28 UTC 2018 - [email protected] + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.1 + +------------------------------------------------------------------- Old: ---- yast2-instserver-4.0.0.tar.bz2 New: ---- yast2-instserver-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-instserver.spec ++++++ --- /var/tmp/diff_new_pack.TKClqQ/_old 2018-02-06 16:49:11.079982705 +0100 +++ /var/tmp/diff_new_pack.TKClqQ/_new 2018-02-06 16:49:11.083982517 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-instserver # -# 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,7 +17,7 @@ Name: yast2-instserver -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,12 +25,14 @@ Source1: inst_server.conf.in Url: http://github.com/yast/yast-instserver -BuildRequires: yast2 +# SuSEFirewall2 replaced by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: rubygem(rspec) BuildRequires: rubygem(yast-rake) -Requires: yast2 > 3.3.4 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 > 4.0.39 # file conflict, move of ag_content Conflicts: yast2 <= 3.3.4 ++++++ yast2-instserver-4.0.0.tar.bz2 -> yast2-instserver-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-instserver-4.0.0/package/yast2-instserver.changes new/yast2-instserver-4.0.1/package/yast2-instserver.changes --- old/yast2-instserver-4.0.0/package/yast2-instserver.changes 2017-10-06 10:18:58.098064541 +0200 +++ new/yast2-instserver-4.0.1/package/yast2-instserver.changes 2018-02-05 15:00:46.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 5 13:39:28 UTC 2018 - [email protected] + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.1 + +------------------------------------------------------------------- Thu Oct 5 13:13:54 UTC 2017 - [email protected] - Stop using tmpnam, it is no longer supported in perl 5.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-instserver-4.0.0/package/yast2-instserver.spec new/yast2-instserver-4.0.1/package/yast2-instserver.spec --- old/yast2-instserver-4.0.0/package/yast2-instserver.spec 2017-10-06 10:18:58.098064541 +0200 +++ new/yast2-instserver-4.0.1/package/yast2-instserver.spec 2018-02-05 15:00:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-instserver -Version: 4.0.0 +Version: 4.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,12 +27,14 @@ url: http://github.com/yast/yast-instserver Group: System/YaST License: GPL-2.0+ -BuildRequires: yast2 +# SuSEFirewall2 replaced by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: rubygem(rspec) BuildRequires: rubygem(yast-rake) -Requires: yast2 > 3.3.4 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 > 4.0.39 # file conflict, move of ag_content Conflicts: yast2 <= 3.3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-instserver-4.0.0/src/include/instserver/dialogs.rb new/yast2-instserver-4.0.1/src/include/instserver/dialogs.rb --- old/yast2-instserver-4.0.0/src/include/instserver/dialogs.rb 2017-10-06 10:18:58.102064541 +0200 +++ new/yast2-instserver-4.0.1/src/include/instserver/dialogs.rb 2018-02-05 15:00:46.000000000 +0100 @@ -1482,7 +1482,7 @@ # firewall widget using CWM fw_settings = { - "services" => ["service:nfs-kernel-server"], + "services" => ["nfs-kernel-server"], "display_details" => true } @@ -1576,7 +1576,7 @@ def FtpDialog # firewall widget using CWM fw_settings = { - "services" => ["service:vsftpd"], + "services" => ["vsftpd"], "display_details" => true } @@ -1676,7 +1676,7 @@ # firewall widget using CWM fw_settings = { - "services" => ["service:apache2"], + "services" => ["apache2"], "display_details" => true } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-instserver-4.0.0/src/modules/Instserver.rb new/yast2-instserver-4.0.1/src/modules/Instserver.rb --- old/yast2-instserver-4.0.0/src/modules/Instserver.rb 2017-10-06 10:18:58.102064541 +0200 +++ new/yast2-instserver-4.0.1/src/modules/Instserver.rb 2018-02-05 15:00:46.000000000 +0100 @@ -8,6 +8,7 @@ # Representation of the configuration of Installation Server. # Input and output routines. require "yast" +require "y2firewall/firewalld" module Yast class InstserverClass < Module @@ -24,7 +25,6 @@ Yast.import "Service" Yast.import "IP" Yast.import "Message" - Yast.import "SuSEFirewall" Yast.import "String" Yast.include self, "instserver/routines.rb" @@ -77,6 +77,10 @@ Instserver() end + def firewalld + Y2Firewall::Firewalld.instance + end + # Abort function # @return [Boolean] def Abort @@ -422,7 +426,7 @@ end end - SuSEFirewall.Write + firewalld.write true end @@ -533,7 +537,7 @@ end RunSuseConfigApache(true) - SuSEFirewall.Write + firewalld.write Service.Enable("apache2") if Service.Status("apache2") == 0 @@ -601,7 +605,7 @@ Service.Start("nfsserver") end - SuSEFirewall.Write + firewalld.write true end @@ -1205,11 +1209,7 @@ @FirstDialog = "settings" end - # disable progress for firewall - prg = Progress.set(false) - # read firewall settings - SuSEFirewall.Read - Progress.set(prg) + firewalld.read # read current settings return false if Abort()
