Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2018-02-14 14:19:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ftp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-ftp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ftp-server" Wed Feb 14 14:19:00 2018 rev:57 rq:576474 version:4.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2018-02-09 15:51:43.902371840 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes 2018-02-14 14:19:01.992247785 +0100 @@ -1,0 +2,7 @@ +Thu Feb 8 20:58:22 UTC 2018 - [email protected] + +- Replace CWMServiceStart xinetd methods or parameters by socket + ones (fate#323373) +- 4.0.2 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-4.0.1.tar.bz2 New: ---- yast2-ftp-server-4.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.r6bDAv/_old 2018-02-14 14:19:02.684222845 +0100 +++ /var/tmp/diff_new_pack.r6bDAv/_new 2018-02-14 14:19:02.684222845 +0100 @@ -17,17 +17,17 @@ Name: yast2-ftp-server -Version: 4.0.1 +Version: 4.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -# SuSEFirewall2 replace by firewalld (fate#323460) -Requires: yast2 >= 4.0.39 +# Replace xinetd by systemd socket activation (fate#323373) +Requires: yast2 >= 4.0.50 BuildRequires: update-desktop-files -# SuSEFirewall2 replace by firewalld (fate#323460) -BuildRequires: yast2 >= 4.0.39 +# Replace xinetd by systemd socket activation (fate#323373) +BuildRequires: yast2 >= 4.0.50 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: rubygem(%rb_default_ruby_abi:rspec) BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) ++++++ yast2-ftp-server-4.0.1.tar.bz2 -> yast2-ftp-server-4.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.0.1/package/yast2-ftp-server.changes new/yast2-ftp-server-4.0.2/package/yast2-ftp-server.changes --- old/yast2-ftp-server-4.0.1/package/yast2-ftp-server.changes 2018-02-08 17:54:08.000000000 +0100 +++ new/yast2-ftp-server-4.0.2/package/yast2-ftp-server.changes 2018-02-09 11:48:57.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 8 20:58:22 UTC 2018 - [email protected] + +- Replace CWMServiceStart xinetd methods or parameters by socket + ones (fate#323373) +- 4.0.2 + +------------------------------------------------------------------- Thu Feb 8 15:07:37 UTC 2018 - [email protected] - convert starting on demand from Xinetd to systemd sockets due diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.0.1/package/yast2-ftp-server.spec new/yast2-ftp-server-4.0.2/package/yast2-ftp-server.spec --- old/yast2-ftp-server-4.0.1/package/yast2-ftp-server.spec 2018-02-08 17:54:08.000000000 +0100 +++ new/yast2-ftp-server-4.0.2/package/yast2-ftp-server.spec 2018-02-09 11:48:57.000000000 +0100 @@ -17,17 +17,17 @@ Name: yast2-ftp-server -Version: 4.0.1 +Version: 4.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -# SuSEFirewall2 replace by firewalld (fate#323460) -Requires: yast2 >= 4.0.39 +# Replace xinetd by systemd socket activation (fate#323373) +Requires: yast2 >= 4.0.50 BuildRequires: update-desktop-files -# SuSEFirewall2 replace by firewalld (fate#323460) -BuildRequires: yast2 >= 4.0.39 +# Replace xinetd by systemd socket activation (fate#323373) +BuildRequires: yast2 >= 4.0.50 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-4.0.1/src/include/ftp-server/dialogs.rb new/yast2-ftp-server-4.0.2/src/include/ftp-server/dialogs.rb --- old/yast2-ftp-server-4.0.1/src/include/ftp-server/dialogs.rb 2018-02-08 17:54:08.000000000 +0100 +++ new/yast2-ftp-server-4.0.2/src/include/ftp-server/dialogs.rb 2018-02-09 11:48:57.000000000 +0100 @@ -121,28 +121,20 @@ ) Ops.set( result, - "get_service_start_via_xinetd", + "get_service_start_via_socket", fun_ref(method(:"started_via_socket?"), "boolean ()") ) Ops.set( result, - "set_service_start_via_xinetd", + "set_service_start_via_socket", fun_ref(method(:"start_via_socket="), "void (boolean)") ) - # TRANSLATORS: Radio selection - Ops.set(result, "start_auto_button", _("&When booting")) - Ops.set(result, "start_manual_button", _("&Manually")) - Ops.set(result, "start_xinetd_button", _("Via &xinetd")) Ops.set( result, "help", - Builtins.sformat( - CWMServiceStart.AutoStartHelpXinetdTemplate, - _("When Booting"), - _("Manually"), - _("Via Socket") - ) + CWMServiceStart.AutoStartSocketHelp ) + deep_copy(result) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-4.0.1/src/modules/FtpServer.rb new/yast2-ftp-server-4.0.2/src/modules/FtpServer.rb --- old/yast2-ftp-server-4.0.1/src/modules/FtpServer.rb 2018-02-08 17:54:08.000000000 +0100 +++ new/yast2-ftp-server-4.0.2/src/modules/FtpServer.rb 2018-02-09 11:48:57.000000000 +0100 @@ -420,7 +420,7 @@ true end - # Remap UI pure-ftpd or vsftpd configuration + # Remap UI vsftpd configuration # to write structure for SCR # # @return [Boolean] successfull @@ -868,9 +868,7 @@ publish_variable :modified, "boolean" publish_variable :proposal_valid, "boolean" publish_variable :vsftpd_installed, "boolean" - publish_variable :pureftpd_installed, "boolean" publish_variable :vsftpd_xined_id, "integer" - publish_variable :pureftpd_xined_id, "integer" publish_variable :create_upload_dir, "boolean" publish_variable :upload_good_permission, "boolean" publish_variable :pure_ftp_allowed_permissios_upload, "integer"
