From 869cb9057839528f869420788bb9ecefd0a73772 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 14 Nov 2023 18:52:17 +0000 Subject: [PATCH 1/4] import UBI subscription-manager-1.28.40-1.el8_9 --- .gitignore | 4 +- .subscription-manager.metadata | 4 +- SOURCES/00001-fix-dbus-policy.patch | 99 ------------- SPECS/subscription-manager.spec | 213 ++++++++++++---------------- 4 files changed, 93 insertions(+), 227 deletions(-) delete mode 100644 SOURCES/00001-fix-dbus-policy.patch diff --git a/.gitignore b/.gitignore index 5d53bec..4d1f0ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.28.36.tar.gz -SOURCES/subscription-manager-cockpit-1.28.36.tar.gz +SOURCES/subscription-manager-1.28.40.tar.gz +SOURCES/subscription-manager-cockpit-1.28.40.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 8707af4..63f373a 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -6f4343d358f15c4a62d6c9e99bcd0cef4666a415 SOURCES/subscription-manager-1.28.36.tar.gz -563cd7a7b586d72f5e9b4032593ba5befad64dff SOURCES/subscription-manager-cockpit-1.28.36.tar.gz +5326ac57a950e727a7c88b703bbc16b5b1cbe108 SOURCES/subscription-manager-1.28.40.tar.gz +79fd54731e17471f43d144a9c8e24d2fcd722d7b SOURCES/subscription-manager-cockpit-1.28.40.tar.gz diff --git a/SOURCES/00001-fix-dbus-policy.patch b/SOURCES/00001-fix-dbus-policy.patch deleted file mode 100644 index ee8bc45..0000000 --- a/SOURCES/00001-fix-dbus-policy.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf -index e21c57263..11adf1d79 100644 ---- a/etc-conf/dbus/system.d/com.redhat.RHSM1.conf -+++ b/etc-conf/dbus/system.d/com.redhat.RHSM1.conf -@@ -7,23 +7,9 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -+ - - -@@ -37,11 +23,6 @@ - - -- -- -- - - -@@ -65,5 +46,54 @@ - - -- - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 4b3b9b4..030b103 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -15,9 +15,7 @@ %global use_container_plugin 1 %endif -%if (0%{?rhel} >= 7 || 0%{?fedora}) -%global dmidecode_version >= 3.12.2-2 -%endif +%global dmidecode_arches %{ix86} x86_64 aarch64 # We use the tmpfiles_create macro from systemd-rpm-macros rpm. # Because of an incorrect version labelling of that rpm in SLES 12 which @@ -51,13 +49,6 @@ %global use_subman_gui 1 %endif -# Install subscription-manager-migration only for rhel8 and lower -%if 0%{?rhel} && 0%{?rhel} <= 8 -%global use_subscription_manager_migration 1 -%else -%global use_subscription_manager_migration 0 -%endif - %if 0%{?suse_version} && 0%{?suse_version} < 1200 %global completion_dir %{_sysconfdir}/bash_completion.d %else @@ -188,12 +179,6 @@ %global with_subman_gui WITH_SUBMAN_GUI=false %endif -%if %{use_subscription_manager_migration} -%global with_subman_migration WITH_SUBMAN_MIGRATION=true -%else -%global with_subman_migration WITH_SUBMAN_MIGRATION=false -%endif - %if %{use_cockpit} && !0%{use_subman_gui} %global with_cockpit WITH_COCKPIT=true %else @@ -230,10 +215,6 @@ %global exclude_packages %{exclude_packages}*.plugin.container, %endif -%if !%{use_subscription_manager_migration} -%global exclude_packages %{exclude_packages}subscription_manager.migrate, -%endif - # add new exclude_packages items before me %global exclude_packages %{exclude_packages}" @@ -244,8 +225,8 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.36 -Release: 3%{?dist} +Version: 1.28.40 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} Group: Productivity/Networking/System @@ -291,6 +272,10 @@ Requires: %{py_package_prefix}-ethtool Requires: %{py_package_prefix}-iniparse Requires: %{py_package_prefix}-decorator Requires: virt-what +%ifarch %{dmidecode_arches} +Requires: dmidecode +%endif + %if 0%{?suse_version} Requires: logrotate Requires: cron @@ -337,11 +322,6 @@ Requires: python3-gobject-base %else Requires: %{?gtk3:gobject-introspection, pygobject3-base} %{!?gtk3:pygobject2} %endif -# There's no dmi to read on these arches, so don't pull in this dep. -# Additionally, dmidecode isn't packaged at all on SUSE -%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x -Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} -%endif %endif %if %use_inotify @@ -366,7 +346,6 @@ BuildRequires: gcc BuildRequires: %{py_package_prefix}-setuptools BuildRequires: gettext BuildRequires: intltool -BuildRequires: libnotify-devel BuildRequires: %{py_package_prefix}-six %if %{use_subman_gui} || %{use_cockpit} @@ -384,10 +363,7 @@ BuildRequires: libzypp %endif %if %{use_subman_gui} -BuildRequires: %{?suse_version:gconf2-devel} %{!?suse_version:GConf2-devel} BuildRequires: %{?suse_version:update-desktop-files} %{!?suse_version:scrollkeeper} -BuildRequires: %{?suse_version:dbus-1-glib-devel} %{!?suse_version:dbus-glib-devel} -BuildRequires: %{?gtk3:gtk3-devel} %{!?gtk3:gtk2-devel} %endif %if %use_systemd @@ -398,12 +374,12 @@ BuildRequires: systemd-rpm-macros BuildRequires: systemd %endif +Obsoletes: subscription-manager-migration <= %{version}-%{release} + %if !%{use_container_plugin} Obsoletes: subscription-manager-plugin-container %endif -Patch00001: 00001-fix-dbus-policy.patch - %description The Subscription Manager package provides programs and libraries to allow users to manage subscriptions and yum repositories from the Red Hat entitlement @@ -475,7 +451,6 @@ Group: System Environment/Base Requires: %{name} = %{version}-%{release} Requires: gnome-icon-theme -# We need pygtk3 and gtk2 until rhsm-icon is ported to gtk3 Requires: rhsm-gtk = %{version}-%{release} # Renamed from -gnome, so obsolete it properly @@ -495,29 +470,6 @@ subscriptions. %endif -%if %{use_subscription_manager_migration} -%package -n subscription-manager-migration -Summary: Migration scripts for moving to certificate based subscriptions -%if 0%{?suse_version} -Group: Productivity/Networking/System -%else -Group: System Environment/Base -%endif -Requires: %{name} = %{version}-%{release} -Requires: rhnlib - -# Since the migration data package is not in Fedora, we can only require it -# on RHEL. -%if 0%{?rhel} -Requires: subscription-manager-migration-data -%endif - -%description -n subscription-manager-migration -This package contains scripts that aid in moving to certificate based -subscriptions -%endif - - %if %use_dnf %package -n dnf-plugin-subscription-manager Summary: Subscription Manager plugins for DNF @@ -690,21 +642,6 @@ Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. %endif -%package -n subscription-manager-rhsm-certificates -Summary: Certificates required to communicate with a Red Hat Unified Entitlement Platform -%if 0%{?suse_version} -Group: Development/Libraries/Python -%else -Group: Development/Libraries -%endif -Provides: python-rhsm-certificates = %{version}-%{release} -Obsoletes: python-rhsm-certificates <= 1.20.3-1 - -%description -n subscription-manager-rhsm-certificates -This package contains certificates required for communicating with the REST interface -of a Red Hat Unified Entitlement Platform, used for the management of system entitlements -and to receive access to content. - %if %use_cockpit %package -n subscription-manager-cockpit Summary: Subscription Manager Cockpit UI @@ -748,8 +685,8 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi Summary: Python package for detection of public cloud provider License: GPLv2 Requires: python3-requests -%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x -Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version} +%ifarch %{dmidecode_arches} +Requires: dmidecode %endif %description -n python3-cloud-what @@ -760,13 +697,11 @@ cloud metadata and signatures. %prep %setup -q -%autopatch -p1 - %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ %{?gtk_version} \ - %{exclude_packages} %{?with_subman_gui} %{?with_subman_migration} + %{exclude_packages} %{?with_subman_gui} %if %{with python2_rhsm} python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release} @@ -795,7 +730,6 @@ make -f Makefile install VERSION=%{version}-%{release} \ %{?install_zypper_plugins} \ %{?with_systemd} \ %{?with_subman_gui} \ - %{?with_subman_migration} \ %{?with_cockpit} \ %{?exclude_packages} @@ -825,7 +759,6 @@ cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm %endif %if %use_subman_gui -desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop %else @@ -852,13 +785,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement # Setup cert directories for the container plugin: mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com -install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt +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 -mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca -install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem - %if %use_cockpit # install cockpit dist targz tar --strip-components=1 -xzf %{SOURCE1} -C %{buildroot} @@ -943,6 +872,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %attr(755,root,root) %{_bindir}/rhsmcertd %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker +%attr(755,root,root) %{_libexecdir}/rhsm-package-profile-uploader # our config dirs and files @@ -1003,14 +933,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{completion_dir}/rhsm-debug %{completion_dir}/rhsmcertd -%if %{use_subscription_manager_migration} -%{completion_dir}/rhn-migrate-classic-to-rhsm -%endif - -%if %use_subman_gui -%{completion_dir}/rhsm-icon -%endif - %dir %{python_sitearch}/subscription_manager # code, python modules and packages @@ -1165,7 +1087,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_bindir}/subscription-manager-gui %endif -%{_bindir}/rhsm-icon %doc %{_datadir}/gnome/help/subscription-manager/C/figures/*.png %doc %{_datadir}/gnome/help/subscription-manager/C/*.xml @@ -1174,8 +1095,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{_datadir}/applications/subscription-manager-gui.desktop %{_datadir}/appdata/subscription-manager-gui.appdata.xml -# desktop config files -%{_sysconfdir}/xdg/autostart/rhsm-icon.desktop + %if !0%{?suse_version} %{_sysconfdir}/pam.d/subscription-manager-gui %{_sysconfdir}/security/console.apps/subscription-manager-gui @@ -1185,7 +1105,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %doc %{_mandir}/man8/subscription-manager-gui.8* -%{_mandir}/man8/rhsm-icon.8* %doc LICENSE %endif @@ -1211,24 +1130,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif -%if 0%{?use_subscription_manager_migration} -%files -n subscription-manager-migration -%defattr(-,root,root,-) -%dir %{python_sitearch}/subscription_manager/migrate -%{python_sitearch}/subscription_manager/migrate/*.py* -%if %{with python3} -%{python_sitearch}/subscription_manager/migrate/__pycache__ -%endif -%attr(755,root,root) %{_sbindir}/rhn-migrate-classic-to-rhsm - -%doc -%{_mandir}/man8/rhn-migrate-classic-to-rhsm.8* -%doc LICENSE -%if 0%{?fedora} -%doc README.Fedora -%endif -%endif - %files -n %{py_package_prefix}-syspurpose -f syspurpose.lang %defattr(-,root,root,-) %dir %{python_sitelib}/syspurpose*.egg-info @@ -1328,13 +1229,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %{python_sitearch}/cloud_what/providers/__pycache__ %endif -%files -n subscription-manager-rhsm-certificates -%attr(755,root,root) %dir %{_sysconfdir}/rhsm -%attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca - -%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem - %if %use_cockpit %files -n subscription-manager-cockpit %defattr(-,root,root,-) @@ -1487,9 +1381,80 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Tue Aug 08 2023 Jiri Hnidek 1.28.36-3 -- 2225442: Fix D-Bus policy (jhnidek@redhat.com) -* Wed Feb 22 2023 Pino Toscano 1.28.36-2 +* Thu Sep 14 2023 Pino Toscano 1.28.40-1 +- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ptoscano@redhat.com) + +* Wed Aug 23 2023 Pino Toscano 1.28.39-1 +- Translated using Weblate (Korean) (simmon@nplob.com) +- Update translation files (noreply@weblate.org) +- 2225443: [1.28] Hotfix of D-Bus policy (jhnidek@redhat.com) +- New extraction for translatable strings (ptoscano@redhat.com) +- Translated using Weblate (Punjabi) (jsefler@redhat.com) +- Translated using Weblate (Korean) (simmon@nplob.com) +- [1.28] Update messaging around the "container mode" (#3310) + (34436146+grunwmar@users.noreply.github.com) +- ENT-5624: Properly translate error strings (mhorky@redhat.com) +- ENT-5610: Explicitly check for provided entitlement certificates + (mhorky@redhat.com) +- Fix flake8 errors (mhorky@redhat.com) +- Run flake8 and rpmlint on CI (mhorky@redhat.com) +- Mock IOError for Insights fact collection tests (mhorky@redhat.com) +- Collect GCP Project information as cloud facts (chambrid@redhat.com) +- Collect Azure Subscription ID as a cloud fact (#3285) (chambrid@redhat.com) +- Update cockpit test lib for Chromium 113 fix (martin@piware.de) +- tests: repair attach cases in SCA mode (ptoscano@redhat.com) +- 2091269: Make locking more reliable (jhnidek@redhat.com) + +* Wed May 17 2023 Pino Toscano 1.28.38-1 +- Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- Update translation files (noreply@weblate.org) +- Clean up tests using Cloud What detectors properly (mhorky@redhat.com) +- spec: Obsolete subscription-manager-migration (ptoscano@redhat.com) +- New extraction for translatable strings (ptoscano@redhat.com) +- Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- 2150814: Drop RHN migration (ptoscano@redhat.com) +- ci: stop testing on Fedora Rawhide (ptoscano@redhat.com) +- Drop redhat-uep.pem (ptoscano@redhat.com) +- Move redhat-entitlement-authority.pem to container plugin + (ptoscano@redhat.com) +- Drop subscription-manager-rhsm-certificates package (ptoscano@redhat.com) +- utils: import pkg_resources only when needed (ptoscano@redhat.com) +- ENT-5532: Call rhsm-package-profile-uploader with --force-upload + (jhnidek@redhat.com) +- rhsmcertd reads default_log_level from rhsm.conf (jhnidek@redhat.com) +- Create log dir by rhsmcertd, when log dir does not exist (jhnidek@redhat.com) +- Fix issue with old glib not containing one macro (jhnidek@redhat.com) +- 2132242: [1.28] Outsource uploading DNF profile to rhsmcertd + (jhnidek@redhat.com) +- 1890080: Handle IOErrors and Exceptions when looking for process names + (csnyder@redhat.com) +- ci: install nodejs-npm on Fedora (ptoscano@redhat.com) +- tito: add centos-8-stream releaser (ptoscano@redhat.com) + +* Wed Apr 19 2023 Pino Toscano 1.28.37-1 +- 2174887: register: do a simple strip() on environment(s) input + (ptoscano@redhat.com) +- [1.28] Remove source code of rhsm-icon (jhnidek@redhat.com) +- Fix of unit tests of d-bus register: extended list of exceptions for + catching. (jhnidek@redhat.com) +- [1.28] Include D-Bus sender in User-Agent http header; Singleton + (jhnidek@redhat.com) +- Revert "Try to use --forked for all unit tests." (ptoscano@redhat.com) +- test: add simple test for 1982670 (ptoscano@redhat.com) +- 2076948: [1.28] Fix issue with race condition in rhsm.service + (jhnidek@redhat.com) +- 1982670: do not collect unentitled products in SCA mode (ptoscano@redhat.com) +- Use dmidecode on aarch64 (jhnidek@redhat.com) +- Fix possible parsing issues of dmidecode output (mhorky@redhat.com) +- zypper: drop dead python-dmidecode usage (ptoscano@redhat.com) +- facts: drop DmiFirmwareInfoCollector (ptoscano@redhat.com) +- facts: switch to DmidecodeFactCollector for DMI facts (ptoscano@redhat.com) +- facts: add dmidecode parser and facts collector (ptoscano@redhat.com) +- cloud-what: switch MiniHostCollector to dmidecode(1) (ptoscano@redhat.com) +- Remove pytest arguments for CentOS 9 Stream image (mhorky@redhat.com) +- tests: Install dnf-plugins-core every time (mhorky@redhat.com) + +* Wed Feb 22 2023 Pino Toscano 1.28.36-1 - Translated using Weblate (French) (ljanda@redhat.com) - Translated using Weblate (French) (suanand@redhat.com) - Translated using Weblate (Korean) (jsefler@redhat.com) From e580dca8a30a17a2b287a5e6a761ac26857c9a96 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 22 May 2024 13:39:53 +0000 Subject: [PATCH 2/4] import UBI subscription-manager-1.28.42-1.el8 --- .gitignore | 4 ++-- .subscription-manager.metadata | 4 ++-- SPECS/subscription-manager.spec | 28 +++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4d1f0ed..18b7f59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.28.40.tar.gz -SOURCES/subscription-manager-cockpit-1.28.40.tar.gz +SOURCES/subscription-manager-1.28.42.tar.gz +SOURCES/subscription-manager-cockpit-1.28.42.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 63f373a..6bafdd9 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -5326ac57a950e727a7c88b703bbc16b5b1cbe108 SOURCES/subscription-manager-1.28.40.tar.gz -79fd54731e17471f43d144a9c8e24d2fcd722d7b SOURCES/subscription-manager-cockpit-1.28.40.tar.gz +01f0a068cb66e42b795d775faa5cf6d6741356e4 SOURCES/subscription-manager-1.28.42.tar.gz +2599b490ec820cd7b36a3debb6651246854162dc SOURCES/subscription-manager-cockpit-1.28.42.tar.gz diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 030b103..9ac495b 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -225,7 +225,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.40 +Version: 1.28.42 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -1381,6 +1381,32 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Jan 25 2024 Pino Toscano 1.28.42-1 +- Translated using Weblate (Korean) (simmon@nplob.com) +- Translated using Weblate (Chinese (Simplified) (zh_CN)) + (mariocanfly@hotmail.com) +- RHEL-21049: [1.28] RegisterServer is stopped, when not needed + (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) +- CCT-71: Try to ping server, when --proxy is used (jhnidek@redhat.com) +- CCT-10: Ensure IPv6-based URLs are properly formatted (mhorky@redhat.com) +- cli: normalize hostname in error message (ptoscano@redhat.com) +- connection: normalize hostname in ConnectionOSErrorException + (ptoscano@redhat.com) +- Improved printing of addresses and URLs (jhnidek@redhat.com) +- Use username and password from --proxy=URL (jhnidek@redhat.com) +- Use parse_url() from utils.py for parsing URL, when --proxy is used. + (jhnidek@redhat.com) +- RHEL-13375: 1.28 Parse URL properly (jhnidek@redhat.com) +- ci: stop testing on Fedora (ptoscano@redhat.com) +- Simplify autoregistration test setup (mhorky@redhat.com) +- RHEL-9435: Get AWS metadata via IMDSv2 (mhorky@redhat.com) + * Thu Sep 14 2023 Pino Toscano 1.28.40-1 - Translated using Weblate (Chinese (Simplified) (zh_CN)) (ptoscano@redhat.com) From b2216378630579fd46b24d926d0db2af8003fd5c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 31 May 2024 17:10:28 +0000 Subject: [PATCH 3/4] Import from AlmaLinux stable repository --- .gitignore | 1 - .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 | 55 +++++++++++++------ 6 files changed, 107 insertions(+), 19 deletions(-) delete mode 100644 .subscription-manager.metadata create mode 100644 SOURCES/subscription-manager-debrand.patch create mode 100644 SOURCES/subscription-manager-remove-redhat.repo.patch create mode 100644 SOURCES/use-almalinux-syspurposes.patch diff --git a/.gitignore b/.gitignore index 18b7f59..465a6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ SOURCES/subscription-manager-1.28.42.tar.gz -SOURCES/subscription-manager-cockpit-1.28.42.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata deleted file mode 100644 index 6bafdd9..0000000 --- a/.subscription-manager.metadata +++ /dev/null @@ -1,2 +0,0 @@ -01f0a068cb66e42b795d775faa5cf6d6741356e4 SOURCES/subscription-manager-1.28.42.tar.gz -2599b490ec820cd7b36a3debb6651246854162dc SOURCES/subscription-manager-cockpit-1.28.42.tar.gz diff --git a/SOURCES/subscription-manager-debrand.patch b/SOURCES/subscription-manager-debrand.patch new file mode 100644 index 0000000..ac83ccc --- /dev/null +++ b/SOURCES/subscription-manager-debrand.patch @@ -0,0 +1,32 @@ +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 new file mode 100644 index 0000000..0001d86 --- /dev/null +++ b/SOURCES/subscription-manager-remove-redhat.repo.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..2cfced4 --- /dev/null +++ b/SOURCES/use-almalinux-syspurposes.patch @@ -0,0 +1,20 @@ +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 9ac495b..43d53be 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -1,9 +1,10 @@ +%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 1 +%global use_initial_setup 0 %global use_firstboot 0 %global use_inotify 1 %global py2_package_prefix python2 @@ -90,14 +91,14 @@ %endif %if (%{use_subman_gui} || %{use_initial_setup} || %{use_firstboot}) -%global use_rhsm_gtk 1 +%global use_rhsm_gtk 0 %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%{?fedora} || 0%{?rhel} >= 7 +%global use_cockpit 0 %if %{with python3} %global python_sitearch %python3_sitearch @@ -255,6 +256,9 @@ 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 @@ -379,10 +383,15 @@ 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 Red Hat entitlement +to manage subscriptions and yum repositories from the EL entitlement platform. @@ -442,7 +451,7 @@ and RHSM initial_setup module for Anaconda. %if %{use_subman_gui} %package -n subscription-manager-gui -Summary: A GUI interface to manage Red Hat product subscriptions +Summary: A GUI interface to manage product subscriptions %if 0%{?suse_version} Group: Productivity/Networking/System %else @@ -465,7 +474,7 @@ Requires(postun): scrollkeeper %description -n subscription-manager-gui This package contains a GTK+ graphical interface for configuring and -registering a system with a Red Hat Entitlement platform and manage +registering a system with a Entitlement platform and manage subscriptions. %endif @@ -505,7 +514,7 @@ Requires: dnf >= 1.0.0 %description -n dnf-plugin-subscription-manager This package provides plugins to interact with repositories and subscriptions -from the Red Hat entitlement platform; contains subscription-manager and +from the entitlement platform; contains subscription-manager and product-id plugins. %endif @@ -540,9 +549,11 @@ 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. @@ -571,7 +582,7 @@ the remote in the currently deployed .origin file. %package -n %{rhsm_package_name} -Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform +Summary: A Python library to communicate with a Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -606,14 +617,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 Red Hat Unified +A small library for communicating with the REST interface of a 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 Red Hat Unified Entitlement Platform +Summary: A Python library to communicate with a Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -637,7 +648,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 Red Hat Unified +A small library for communicating with the REST interface of a Unified Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. %endif @@ -661,7 +672,7 @@ Subscription Manager Cockpit UI %if %{use_rhsm_icons} %package -n rhsm-icons -Summary: Icons for Red Hat Subscription Management client tools +Summary: Icons for Subscription Management client tools License: GPLv2 BuildArch: noarch @@ -676,7 +687,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 Red Hat subscriptions. There are many such interfaces, subscription-manager-gui, +of subscriptions. There are many such interfaces, subscription-manager-gui, subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily. %endif @@ -696,6 +707,9 @@ cloud metadata and signatures. %prep %setup -q +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ @@ -774,7 +788,9 @@ 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 @@ -784,9 +800,11 @@ 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 @@ -811,6 +829,9 @@ 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' @@ -1164,10 +1185,12 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %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 @@ -1381,6 +1404,9 @@ 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 + * Thu Jan 25 2024 Pino Toscano 1.28.42-1 - Translated using Weblate (Korean) (simmon@nplob.com) - Translated using Weblate (Chinese (Simplified) (zh_CN)) @@ -1389,7 +1415,6 @@ 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) @@ -1508,7 +1533,6 @@ 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) @@ -1604,7 +1628,6 @@ 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) From 7557b88bfd9756654bfb8648418110cf50a9df5b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 15 Jul 2025 07:52:31 +0000 Subject: [PATCH 4/4] 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)