Hello community, here is the log from the commit of package yast2-nfs-server for openSUSE:Factory checked in at 2018-02-02 22:19:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-server" Fri Feb 2 22:19:13 2018 rev:50 rq:572073 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes 2016-06-10 23:59:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new/yast2-nfs-server.changes 2018-02-02 22:19:14.698383177 +0100 @@ -1,0 +2,6 @@ +Fri Feb 2 15:16:24 UTC 2018 - knut.anders...@suse.com + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Old: ---- yast2-nfs-server-3.1.9.tar.bz2 New: ---- yast2-nfs-server-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-server.spec ++++++ --- /var/tmp/diff_new_pack.ggSlGr/_old 2018-02-02 22:19:15.278356101 +0100 +++ /var/tmp/diff_new_pack.ggSlGr/_new 2018-02-02 22:19:15.282355915 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nfs-server # -# Copyright (c) 2016 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,22 +17,21 @@ Name: yast2-nfs-server -Version: 3.1.9 +Version: 4.0.0 Release: 0 Url: https://github.com/yast/yast-nfs-server BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -# Changed implementation for checking if service is enabled 2.23.23 (affects testsuite) +# SuSEFirewall2 replaced by firewalld (fate#323460) BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files -BuildRequires: yast2 >= 2.23.23 +BuildRequires: yast2 >= 4.0.39 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-testsuite -# Service::Find -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 Requires: yast2-nfs-common Recommends: nfs-kernel-server ++++++ yast2-nfs-server-3.1.9.tar.bz2 -> yast2-nfs-server-4.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/.travis.yml new/yast2-nfs-server-4.0.0/.travis.yml --- old/yast2-nfs-server-3.1.9/.travis.yml 2016-06-07 10:55:05.321980484 +0200 +++ new/yast2-nfs-server-4.0.0/.travis.yml 2018-02-02 17:18:54.000000000 +0100 @@ -1,16 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "yast-rake gettext" + - docker build -t yast-nfs-server-image . script: - - rake check:syntax - - rake check:pot - - make -f Makefile.cvs - - make - - sudo make install - - make check - + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-nfs-server-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/.yardopts new/yast2-nfs-server-4.0.0/.yardopts --- old/yast2-nfs-server-3.1.9/.yardopts 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nfs-server-4.0.0/.yardopts 2018-02-02 17:18:54.000000000 +0100 @@ -0,0 +1,7 @@ +--no-private +--markup markdown +--protected +--readme README.md +--output-dir ./doc/autodocs +--files *.md +src/**/*.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/CONTRIBUTING.md new/yast2-nfs-server-4.0.0/CONTRIBUTING.md --- old/yast2-nfs-server-3.1.9/CONTRIBUTING.md 2016-06-07 10:55:05.329980484 +0200 +++ new/yast2-nfs-server-4.0.0/CONTRIBUTING.md 2018-02-02 17:18:54.000000000 +0100 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/Dockerfile new/yast2-nfs-server-4.0.0/Dockerfile --- old/yast2-nfs-server-3.1.9/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nfs-server-4.0.0/Dockerfile 2018-02-02 17:18:54.000000000 +0100 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/package/yast2-nfs-server.changes new/yast2-nfs-server-4.0.0/package/yast2-nfs-server.changes --- old/yast2-nfs-server-3.1.9/package/yast2-nfs-server.changes 2016-06-07 10:55:05.361980484 +0200 +++ new/yast2-nfs-server-4.0.0/package/yast2-nfs-server.changes 2018-02-02 17:18:54.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 2 15:16:24 UTC 2018 - knut.anders...@suse.com + +- Replace SuSEFirewall2 by firewalld (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Tue Jun 7 08:24:14 UTC 2016 - igonzalezs...@suse.com - Stop generating autodocs (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/package/yast2-nfs-server.spec new/yast2-nfs-server-4.0.0/package/yast2-nfs-server.spec --- old/yast2-nfs-server-3.1.9/package/yast2-nfs-server.spec 2016-06-07 10:55:05.361980484 +0200 +++ new/yast2-nfs-server-4.0.0/package/yast2-nfs-server.spec 2018-02-02 17:18:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.9 +Version: 4.0.0 Release: 0 URL: https://github.com/yast/yast-nfs-server @@ -26,13 +26,12 @@ Group: System/YaST License: GPL-2.0+ -# Changed implementation for checking if service is enabled 2.23.23 (affects testsuite) -BuildRequires: yast2 >= 2.23.23 +# SuSEFirewall2 replaced by firewalld (fate#323460) +BuildRequires: yast2 >= 4.0.39 BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite BuildRequires: yast2-devtools >= 3.1.10 -# Service::Find -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# SuSEFirewall2 replaced by firewalld (fate#323460) +Requires: yast2 >= 4.0.39 Requires: yast2-nfs-common Recommends: nfs-kernel-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/src/include/nfs_server/ui.rb new/yast2-nfs-server-4.0.0/src/include/nfs_server/ui.rb --- old/yast2-nfs-server-3.1.9/src/include/nfs_server/ui.rb 2016-06-07 10:55:05.377980484 +0200 +++ new/yast2-nfs-server-4.0.0/src/include/nfs_server/ui.rb 2018-02-02 17:18:54.000000000 +0100 @@ -281,13 +281,9 @@ changed = false - # firewall widget using CWM - fw_settings = { - "services" => ["service:nfs-kernel-server"], # bnc#446163 - "display_details" => true - } fw_cwm_widget = CWMFirewallInterfaces.CreateOpenFirewallWidget( - fw_settings + "services" => ["nfs-kernel-server"], + "display_details" => true ) help_text = @@ -464,7 +460,7 @@ end while ret != :back && ret != :next && ret != :abort if ret == :next - # grab current settings, store them to SuSEFirewall:: + # grab current settings, store them to firewalld:: CWMFirewallInterfaces.OpenFirewallStore(fw_cwm_widget, "", event) NfsServer.start = start_nfs_server NfsServer.domain = Convert.to_string( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.9/src/modules/NfsServer.rb new/yast2-nfs-server-4.0.0/src/modules/NfsServer.rb --- old/yast2-nfs-server-3.1.9/src/modules/NfsServer.rb 2016-06-07 10:55:05.377980484 +0200 +++ new/yast2-nfs-server-4.0.0/src/modules/NfsServer.rb 2018-02-02 17:18:54.000000000 +0100 @@ -15,6 +15,7 @@ # $Id$ # require "yast" +require "y2firewall/firewalld" module Yast class NfsServerClass < Module @@ -25,7 +26,6 @@ Yast.import "Report" Yast.import "Service" Yast.import "Summary" - Yast.import "SuSEFirewall" Yast.import "Wizard" # default value of settings modified @@ -137,7 +137,7 @@ end progress_orig = Progress.set(false) - SuSEFirewall.Read + firewalld.read Progress.set(progress_orig) @exports != nil @@ -306,8 +306,7 @@ end progress_orig = Progress.set(false) - SuSEFirewall.WriteOnly - SuSEFirewall.ActivateConfiguration if !@write_only + @write_only ? firewalld.write_only : firewalld.write Progress.set(progress_orig) Progress.NextStage @@ -379,6 +378,12 @@ publish :function => :Write, :type => "boolean ()" publish :function => :Summary, :type => "string ()" publish :function => :AutoPackages, :type => "map ()" + + private + + def firewalld + Y2Firewall::Firewalld.instance + end end NfsServer = NfsServerClass.new
