Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2018-03-04 11:50:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-client" Sun Mar 4 11:50:00 2018 rev:93 rq:580960 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2017-06-17 10:18:00.121962624 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes 2018-03-04 11:50:07.043526661 +0100 @@ -1,0 +2,6 @@ +Fri Feb 2 17:03:31 UTC 2018 - knut.anderssen@suse.com + +- SuSEFirewall2 replaced by firewalld (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-3.1.19.tar.bz2 New: ---- yast2-samba-client-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.Fwza0Q/_old 2018-03-04 11:50:07.891495941 +0100 +++ /var/tmp/diff_new_pack.Fwza0Q/_new 2018-03-04 11:50:07.895495796 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-samba-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-samba-client -Version: 3.1.19 +Version: 4.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,9 +35,8 @@ # new Pam.ycp API Requires: yast2-pam >= 2.14.0 -# .etc.ssh.sshd_config -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 BuildArch: noarch ++++++ yast2-samba-client-3.1.19.tar.bz2 -> yast2-samba-client-4.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.19/package/yast2-samba-client.changes new/yast2-samba-client-4.0.0/package/yast2-samba-client.changes --- old/yast2-samba-client-3.1.19/package/yast2-samba-client.changes 2017-06-12 18:56:01.270130359 +0200 +++ new/yast2-samba-client-4.0.0/package/yast2-samba-client.changes 2018-02-05 12:30:04.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 2 17:03:31 UTC 2018 - knut.anderssen@suse.com + +- SuSEFirewall2 replaced by firewalld (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Fri May 26 09:37:23 UTC 2017 - nopower@suse.com - Enable yast to create temporary smb.conf based on existing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.19/package/yast2-samba-client.spec new/yast2-samba-client-4.0.0/package/yast2-samba-client.spec --- old/yast2-samba-client-3.1.19/package/yast2-samba-client.spec 2017-06-12 18:56:01.270130359 +0200 +++ new/yast2-samba-client-4.0.0/package/yast2-samba-client.spec 2018-02-05 12:30:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 3.1.19 +Version: 4.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,9 +33,8 @@ # new Pam.ycp API Requires: yast2-pam >= 2.14.0 -# .etc.ssh.sshd_config -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 BuildArchitectures: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.1.19/src/modules/Samba.rb new/yast2-samba-client-4.0.0/src/modules/Samba.rb --- old/yast2-samba-client-3.1.19/src/modules/Samba.rb 2017-06-12 18:56:01.270130359 +0200 +++ new/yast2-samba-client-4.0.0/src/modules/Samba.rb 2018-02-05 12:30:04.000000000 +0100 @@ -29,6 +29,7 @@ # Representation of the configuration of samba-client. # Input and output routines. require "yast" +require "y2firewall/firewalld" module Yast class SambaClass < Module @@ -52,7 +53,6 @@ Yast.import "SambaNmbLookup" Yast.import "String" Yast.import "Summary" - Yast.import "SuSEFirewall" Yast.import "OSRelease" @@ -143,6 +143,10 @@ @network_setup = NetworkConfig.Export end + def firewalld + Y2Firewall::Firewalld.instance + end + def PAMMountModified @pam_mount_volumes_orig == nil && @pam_mount_volumes != [] || @pam_mount_volumes_orig != nil && @@ -672,7 +676,7 @@ NetworkConfig.Read @network_setup = NetworkConfig.Export - SuSEFirewall.Read + firewalld.read ReadPAMMount() @@ -903,8 +907,7 @@ WriteHostsResolution() - SuSEFirewall.WriteOnly - SuSEFirewall.ActivateConfiguration if !write_only + write_only ? firewalld.write_only : firewalld.write if WritePAMMount() && Ops.greater_than(Builtins.size(@pam_mount_volumes), 0)