Compare commits

...

No commits in common. "changed/a8-beta/subscription-manager-1.28.28-1.el8.alma" and "c8" have entirely different histories.

6 changed files with 285 additions and 267 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/subscription-manager-1.28.28.tar.gz
SOURCES/subscription-manager-cockpit-1.28.28.tar.gz
SOURCES/subscription-manager-1.28.40.tar.gz
SOURCES/subscription-manager-cockpit-1.28.40.tar.gz

View File

@ -1,2 +1,2 @@
508a506483c7e6454e3b898489c40896227c9d59 SOURCES/subscription-manager-1.28.28.tar.gz
179f0e65324800141f3dd652518d3a91c451309a SOURCES/subscription-manager-cockpit-1.28.28.tar.gz
5326ac57a950e727a7c88b703bbc16b5b1cbe108 SOURCES/subscription-manager-1.28.40.tar.gz
79fd54731e17471f43d144a9c8e24d2fcd722d7b SOURCES/subscription-manager-cockpit-1.28.40.tar.gz

View File

@ -1,56 +0,0 @@
diff -Naur subscription-manager-1.27.18.orig/etc-conf/rhsm-icon.desktop.in subscription-manager-1.27.18.debrand/etc-conf/rhsm-icon.desktop.in
--- subscription-manager-1.27.18.orig/etc-conf/rhsm-icon.desktop.in 2021-02-18 05:55:39.035895432 +0300
+++ subscription-manager-1.27.18.debrand/etc-conf/rhsm-icon.desktop.in 2021-03-24 00:43:26.233292918 +0300
@@ -1,6 +1,6 @@
[Desktop Entry]
-_Name=Red Hat Subscription Validity Applet
+_Name=Subscription Validity Applet
Icon=subscription-manager
Exec=rhsm-icon
Terminal=false
diff -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in
--- subscription-manager-1.27.18.orig/etc-conf/subscription-manager-cockpit.desktop.in 2021-02-18 05:55:39.035895432 +0300
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-cockpit.desktop.in 2021-03-24 00:43:45.609663355 +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 -Naur subscription-manager-1.27.18.orig/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-gui.desktop.in
--- subscription-manager-1.27.18.orig/etc-conf/subscription-manager-gui.desktop.in 2021-02-18 05:55:39.035895432 +0300
+++ subscription-manager-1.27.18.debrand/etc-conf/subscription-manager-gui.desktop.in 2021-03-24 00:43:16.151860329 +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 -Naur subscription-manager-1.27.18.orig/src/subscription_manager/migrate/migrate.py subscription-manager-1.27.18.debrand/src/subscription_manager/migrate/migrate.py
--- subscription-manager-1.27.18.orig/src/subscription_manager/migrate/migrate.py 2021-02-18 05:55:38.971979206 +0300
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/migrate/migrate.py 2021-03-24 00:45:36.979918648 +0300
@@ -279,8 +279,7 @@
if self.options.five_to_six:
msgs = [_("This system appears to already be registered to Satellite 6.")]
else:
- msgs = [_("This system appears to already be registered to Red Hat Subscription Management.")]
- msgs.append(_("Please visit https://access.redhat.com/management/consumers/%s to view the profile details.") % identity.uuid)
+ msgs = [_("This system appears to already be registered to Subscription Management.")]
system_exit(1, msgs)
try:
diff -Naur subscription-manager-1.27.18.orig/src/subscription_manager/repolib.py subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py
--- subscription-manager-1.27.18.orig/src/subscription_manager/repolib.py 2021-02-18 05:55:38.973062531 +0300
+++ subscription-manager-1.27.18.debrand/src/subscription_manager/repolib.py 2021-03-24 00:44:17.617615991 +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

View File

@ -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

View File

@ -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": [

View File

@ -1,10 +1,9 @@
%global dist %{?dist}.alma
# 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
@ -16,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
@ -52,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
@ -100,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
@ -124,8 +114,6 @@
%global rhsm_package_name subscription-manager-rhsm
%endif
%global include_syspurpose 1
%global _hardened_build 1
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
@ -191,20 +179,12 @@
%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
%global with_cockpit WITH_COCKPIT=false
%endif
%global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}"
# Build a list of python package to exclude from the build.
# This is necessary because we have multiple rpms which may or may not
# need to be built depending on the distro which are all in one source tree.
@ -235,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}"
@ -249,7 +225,7 @@
%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
Name: subscription-manager
Version: 1.28.28
Version: 1.28.40
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version}
@ -279,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
@ -299,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
@ -345,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
@ -374,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}
@ -392,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
@ -406,18 +374,15 @@ BuildRequires: systemd-rpm-macros
BuildRequires: systemd
%endif
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.
@ -477,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
@ -486,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
@ -501,34 +465,11 @@ 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
%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
@ -564,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
@ -599,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.
@ -632,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
@ -650,7 +589,7 @@ Requires: %{py_package_prefix}-dateutil
Requires: %{py_package_prefix}-iniparse
# rpm-python is an old name for python2-rpm but RHEL6 uses the old name
Requires: %{py_package_prefix}-six
Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
Requires: subscription-manager-rhsm-certificates
# Required by Fedora packaging guidelines
%{?python_provide:%python_provide %{py_package_prefix}-rhsm}
%if %{with python3}
@ -667,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
@ -690,7 +629,7 @@ Requires: %{py2_package_prefix}-dateutil
Requires: %{py2_package_prefix}-iniparse
# rpm-python is an old name for python2-rpm but RHEL6 uses the old name
Requires: %{py2_package_prefix}-six
Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
Requires: subscription-manager-rhsm-certificates
# Required by Fedora packaging guidelines
%{?python_provide:%python_provide %{py2_package_prefix}-rhsm}
Requires: rpm-python
@ -698,26 +637,11 @@ 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
%package -n subscription-manager-rhsm-certificates
Summary: Certificates required to communicate with a 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 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
@ -737,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
@ -752,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
@ -761,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
@ -772,15 +696,12 @@ cloud metadata and signatures.
%prep
%setup -q
%patch100 -p1
%patch101 -p1
%patch102 -p1
%build
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \
%{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
%{exclude_packages} %{?with_subman_gui} %{?with_subman_migration}
%{?gtk_version} \
%{exclude_packages} %{?with_subman_gui}
%if %{with python2_rhsm}
python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release}
@ -809,10 +730,7 @@ make -f Makefile install VERSION=%{version}-%{release} \
%{?install_zypper_plugins} \
%{?with_systemd} \
%{?with_subman_gui} \
%{?with_subman_migration} \
%{?with_cockpit} \
%{?subpackages} \
%{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
%{?exclude_packages}
%if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
@ -841,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,16 +769,12 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c
%endif
%find_lang rhsm
%if 0%{?include_syspurpose}
%find_lang syspurpose
%endif
# 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
@ -871,18 +784,8 @@ 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}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt
%endif
%endif
%if %{undefined almalinux_ver}
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
%else
rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem
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
%if %use_cockpit
@ -908,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'
@ -972,6 +872,7 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%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
@ -1032,14 +933,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%{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
@ -1194,7 +1087,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%{_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
@ -1203,8 +1095,7 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%{_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
@ -1214,7 +1105,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%doc
%{_mandir}/man8/subscription-manager-gui.8*
%{_mandir}/man8/rhsm-icon.8*
%doc LICENSE
%endif
@ -1240,24 +1130,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%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
@ -1292,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
@ -1359,15 +1229,6 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti
%{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
%if %{undefined almalinux_ver}
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem
%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem
%endif
%if %use_cockpit
%files -n subscription-manager-cockpit
%defattr(-,root,root,-)
@ -1520,8 +1381,257 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Fri Apr 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1.28.28-1.alma
- AlmaLinux changes
* Thu Sep 14 2023 Pino Toscano <ptoscano@redhat.com> 1.28.40-1
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ptoscano@redhat.com)
* Wed Aug 23 2023 Pino Toscano <ptoscano@redhat.com> 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 <ptoscano@redhat.com> 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 <ptoscano@redhat.com> 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 <ptoscano@redhat.com> 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)
- 2168576: cockpit: insights: fix spawn_error_to_string in more cases
(ptoscano@redhat.com)
- cockpit: Fix the issue, when it is not possible to install insights-client
(jhnidek@redhat.com)
- ENT-5542: Build package using GitHub Actions (mhorky@redhat.com)
- 2166317: gui: do not use an empty environment string (ptoscano@redhat.com)
- Test libdnf plugin using GitHub Actions (mhorky@redhat.com)
- libdnf: fix return value of findProductId() (ptoscano@redhat.com)
- 1938878: Fix issues discovered by static code analyzers (#2644)
(jhnidek@redhat.com)
- ENT-5541: Publish PR coverage (mhorky@redhat.com)
- 2166623: gui: use UnknownContentException instead of NetworkException
(ptoscano@redhat.com)
- ENT-3759: Test on GitHub Actions (mhorky@redhat.com)
- Alter import of rhsm.config functions (mhorky@redhat.com)
- ENT-5536: Fix FileMonitor tests (mhorky@redhat.com)
- tests: drop test_po_files.py (ptoscano@redhat.com)
- Ensure tests don't fail when run under root (mhorky@redhat.com)
- build: pin pytest to < 7 (ptoscano@redhat.com)
- rhsm: drop custom which() implementation (ptoscano@redhat.com)
- facts: switch to shutil.which() (ptoscano@redhat.com)
- 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 <ptoscano@redhat.com> 1.28.35-1
- Translated using Weblate (Spanish) (ptoscano@redhat.com)
- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ljanda@redhat.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- Update translation files (noreply@weblate.org)
- Translated using Weblate (German) (atalanttore@googlemail.com)
- New extraction for translatable strings (ptoscano@redhat.com)
- Base DBusServerStubProvider on SubManFixture (mhorky@redhat.com)
- Mark D-Bus tests (mhorky@redhat.com)
- Remove unused classes of DBus tests (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Unregister (mhorky@redhat.com)
- ENT-5350: Implement "force" register option in rhsm dbus python bindings
(mhorky@redhat.com)
- ENT-5533: Fix failures of D-Bus' Register tests (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Register (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Products (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of AllFacts (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Entitlement (mhorky@redhat.com)
- Fix typo in method name of EntitlementService (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Consumer (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Attach (mhorky@redhat.com)
- ENT-5533: Update D-Bus tests of Config (mhorky@redhat.com)
- Skip AsyncPool tests (mhorky@redhat.com)
- Catch generic OSError during BaseRestLib._request() (ptoscano@redhat.com)
- Catch also CertificateLoadingError for identity cert loading
(ptoscano@redhat.com)
- Fix formatting of proxy errors w/o errno (ptoscano@redhat.com)
- Improve formatting of CertificateLoadingError (ptoscano@redhat.com)
- Raise a new CertificateLoadingError on X.509 loading failures
(ptoscano@redhat.com)
- Improve formatting of UnknownContentException (ptoscano@redhat.com)
- connection: improve the internal UnknownContentException
(ptoscano@redhat.com)
- utils: add terminal_printable_content (ptoscano@redhat.com)
- connection: rename NetworkException to UnknownContentException
(ptoscano@redhat.com)
- Improve formatting of ProxyException (ptoscano@redhat.com)
- connection: improve the internal ProxyException (ptoscano@redhat.com)
- Improve formatting of socket.gaierror (ptoscano@redhat.com)
- Improve formatting of ConnectionError (ptoscano@redhat.com)
- Improve formatting of BadCertificateException (ptoscano@redhat.com)
- connection: extend BadCertificateException w/ SSL exception
(ptoscano@redhat.com)
- connection: drop dead code (ptoscano@redhat.com)
- ENT-4286: Additional fix for exception handling (jajerome@redhat.com)
- ENT-4286: Simplify exception reporting with system_exit()
(jajerome@redhat.com)
- Cloud-what: Make saving token file more robust (jhnidek@redhat.com)
- Remove deprecated function call (mhorky@redhat.com)
- Fix failures of D-Bus' Register tests (mhorky@redhat.com)
- Show locals in pytest output (mhorky@redhat.com)
* Fri Dec 02 2022 Pino Toscano <ptoscano@redhat.com> 1.28.34-1
- tito: add rhel 8.8 releaser (ptoscano@redhat.com)
- Translated using Weblate (Japanese) (suanand@redhat.com)
- Translated using Weblate (French) (vincent.lefebvre59@gmail.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- ENT-5510: Fix issues with proxy and cockpit interaction (jajerome@redhat.com)
- 2118486: [1.28] Implement "force" register option in rhsm dbus python binding
(jajerome@redhat.com)
* Mon Oct 31 2022 Christopher Snyder <csnyder@redhat.com> 1.28.33-1
- Translated using Weblate (Korean) (simmon@nplob.com)
- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com)
- 2096852: [1.28] Fixed script hang in non-interactive execution
(jajerome@redhat.com)
- 2134165: Fixed incorrect registration warning with yum/dnf
(jajerome@redhat.com)
- 2097672: Fixed expected message for manual attach case (jajerome@redhat.com)
- 2097672: [1.28] Improve warning message (auto-attach in SCA mode)
(jhnidek@redhat.com)
- build: switch rpmlint check to rpmlint 2.x (ptoscano@redhat.com)
- Only rpmlint our specfiles (csnyder@redhat.com)
- integration-test: Use custom TLS certs for mock-insights
(mvollmer@redhat.com)
- integration-test: Updates for newer insights-client (mvollmer@redhat.com)
- test: Rely on insights-client.service to succeed in testSubAndInAndFail
(mvollmer@redhat.com)
- integration-tests: Run testSubAndInAndFail with "setenforce 0"
(mvollmer@redhat.com)
- 2101510: [1.28] Fix D-Bus Register() and update entitlement certs
(jhnidek@redhat.com)
- 2097672: [RFE][1.28] Improve the message, when SCA is enabled
(jhnidek@redhat.com)
* Thu Aug 04 2022 Christopher Snyder <csnyder@redhat.com> 1.28.32-1
- cockpit: Allow unexpected message from RHEL 8.5 version of cockpit-ws
(martin@piware.de)
- test: use --track-naughties option (martin@piware.de)
- Bump cockpit test API to 273 + run-tests scheduler fix (martin@piware.de)
- ENT-5215: Handle all exceptions caused by network problems
(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 <csnyder@redhat.com> 1.28.31-1
- Translated using Weblate (Korean) (simmon@nplob.com)
- Update translation files (noreply@weblate.org)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)
- New extraction for translatable strings (ptoscano@redhat.com)
- 2043331: Do not delete installed SCA cert during registration
(jhnidek@redhat.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- build: fix extraction of cockpit messages (ptoscano@redhat.com)
- cockpit: Fix continuation lines for gettext strings (ptoscano@redhat.com)
- 1822242: cockpit: fix/simplify the loading/error view checks
(ptoscano@redhat.com)
- 2076522: enable sslverifystatus on repos if advertized by CP
(ptoscano@redhat.com)
- RepoUpdateActionCommand: lazy load the consumer auth (ptoscano@redhat.com)
- 2071622: Updated redhat-uep.pem to not use SHA-1 algorithm
(jhnidek@redhat.com)
- cockpit: insights: properly show error message in Insights dialog
(ptoscano@redhat.com)
- cockpit: insights: fix formatting of multiline insights-client output
(ptoscano@redhat.com)
- cockpit: insights: improve handling of registration/unregistration errors
(ptoscano@redhat.com)
- cockpit: insights: merge insights-client stderr with stdout
(ptoscano@redhat.com)
- cockpit: Remove extra toString() call (ptoscano@redhat.com)
* Mon May 16 2022 Christopher Snyder <csnyder@redhat.com> 1.28.30-1
- Add 8.7 tito releaser (csnyder@redhat.com)
- spec: relax subscription-manager-rhsm-certificates requires
(ptoscano@redhat.com)
- 2073347: [1.28] Print correct status, when access mode has changed
(jhnidek@redhat.com)
- 2056896: Handle all exceptions of gathering data properly
(jhnidek@redhat.com)
- Improve azure determination method (suttner@atix.de)
- ENT-4939: [1.28] Drop old dbus_interface.py (mhorky@redhat.com)
- cockpit: Read files in /var/lib/insights as superuser (mvollmer@redhat.com)
- refresh: clear also the release status (ptoscano@redhat.com)
- 2074111: clear the release cache on release change (ptoscano@redhat.com)
- 1.28 Add gcp_license_codes to system facts. (jhnidek@redhat.com)
- build: always build & ship syspurpose bits (ptoscano@redhat.com)
- 2057732: [1.28] Fix inaccurate module status in combined profile
(jhnidek@redhat.com)
- 2064002: fix named argument for registerConsumer() (ptoscano@redhat.com)
- 2057053: Improve API of detection of cloud-what (jhnidek@redhat.com)
- 2057053: Facts: do no use heuristics detection of cloud (jhnidek@redhat.com)
- 2018215: Cockpit use "Organization ID" in label (jhnidek@redhat.com)
- 1822242: Cockpit: another improvement of curtain view (jhnidek@redhat.com)
- 1822242: cockpit: improve handling of main curtain view (ptoscano@redhat.com)
* Fri Mar 11 2022 Christopher Snyder <csnyder@redhat.com> 1.28.29-1
- Update translation files (noreply@weblate.org)
* Tue Feb 15 2022 Christopher Snyder <csnyder@redhat.com> 1.28.28-1
- Revert "1887600: Use updated cert with SHA-256 algorithm"