Hello community, here is the log from the commit of package yast2-inetd for openSUSE:Factory checked in at 2014-10-08 22:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-inetd (Old) and /work/SRC/openSUSE:Factory/.yast2-inetd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-inetd" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-inetd/yast2-inetd.changes 2014-09-07 11:09:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-inetd.new/yast2-inetd.changes 2014-10-08 22:13:35.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 29 10:51:23 CEST 2014 - sch...@suse.de + +- Checking nil parameters (server,server_args) in GetServerBasename + before making a dup. (bnc#898745) +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-inetd-3.1.8.tar.bz2 New: ---- yast2-inetd-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-inetd.spec ++++++ --- /var/tmp/diff_new_pack.chXRAF/_old 2014-10-08 22:13:36.000000000 +0200 +++ /var/tmp/diff_new_pack.chXRAF/_new 2014-10-08 22:13:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-inetd ++++++ yast2-inetd-3.1.8.tar.bz2 -> yast2-inetd-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/MAINTAINER new/yast2-inetd-3.1.9/MAINTAINER --- old/yast2-inetd-3.1.8/MAINTAINER 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/MAINTAINER 2014-10-08 11:03:10.000000000 +0200 @@ -1 +1 @@ -YaST2 Maintainers <yast2-maintain...@suse.de> +Deprecated file. Use `osc maintainer yast2-inetd` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/package/yast2-inetd.changes new/yast2-inetd-3.1.9/package/yast2-inetd.changes --- old/yast2-inetd-3.1.8/package/yast2-inetd.changes 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/package/yast2-inetd.changes 2014-10-08 11:03:10.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 29 10:51:23 CEST 2014 - sch...@suse.de + +- Checking nil parameters (server,server_args) in GetServerBasename + before making a dup. (bnc#898745) +- 3.1.9 + +------------------------------------------------------------------- Thu Sep 4 12:21:02 UTC 2014 - mvid...@suse.com - Use a more flexible rubygem requirement syntax (bnc#895069) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/package/yast2-inetd.spec new/yast2-inetd-3.1.9/package/yast2-inetd.spec --- old/yast2-inetd-3.1.8/package/yast2-inetd.spec 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/package/yast2-inetd.spec 2014-10-08 11:03:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.8 +Version: 3.1.9 Release: 0 Url: https://github.com/yast/yast-inetd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/src/include/inetd/routines.rb new/yast2-inetd-3.1.9/src/include/inetd/routines.rb --- old/yast2-inetd-3.1.8/src/include/inetd/routines.rb 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/src/include/inetd/routines.rb 2014-10-08 11:03:10.000000000 +0200 @@ -81,18 +81,18 @@ # @param [String] server_args "server_args" field of a service # @return basename of the real server def GetServerBasename(server, server_args) - result = (server == TCPD_BINARY ? server_args : server).dup + arg = server == TCPD_BINARY ? server_args : server + return nil unless arg - # check nil - if result && !result.empty? - # find the server name - server_path = result.strip.split(/[ \t]/).first - result = File.basename(server_path) - end + arg = arg.dup # do we really modify arg??? - result + server_path = arg.strip.split(/[ \t]/).first + return server_path if !server_path || server_path.empty? + + File.basename(server_path) end + # Considers the maps as structs and tests # some of their fields for equality (conjunctively, short circuit). # @param [Hash] a one struct diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.8/test/inetd_test.rb new/yast2-inetd-3.1.9/test/inetd_test.rb --- old/yast2-inetd-3.1.8/test/inetd_test.rb 2014-09-04 16:29:36.000000000 +0200 +++ new/yast2-inetd-3.1.9/test/inetd_test.rb 2014-10-08 11:03:10.000000000 +0200 @@ -54,5 +54,96 @@ end end end + + context "GetServerBasename: return basename of the real server" do + + context "server binary is tcpd" do + let(:tcpd_name) { "/usr/sbin/tcpd" } + + context "server name is defined in server_args" do + it "returns server name from server_args" do + expect(Yast::Inetd.GetServerBasename(tcpd_name, "/usr/sbin/in.rlogin")).to eq("in.rlogin") + expect(Yast::Inetd.GetServerBasename(tcpd_name, "/usr/sbin/in.rlogin arg")).to eq("in.rlogin") + end + end + + context "server name is not defined in server_args" do + it "returns nil" do + expect(Yast::Inetd.GetServerBasename(tcpd_name, "")).to be_nil + expect(Yast::Inetd.GetServerBasename(tcpd_name, nil)).to be_nil + end + end + end + + context "server binary is not tcpd" do + let(:texecd_name) { "/usr/sbin/in.texecd" } + it "returns given server name" do + expect(Yast::Inetd.GetServerBasename(texecd_name, nil)).to eq("in.texecd") + expect(Yast::Inetd.GetServerBasename(texecd_name, "not interested")).to eq("in.texecd") + end + end + + context "server binary is nil" do + it "returns nil" do + expect(Yast::Inetd.GetServerBasename(nil, nil)).to be_nil + expect(Yast::Inetd.GetServerBasename(nil, "not interested")).to be_nil + end + end + end + + context "MergeAyProfile: Merges AY profile items into a target list (defaults or system)" do + it "Merging profiles" do + target = [ + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/time", + "protocol"=>"tcp", + "script"=>"time", + "service"=>"time" + } + ] + changes = [ + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/services", + "protocol"=>"tcp", + "script"=>"services", + "service"=>"services" }, + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/vnc", + "protocol"=>"tcp", + "script"=>"vnc", + "server"=>"/usr/bin/Xvnc", + "server_args"=>"-noreset -inetd -once -query localhost", + "service"=>"vnc1" }, + { "enabled"=>true, + "iid"=>"1:/etc/xinetd.d/time", + "protocol"=>"tcp", + "script"=>"time", + "service"=>"time" + } + ] + ret = [ + { "enabled"=>true, + "iid"=>"1:/etc/xinetd.d/time", + "protocol"=>"tcp", + "script"=>"time", + "service"=>"time", + "changed"=>true }, + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/services", + "protocol"=>"tcp", + "script"=>"services", + "service"=>"services" }, + { "enabled"=>false, + "iid"=>"1:/etc/xinetd.d/vnc", + "protocol"=>"tcp", + "script"=>"vnc", + "server"=>"/usr/bin/Xvnc", + "server_args"=>"-noreset -inetd -once -query localhost", + "service"=>"vnc1" } + ] + expect(Yast::Inetd.MergeAyProfile(target, changes)).to eq(ret) + end + end + end end -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
