Hello community, here is the log from the commit of package yast2-slp for openSUSE:Factory checked in at 2014-02-16 10:28:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-slp (Old) and /work/SRC/openSUSE:Factory/.yast2-slp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-slp" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-slp/yast2-slp.changes 2014-02-06 11:11:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-slp.new/yast2-slp.changes 2014-02-16 10:28:36.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 7 08:57:31 UTC 2014 - [email protected] + +- Improve protocol resolution +- 3.1.3 + +------------------------------------------------------------------- Old: ---- yast2-slp-3.1.2.tar.bz2 New: ---- yast2-slp-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp.spec ++++++ --- /var/tmp/diff_new_pack.nLOgZc/_old 2014-02-16 10:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.nLOgZc/_new 2014-02-16 10:28:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-slp-3.1.2.tar.bz2 -> yast2-slp-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.2/package/yast2-slp.changes new/yast2-slp-3.1.3/package/yast2-slp.changes --- old/yast2-slp-3.1.2/package/yast2-slp.changes 2014-02-04 11:16:53.000000000 +0100 +++ new/yast2-slp-3.1.3/package/yast2-slp.changes 2014-02-12 10:42:05.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 7 08:57:31 UTC 2014 - [email protected] + +- Improve protocol resolution +- 3.1.3 + +------------------------------------------------------------------- Fri Jan 31 10:18:53 UTC 2014 - [email protected] - Add SlpService module (fate#316384) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.2/package/yast2-slp.spec new/yast2-slp-3.1.3/package/yast2-slp.spec --- old/yast2-slp-3.1.2/package/yast2-slp.spec 2014-02-04 11:16:53.000000000 +0100 +++ new/yast2-slp-3.1.3/package/yast2-slp.spec 2014-02-12 10:42:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-slp -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-slp-3.1.2/src/modules/SlpService.rb new/yast2-slp-3.1.3/src/modules/SlpService.rb --- old/yast2-slp-3.1.2/src/modules/SlpService.rb 2014-02-04 11:16:53.000000000 +0100 +++ new/yast2-slp-3.1.3/src/modules/SlpService.rb 2014-02-12 10:42:05.000000000 +0100 @@ -40,9 +40,6 @@ # puts type.name # puts type.protocol # end -# -# The rule is: if the service name is equal to protocol name, don't pass the protocol -# name as parameter to the search query (this is typical i.e. for ntp, ssh or ldap services). require 'resolv' require 'ostruct' @@ -87,7 +84,13 @@ private def create_service_type(service_name, protocol) - [SCHEME, service_name, protocol].compact.join(DELIMITER) + # This check is due to possible duplication in abstract and concrete service types + # http://www.ietf.org/rfc/rfc2608.txt, Section 4.1, Service: URLs + if service_name == protocol + [SCHEME, service_name].join(DELIMITER) + else + [SCHEME, service_name, protocol].compact.join(DELIMITER) + end end def parse_slp_type(service_type) @@ -129,7 +132,7 @@ @port = slp_data['pcPort'] @slp_type = slp_data['pcSrvType'] @slp_url = slp_data['srvurl'] - @protocol = params.delete(:protocol) || slp_type.split(DELIMITER).last + @protocol = slp_type.split(DELIMITER).last @host = DnsCache.resolve(ip) @lifetime = slp_data['lifetime'] @attributes = OpenStruct.new(SLP.GetUnicastAttrMap(slp_url, ip)) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
