Sync from SUSE:SLFO:Main cloud-regionsrv-client revision 33a6f15a916bf756818cf1527f92baed

cloud-regionsrv-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  3 17:21:52 UTC 2024 - Jesús Bermúdez Velázquez <jesus.bv@suse.com>
+
+- Update to 10.3.9 (bsc#1234050)
+  + Send registration code for the extensions, not only base product
+
 -------------------------------------------------------------------
 Wed Nov 18 16:12:23 UTC 2024 - Marcus Schäfer <marcus.schaefer@suse.com>
 

cloud-regionsrv-client.spec

@@ -22,7 +22,7 @@
 %endif
 %global _sitelibdir %{%{pythons}_sitelib}
 
-%define base_version 10.3.8
+%define base_version 10.3.11
 Name:           cloud-regionsrv-client
 Version:        %{base_version}
 Release:        0
@@ -67,6 +67,7 @@ Requires:       regionsrv-certs
 Requires:       sudo
 Requires:       zypper
 BuildRequires:  systemd
+BuildRequires:  findutils
 Conflicts:      container-suseconnect
 %if 0%{?suse_version} == 1315
 %{?systemd_requires}
@@ -161,9 +162,16 @@ instance status are detected for PAYG vs. BYOS
 %prep
 %setup -q
 %if 0%{?suse_version} == 1315
-%patch -P 0
-%patch -P 1
-%patch -P 2
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+
+# %patch macro does not support to call patch such that it
+# does not create .orig files. Under certain conditions patch
+# creates them and this will break the build for files found
+# but not packaged
+find . -name *.orig -delete
+
 %endif
 
 %build

fix-for-sles12-disable-ipv6.patch

@@ -1,6 +1,8 @@
---- lib/cloudregister/smt.py.orig
-+++ lib/cloudregister/smt.py
-@@ -109,6 +109,7 @@ class SMT:
+diff --git a/lib/cloudregister/smt.py b/lib/cloudregister/smt.py
+index 62c461a..19c7ebd 100644
+--- a/lib/cloudregister/smt.py
++++ b/lib/cloudregister/smt.py
+@@ -128,6 +128,7 @@ class SMT:
      # --------------------------------------------------------------------
      def get_ipv6(self):
          """Return the IP address"""

fix-for-sles12-disable-registry.patch

@@ -1,5 +1,7 @@
---- lib/cloudregister/registerutils.py.orig
-+++ lib/cloudregister/registerutils.py
+diff --git a/lib/cloudregister/registerutils.py b/lib/cloudregister/registerutils.py
+index 7825ff0..5a712b0 100644
+--- a/lib/cloudregister/registerutils.py
++++ b/lib/cloudregister/registerutils.py
 @@ -30,7 +30,8 @@ import stat
  import subprocess
  import sys
@@ -46,7 +48,7 @@
      smt = get_smt_from_store(__get_registered_smt_file_path())
      private_registry_fqdn = smt.get_registry_FQDN() if smt else ''
      clean_registry_auth(private_registry_fqdn)
-@@ -1193,6 +1199,8 @@ def clean_registries_conf_docker(private
+@@ -1193,6 +1199,8 @@ def clean_registries_conf_docker(private_registry_fqdn):
  # ----------------------------------------------------------------------------
  def write_registries_conf(registries_conf, container_path, container_name):
      """Write registries_conf content to container_path."""
@@ -55,9 +57,11 @@
      try:
          if container_name == 'podman':
              with open(container_path, 'w') as registries_conf_file:
---- usr/sbin/registercloudguest.orig
-+++ usr/sbin/registercloudguest
-@@ -139,6 +139,8 @@ def setup_registry(registration_target,
+diff --git a/usr/sbin/registercloudguest b/usr/sbin/registercloudguest
+index d32f036..c5f40d3 100755
+--- a/usr/sbin/registercloudguest
++++ b/usr/sbin/registercloudguest
+@@ -139,6 +139,8 @@ def setup_registry(registration_target, clean='registry'):
      clean == all -> cleans repository and registry setup
      clean == registry -> clean only registry artifacts
      """

fix-for-sles12-no-trans_update.patch

@@ -1,5 +1,7 @@
---- lib/cloudregister/registerutils.py
-+++ lib/cloudregister/registerutils.py
+diff --git a/lib/cloudregister/registerutils.py b/lib/cloudregister/registerutils.py
+index 7825ff0..6770e23 100644
+--- a/lib/cloudregister/registerutils.py
++++ b/lib/cloudregister/registerutils.py
 @@ -339,6 +339,8 @@ def get_register_cmd():
      """Determine which command we need to use to register the system"""