Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at 2014-11-15 11:42: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" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ftp-server/yast2-ftp-server.changes 2014-09-19 15:45:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ftp-server.new/yast2-ftp-server.changes 2014-11-15 12:30:51.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Oct 3 14:03:26 UTC 2014 - [email protected] + +- Fixed a configuration problem preventing xinetd to handle vsftp, + since it was always configured as standalone (bnc#897470). +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-ftp-server-3.1.5.tar.bz2 New: ---- yast2-ftp-server-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.ORtSPh/_old 2014-11-15 12:30:51.000000000 +0100 +++ /var/tmp/diff_new_pack.ORtSPh/_new 2014-11-15 12:30:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ftp-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ftp-server-3.1.5.tar.bz2 -> yast2-ftp-server-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/.travis.yml new/yast2-ftp-server-3.1.6/.travis.yml --- old/yast2-ftp-server-3.1.5/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ftp-server-3.1.6/.travis.yml 2014-11-14 18:28:15.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +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 yast2-inetd ruby-rspec" -g "yast-rake gettext" +script: + - rake check:syntax + - rake check:pot + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/README.md new/yast2-ftp-server-3.1.6/README.md --- old/yast2-ftp-server-3.1.5/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ftp-server-3.1.6/README.md 2014-11-14 18:28:15.000000000 +0100 @@ -0,0 +1,5 @@ +# YaST - The FTP Server Configuration Module # + +[](https://travis-ci.org/yast/yast-ftp-server) +[](https://ci.opensuse.org/view/Yast/job/yast-ftp-server-master/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/package/yast2-ftp-server.changes new/yast2-ftp-server-3.1.6/package/yast2-ftp-server.changes --- old/yast2-ftp-server-3.1.5/package/yast2-ftp-server.changes 2014-09-18 17:43:11.000000000 +0200 +++ new/yast2-ftp-server-3.1.6/package/yast2-ftp-server.changes 2014-11-14 18:28:15.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 3 14:03:26 UTC 2014 - [email protected] + +- Fixed a configuration problem preventing xinetd to handle vsftp, + since it was always configured as standalone (bnc#897470). +- 3.1.6 + +------------------------------------------------------------------- Thu Sep 18 12:16:09 CEST 2014 - [email protected] - Autoyast Import:Evaluate the kind of ftpserver at first. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/package/yast2-ftp-server.spec new/yast2-ftp-server-3.1.6/package/yast2-ftp-server.spec --- old/yast2-ftp-server-3.1.5/package/yast2-ftp-server.spec 2014-09-18 17:43:11.000000000 +0200 +++ new/yast2-ftp-server-3.1.6/package/yast2-ftp-server.spec 2014-11-14 18:28:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ftp-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/src/include/ftp-server/write_load.rb new/yast2-ftp-server-3.1.6/src/include/ftp-server/write_load.rb --- old/yast2-ftp-server-3.1.5/src/include/ftp-server/write_load.rb 2014-09-18 17:43:11.000000000 +0200 +++ new/yast2-ftp-server-3.1.6/src/include/ftp-server/write_load.rb 2014-11-14 13:28:13.000000000 +0100 @@ -1360,8 +1360,8 @@ Service.Disable("vsftpd") if Service.Enabled("vsftpd") Service.Disable("pure-ftpd") if Service.Enabled("pure-ftpd") if @vsftpd_edit - Ops.set(@VS_SETTINGS, "listen", nil) - Ops.set(@VS_SETTINGS, "listen_ipv6", nil) + Ops.set(@VS_SETTINGS, "listen", "NO") + Ops.set(@VS_SETTINGS, "listen_ipv6", "NO") else Ops.set(@PURE_SETTINGS, "Daemonize", "NO") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/test/ftpserver_test.rb new/yast2-ftp-server-3.1.6/test/ftpserver_test.rb --- old/yast2-ftp-server-3.1.5/test/ftpserver_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ftp-server-3.1.6/test/ftpserver_test.rb 2014-11-14 13:28:13.000000000 +0100 @@ -0,0 +1,204 @@ +#! /usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +Yast.import "FtpServer" + +VS_CONFIG_PATH = Yast::Path.new(".vsftpd") +PURE_CONFIG_PATH = Yast::Path.new(".pure-ftpd") + +def mock_config(config_path, map) + allow(Yast::SCR).to receive(:Dir).with(config_path).and_return(map.keys) + map.each_pair do |key, value| + allow(Yast::SCR).to receive(:Read).with(config_path + key).and_return(value) + end +end + +VS_SETTINGS = { + "write_enable" => "NO", + "dirmessage_enable" => "YES", + "nopriv_user" => "ftpsecure", + "local_enable" => "YES", + "anonymous_enable" => "YES", + "anon_world_readable_only" => "YES", + "syslog_enable" => "YES", + "connect_from_port_20" => "YES", + "ascii_upload_enable" => "YES", + "pam_service_name" => "vsftpd", + "listen" => "NO", + "listen_ipv6" => "YES", + "ssl_enable" => "NO", + "pasv_min_port" => "30000", + "pasv_max_port" => "30100" +} + +PURE_SETTINGS = { + "AllowAnonymousFXP" => "no", + "AllowDotFiles" => "yes", + "AllowUserFXP" => "no", + "AnonymousCanCreateDirs" => "no", + "AnonymousCantUpload" => "yes", + "AnonymousOnly" => "yes", + "AntiWarez" => "yes", + "AutoRename" => "yes", + "BrokenClientsCompatibility" => "no", + "ChrootEveryone" => "yes", + "CustomerProof" => "yes", + "Daemonize" => "no", + "DisplayDotFiles" => "yes", + "DontResolve" => "yes", + "LimitRecursion" => "10000 8", + "MaxClientsNumber" => "10", + "MaxClientsPerIP" => "3", + "MaxDiskUsage" => "99", + "MaxIdleTime" => "15", + "MaxLoad" => "4", + "MinUID" => "40", + "NoAnonymous" => "no", + "NoRename" => "yes", + "PAMAuthentication" => "yes", + "PassivePortRange" => "30000 30100", + "ProhibitDotFilesRead" => "no", + "ProhibitDotFilesWrite" => "yes", + "SyslogFacility" => "ftp", + "VerboseLog" => "no" +} + +describe "Yast::FtpServer" do + describe ".ValueUI" do + context "'VerboseLogging' when getting vsftpd settings" do + before do + Yast::FtpServer.vsftpd_edit = true + end + + it "returns default value 'YES' if 'log_ftp_protocol' missing in config file" do + mock_config(VS_CONFIG_PATH, VS_SETTINGS) + Yast::FtpServer.ReadVSFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" + end + + it "returns value from config file 'NO' if 'log_ftp_protocol = NO' in config file" do + mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" => "NO")) + Yast::FtpServer.ReadVSFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" + end + + it "returns value from config file 'YES' if 'log_ftp_protocol = YES' in config file" do + mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" => "YES")) + Yast::FtpServer.ReadVSFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" + end + end + + context "'VerboseLogging' when getting pure-ftpd settings" do + before do + Yast::FtpServer.vsftpd_edit = false + end + + it "returns default value 'NO' if config file empty" do + mock_config(PURE_CONFIG_PATH, {}) + Yast::FtpServer.ReadPUREFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" + end + + it "returns value from config file 'NO' if 'VerboseLog = no' in config file" do + mock_config(PURE_CONFIG_PATH, PURE_SETTINGS) + Yast::FtpServer.ReadPUREFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" + end + + it "returns value from config file 'YES' if 'VerboseLog = yes' in config file" do + mock_config(PURE_CONFIG_PATH, PURE_SETTINGS.merge("VerboseLog" => "YES")) + Yast::FtpServer.ReadPUREFTPDSettings() + + expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" + end + end + + context "using vsftpd" do + before do + Yast::FtpServer.vsftpd_edit = true + # Init values to a known (and invalid) state + mock_config(VS_CONFIG_PATH, + VS_SETTINGS.merge("listen" => "", "listen_ipv6" => "")) + end + + context "configured to use xinetd" do + before do + Yast::FtpServer.EDIT_SETTINGS["StartDaemon"] = "2" + Yast::FtpServer.EDIT_SETTINGS["StartXinetd"] = "YES" + end + + it "disables vsftpd's standalone mode when writing StartXinetd" do + allow(Yast::Service).to receive(:Enabled).and_return false + + Yast::FtpServer.ValueUI("StartXinetd", true) + + expect(Yast::FtpServer.VS_SETTINGS["listen"]).to eq("NO") + expect(Yast::FtpServer.VS_SETTINGS["listen_ipv6"]).to eq("NO") + end + + it "disables vsftpd service when writing StartXinetd" do + allow(Yast::Service).to receive(:Enabled).with("pure-ftpd").and_return false + allow(Yast::Service).to receive(:Enabled).with("vsftpd").and_return true + expect(Yast::Service).to receive(:Disable).with("vsftpd") + + Yast::FtpServer.ValueUI("StartXinetd", true) + end + end + + context "configured to run at boot" do + before do + Yast::FtpServer.EDIT_SETTINGS["StartDaemon"] = "1" + end + + it "enables vsftpd's standalone mode when writing StartXinetd" do + allow(Yast::Service).to receive(:Disable) + allow(Yast::Service).to receive(:Enable) + + Yast::FtpServer.ValueUI("StartXinetd", true) + + expect(Yast::FtpServer.VS_SETTINGS["listen"]).to eq("YES") + expect(Yast::FtpServer.VS_SETTINGS["listen_ipv6"]).to be_nil + end + + it "configures ftp services when writing StartXinetd" do + expect(Yast::Service).to receive(:Disable).with("pure-ftpd") + expect(Yast::Service).to receive(:Enable).with("vsftpd") + + Yast::FtpServer.ValueUI("StartXinetd", true) + end + end + + context "configured to run manually" do + before do + Yast::FtpServer.EDIT_SETTINGS["StartDaemon"] = "0" + end + + it "enables vsftpd's standalone mode when writing StartXinetd" do + allow(Yast::Service).to receive(:Disable) + allow(Yast::Service).to receive(:Enable) + + Yast::FtpServer.ValueUI("StartXinetd", true) + + expect(Yast::FtpServer.VS_SETTINGS["listen"]).to eq("YES") + expect(Yast::FtpServer.VS_SETTINGS["listen_ipv6"]).to be_nil + end + + it "disables ftp services when writing StartXinetd" do + expect(Yast::Service).to receive(:Disable).with("pure-ftpd") + expect(Yast::Service).to receive(:Disable).with("vsftpd") + + Yast::FtpServer.ValueUI("StartXinetd", true) + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-3.1.5/test/verbose_logging_test.rb new/yast2-ftp-server-3.1.6/test/verbose_logging_test.rb --- old/yast2-ftp-server-3.1.5/test/verbose_logging_test.rb 2014-09-18 17:43:11.000000000 +0200 +++ new/yast2-ftp-server-3.1.6/test/verbose_logging_test.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,126 +0,0 @@ -#! /usr/bin/env rspec - -ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) - -require "yast" - -Yast.import "FtpServer" - -VS_CONFIG_PATH = Yast::Path.new(".vsftpd") -PURE_CONFIG_PATH = Yast::Path.new(".pure-ftpd") - -def mock_config(config_path, map) - allow(Yast::SCR).to receive(:Dir).with(config_path).and_return(map.keys) - map.each_pair do |key, value| - allow(Yast::SCR).to receive(:Read).with(config_path + key).and_return(value) - end -end - -VS_SETTINGS = { - "write_enable" => "NO", - "dirmessage_enable" => "YES", - "nopriv_user" => "ftpsecure", - "local_enable" => "YES", - "anonymous_enable" => "YES", - "anon_world_readable_only" => "YES", - "syslog_enable" => "YES", - "connect_from_port_20" => "YES", - "ascii_upload_enable" => "YES", - "pam_service_name" => "vsftpd", - "listen" => "NO", - "listen_ipv6" => "YES", - "ssl_enable" => "NO", - "pasv_min_port" => "30000", - "pasv_max_port" => "30100" -} - -PURE_SETTINGS = { - "AllowAnonymousFXP" => "no", - "AllowDotFiles" => "yes", - "AllowUserFXP" => "no", - "AnonymousCanCreateDirs" => "no", - "AnonymousCantUpload" => "yes", - "AnonymousOnly" => "yes", - "AntiWarez" => "yes", - "AutoRename" => "yes", - "BrokenClientsCompatibility" => "no", - "ChrootEveryone" => "yes", - "CustomerProof" => "yes", - "Daemonize" => "no", - "DisplayDotFiles" => "yes", - "DontResolve" => "yes", - "LimitRecursion" => "10000 8", - "MaxClientsNumber" => "10", - "MaxClientsPerIP" => "3", - "MaxDiskUsage" => "99", - "MaxIdleTime" => "15", - "MaxLoad" => "4", - "MinUID" => "40", - "NoAnonymous" => "no", - "NoRename" => "yes", - "PAMAuthentication" => "yes", - "PassivePortRange" => "30000 30100", - "ProhibitDotFilesRead" => "no", - "ProhibitDotFilesWrite" => "yes", - "SyslogFacility" => "ftp", - "VerboseLog" => "no" -} - -describe "Yast::FtpServer" do - describe "#ValueUI" do - context "'VerboseLogging' when getting vsftpd settings" do - before do - Yast::FtpServer.vsftpd_edit = true - end - - it "returns default value 'YES' if 'log_ftp_protocol' missing in config file" do - mock_config(VS_CONFIG_PATH, VS_SETTINGS) - Yast::FtpServer.ReadVSFTPDSettings() - - expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" - end - - it "returns value from config file 'NO' if 'log_ftp_protocol = NO' in config file" do - mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" => "NO")) - Yast::FtpServer.ReadVSFTPDSettings() - - expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" - end - - it "returns value from config file 'YES' if 'log_ftp_protocol = YES' in config file" do - mock_config(VS_CONFIG_PATH, VS_SETTINGS.merge("log_ftp_protocol" => "YES")) - Yast::FtpServer.ReadVSFTPDSettings() - - expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" - end - end - - context "'VerboseLogging' when getting pure-ftpd settings" do - before do - Yast::FtpServer.vsftpd_edit = false - end - - it "returns default value 'NO' if config file empty" do - mock_config(PURE_CONFIG_PATH, {}) - Yast::FtpServer.ReadPUREFTPDSettings() - - expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" - end - - it "returns value from config file 'NO' if 'VerboseLog = no' in config file" do - mock_config(PURE_CONFIG_PATH, PURE_SETTINGS) - Yast::FtpServer.ReadPUREFTPDSettings() - - expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "NO" - end - - it "returns value from config file 'YES' if 'VerboseLog = yes' in config file" do - mock_config(PURE_CONFIG_PATH, PURE_SETTINGS.merge("VerboseLog" => "YES")) - Yast::FtpServer.ReadPUREFTPDSettings() - - expect(Yast::FtpServer.ValueUI("VerboseLogging", false)).to eql "YES" - end - end - - end -end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
