Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2018-02-03 15:42:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ftp-server" Sat Feb 3 15:42:40 2018 rev:55 rq:572171 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2017-07-12 19:35:34.464006486 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes 2018-02-03 15:42:51.972352049 +0100 @@ -1,0 +2,6 @@ +Mon Jan 29 19:35:29 UTC 2018 - [email protected] + +- SuSEFirewall2 replaced by firewalld (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-3.3.0.tar.bz2 New: ---- yast2-ftp-server-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.mEF72t/_old 2018-02-03 15:42:52.568324213 +0100 +++ /var/tmp/diff_new_pack.mEF72t/_new 2018-02-03 15:42:52.572324027 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ftp-server # -# 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,17 +17,18 @@ Name: yast2-ftp-server -Version: 3.3.0 +Version: 4.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# SuSEFirewall2 replace by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 Requires: yast2-inetd BuildRequires: update-desktop-files -BuildRequires: yast2 +# SuSEFirewall2 replace by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: rubygem(%rb_default_ruby_abi:rspec) BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) ++++++ yast2-ftp-server-3.3.0.tar.bz2 -> yast2-ftp-server-4.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.3.0/README.md new/yast2-ftp-server-4.0.0/README.md --- old/yast2-ftp-server-3.3.0/README.md 2017-07-11 09:41:46.309229744 +0200 +++ new/yast2-ftp-server-4.0.0/README.md 2018-02-02 07:49:54.000000000 +0100 @@ -2,4 +2,4 @@ [](https://travis-ci.org/yast/yast-ftp-server) [](https://ci.opensuse.org/view/Yast/job/yast-ftp-server-master/) - +[](https://coveralls.io/github/yast/yast-ftp-server?branch=master) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.3.0/package/yast2-ftp-server.changes new/yast2-ftp-server-4.0.0/package/yast2-ftp-server.changes --- old/yast2-ftp-server-3.3.0/package/yast2-ftp-server.changes 2017-07-11 09:41:46.313229744 +0200 +++ new/yast2-ftp-server-4.0.0/package/yast2-ftp-server.changes 2018-02-02 07:49:54.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 29 19:35:29 UTC 2018 - [email protected] + +- SuSEFirewall2 replaced by firewalld (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Mon Jul 10 14:20:16 CEST 2017 - [email protected] - Added missing StartDaemon flag to internal data structure in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.3.0/package/yast2-ftp-server.spec new/yast2-ftp-server-4.0.0/package/yast2-ftp-server.spec --- old/yast2-ftp-server-3.3.0/package/yast2-ftp-server.spec 2017-07-11 09:41:46.313229744 +0200 +++ new/yast2-ftp-server-4.0.0/package/yast2-ftp-server.spec 2018-02-02 07:49:54.000000000 +0100 @@ -17,17 +17,18 @@ Name: yast2-ftp-server -Version: 3.3.0 +Version: 4.0.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# SuSEFirewall2 replace by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 Requires: yast2-inetd BuildRequires: update-desktop-files -BuildRequires: yast2 +# SuSEFirewall2 replace by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: rubygem(%rb_default_ruby_abi:rspec) BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.3.0/src/include/ftp-server/dialogs.rb new/yast2-ftp-server-4.0.0/src/include/ftp-server/dialogs.rb --- old/yast2-ftp-server-3.3.0/src/include/ftp-server/dialogs.rb 2017-07-11 09:41:46.313229744 +0200 +++ new/yast2-ftp-server-4.0.0/src/include/ftp-server/dialogs.rb 2018-02-02 07:49:54.000000000 +0100 @@ -25,10 +25,6 @@ Yast.include include_target, "ftp-server/helps.rb" Yast.include include_target, "ftp-server/wid_functions.rb" - - - - # map for description of widget later in CWNTree # widget_descr (vsftpd) # @@ -1513,19 +1509,15 @@ deep_copy(result) end - # Init function where are added firewall # # @return [Hash{String => Object}] map for firewall settings - def FirewallSettingsPure - result = {} - - Ops.set(result, "services", ["service:pure-ftpd"]) - Ops.set(result, "display_details", true) - - deep_copy(result) + { + "services" => ["pure-ftpd"], + "display_details" => true + } end # Init function where are added firewall @@ -1534,12 +1526,10 @@ def FirewallSettingsVs - result = {} - - Ops.set(result, "services", ["service:vsftpd"]) - Ops.set(result, "display_details", true) - - deep_copy(result) + { + "services" => ["vsftpd"], + "display_details" => true + } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.3.0/src/modules/FtpServer.rb new/yast2-ftp-server-4.0.0/src/modules/FtpServer.rb --- old/yast2-ftp-server-3.3.0/src/modules/FtpServer.rb 2017-07-11 09:41:46.321229744 +0200 +++ new/yast2-ftp-server-4.0.0/src/modules/FtpServer.rb 2018-02-02 07:49:54.000000000 +0100 @@ -30,8 +30,6 @@ Yast.import "Package" Yast.import "CommandLine" Yast.import "Users" - Yast.import "SuSEFirewall" - Yast.import "SuSEFirewallServices" Yast.import "PortAliases" # Data was modified? @@ -241,6 +239,10 @@ @write_only = false end + def firewalld + @firewalld ||= Y2Firewall::Firewalld.instance + end + # Read current pure-ftpd configuration # # @return [Boolean] successfull @@ -472,7 +474,7 @@ end #read firewall settings progress_orig = Progress.set(false) - SuSEFirewall.Read + firewalld.read Progress.set(progress_orig) #read existing upload directory for vsftpd result = ReadVSFTPDUpload() if @vsftpd_edit @@ -539,36 +541,29 @@ port_range = "" active_port = "" - if SuSEFirewall.IsStarted - if Ops.get(@EDIT_SETTINGS, "PassiveMode") == "YES" - port_range = Ops.add( - Ops.add(Ops.get(@EDIT_SETTINGS, "PasMinPort"), ":"), - Ops.get(@EDIT_SETTINGS, "PasMaxPort") - ) - else - active_port = PortAliases.IsKnownPortName("ftp-data") ? "ftp-data" : "20" - end + return true if !firewalld.running? - suse_config = { - "tcp_ports" => [ - PortAliases.IsKnownPortName("ftp") ? "ftp" : "21", - active_port != "" ? active_port : port_range - ] - } - - if @vsftpd_edit - return SuSEFirewallServices.SetNeededPortsAndProtocols( - "service:vsftpd", - suse_config - ) - else - return SuSEFirewallServices.SetNeededPortsAndProtocols( - "service:pure-ftpd", - suse_config - ) - end + if Ops.get(@EDIT_SETTINGS, "PassiveMode") == "YES" + port_range = Ops.add( + Ops.add(Ops.get(@EDIT_SETTINGS, "PasMinPort"), ":"), + Ops.get(@EDIT_SETTINGS, "PasMaxPort") + ) else - return true + active_port = PortAliases.IsKnownPortName("ftp-data") ? "ftp-data" : "20" + end + + tcp_ports = [ + PortAliases.IsKnownPortName("ftp") ? "ftp" : "21", + active_port != "" ? active_port : port_range + ] + + service = @vsftpd_edit ? "pure-ftpd" : "vsftpd" + + begin + return Y2Firewall::Firewalld::Service.modify_ports(name: service, tcp_ports: tcp_ports) + rescue Y2Firewall::Firewalld::Service::NotFound + y2error("Firewalld 'cluster' service is not available.") + return false end end @@ -630,7 +625,7 @@ if result # write configuration to the firewall progress_orig = Progress.set(false) - result = SuSEFirewall.Write + result = firewalld.write Progress.set(progress_orig) end result diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.3.0/test/ftpserver_test.rb new/yast2-ftp-server-4.0.0/test/ftpserver_test.rb --- old/yast2-ftp-server-3.3.0/test/ftpserver_test.rb 2017-07-11 09:41:46.321229744 +0200 +++ new/yast2-ftp-server-4.0.0/test/ftpserver_test.rb 2018-02-02 07:49:54.000000000 +0100 @@ -4,6 +4,27 @@ require "yast" +if ENV["COVERAGE"] + require "simplecov" + SimpleCov.start do + # Don't measure coverage of the tests themselves. + add_filter "/test/" + end + + # track all ruby files under src + src_location = File.expand_path("../../src", __FILE__) + SimpleCov.track_files("#{src_location}/**/*.rb") + + # use coveralls for on-line code coverage reporting at Travis CI + if ENV["TRAVIS"] + require "coveralls" + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + SimpleCov::Formatter::HTMLFormatter, + Coveralls::SimpleCov::Formatter + ] + end +end + # stub module to prevent its Import # Useful for modules from different yast packages, to avoid build dependencies def stub_module(name)
