rpms/subscription-manager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c9-beta' into a9-beta

Browse Source
This commit is contained in:
eabdullin 2023-09-21 20:31:54 +00:00 committed by eabdullin
commit 45257e02ae
7 changed files with 149 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/subscription-manager-1.29.33.tar.gz SOURCES/subscription-manager-1.29.37.tar.gz

2
.subscription-manager.metadata
View File

@ -1 +1 @@
4debb09527cff8161e24303f2d6a299df9076bab SOURCES/subscription-manager-1.29.33.tar.gz a399b89ecd9b7e363123d839f7ba407290d0c03c SOURCES/subscription-manager-1.29.37.tar.gz

47
SOURCES/almalinux_debrand.patch Normal file
View File

@ -0,0 +1,47 @@
diff -aruN subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json
--- subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json 2023-10-09 23:38:40
@@ -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 -aruN subscription-manager-1.29.37/src/subscription_manager/repofile.py subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py
--- subscription-manager-1.29.37/src/subscription_manager/repofile.py 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py 2023-10-09 23:38:48
@@ -375,11 +375,7 @@
"""
Try to create new repo file.
"""
- 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: str) -> str:
return content
diff -aruN subscription-manager-1.29.37/src/subscription_manager/repolib.py subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.29.37/src/subscription_manager/repolib.py 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py 2023-10-09 23:38:57
@@ -92,7 +92,7 @@
def warning_message(enabled_yum_plugins: List[str]) -> str:
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)

12
SOURCES/subscription-manager-debrand.patch
View File

@ -1,12 +0,0 @@
diff -aruN subscription-manager-1.29.30/src/subscription_manager/repolib.py subscription-manager-1.29.30.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.29.30/src/subscription_manager/repolib.py 2022-08-09 23:10:15.000000000 +0300
+++ subscription-manager-1.29.30.alma/src/subscription_manager/repolib.py 2022-10-26 15:31:28.000000000 +0300
@@ -83,7 +83,7 @@
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)

16
SOURCES/subscription-manager-remove-redhat.repo.patch
View File

@ -1,16 +0,0 @@
diff -Nurp subscription-manager-1.29.30/src/subscription_manager/repofile.py subscription-manager-1.29.30.alma/src/subscription_manager/repofile.py
--- subscription-manager-1.29.30/src/subscription_manager/repofile.py 2022-08-09 23:10:15.000000000 +0300
+++ subscription-manager-1.29.30.alma/src/subscription_manager/repofile.py 2022-10-24 11:47:04.000000000 +0300
@@ -370,11 +370,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

20
SOURCES/use-almalinux-syspurposes.patch
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": [

113
SPECS/subscription-manager.spec
View File

@ -95,14 +95,14 @@
%global exclude_packages %{exclude_packages}" %global exclude_packages %{exclude_packages}"
Name: subscription-manager Name: subscription-manager
Version: 1.29.33 Version: 1.29.37
Release: 1%{?dist} Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version} %if 0%{?suse_version}
Group: Productivity/Networking/System Group: Productivity/Networking/System
License: GPL-2.0 License: GPL-2.0
%else %else
License: GPLv2 License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
%endif %endif
URL: http://www.candlepinproject.org/ URL: http://www.candlepinproject.org/
@ -113,9 +113,7 @@ URL: http://www.candlepinproject.org/
# tito build --tag subscription-manager-$VERSION-$RELEASE --tgz # tito build --tag subscription-manager-$VERSION-$RELEASE --tgz
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch100: use-almalinux-syspurposes.patch Patch100: almalinux_debrand.patch
Patch101: subscription-manager-remove-redhat.repo.patch
Patch102: subscription-manager-debrand.patch
# Especially for the OpenSuse Build Service we need to have another lint config # Especially for the OpenSuse Build Service we need to have another lint config
%if 0%{?suse_version} %if 0%{?suse_version}
@ -134,7 +132,7 @@ Source2: subscription-manager-rpmlintrc
# nesting is required since RPM requires the various preamble directives to be # nesting is required since RPM requires the various preamble directives to be
# at the start of a line making meaningful indentation impossible. # at the start of a line making meaningful indentation impossible.
Requires: %{py_package_prefix}-ethtool Requires: iproute
Requires: %{py_package_prefix}-iniparse Requires: %{py_package_prefix}-iniparse
Requires: %{py_package_prefix}-decorator Requires: %{py_package_prefix}-decorator
Requires: virt-what Requires: virt-what
@ -168,7 +166,7 @@ Requires: %{py_package_prefix}-setuptools
%if %{use_dnf} %if %{use_dnf}
%if %{create_libdnf_rpm} %if %{create_libdnf_rpm}
Requires: dnf >= 1.0.0 Requires: python3-dnf
Requires: python3-dnf-plugins-core Requires: python3-dnf-plugins-core
Requires: python3-librepo Requires: python3-librepo
%else %else
@ -205,6 +203,8 @@ BuildRequires: %{py_package_prefix}-dateutil
BuildRequires: systemd BuildRequires: systemd
Obsoletes: subscription-manager-migration <= %{version}-%{release}
Obsoletes: subscription-manager-initial-setup-addon <= %{version}-%{release} Obsoletes: subscription-manager-initial-setup-addon <= %{version}-%{release}
Obsoletes: rhsm-gtk <= %{version}-%{release} Obsoletes: rhsm-gtk <= %{version}-%{release}
@ -258,9 +258,6 @@ BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
BuildRequires: json-c-devel BuildRequires: json-c-devel
BuildRequires: libdnf-devel >= 0.22.5 BuildRequires: libdnf-devel >= 0.22.5
Requires: json-c
Requires: libdnf >= 0.22.5
Requires: dnf >= 1.0.0
Obsoletes: dnf-plugin-subscription-manager < 1.29.0 Obsoletes: dnf-plugin-subscription-manager < 1.29.0
@ -372,8 +369,6 @@ cloud metadata and signatures.
%prep %prep
%setup -q %setup -q
%patch100 -p1 %patch100 -p1
%patch101 -p1
%patch102 -p1
%build %build
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
@ -763,9 +758,101 @@ rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-
rm -f /var/lib/rhsm/cache/rhsm_icon.json rm -f /var/lib/rhsm/cache/rhsm_icon.json
%changelog %changelog
* Wed Mar 29 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1.29.33-1.alma * Thu Sep 21 2023 Eduard Abdullin <eabdullin@almalinux.org> - 1.29.37-1.alma.1
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Wed Aug 23 2023 Pino Toscano <ptoscano@redhat.com> 1.29.37-1
- Translated using Weblate (Korean) (simmon@nplob.com)
- Update translation files (noreply@weblate.org)
- 2225446: Hotfix of D-Bus policy (jhnidek@redhat.com)
- TESTING: Update testing requirements (mhorky@redhat.com)
- Use Fedora registry to pull container images (mhorky@redhat.com)
- 2232316: dbus: check "force" again from the registration option
(ptoscano@redhat.com)
- dbus: run EntCertActionInvoker on PoolAttach (ptoscano@redhat.com)
- ENT-5624: Properly translate error strings (mhorky@redhat.com)
- Mock IOError for Insights fact collection tests (mhorky@redhat.com)
- New extraction for translatable strings (ptoscano@redhat.com)
* Wed Aug 02 2023 Pino Toscano <ptoscano@redhat.com> 1.29.36-1
- Translated using Weblate (Korean) (simmon@nplob.com)
- ENT-5581: Update messaging around the "container mode" (mhorky@redhat.com)
- Remove 'dbus' marker for pytest (mhorky@redhat.com)
- Rewrite D-Bus tests to be testable without pytest-forked (mhorky@redhat.com)
- Drop further ethtool dependency mentions (mhorky@redhat.com)
- tests: fix test_file_monitor without pyinotify (ptoscano@redhat.com)
- tests: switch from imp to importlib (ptoscano@redhat.com)
- Fix the order of user env var checking for translations.
(tkuratom@redhat.com)
- 2215974: Collect network facts using 'ip' (mhorky@redhat.com)
- ENT-5582: Remove container detection envvar overwrite (mhorky@redhat.com)
- ENT-5603: Explicitly check for provided entitlement certificates
(mhorky@redhat.com)
- fix test case (chambrid@redhat.com)
- Collect GCP Project information as cloud facts (chambrid@redhat.com)
- Collect Azure Subscription ID as a cloud fact (#3285) (chambrid@redhat.com)
- ENT-5580: Disable the proper container detection (mhorky@redhat.com)
- spec: convert License to SPDX (ptoscano@redhat.com)
- 2093291: Make reading of cache file more reliable (jhnidek@redhat.com)
- 2093291: Make code of DNF plugins testable (jhnidek@redhat.com)
- spec: change subscription-manager dnf dep (ptoscano@redhat.com)
- spec: update libdnf-plugin-subscription-manager deps (ptoscano@redhat.com)
- tests: repair attach cases in SCA mode (ptoscano@redhat.com)
* Tue May 16 2023 Pino Toscano <ptoscano@redhat.com> 1.29.35-1
- Translated using Weblate (Italian) (toscano.pino@tiscali.it)
- Clean up tests using Cloud What detectors properly (mhorky@redhat.com)
- spec: Obsolete subscription-manager-migration (ptoscano@redhat.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ljanda@redhat.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com)
- Translated using Weblate (Italian) (toscano.pino@tiscali.it)
- Update translation files (noreply@weblate.org)
- New extraction for translatable strings (ptoscano@redhat.com)
- Translated using Weblate (Italian) (toscano.pino@tiscali.it)
- Typo fixes (ptoscano@redhat.com)
- Avoid string puzzle (ptoscano@redhat.com)
- Properly use ungettext for plural forms (ptoscano@redhat.com)
- 2189664: cache: fix SyspurposeComplianceStatusCache on failed load
(ptoscano@redhat.com)
- dbus: don't catch exceptions in DomainSocketServer.run()
(ptoscano@redhat.com)
- cli: directly exit on InvalidCLIOptionError (ptoscano@redhat.com)
- Revert "ENT-5549: Fix return code handling of CLI" (ptoscano@redhat.com)
- ci: add dependabot config for GitHub Actions (ptoscano@redhat.com)
- Update .git-blame-ignore-revs (mhorky@redhat.com)
- Format code with black==23.3.0 (mhorky@redhat.com)
- ENT-5535: Update black to version 23.3.0 (mhorky@redhat.com)
* Wed Apr 12 2023 Pino Toscano <ptoscano@redhat.com> 1.29.34-1
- Update TESTING.md (mhorky@redhat.com)
- Improved debug print of http traffic, when proxy is used (jhnidek@redhat.com)
- ENT-5544: Remove Jenkins jobs, Containers (mhorky@redhat.com)
- ENT-5549: Remove unused code from entcertlib (mhorky@redhat.com)
- ENT-5549: Fix issues found when type-hinting (mhorky@redhat.com)
- ENT-5549: Fix return code handling of CLI (mhorky@redhat.com)
- ENT-5549: Fix found type hint issues (mhorky@redhat.com)
- ENT-5549: Fix object instantiation in EntitlementDirectory
(mhorky@redhat.com)
- ENT-5549: Refactor ProductDirectory (mhorky@redhat.com)
- ENT-5549: Change internal implementation for some Cache methods
(mhorky@redhat.com)
- ENT-5549: Clean up _sync_with_server arguments of cache objects
(mhorky@redhat.com)
- ENT-5549: Remove 'autoheal' argument from Action clients (mhorky@redhat.com)
- Refactored code a little bit (jhnidek@redhat.com)
- 2093291: Make locking more reliable (jhnidek@redhat.com)
- test: add simple test for 2178610 (ptoscano@redhat.com)
- Small improvement of debugging of http traffic (jhnidek@redhat.com)
- 2093883: Fix issue with race condition in rhsm.service (jhnidek@redhat.com)
- 2178610: do not collect unentitled products in SCA mode (ptoscano@redhat.com)
- 2174297: register: do a simple strip() on environment(s) input
(ptoscano@redhat.com)
- Stop subclassing 'object' (ptoscano@redhat.com)
- Remove pytest arguments for CentOS 9 Stream image (mhorky@redhat.com)
- tests: Install dnf-plugins-core every time (mhorky@redhat.com)
- 2169251: connection: restore UEPConnection.getJob() (ptoscano@redhat.com)
- ENT-5106: Type-hint subscription_manager/ files (mhorky@redhat.com)
* Thu Feb 16 2023 Pino Toscano <ptoscano@redhat.com> 1.29.33-1 * Thu Feb 16 2023 Pino Toscano <ptoscano@redhat.com> 1.29.33-1
- Translated using Weblate (French) (ljanda@redhat.com) - Translated using Weblate (French) (ljanda@redhat.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com) - Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)