From 7557b88bfd9756654bfb8648418110cf50a9df5b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 15 Jul 2025 07:52:31 +0000 Subject: [PATCH] import UBI subscription-manager-1.28.44-1.el8_10 --- .gitignore | 3 +- .subscription-manager.metadata | 2 + SOURCES/subscription-manager-debrand.patch | 32 ----- ...scription-manager-remove-redhat.repo.patch | 16 --- SOURCES/use-almalinux-syspurposes.patch | 20 --- SPECS/subscription-manager.spec | 124 ++++++++++++------ 6 files changed, 89 insertions(+), 108 deletions(-) create mode 100644 .subscription-manager.metadata delete mode 100644 SOURCES/subscription-manager-debrand.patch delete mode 100644 SOURCES/subscription-manager-remove-redhat.repo.patch delete mode 100644 SOURCES/use-almalinux-syspurposes.patch diff --git a/.gitignore b/.gitignore index 465a6cf..b6283e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/subscription-manager-1.28.42.tar.gz +SOURCES/subscription-manager-1.28.44.tar.gz +SOURCES/subscription-manager-cockpit-1.28.44.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata new file mode 100644 index 0000000..f546589 --- /dev/null +++ b/.subscription-manager.metadata @@ -0,0 +1,2 @@ +14b2eace3714eaa4d6d95064c0f561734ec8652f SOURCES/subscription-manager-1.28.44.tar.gz +264ebb8f882bbc887389695ce69e6b69ecc111e4 SOURCES/subscription-manager-cockpit-1.28.44.tar.gz diff --git a/SOURCES/subscription-manager-debrand.patch b/SOURCES/subscription-manager-debrand.patch deleted file mode 100644 index ac83ccc..0000000 --- a/SOURCES/subscription-manager-debrand.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in ---- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in 2022-04-13 18:01:03.000000000 +0300 -+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in 2022-05-10 19:54:57.000000000 +0300 -@@ -1,5 +1,5 @@ - [Desktop Entry] --_Name=Red Hat Subscription Manager -+_Name=Subscription Manager - Icon=subscription-manager - Type=Application - TryExec=/usr/libexec/cockpit-desktop -diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in ---- subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in 2022-04-13 18:01:03.000000000 +0300 -+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in 2022-05-10 19:55:18.000000000 +0300 -@@ -1,5 +1,5 @@ - [Desktop Entry] --_Name=Red Hat Subscription Manager -+_Name=Subscription Manager - Icon=subscription-manager - Exec=subscription-manager-gui - Terminal=false -diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py ---- subscription-manager-1.28.29/src/subscription_manager/repolib.py 2022-04-13 18:01:03.000000000 +0300 -+++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py 2022-05-10 20:01:44.000000000 +0300 -@@ -87,7 +87,7 @@ - @staticmethod - def warning_message(enabled_yum_plugins): - message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of ' -- 'Red Hat Subscription Management. If not desired, use ' -+ 'Subscription Management. If not desired, use ' - '"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to ' - 'block this behavior.') % ', '.join(enabled_yum_plugins) - return message diff --git a/SOURCES/subscription-manager-remove-redhat.repo.patch b/SOURCES/subscription-manager-remove-redhat.repo.patch deleted file mode 100644 index 0001d86..0000000 --- a/SOURCES/subscription-manager-remove-redhat.repo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurp subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py subscription-manager-1.27.11/src/subscription_manager/repofile.py ---- subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py 2020-07-28 11:06:10.000000000 -0500 -+++ subscription-manager-1.27.11/src/subscription_manager/repofile.py 2020-08-05 16:48:00.911709258 -0500 -@@ -368,11 +368,7 @@ class RepoFileBase(object): - Try to create new repo file. - :return: None - """ -- self.create_dir_path() -- if self.path_exists(self.path) or not self.manage_repos: -- return -- with open(self.path, 'w') as f: -- f.write(self.REPOFILE_HEADER) -+ pass - - def fix_content(self, content): - return content diff --git a/SOURCES/use-almalinux-syspurposes.patch b/SOURCES/use-almalinux-syspurposes.patch deleted file mode 100644 index 2cfced4..0000000 --- a/SOURCES/use-almalinux-syspurposes.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json -index 1ac7ea0e..305ec4b9 100644 ---- a/etc-conf/syspurpose/valid_fields.json -+++ b/etc-conf/syspurpose/valid_fields.json -@@ -1,12 +1,10 @@ - { - "role": [ -- "Red Hat Enterprise Linux Server", -- "Red Hat Enterprise Linux Workstation", -- "Red Hat Enterprise Linux Compute Node" -+ "AlmaLinux Server", -+ "AlmaLinux Workstation", -+ "AlmaLinux Compute Node" - ], - "service_level_agreement": [ -- "Premium", -- "Standard", - "Self-Support" - ], - "usage": [ diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 43d53be..f4825fd 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -1,10 +1,9 @@ -%global dist %{?dist}.alma.1 # Prefer systemd over sysv on Fedora and RHEL 7+ %global use_systemd 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} && 0%{?suse_version} >= 1315) # For optional building of ostree-plugin sub package. Unrelated to systemd # but the same versions apply at the moment. %global has_ostree %use_systemd && 0%{?suse_version} == 0 -%global use_initial_setup 0 +%global use_initial_setup 1 %global use_firstboot 0 %global use_inotify 1 %global py2_package_prefix python2 @@ -91,14 +90,14 @@ %endif %if (%{use_subman_gui} || %{use_initial_setup} || %{use_firstboot}) -%global use_rhsm_gtk 0 +%global use_rhsm_gtk 1 %else %global use_rhsm_gtk 0 %endif %global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7) %global use_yum (0%{?rhel} && 0%{?rhel} <= 7) -%global use_cockpit 0 +%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7 %if %{with python3} %global python_sitearch %python3_sitearch @@ -226,7 +225,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.42 +Version: 1.28.44 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -256,9 +255,6 @@ Source2: subscription-manager-rpmlintrc %if (0%{?suse_version} && 0%{?suse_version} < 1200) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -Patch100: use-almalinux-syspurposes.patch -Patch101: subscription-manager-remove-redhat.repo.patch -Patch102: subscription-manager-debrand.patch # The following macro examples are preceeded by '%' to stop macro expansion # in the comments. (See https://bugzilla.redhat.com/show_bug.cgi?id=1224660 for @@ -383,15 +379,10 @@ Obsoletes: subscription-manager-migration <= %{version}-%{release} %if !%{use_container_plugin} Obsoletes: subscription-manager-plugin-container %endif -# AlmaLinux do not provide the following packages no more -Obsoletes: subscription-manager-cockpit -Obsoletes: subscription-manager-initial-setup-addon -Obsoletes: rhsm-gtk -Obsoletes: rhsm-icons %description The Subscription Manager package provides programs and libraries to allow users -to manage subscriptions and yum repositories from the EL entitlement +to manage subscriptions and yum repositories from the Red Hat entitlement platform. @@ -451,7 +442,7 @@ and RHSM initial_setup module for Anaconda. %if %{use_subman_gui} %package -n subscription-manager-gui -Summary: A GUI interface to manage product subscriptions +Summary: A GUI interface to manage Red Hat product subscriptions %if 0%{?suse_version} Group: Productivity/Networking/System %else @@ -474,7 +465,7 @@ Requires(postun): scrollkeeper %description -n subscription-manager-gui This package contains a GTK+ graphical interface for configuring and -registering a system with a Entitlement platform and manage +registering a system with a Red Hat Entitlement platform and manage subscriptions. %endif @@ -514,7 +505,7 @@ Requires: dnf >= 1.0.0 %description -n dnf-plugin-subscription-manager This package provides plugins to interact with repositories and subscriptions -from the entitlement platform; contains subscription-manager and +from the Red Hat entitlement platform; contains subscription-manager and product-id plugins. %endif @@ -549,11 +540,9 @@ Group: System Environment/Base Requires: rhsm-gtk = %{version}-%{release} Requires: initial-setup-gui >= 0.3.9.24-1 Obsoletes: subscription-manager-firstboot < 1.15.3-1 -%if %{undefined almalinux_ver} %if (0%{?rhel} >= 8) Supplements: initial-setup-gui %endif -%endif %description -n subscription-manager-initial-setup-addon This package contains the initial-setup screens for subscription-manager. @@ -582,7 +571,7 @@ the remote in the currently deployed .origin file. %package -n %{rhsm_package_name} -Summary: A Python library to communicate with a Unified Entitlement Platform +Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -617,14 +606,14 @@ Obsoletes: python-rhsm <= 1.20.3-1 %endif %description -n %{rhsm_package_name} -A small library for communicating with the REST interface of a Unified +A small library for communicating with the REST interface of a Red Hat Unified Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. %if %{with python2_rhsm} %package -n python2-subscription-manager-rhsm -Summary: A Python library to communicate with a Unified Entitlement Platform +Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -648,7 +637,7 @@ Provides: python-rhsm = %{version}-%{release} Obsoletes: python-rhsm <= 1.20.3-1 %description -n python2-subscription-manager-rhsm -A small library for communicating with the REST interface of a Unified +A small library for communicating with the REST interface of a Red Hat Unified Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. %endif @@ -672,7 +661,7 @@ Subscription Manager Cockpit UI %if %{use_rhsm_icons} %package -n rhsm-icons -Summary: Icons for Subscription Management client tools +Summary: Icons for Red Hat Subscription Management client tools License: GPLv2 BuildArch: noarch @@ -687,7 +676,7 @@ Conflicts: subscription-manager-cockpit < 1.26.7 %description -n rhsm-icons This package contains the desktop icons for the graphical interfaces provided for management -of subscriptions. There are many such interfaces, subscription-manager-gui, +of Red Hat subscriptions. There are many such interfaces, subscription-manager-gui, subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily. %endif @@ -707,9 +696,6 @@ cloud metadata and signatures. %prep %setup -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ @@ -788,9 +774,7 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c # fake out the redhat.repo file %if %{use_yum} || %{use_dnf} mkdir %{buildroot}%{_sysconfdir}/yum.repos.d - %if %{undefined almalinux_ver} touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo - %endif %endif # fake out the certificate directories @@ -800,11 +784,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement %if %{use_container_plugin} # Setup cert directories for the container plugin: mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ -%if %{undefined almalinux_ver} mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com install -m 644 %{_builddir}/%{buildsubdir}/src/content_plugins/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif %if %use_cockpit # install cockpit dist targz @@ -829,9 +811,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; ln -s %{_initrddir}/rhsmcertd %{buildroot}%{_sbindir}/rcrhsmcertd %endif %endif -%if %{defined almalinux_ver} -sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf -%endif # base/cli tools use the gettext domain 'rhsm', while the # gnome-help tools use domain 'subscription-manager' @@ -1185,12 +1164,10 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %endif %{python_sitearch}/subscription_manager/plugin/container/*.py* -%if %{undefined almalinux_ver} # Copying Red Hat CA cert into each directory: %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com %attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif %if %has_ostree %files -n subscription-manager-plugin-ostree @@ -1404,8 +1381,74 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Wed Mar 27 2024 Eduard Abdullin - 1.28.42-1.alma -- AlmaLinux changes +* Wed May 21 2025 Jiri Hnidek 1.28.44-1 +- Translated using Weblate (Korean) (simmon@nplob.com) +- Translated using Weblate (Italian) (info@salvatorecocuzza.it) +- Translated using Weblate (Italian) (noreply-mt-weblate-translation- + memory@weblate.org) +- Translated using Weblate (Italian) (info@salvatorecocuzza.it) +- Translated using Weblate (Chinese (Traditional) (zh_TW)) (chzang55@gmail.com) +- Translated using Weblate (Spanish) (fserrador@gmail.com) + +* Thu Apr 10 2025 Jiri Hnidek 1.28.43-1 +- Translated using Weblate (Chinese (Traditional) (zh_TW)) (chzang55@gmail.com) +- Translated using Weblate (Chinese (Simplified) (zh_CN)) (mhorky@redhat.com) +- Translated using Weblate (French) (leane.grasser@proton.me) +- Translated using Weblate (French) (noreply-mt-weblate-translation- + memory@weblate.org) +- Translated using Weblate (Korean) (simmon@nplob.com) +- Update translation files (noreply@weblate.org) +- New extraction for translatable strings (ptoscano@redhat.com) +- Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com) +- Translated using Weblate (Italian) (info@salvatorecocuzza.it) +- Translated using Weblate (French) (leane.grasser@proton.me) +- Translated using Weblate (German) (atalanttore@googlemail.com) +- Translated using Weblate (Russian) (aleksejfedorov963@gmail.com) +- Translated using Weblate (Korean) (simmon@nplob.com) +- tests: fix mocking of get_terminal_width() in TestColumnize + (ptoscano@redhat.com) +- feat: print compliance errors & syspurpose status only in entitlement mode + (ptoscano@redhat.com) +- feat: print "registered" as status when using SCA (ptoscano@redhat.com) +- feat: print "not registered" on status when not registered + (ptoscano@redhat.com) +- tests: force syspurpose tests in test_status to non-SCA (ptoscano@redhat.com) +- refactor: move determination of content access mode in own method + (ptoscano@redhat.com) +- tests: move StubIdentity to stubs (ptoscano@redhat.com) +- tests: cleanup dead/broken bits in test_status (ptoscano@redhat.com) +- chore: move banner printing to its own function (ptoscano@redhat.com) +- ci: bump actions/upload-artifact from 3 to 4 + (49699333+dependabot[bot]@users.noreply.github.com) +- ci: bump actions/checkout from 3 to 4 + (49699333+dependabot[bot]@users.noreply.github.com) +- test: cockpit: switch to CERT auth for insights-client (ptoscano@redhat.com) +- test: cockpit: mock-insights: implement upload and delete platform endpoints + (ptoscano@redhat.com) +- test: cockpit: mock-insights: fix/improve handling of IDs + (ptoscano@redhat.com) +- test: cockpit: mock-insights: refactor of two platform endpoints + (ptoscano@redhat.com) +- feat: cockpit: switch from .last-upload.results to .lastupload + (ptoscano@redhat.com) +- chore: cockpit: test: use the new syspurpose command (ptoscano@redhat.com) +- test: cockpit: wait more when registering to Insights (ptoscano@redhat.com) +- test: cockpit: break insights-client in a different way (ptoscano@redhat.com) +- test: cockpit: mock-insights: return 404 for missing systems in /systems + (ptoscano@redhat.com) +- test: cockpit: wait longer in certain situations (ptoscano@redhat.com) +- test: cockpit: assume /root/run-candlepin to start candlepin + (ptoscano@redhat.com) +- chore(ci): Use Vault for CentOS Stream 8 (mhorky@redhat.com) +- fix: Hide subscription management "errors" in container mode + (mhorky@redhat.com) +- feat: 1.28 Added more AWS cloud facts (jhnidek@redhat.com) +- feat: 1.28 Added zone GCP fact (jhnidek@redhat.com) +- feat: 1.28 Azure: added extended location and type of location fact + (jhnidek@redhat.com) +- fix: 1.28 Update version of Azure metadata (jhnidek@redhat.com) +- feat: 1.28 Added Azure location to facts (jhnidek@redhat.com) * Thu Jan 25 2024 Pino Toscano 1.28.42-1 - Translated using Weblate (Korean) (simmon@nplob.com) @@ -1415,6 +1458,7 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : (jhnidek@redhat.com) - RHEL-21049: [1.28] Fix issue with registration using gsd-subman (jhnidek@redhat.com) + * Tue Dec 05 2023 Pino Toscano 1.28.41-1 - tito: drop bz requirement (ptoscano@redhat.com) - Translated using Weblate (Chinese (Simplified) (zh_CN)) (jsefler@redhat.com) @@ -1533,6 +1577,7 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : - Fix tests for Python 3.6 runner (mhorky@redhat.com) - Stop calling pytest with --failed-first (mhorky@redhat.com) - Handle tests in containers better (mhorky@redhat.com) + * Fri Jan 20 2023 Pino Toscano 1.28.35-1 - Translated using Weblate (Spanish) (ptoscano@redhat.com) - Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com) @@ -1628,6 +1673,7 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : (mhorky@redhat.com) - ENT-5215: Handle errors raised in DNF plugin (mhorky@redhat.com) - Translated using Weblate (Chinese (Simplified) (zh_CN)) (ljanda@redhat.com) + * Tue Jun 28 2022 Christopher Snyder 1.28.31-1 - Translated using Weblate (Korean) (simmon@nplob.com) - Update translation files (noreply@weblate.org)