Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2018-02-02 22:19:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-client" Fri Feb 2 22:19:00 2018 rev:69 rq:572033 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2018-01-17 21:41:51.317419024 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2018-02-02 22:19:00.899027395 +0100 @@ -1,0 +2,6 @@ +Thu Feb 1 20:39:37 UTC 2018 - knut.anders...@suse.com + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.1 + +------------------------------------------------------------------- @@ -4 +10 @@ -- Fix teststuite once SuSEFirewall2 is being replaced by Firewalld +- Fix teststuite once SuSEFirewall2 is being replaced by firewalld Old: ---- yast2-nfs-client-4.0.0.tar.bz2 New: ---- yast2-nfs-client-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.XQvZ5d/_old 2018-02-02 22:19:01.423002933 +0100 +++ /var/tmp/diff_new_pack.XQvZ5d/_new 2018-02-02 22:19:01.427002747 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nfs-client # -# 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-nfs-client -Version: 4.0.0 +Version: 4.0.1 Release: 0 Url: https://github.com/yast/yast-nfs-client @@ -28,14 +28,13 @@ BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.27 BuildRequires: yast2-testsuite -# Don't use Info function to check enable state (bnc#807507) -BuildRequires: yast2 >= 2.23.23 +# SuSEFirewall2 replaced by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: rubygem(rspec) # path_matching (RSpec argument matcher) BuildRequires: yast2-ruby-bindings >= 3.1.31 -#ag_showexports moved to yast2 base -# introduces extended IPv6 support. -Requires: yast2 >= 2.23.6 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 #idmapd_conf agent Requires: yast2-nfs-common >= 2.24.0 # showmount, #150382, #286300 ++++++ yast2-nfs-client-4.0.0.tar.bz2 -> yast2-nfs-client-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/package/yast2-nfs-client.changes new/yast2-nfs-client-4.0.1/package/yast2-nfs-client.changes --- old/yast2-nfs-client-4.0.0/package/yast2-nfs-client.changes 2017-11-07 16:44:07.628457392 +0100 +++ new/yast2-nfs-client-4.0.1/package/yast2-nfs-client.changes 2018-02-02 14:53:26.000000000 +0100 @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +Thu Feb 1 20:39:37 UTC 2018 - knut.anders...@suse.com + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.1 + +------------------------------------------------------------------- Fri Nov 3 18:20:20 UTC 2017 - knut.anders...@suse.com -- Fix teststuite once SuSEFirewall2 is being replaced by Firewalld +- Fix teststuite once SuSEFirewall2 is being replaced by firewalld (fate#323460) - 4.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/package/yast2-nfs-client.spec new/yast2-nfs-client-4.0.1/package/yast2-nfs-client.spec --- old/yast2-nfs-client-4.0.0/package/yast2-nfs-client.spec 2017-11-07 16:44:07.628457392 +0100 +++ new/yast2-nfs-client-4.0.1/package/yast2-nfs-client.spec 2018-02-02 14:53:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 4.0.0 +Version: 4.0.1 Release: 0 Url: https://github.com/yast/yast-nfs-client @@ -28,14 +28,13 @@ BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.27 BuildRequires: yast2-testsuite -# Don't use Info function to check enable state (bnc#807507) -BuildRequires: yast2 >= 2.23.23 +# SuSEFirewall2 replaced by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: rubygem(rspec) # path_matching (RSpec argument matcher) BuildRequires: yast2-ruby-bindings >= 3.1.31 -#ag_showexports moved to yast2 base -# introduces extended IPv6 support. -Requires: yast2 >= 2.23.6 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 #idmapd_conf agent Requires: yast2-nfs-common >= 2.24.0 # showmount, #150382, #286300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/src/include/nfs/ui.rb new/yast2-nfs-client-4.0.1/src/include/nfs/ui.rb --- old/yast2-nfs-client-4.0.0/src/include/nfs/ui.rb 2017-11-07 16:44:07.632457392 +0100 +++ new/yast2-nfs-client-4.0.1/src/include/nfs/ui.rb 2018-02-02 14:53:26.000000000 +0100 @@ -1,4 +1,5 @@ # encoding: utf-8 +require "y2firewall/firewalld" # YaST namespace module Yast @@ -15,7 +16,6 @@ Yast.import "Nfs" Yast.import "NfsOptions" Yast.import "Popup" - Yast.import "SuSEFirewall" Yast.import "Wizard" Yast.include include_target, "nfs/routines.rb" @@ -28,7 +28,7 @@ # firewall widget using CWM @fw_settings = { - "services" => ["service:nfs-client"], + "services" => ["nfs"], "display_details" => true } @fw_cwm_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget( @@ -324,13 +324,13 @@ # Translators: 1st part of error message error_msg = _("No NFS server has been found on your network.") - if SuSEFirewall.GetStartService + if firewalld.running? # Translators: 2nd part of error message (1st one is 'No nfs servers have been found ...) error_msg = Ops.add( error_msg, _( "\n" \ - "This could be caused by a running SuSEfirewall2,\n" \ + "This could be caused by a running firewall,\n" \ "which probably blocks the network scanning." ) ) @@ -708,7 +708,7 @@ end if ret == :next - # grab current settings, store them to SuSEFirewall:: + # grab current settings, store them to firewalld:: SaveFstabEntries() if UI.WidgetExists(Id(:fstable)) SaveSettings(event) if UI.WidgetExists(Id(:enable_nfs4)) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/src/modules/Nfs.rb new/yast2-nfs-client-4.0.1/src/modules/Nfs.rb --- old/yast2-nfs-client-4.0.0/src/modules/Nfs.rb 2017-11-07 16:44:07.632457392 +0100 +++ new/yast2-nfs-client-4.0.1/src/modules/Nfs.rb 2018-02-02 14:53:26.000000000 +0100 @@ -2,6 +2,7 @@ require "yast" require "fstab/tsort" +require "y2firewall/firewalld" # YaST namespace module Yast @@ -18,7 +19,6 @@ Yast.import "Report" Yast.import "Service" Yast.import "Summary" - Yast.import "SuSEFirewall" Yast.import "Progress" Yast.import "PackageSystem" Yast.import "PackagesProposal" @@ -55,6 +55,10 @@ @created_dirs = [] end + def firewalld + Y2Firewall::Firewalld.instance + end + # Function sets internal variable, which indicates, that any # settings were modified, to "true" def SetModified @@ -337,7 +341,7 @@ @idmapd_domain = ReadIdmapd() progress_orig = Progress.set(false) - SuSEFirewall.Read + firewalld.read Progress.set(progress_orig) @portmapper = FindPortmapper() @@ -429,7 +433,7 @@ ) progress_orig = Progress.set(false) - SuSEFirewall.WriteOnly + firewalld.write_only Progress.set(progress_orig) true @@ -488,11 +492,7 @@ return false end end - - progress_orig = Progress.set(false) - SuSEFirewall.ActivateConfiguration - Progress.set(progress_orig) - + firewalld.reload Progress.NextStage true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/test/nfs_test.rb new/yast2-nfs-client-4.0.1/test/nfs_test.rb --- old/yast2-nfs-client-4.0.0/test/nfs_test.rb 2017-11-07 16:44:07.632457392 +0100 +++ new/yast2-nfs-client-4.0.1/test/nfs_test.rb 2018-02-02 14:53:26.000000000 +0100 @@ -19,16 +19,17 @@ require_relative "spec_helper" require "yaml" +require "y2firewall/firewalld" Yast.import "Nfs" Yast.import "Progress" -Yast.import "SuSEFirewall" Yast.import "Service" describe Yast::Nfs do subject { Yast::Nfs } describe ".WriteOnly" do + let(:firewalld) { Y2Firewall::Firewalld.instance } let(:fstab_entries) { YAML.load_file(File.join(DATA_PATH, "fstab_entries.yaml")) } let(:nfs_entries) { fstab_entries.select { |e| e["vfstype"] == "nfs" } } @@ -39,7 +40,7 @@ allow(subject).to receive(:FindPortmapper).and_return "portmap" # Stub some risky calls - allow(Yast::SuSEFirewall).to receive(:WriteOnly) + allow(subject).to receive(:firewalld).and_return(firewalld) allow(Yast::Progress).to receive(:set) allow(Yast::Service).to receive(:Enable) allow(Yast::SCR).to receive(:Execute) @@ -48,6 +49,9 @@ .with(path_matching(/^\.sysconfig\.nfs/), any_args) allow(Yast::SCR).to receive(:Write) .with(path_matching(/^\.etc\.idmapd_conf/), any_args) + allow(firewalld).to receive(:installed?).and_return(true) + allow(firewalld).to receive(:read) + allow(firewalld).to receive(:write_only) # Creation of the backup allow(Yast::SCR).to receive(:Execute) .with(path(".target.bash"), %r{^/bin/cp }, any_args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.out new/yast2-nfs-client-4.0.1/testsuite/tests/autoyast.out --- old/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.out 2017-11-07 16:44:07.632457392 +0100 +++ new/yast2-nfs-client-4.0.1/testsuite/tests/autoyast.out 2018-02-02 14:53:26.000000000 +0100 @@ -1,5 +1,4 @@ Read .target.tmpdir "/tmp" -Execute .target.bash "rpm -q --whatprovides firewalld" 1 Dump Nfs::Import Dump - basic, SLE11-SP2 Read .sysconfig.nfs.NFS4_SUPPORT "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.rb new/yast2-nfs-client-4.0.1/testsuite/tests/autoyast.rb --- old/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.rb 2017-11-07 16:44:07.632457392 +0100 +++ new/yast2-nfs-client-4.0.1/testsuite/tests/autoyast.rb 2018-02-02 14:53:26.000000000 +0100 @@ -6,13 +6,7 @@ Yast.include self, "testsuite.rb" @I_READ = { "target" => { "tmpdir" => "/tmp" } } @I_WRITE = {} - # Firewalld rpm not installed - @I_EXEC = { - "target" => { - "bash" => 1, - "bash_output" => { "exit" => 0, "stdout" => "", "stderr" => "" } - } - } + @I_EXEC = {} TESTSUITE_INIT([@I_READ, @I_WRITE, @I_EXEC], nil)
