Hello community, here is the log from the commit of package SUSEConnect for openSUSE:Factory checked in at 2019-10-25 18:38:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SUSEConnect (Old) and /work/SRC/openSUSE:Factory/.SUSEConnect.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SUSEConnect" Fri Oct 25 18:38:51 2019 rev:21 rq:741836 version:0.3.23 Changes: -------- --- /work/SRC/openSUSE:Factory/SUSEConnect/SUSEConnect.changes 2019-09-18 13:07:31.524739305 +0200 +++ /work/SRC/openSUSE:Factory/.SUSEConnect.new.2990/SUSEConnect.changes 2019-10-25 18:38:54.919714937 +0200 @@ -1,0 +2,18 @@ +Mon Oct 14 13:16:03 UTC 2019 - Thomas Schmidt <[email protected]> + +- 0.3.23 + fix .spec file to correctly apply switch_server_cert_location_to_etc.patch to SLE15SP2+ (bsc#1130864) + +------------------------------------------------------------------- +Mon Sep 30 08:15:35 UTC 2019 - Thomas Schmidt <[email protected]> + +- Update to 0.3.22 + switch_server_cert_location_to_etc.patch: add patch to switch server cert path for SLE15.2+ to /etc (bsc#1130864) + +------------------------------------------------------------------- +Thu Sep 26 09:53:36 UTC 2019 - Thomas Schmidt <[email protected]> + +- Update to 0.3.21 + Fix error on first activation of packagehub extension (bsc#1124318) + +------------------------------------------------------------------- Old: ---- suse-connect-0.3.20.gem New: ---- suse-connect-0.3.23.gem switch_server_cert_location_to_etc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SUSEConnect.spec ++++++ --- /var/tmp/diff_new_pack.diMiKd/_old 2019-10-25 18:38:55.623715600 +0200 +++ /var/tmp/diff_new_pack.diMiKd/_new 2019-10-25 18:38:55.627715604 +0200 @@ -17,7 +17,7 @@ Name: SUSEConnect -Version: 0.3.20 +Version: 0.3.23 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 +Patch0: switch_server_cert_location_to_etc.patch Summary: Utility to register a system with the SUSE Customer Center License: LGPL-2.1 @@ -99,6 +100,9 @@ for s in %{sources}; do cp -p $s . done +for s in %{patches}; do + cp -p $s . +done %build @@ -109,6 +113,12 @@ mv %{buildroot}%{_bindir}/%{name}* %{buildroot}%{_sbindir}/%{name} ln -s %{_sbindir}/%{name} %{buildroot}%{_bindir}/%{name} +# system certificate location changed to /etc/pki/trust/anchors/registration_server.pem, see bsc#1130864 +# sle_version >= 150200 is matching SLES + Leap >= 15SP2, suse_version >= 1550 is Tumbleweed +%if (0%{?sle_version} >= 150200 || 0%{?suse_version} >= 1550) +patch -d %{buildroot}%{gem_base}/gems/%{mod_full_name} -p1 < switch_server_cert_location_to_etc.patch +%endif + install -D -m 644 %_sourcedir/SUSEConnect.5 %{buildroot}%_mandir/man5/SUSEConnect.5 install -D -m 644 %_sourcedir/SUSEConnect.8 %{buildroot}%_mandir/man8/SUSEConnect.8 install -D -m 644 %_sourcedir/SUSEConnect.example %{buildroot}%_sysconfdir/SUSEConnect.example ++++++ SUSEConnect.5 ++++++ --- /var/tmp/diff_new_pack.diMiKd/_old 2019-10-25 18:38:55.655715630 +0200 +++ /var/tmp/diff_new_pack.diMiKd/_new 2019-10-25 18:38:55.655715630 +0200 @@ -1,147 +1,57 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "8" "August 2019" "" "SUSEConnect" +.TH "SUSECONNECT" "5" "February 2017" "" "SUSEConnect" . .SH "NAME" -\fBSUSEConnect\fR \- SUSE Customer Center registration tool -. -.SH "SYNOPSIS" -\fBSUSEConnect [<optional>\.\.\.] \-p PRODUCT\fR +\fBSUSEConnect\fR \- SUSE Customer Center registration tool config file . .SH "DESCRIPTION" -Register SUSE Linux Enterprise installations with the SUSE Customer Center\. Registration allows access to software repositories (including updates) and allows online management of subscriptions and organizations\. +</etc/SUSEConnect> is the config file for the SUSE registration tool SUSEConnect\. This file allows the registration of the base product that is installed on the system\. NB: using this file, registration of extensions is not supported\. . -.P -By default, SUSEConnect registers the base SUSE Linux Enterprise product installed on a system\. It can also be used to register extensions and modules\. +.SH "FORMAT" +The file is in [YAML][yaml\-spec] format\. . .P -To register an extension or a module, use the \fB\-\-product <PRODUCT\-IDENTIFIER>\fR option together with the product identifier of the extension or module\. You can see a list of all available extensions and modules for your system by using the \fB\-\-list\-extensions\fR option\. +Example: . .P -Manage subscriptions at the SUSE Customer Center: https://scc\.suse\.com -. -.SH "OPTIONS" -. -.TP -\fB\-p\fR, \fB\-\-product <PRODUCT>\fR -Specify a product for activation/deactivation\. Only one product can be processed at a time\. Defaults to the base SUSE Linux Enterprise product on this system\. Product identifiers can be obtained with \fB\-\-list\-extensions\fR\. Format: \fIname\fR/\fIversion\fR/\fIarchitecture\fR -. -.TP -\fB\-r\fR, \fB\-\-regcode <REGCODE>\fR -Subscription registration code for the product to be registered\. Relates that product to the specified subscription and enables software repositories for that product\. -. -.TP -\fB\-d\fR, \fB\-\-de\-register\fR -De\-registers the system and base product, or in conjunction with \-\-product, a single extension, and removes all its services installed by SUSEConnect\. After de\-registration, the system no longer consumes a subscription slot in SCC\. -. -.TP -\fB\-\-list\-extensions\fR -List all extensions and modules available for installation on this system\. -. -.TP -\fB\-\-instance\-data <path to file>\fR -Path to the XML file holding the public key and instance data for cloud registration with SMT\. -. -.TP -\fB\-e\fR, \fB\-\-email <email>\fR -Email address for product registration\. -. -.TP -\fB\-\-url <URL>\fR -URL of registration server (e\.g\. https://scc\.suse\.com)\. -. -.TP -\fB\-\-namespace <NAMESPACE>\fR -Namespace option for use with SMT staging environments\. -. -.TP -\fB\-s\fR, \fB\-\-status\fR -Get current system registration status in json format\. -. -.TP -\fB\-\-status\-text\fR -Get current system registration status in text format\. -. -.TP -\fB\-\-write\-config\fR -Write options to config file at /etc/SUSEConnect\. -. -.TP -\fB\-\-cleanup\fR -Remove old system credentials and all zypper services installed by SUSEConnect\. -. -.TP -\fB\-\-rollback\fR -Revert the registration state in case of a failed migration\. -. -.TP -\fB\-\-root <PATH>\fR -Path to the root folder, uses the same parameter for zypper\. +\fB\-\-\-\fR . -.TP -\fB\-\-version\fR -Print program version\. +.P +\fBregcode: <regcode>\fR . -.TP -\fB\-\-debug\fR -Provide debug output\. +.P +\fBurl: https://scc\.suse\.com\fR . -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help message\. +.P +\fBlanguage: en\fR . -.SH "EXIT CODES" -SUSEConnect sets the following exit codes: +.P +\fBinsecure: false\fR . -.IP "\(bu" 4 -0: Registration successful +.P +Each line of the file specifies a single parameter\. The fields are as follows: . .IP "\(bu" 4 -64: Connection refused +regcode: (mandatory) Registration code to use for the base product on the system . .IP "\(bu" 4 -65: Access error, e\.g\. files not readable +url: (optional) URL of the registration server\. Corresponds to the \-\-url argument to SUSEConnect\. Defaults to https://scc\.suse\.com . .IP "\(bu" 4 -66: Parser error: Server JSON response was not parseable +language: (optional) Language code to use for error messages . .IP "\(bu" 4 -67: Server responded with error: see log output +insecure: (optional) Do not verify SSL certificates when using https (default: false) . .IP "" 0 . -.SH "COMPARED TO SUSE_REGISTER" -. -.SS "BEFORE" -\fBsuse_register \-a email=<email> \-a regcode\-sles=<regcode> \-L <logfile>\fR -. -.SS "AFTER" -\fBSUSEConnect \-\-url <registration\-server\-url> \-r <regcode> >> <logfile>\fR -. -.SH "USE WITH REGISTRATION PROXY" -SUSEConnect can also be used to register systems with a local SUSE registration proxy (RMT/SMT) instead of the SUSE Customer Center\. Use \fBSUSEConnect \-\-url <registration\-proxy\-server\-url>\fR to register systems with RMT/SMT\. -. -.SH "IMPLEMENTATION" -SUSEConnect is implemented in Ruby\. It communicates with the registration server using a RESTful JSON API over HTTP using TLS encryption\. -. -.SH "ENVIRONMENT" -SUSEConnect respects the HTTP_PROXY environment variable\. -. -.SH "FILES" -. -.TP -\fB/etc/SUSEConnect\fR -Configuration file containing server URL, regcode and language for registration\. -. .SH "AUTHOR" -SUSE Linux Products GmbH (\fIscc\-feedback@suse\.de\fR) +SUSE Linux Products GmbH \fIscc\-feedback@suse\.de\fR . .SH "LINKS" -SUSE Customer Center: https://scc\.suse\.com -. -.P -SUSEConnect on GitHub: https://github\.com/SUSE/connect +[SUSE Customer Center][scc] . .SH "SEE ALSO" -SUSEConnect(5) +SUSEConnect(8) ++++++ SUSEConnect.8 ++++++ --- /var/tmp/diff_new_pack.diMiKd/_old 2019-10-25 18:38:55.679715653 +0200 +++ /var/tmp/diff_new_pack.diMiKd/_new 2019-10-25 18:38:55.683715656 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "8" "August 2019" "" "SUSEConnect" +.TH "SUSECONNECT" "8" "July 2019" "" "SUSEConnect" . .SH "NAME" \fBSUSEConnect\fR \- SUSE Customer Center registration tool ++++++ suse-connect-0.3.20.gem -> suse-connect-0.3.23.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/version.rb new/lib/suse/connect/version.rb --- old/lib/suse/connect/version.rb 2019-09-16 12:08:39.000000000 +0200 +++ new/lib/suse/connect/version.rb 2019-10-14 15:17:46.000000000 +0200 @@ -1,5 +1,5 @@ module SUSE module Connect - VERSION = '0.3.20' + VERSION = '0.3.23' end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/zypper.rb new/lib/suse/connect/zypper.rb --- old/lib/suse/connect/zypper.rb 2019-09-16 12:08:39.000000000 +0200 +++ new/lib/suse/connect/zypper.rb 2019-10-14 15:17:46.000000000 +0200 @@ -156,7 +156,13 @@ def install_release_package(identifier) return unless identifier _, _, status = execute_raw("rpm -q #{identifier}-release") - call("--no-refresh --non-interactive install --no-recommends --auto-agree-with-product-licenses -t product #{identifier}") unless (status == 0) + valid_error_codes = [Zypper::ExitCode::OK] + # in case of packagehub we accept some repos to fail the initial refresh, because the signing key is not yet imported. + # it is part of the -release package, so the repos will be trusted after the release package is installed + valid_error_codes << Zypper::ExitCode::Info::REPOS_SKIPPED if (identifier == 'PackageHub') + unless (status == 0) + call("--no-refresh --non-interactive install --no-recommends --auto-agree-with-product-licenses -t product #{identifier}", false, valid_error_codes) + end end def remove_release_package(identifier) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2019-09-16 12:08:39.000000000 +0200 +++ new/metadata 2019-10-14 15:17:46.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: suse-connect version: !ruby/object:Gem::Version - version: 0.3.20 + version: 0.3.23 platform: ruby authors: - SUSE Customer Center Team autorequire: bindir: bin cert_chain: [] -date: 2019-09-16 00:00:00.000000000 Z +date: 2019-10-14 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 @@ -85,7 +85,8 @@ - !ruby/object:Gem::Version version: '0' requirements: [] -rubygems_version: 3.0.6 +rubyforge_project: +rubygems_version: 2.7.3 signing_key: specification_version: 4 summary: SUSE Connect utility to register a system with the SUSE Customer Center ++++++ switch_server_cert_location_to_etc.patch ++++++ diff --git a/lib/suse/connect/ssl_certificate.rb b/lib/suse/connect/ssl_certificate.rb index 8117406..eed0f12 100644 --- a/lib/suse/connect/ssl_certificate.rb +++ b/lib/suse/connect/ssl_certificate.rb @@ -9,7 +9,7 @@ module SUSE extend Logger # where to save the imported certificate - SERVER_CERT_FILE = '/usr/share/pki/trust/anchors/registration_server.pem' + SERVER_CERT_FILE = '/etc/pki/trust/anchors/registration_server.pem' # script for updating the system certificates UPDATE_CERTIFICATES = '/usr/sbin/update-ca-certificates'
