Compare commits
No commits in common. "c8" and "a9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/subscription-manager-1.28.42.tar.gz
|
SOURCES/subscription-manager-1.29.42.tar.gz
|
||||||
|
1
.subscription-manager.metadata
Normal file
1
.subscription-manager.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
96fe0bb71a717a9b248374f7252505e74d61f3f8 SOURCES/subscription-manager-1.29.42.tar.gz
|
47
SOURCES/almalinux_debrand.patch
Normal file
47
SOURCES/almalinux_debrand.patch
Normal 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)
|
@ -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
|
|
@ -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
|
|
@ -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": [
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user