Hello community, here is the log from the commit of package SUSEConnect for openSUSE:Factory checked in at 2020-11-29 12:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SUSEConnect (Old) and /work/SRC/openSUSE:Factory/.SUSEConnect.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SUSEConnect" Sun Nov 29 12:24:40 2020 rev:23 rq:850688 version:0.3.29 Changes: -------- --- /work/SRC/openSUSE:Factory/SUSEConnect/SUSEConnect.changes 2020-09-03 01:13:05.560447134 +0200 +++ /work/SRC/openSUSE:Factory/.SUSEConnect.new.5913/SUSEConnect.changes 2020-11-29 12:24:57.969792078 +0100 @@ -1,0 +2 @@ +Tue Nov 17 09:36:24 UTC 2020 - Tamara Schmitz <[email protected]> @@ -2,0 +4,20 @@ +- Update to 0.3.29 +- replace env ruby path with native ruby path during build phase + +------------------------------------------------------------------- +Mon Sep 28 17:36:08 UTC 2020 - Thomas Schmidt <[email protected]> + +- Recognize more formats when parsing .curlrc for proxy credentials (bsc#1155027) +- Add rpmlintrc to filter false-positive warning about patch not applied + +------------------------------------------------------------------ +Mon Aug 31 14:10:15 UTC 2020 - Thomas Muntaner <[email protected]> + +- Update to 0.3.27 +- SUSEConnect now ensures that it writes its configuration when it + encounters errors. This helps in the situation where SUSEConnect + announces itself, but fails during a later step. Without the saved + configuration, a system could have credentials, but be unsure which + registration proxy they're valid for. + +------------------------------------------------------------------- Old: ---- suse-connect-0.3.26.gem New: ---- SUSEConnect-rpmlintrc suse-connect-0.3.29.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SUSEConnect.spec ++++++ --- /var/tmp/diff_new_pack.5hBLVI/_old 2020-11-29 12:25:00.073794206 +0100 +++ /var/tmp/diff_new_pack.5hBLVI/_new 2020-11-29 12:25:00.077794210 +0100 @@ -17,7 +17,7 @@ Name: SUSEConnect -Version: 0.3.26 +Version: 0.3.29 Release: 0 %define mod_name suse-connect %define mod_full_name %{mod_name}-%{version} @@ -83,6 +83,7 @@ Source1: %{name}.5 Source2: %{name}.8 Source3: %{name}.example +Source4: %{name}-rpmlintrc Patch0: switch_server_cert_location_to_etc.patch Summary: Utility to register a system with the SUSE Customer Center @@ -127,6 +128,10 @@ mkdir -p %{buildroot}%_sysconfdir/zypp/credentials.d/ touch %{buildroot}%_sysconfdir/zypp/credentials.d/SCCcredentials +# replace /usr/bin/env with native ruby path +sed -i "1s/.*/#\!\/usr\/bin\/ruby\.%{ruby_version}/" %{buildroot}%{_sbindir}/%{name} +sed -i "1s/.*/#\!\/usr\/bin\/ruby\.%{ruby_version}/" %{buildroot}%{gem_base}/gems/%{mod_full_name}/bin/%{name} + %post if [ -s /etc/zypp/credentials.d/NCCcredentials ] && [ ! -e /etc/zypp/credentials.d/SCCcredentials ]; then echo "Imported NCC system credentials to /etc/zypp/credentials.d/SCCcredentials" ++++++ SUSEConnect-rpmlintrc ++++++ # this patch gets applied conditionally inline the .spec file addFilter("SUSEConnect.src: W: patch-not-applied Patch0: switch_server_cert_location_to_etc.patch") ++++++ SUSEConnect.5 ++++++ --- /var/tmp/diff_new_pack.5hBLVI/_old 2020-11-29 12:25:00.117794251 +0100 +++ /var/tmp/diff_new_pack.5hBLVI/_new 2020-11-29 12:25:00.117794251 +0100 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "5" "August 2020" "" "SUSEConnect" +.TH "SUSECONNECT" "5" "April 2019" "" "SUSEConnect" . .SH "NAME" \fBSUSEConnect\fR \- SUSE Customer Center registration tool config file ++++++ suse-connect-0.3.26.gem -> suse-connect-0.3.29.gem ++++++ Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/cli.rb new/lib/suse/connect/cli.rb --- old/lib/suse/connect/cli.rb 2020-08-27 11:32:16.000000000 +0200 +++ new/lib/suse/connect/cli.rb 2020-11-25 12:10:47.000000000 +0100 @@ -49,8 +49,6 @@ Client.new(@config).register! end end - - @config.write! if @config.write_config rescue Errno::ECONNREFUSED log.fatal "Error: Connection refused by server #{@config.url}" exit 64 @@ -84,6 +82,8 @@ rescue BaseProductDeactivationError log.fatal 'Can not deregister base product. Use SUSEConnect -d to deactivate the whole system.' exit 70 + ensure + @config.write! if @config.write_config end private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/client.rb new/lib/suse/connect/client.rb --- old/lib/suse/connect/client.rb 2020-08-27 11:32:16.000000000 +0200 +++ new/lib/suse/connect/client.rb 2020-11-25 12:10:47.000000000 +0100 @@ -104,6 +104,7 @@ params.push(@config.namespace) if @config.namespace response = @api.announce_system(*params) + [response.body['login'], response.body['password']] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/version.rb new/lib/suse/connect/version.rb --- old/lib/suse/connect/version.rb 2020-08-27 11:32:16.000000000 +0200 +++ new/lib/suse/connect/version.rb 2020-11-25 12:10:47.000000000 +0100 @@ -1,5 +1,5 @@ module SUSE module Connect - VERSION = '0.3.26' + VERSION = '0.3.29' end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/toolkit/curlrc_dotfile.rb new/lib/suse/toolkit/curlrc_dotfile.rb --- old/lib/suse/toolkit/curlrc_dotfile.rb 2020-08-27 11:32:16.000000000 +0200 +++ new/lib/suse/toolkit/curlrc_dotfile.rb 2020-11-25 12:10:47.000000000 +0100 @@ -1,8 +1,20 @@ require 'etc' -# implementing interface to ~/.curlrc which can hold proxy details + +# When configuring a proxy with "yast2 proxy", the proxy url is written to ~/.curlrc +# and /etc/sysconfig/proxy. The proxy credentials are only written to ~/.curlrc. +# At login session init, the values from /etc/sysconfig/proxy are set in the environment, +# from where Net::Http is picking them up. Unfortunately the proxy credentials are +# not prepended to the proxy url, but stored seperately in .curlrc. Net::Http isn't picking +# them up automatically from there, that's why we need to parse them manually from .curlrc + class SUSE::Toolkit::CurlrcDotfile CURLRC_LOCATION = '.curlrc' + # Yast is setting up the credentials in ~/.curlrc in '--proxy-user "user:pwd"' style, + # but https://www.suse.com/support/kb/doc/?id=000017441 uses 'proxy-user = "john:n0v3ll"'. + # SUSEConnect should be capable of reading both formats + CURLRC_CREDENTIALS_REGEXP = /-*proxy-user[ =]*"(.+):(.+)"/ + def initialize @file_location = File.join(Etc.getpwuid.dir, CURLRC_LOCATION) end @@ -12,17 +24,17 @@ end def username - line_with_credentials.match(/--proxy-user\s?"(.*):/)[1] rescue nil + line_with_credentials.match(CURLRC_CREDENTIALS_REGEXP)[1] rescue nil end def password - line_with_credentials.match(/--proxy-user\s?".*:(.*)"/)[1] rescue nil + line_with_credentials.match(CURLRC_CREDENTIALS_REGEXP)[2] rescue nil end private def line_with_credentials return nil unless exist? - @line_with_credentials ||= File.readlines(@file_location).find { |l| l =~ /--proxy-user ".*:.*"/ } + @line_with_credentials ||= File.readlines(@file_location).find { |l| l =~ CURLRC_CREDENTIALS_REGEXP } end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/toolkit/utilities.rb new/lib/suse/toolkit/utilities.rb --- old/lib/suse/toolkit/utilities.rb 2020-08-27 11:32:16.000000000 +0200 +++ new/lib/suse/toolkit/utilities.rb 2020-11-25 12:10:47.000000000 +0100 @@ -20,7 +20,7 @@ end rescue raise SUSE::Connect::CannotBuildBasicAuth, - "\nCannot read username and password from #{SUSE::Connect::Credentials.system_credentials_file}." + "\nCannot read username and password from #{SUSE::Connect::Credentials.system_credentials_file}. Please activate your system first." end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2020-08-27 11:32:16.000000000 +0200 +++ new/metadata 2020-11-25 12:10:47.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: suse-connect version: !ruby/object:Gem::Version - version: 0.3.26 + version: 0.3.29 platform: ruby authors: - SUSE Customer Center Team autorequire: bindir: bin cert_chain: [] -date: 2020-08-27 00:00:00.000000000 Z +date: 2020-11-25 00:00:00.000000000 Z dependencies: [] description: This package provides a command line tool and rubygem library for connecting a client system to the SUSE Customer Center. It will connect the system to your _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
