Skip to content

Commit

Permalink
Switch to the new SUSEConnect-ng (bsc#1212799)
Browse files Browse the repository at this point in the history
- Includes a SSL reload fix (bsc#1195220)
- 4.3.27
  • Loading branch information
lslezak committed Aug 2, 2023
1 parent e747d7a commit 3ec3146
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
7 changes: 7 additions & 0 deletions package/yast2-registration.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Aug 2 08:44:51 UTC 2023 - Ladislav Slezák <lslezak@suse.com>

- Switch to the new SUSEConnect-ng (bsc#1212799)
- Includes a SSL reload fix (bsc#1195220)
- 4.3.27

-------------------------------------------------------------------
Thu Jul 7 08:06:01 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>

Expand Down
15 changes: 5 additions & 10 deletions package/yast2-registration.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2-registration
Version: 4.3.26
Version: 4.3.27
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
Expand All @@ -32,8 +32,9 @@ BuildRequires: yast2 >= 4.2.76
BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-slp >= 3.1.9
BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec)
BuildRequires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.3.11
BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) >= 0.2.5
# new suseconnect-ng
BuildRequires: suseconnect-ruby-bindings >= 1.2.0
# Y2Packager::MediumType.type=
BuildRequires: yast2-packager >= 4.2.37
BuildRequires: yast2-update >= 3.1.36
Expand All @@ -44,14 +45,8 @@ Requires: yast2 >= 4.2.76
Requires: yast2-pkg-bindings >= 3.1.34
# N_() method
Requires: yast2-ruby-bindings >= 3.1.12
# SUSE::Connect::YaST.list_installer_updates
Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.2.37
# NOTE: Workaround for bsc#947482, SUSEConnect is actually not needed by the
# YaST registration module, it is used just to install the Connect dependencies.
#
# TODO: Remove it once the SUSEConnect dependencies are properly moved to the
# suse-connect gem.
Requires: SUSEConnect >= 0.2.37
# new suseconnect-ng
Requires: suseconnect-ruby-bindings >= 1.2.0
Requires: yast2-add-on >= 3.1.8
Requires: yast2-slp >= 3.1.9
# Y2Packager::MediumType
Expand Down
3 changes: 3 additions & 0 deletions src/lib/registration/ssl_certificate.rb
Expand Up @@ -101,6 +101,9 @@ def self.update_instsys_ca
# Cleanup
FileUtils.rm_rf(TMP_CA_CERTS_DIR)

# Reload SUSEConnect internal cert pool (suseconnect-ng only)
SUSE::Connect::SSLCertificate.reload if SUSE::Connect::SSLCertificate.respond_to?(:reload)

# Check that last file was copied to return true or false
File.exist?(new_files.last)
end
Expand Down

0 comments on commit 3ec3146

Please sign in to comment.