ROCKY/CFG/subscription-manager.cfg

@@ -31,7 +31,7 @@ spec_change {
   search_and_replace {
     any: true
     find: "%setup -q"
-    replace: "%setup -q\n%patch9998 -p1\n%patch2 -p9999\n"
+    replace: "%setup -q\n%patch9998 -p1\n%patch9999 -p1\n"
     n: 1
   }
 

ROCKY/_supporting/0001-subscription-manager-rocky-remove-redhat-refs.patch

-From 1879be0ccb8220a21f07b293602f2a4c637c641f Mon Sep 17 00:00:00 2001
+From be32e6f788b6fc5ae82454ccec3381c6d948d0c1 Mon Sep 17 00:00:00 2001
 From: Louis Abel <label@rockylinux.org>
-Date: Tue, 1 Nov 2022 10:41:47 -0700
+Date: Sun, 5 Nov 2023 16:49:36 -0700
 Subject: [PATCH] patch up subscription manager
 
 ---
@@ -21,12 +21,12 @@ index 9050582..2392f67 100644
  # 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
 diff --git a/src/subscription_manager/repofile.py b/src/subscription_manager/repofile.py
-index 650d963..8bda5f7 100644
+index cc98803..78c7ce2 100644
 --- a/src/subscription_manager/repofile.py
 +++ b/src/subscription_manager/repofile.py
-@@ -370,11 +370,7 @@ class RepoFileBase(object):
+@@ -375,11 +375,7 @@ class RepoFileBase:
+         """
          Try to create new repo file.
-         :return: None
          """
 -        self.create_dir_path()
 -        if self.path_exists(self.path) or not self.manage_repos:
@@ -35,14 +35,14 @@ index 650d963..8bda5f7 100644
 -            f.write(self.REPOFILE_HEADER)
 +        pass
  
-     def fix_content(self, content):
+     def fix_content(self, content: str) -> str:
          return content
 diff --git a/src/subscription_manager/repolib.py b/src/subscription_manager/repolib.py
-index dc649ea..fb1dc0d 100644
+index 4e7c016..f5c0d13 100644
 --- a/src/subscription_manager/repolib.py
 +++ b/src/subscription_manager/repolib.py
-@@ -83,7 +83,7 @@ class YumPluginManager(object):
-     def warning_message(enabled_yum_plugins):
+@@ -92,7 +92,7 @@ class YumPluginManager:
+     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 "
@@ -51,5 +51,5 @@ index dc649ea..fb1dc0d 100644
              "block this behavior."
          ) % ", ".join(enabled_yum_plugins)
 -- 
-2.37.3
+2.41.0