Compare commits

...

No commits in common. 'c9' and 'i10-beta' have entirely different histories.
c9 ... i10-beta

2
.gitignore vendored

@ -1 +1 @@
SOURCES/subscription-manager-1.29.38.tar.gz
SOURCES/subscription-manager-1.30.1.tar.gz

@ -1 +1 @@
711306cb958fd5b645191e8e35aebc432818501d SOURCES/subscription-manager-1.29.38.tar.gz
b1ea2cc96ca64abc517480e8ca838405e997fe25 SOURCES/subscription-manager-1.30.1.tar.gz

File diff suppressed because it is too large Load Diff

@ -0,0 +1,28 @@
From 5d2f973ef5ae4fb1eba602afe11c404162edf474 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:02:34 +0300
Subject: [PATCH 2/4] Set MSVSphere syspurposes
---
etc-conf/syspurpose/valid_fields.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json
index 1ac7ea0..0cf3787 100644
--- a/etc-conf/syspurpose/valid_fields.json
+++ b/etc-conf/syspurpose/valid_fields.json
@@ -1,8 +1,8 @@
{
"role": [
- "Red Hat Enterprise Linux Server",
- "Red Hat Enterprise Linux Workstation",
- "Red Hat Enterprise Linux Compute Node"
+ "MSVSphere Server",
+ "MSVSphere Workstation",
+ "MSVSphere Compute Node"
],
"service_level_agreement": [
"Premium",
--
2.43.5

@ -0,0 +1,29 @@
From 6eda92395cde8e527f26d24399d86c2cf18d22b3 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:03:40 +0300
Subject: [PATCH 3/4] Disable repo file creation
---
src/subscription_manager/repofile.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/subscription_manager/repofile.py b/src/subscription_manager/repofile.py
index c5bbee9..8ed6592 100644
--- a/src/subscription_manager/repofile.py
+++ b/src/subscription_manager/repofile.py
@@ -374,11 +374,7 @@ class RepoFileBase:
"""
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
--
2.43.5

@ -0,0 +1,23 @@
From 85b334400b4d8ff73b3a0c0ec636ba03d32f5410 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 2 Apr 2023 19:15:32 +0300
Subject: [PATCH 4/4] Disable subscription manager plugin
---
etc-conf/plugin/subscription-manager.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc-conf/plugin/subscription-manager.conf b/etc-conf/plugin/subscription-manager.conf
index 9050582..2392f67 100644
--- a/etc-conf/plugin/subscription-manager.conf
+++ b/etc-conf/plugin/subscription-manager.conf
@@ -1,5 +1,5 @@
[main]
-enabled=1
+enabled=0
# When following option is set to 1, then all repositories defined outside redhat.repo will be disabled
# every time subscription-manager plugin is triggered by dnf or yum
--
2.43.5

@ -95,8 +95,8 @@
%global exclude_packages %{exclude_packages}"
Name: subscription-manager
Version: 1.29.38
Release: 1%{?dist}
Version: 1.30.1
Release: 1%{?dist}.inferit
Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version}
Group: Productivity/Networking/System
@ -113,6 +113,12 @@ URL: http://www.candlepinproject.org/
# tito build --tag subscription-manager-$VERSION-$RELEASE --tgz
Source0: %{name}-%{version}.tar.gz
# MSVSphere patches
Patch1001: 0001-Debrand-for-MSVSphere.patch
Patch1002: 0002-Set-MSVSphere-syspurposes.patch
Patch1003: 0003-Disable-repo-file-creation.patch
Patch1004: 0004-Disable-subscription-manager-plugin.patch
# Especially for the OpenSuse Build Service we need to have another lint config
%if 0%{?suse_version}
Source2: subscription-manager-rpmlintrc
@ -156,10 +162,9 @@ Requires: python3-gobject-base
%endif
# rhel 8 has different naming for setuptools going forward
# on newer rhels and Fedora setuptools is not needed on runtime at all
%if (0%{?rhel} && 0%{?rhel} == 8)
Requires: platform-python-setuptools
%else
Requires: %{py_package_prefix}-setuptools
%endif
%if %{use_dnf}
@ -187,6 +192,7 @@ BuildRequires: openssl-devel
BuildRequires: gcc
BuildRequires: %{py_package_prefix}-setuptools
BuildRequires: gettext
BuildRequires: glib2-devel
%if 0%{?suse_version}
BuildRequires: distribution-release
@ -361,6 +367,10 @@ cloud metadata and signatures.
%prep
%setup -q
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%build
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
@ -407,7 +417,9 @@ popd
# fake out the redhat.repo file
%if %{use_dnf}
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
%if %{undefined msvsphere_ver}
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
%endif
%endif
# fake out the certificate directories
@ -417,9 +429,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 msvsphere_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
# fix timestamps on our byte compiled files so they match across arches
find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
@ -615,10 +629,12 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%{python_sitearch}/subscription_manager/plugin/container/__pycache__
%{python_sitearch}/subscription_manager/plugin/container/*.py*
%if %{undefined msvsphere_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
@ -657,7 +673,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%attr(750,root,root) %dir %{_var}/cache/cloud-what
%dir %{python_sitearch}/cloud_what
%dir %{python_sitearch}/cloud_what/providers
%{python_sitearch}/cloud_what/*
%{python_sitearch}/cloud_what/*.py*
%{python_sitearch}/cloud_what/providers/*.py*
%{python_sitearch}/cloud_what/__pycache__
%{python_sitearch}/cloud_what/providers/__pycache__
@ -735,6 +752,125 @@ rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-
rm -f /var/lib/rhsm/cache/rhsm_icon.json
%changelog
* Wed Dec 25 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.30.1-1.inferit
- Debrand for MSVSphere
* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.30.1-1
- Rebuilt for MSVSphere 10
* Wed Aug 21 2024 Pino Toscano <ptoscano@redhat.com> 1.30.1-1
- feat: forcefully switch automatic cloud registration to v1
(ptoscano@redhat.com)
* Fri Aug 16 2024 Pino Toscano <ptoscano@redhat.com> 1.30.0-1
- Translated using Weblate (Russian) (aleksejfedorov963@gmail.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- chore: Format register.py (mhorky@redhat.com)
- feat: Require SCA for registration (mhorky@redhat.com)
- doc: Update install and testing guide (stomsa@redhat.com)
- Fixed spec file to list packages twice (suttner@atix.de)
- code review comments fixes - update metadata and test. (chambrid@redhat.com)
- feat: Disable anonymous cloud registration temporarily (mhorky@redhat.com)
- Collect Azure VM Name and Resource Group Name as a cloud fact.
(chambrid@redhat.com)
- fix: Improve wording in redhat.repo template (glutexo@icloud.com)
- Remove commands moved to syspurpose (glutexo@icloud.com)
- doc: drop references to "activate" (ptoscano@redhat.com)
- feat: Remove import command (zpetrace@redhat.com)
- fix: make SyspurposeComplianceStatusCache.get_overall_status() always usable
(ptoscano@redhat.com)
- fix: Change order of checks (jhnidek@redhat.com)
- fix: Cache shouldn't try to get data from server without UUID
(jhnidek@redhat.com)
- feat: Add option to run smoke tests with fake IMDS servers.
(jhnidek@redhat.com)
- fix: Hide subscription management "errors" in container mode
(mhorky@redhat.com)
- feat(ci): Update testing matrix (mhorky@redhat.com)
- fix(test): Properly stop method mock (mhorky@redhat.com)
- feat: Azure: added extended location and type of location fact
(jhnidek@redhat.com)
- fix: Update version of Azure metadata (jhnidek@redhat.com)
- feat: Added Azure location to facts (jhnidek@redhat.com)
- feat: Added zone GCP fact (jhnidek@redhat.com)
- feat: Added more AWS cloud facts (jhnidek@redhat.com)
- fix: Change type hint according returned value. (jhnidek@redhat.com)
- feat: Add warning message about release version to dnf plugin
(jhnidek@redhat.com)
- Bump black from 23.3.0 to 24.3.0
(49699333+dependabot[bot]@users.noreply.github.com)
- Format code with black==24.3.0 (ptoscano@redhat.com)
- Fix memory leaks in test-productdb.c (jhnidek@redhat.com)
- Fix memory leaks in productdb.c (jhnidek@redhat.com)
- fix: Function prototype without declaration is deprecated
(jhnidek@redhat.com)
- Removed unused includes of .h files (jhnidek@redhat.com)
- libdnf: switch from g_error_free() to g_clear_error() in tests
(ptoscano@redhat.com)
- libdnf: do not build test code in plugin (ptoscano@redhat.com)
- Change handling of deprecated `datetime.datetime.utcnow()`
(mhorky@redhat.com)
- CCT-66: Update identity reporting in DNF plugin during autoregistration
(mhorky@redhat.com)
- Remove automatic registration delay for rhsmcertd (mhorky@redhat.com)
- Remove API endpoint for automatic cloud registration v1 (mhorky@redhat.com)
- CCT-67: Use automatic registration v2 (mhorky@redhat.com)
- IdentityUpdateAction: Improve logging for updating identity certificates
(mhorky@redhat.com)
- Identity: Add method to extract current owner (mhorky@redhat.com)
- rhsmcertd: Define exit codes (mhorky@redhat.com)
- rhsmcertd: Use module-level logger (mhorky@redhat.com)
- Add AnonymousCertificateManager (mhorky@redhat.com)
- Add CloudTokenCache for Candlepin JWT (mhorky@redhat.com)
- Implement API endpoints for Automatic registration v2 (mhorky@redhat.com)
- Update documentation for one API call in connection.py (mhorky@redhat.com)
- Fix type hint of RegisterService.register() (mhorky@redhat.com)
- rhsmcertd: Drop D-Bus loop code (mhorky@redhat.com)
- rhsmcertd: Add type hints (mhorky@redhat.com)
- rhsmcertd: Remove forgotten old comment (mhorky@redhat.com)
- Stop logging full lscpu output (mhorky@redhat.com)
- Prevent double-logging of syspurpose cache log statement (mhorky@redhat.com)
- Update the log message containing response time statistics
(mhorky@redhat.com)
- CCT-266: Update TLS flags (mhorky@redhat.com)
* Thu Jan 18 2024 Pino Toscano <ptoscano@redhat.com> 1.29.40-1
- Translated using Weblate (Korean) (simmon@nplob.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN))
(mariocanfly@hotmail.com)
- spec: Add missing GLib dependency when building without DNF
(debarshir@gnome.org)
- Remove deprecated `locale.*()` functions (mhorky@redhat.com)
- Remove version constraint of pytest (mhorky@redhat.com)
- RHEL-15110: RegisterServer is stopped, when not needed (jhnidek@redhat.com)
- RHEL-15110: Fix issue with registration using gsd-subman (jhnidek@redhat.com)
- Fix an error in debug logging of cloud-what (mhorky@redhat.com)
- ci: bump actions/upload-artifact from 3 to 4
(49699333+dependabot[bot]@users.noreply.github.com)
- Improve debug logging to make it faster to understand (mhorky@redhat.com)
* Thu Nov 23 2023 Pino Toscano <ptoscano@redhat.com> 1.29.39-1
- tito: drop bz requirement (ptoscano@redhat.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (jsefler@redhat.com)
- RHEL-7206: Small change of message printed by dnf plugin (jhnidek@redhat.com)
- CCT-118: Fix flake8 error E721 (mhorky@redhat.com)
- Fix type hint in rhsm (mhorky@redhat.com)
- Simplify autoregistration test setup (mhorky@redhat.com)
- RHEL-9435: Get AWS metadata via IMDSv2 (mhorky@redhat.com)
- Fixed inappropriate logical expression (ataf@openrefactory.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)
- RPM: Avoid needless runtime requirement on python3-setuptools
(miro@hroncok.cz)
- 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)
- 2225403: Parse URL properly (jhnidek@redhat.com)
* Thu Sep 14 2023 Pino Toscano <ptoscano@redhat.com> 1.29.38-1
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (ptoscano@redhat.com)
- ci: bump actions/checkout from 3 to 4

Loading…
Cancel
Save