ROCKY/CFG/subscription-manager.cfg

@@ -7,13 +7,17 @@ add {
 }
 
 spec_change {
-  
+  append {
+    field: "Release"
+    value: ".rocky.0.2"
+  }
+  disable_auto_align: true
   # Hacky workaround:  unfortunately default file/patch add comand sticks the patches in the middle of an ifdef SUSE block
   # We're not SUSE, so the patches never get applied/found
   search_and_replace {
     any: true
     find: "%if (0%{?suse_version} && 0%{?suse_version} < 1200)"
-    replace: "Patch1:  ROCKY-use-rocky-syspurposes.patch\nPatch2:  subscription-manager-rocky-remove-redhat.patch\n%if (0%{?suse_version} && 0%{?suse_version} < 1200)"
+    replace: "Patch9998:  ROCKY-use-rocky-syspurposes.patch\nPatch9999:  subscription-manager-rocky-remove-redhat.patch\n%if (0%{?suse_version} && 0%{?suse_version} < 1200)"
     n: 1
   }
   
@@ -21,10 +25,10 @@ spec_change {
   search_and_replace {
     any: true
     find: "%setup -q"
-    replace: "%setup -q\n%patch1 -p1\n%patch2 -p1\n"
+    replace: "%setup -q\n%patch9998 -p1\n%patch9999 -p1\n"
     n: 1
   }
-  
+
   search_and_replace {
     any: true
     find: "Supplements: initial-setup-gui"
@@ -32,79 +36,16 @@ spec_change {
     n: 1
   }
 
+   # Remove random red hat references
   search_and_replace {
     any: true
-    find: "touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo"
-    replace: "# redhat repo not required"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com"
-    replace: "# remove cdn.redhat.com"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt"
-    replace: "# remove redhat entitlement"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem"
-    replace: "rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem"
-    replace: "sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com"
-    replace: "# remove cdn.redhat.com"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "%attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt"
-    replace: "# remove redhat entitlement"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem"
-    replace: "# remove redhat entitlement authority"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "%attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem"
-    replace: "# remove redhat entitlement authority"
-    n: 1
-  }
-
-  search_and_replace {
-    any: true
-    find: "the Enterprise Linux"
+    find: "the Red Hat"
     replace: "an"
     n: -1
   }
-
   search_and_replace {
     any: true
-    find: "a Enterprise Linux"
+    find: "a Red Hat"
     replace: "a"
     n: -1
   }
@@ -112,6 +53,6 @@ spec_change {
   changelog {
     author_name: "Release Engineering"
     author_email: "releng@rockylinux.org"
-    message: "Remove Red Hat specific references and certificates"
+    message: "Remove Red Hat specific references"
   }
 }

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

-diff -Naurp subscription-manager-1.28.28/etc-conf/plugin/subscription-manager.conf subscription-manager-1.28.28-patch/etc-conf/plugin/subscription-manager.conf
---- subscription-manager-1.28.28/etc-conf/plugin/subscription-manager.conf	2022-02-15 08:23:26.000000000 -0700
-+++ subscription-manager-1.28.28-patch/etc-conf/plugin/subscription-manager.conf	2022-04-02 17:16:08.219528948 -0700
+From 5d25661295dc2e6feb52062a5d113b2cc55dc8e8 Mon Sep 17 00:00:00 2001
+From: Louis Abel <label@rockylinux.org>
+Date: Wed, 17 May 2023 11:09:44 -0700
+Subject: [PATCH] Remove Red Hat references
+
+---
+ etc-conf/plugin/subscription-manager.conf        | 2 +-
+ etc-conf/subscription-manager-cockpit.desktop.in | 2 +-
+ etc-conf/subscription-manager-gui.desktop.in     | 2 +-
+ src/subscription_manager/repofile.py             | 6 +-----
+ src/subscription_manager/repolib.py              | 2 +-
+ 5 files changed, 5 insertions(+), 9 deletions(-)
+
+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
@@ -8,9 +22,10 @@ diff -Naurp subscription-manager-1.28.28/etc-conf/plugin/subscription-manager.co
  
  # 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 -Naurp subscription-manager-1.28.28/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.28-patch/etc-conf/subscription-manager-cockpit.desktop.in
---- subscription-manager-1.28.28/etc-conf/subscription-manager-cockpit.desktop.in	2022-02-15 08:23:26.000000000 -0700
-+++ subscription-manager-1.28.28-patch/etc-conf/subscription-manager-cockpit.desktop.in	2022-04-02 16:57:54.295374442 -0700
+diff --git a/etc-conf/subscription-manager-cockpit.desktop.in b/etc-conf/subscription-manager-cockpit.desktop.in
+index 74b78e1..257f540 100644
+--- a/etc-conf/subscription-manager-cockpit.desktop.in
++++ b/etc-conf/subscription-manager-cockpit.desktop.in
 @@ -1,5 +1,5 @@
  [Desktop Entry]
 -_Name=Red Hat Subscription Manager
@@ -18,9 +33,10 @@ diff -Naurp subscription-manager-1.28.28/etc-conf/subscription-manager-cockpit.d
  Icon=subscription-manager
  Type=Application
  TryExec=/usr/libexec/cockpit-desktop
-diff -Naurp subscription-manager-1.28.28/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.28.28-patch/etc-conf/subscription-manager-gui.desktop.in
---- subscription-manager-1.28.28/etc-conf/subscription-manager-gui.desktop.in	2022-02-15 08:23:26.000000000 -0700
-+++ subscription-manager-1.28.28-patch/etc-conf/subscription-manager-gui.desktop.in	2022-04-02 16:57:43.575412524 -0700
+diff --git a/etc-conf/subscription-manager-gui.desktop.in b/etc-conf/subscription-manager-gui.desktop.in
+index bbac43f..aebeedd 100644
+--- a/etc-conf/subscription-manager-gui.desktop.in
++++ b/etc-conf/subscription-manager-gui.desktop.in
 @@ -1,5 +1,5 @@
  [Desktop Entry]
 -_Name=Red Hat Subscription Manager
@@ -28,23 +44,11 @@ diff -Naurp subscription-manager-1.28.28/etc-conf/subscription-manager-gui.deskt
  Icon=subscription-manager
  Exec=subscription-manager-gui
  Terminal=false
-diff -Naurp subscription-manager-1.28.28/src/subscription_manager/migrate/migrate.py subscription-manager-1.28.28-patch/src/subscription_manager/migrate/migrate.py
---- subscription-manager-1.28.28/src/subscription_manager/migrate/migrate.py	2022-02-15 08:23:26.000000000 -0700
-+++ subscription-manager-1.28.28-patch/src/subscription_manager/migrate/migrate.py	2022-04-02 16:58:22.311274917 -0700
-@@ -278,8 +278,7 @@ class MigrationEngine(object):
-             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 -Naurp subscription-manager-1.28.28/src/subscription_manager/repofile.py subscription-manager-1.28.28-patch/src/subscription_manager/repofile.py
---- subscription-manager-1.28.28/src/subscription_manager/repofile.py	2022-02-15 08:23:26.000000000 -0700
-+++ subscription-manager-1.28.28-patch/src/subscription_manager/repofile.py	2022-04-02 16:59:27.519043271 -0700
-@@ -368,11 +368,7 @@ class RepoFileBase(object):
+diff --git a/src/subscription_manager/repofile.py b/src/subscription_manager/repofile.py
+index 8b523c3..f8a5694 100644
+--- a/src/subscription_manager/repofile.py
++++ b/src/subscription_manager/repofile.py
+@@ -369,11 +369,7 @@ class RepoFileBase(object):
          Try to create new repo file.
          :return: None
          """
@@ -57,10 +61,11 @@ diff -Naurp subscription-manager-1.28.28/src/subscription_manager/repofile.py su
  
      def fix_content(self, content):
          return content
-diff -Naurp subscription-manager-1.28.28/src/subscription_manager/repolib.py subscription-manager-1.28.28-patch/src/subscription_manager/repolib.py
---- subscription-manager-1.28.28/src/subscription_manager/repolib.py	2022-02-15 08:23:26.000000000 -0700
-+++ subscription-manager-1.28.28-patch/src/subscription_manager/repolib.py	2022-04-02 16:59:07.055115968 -0700
-@@ -87,7 +87,7 @@ class YumPluginManager(object):
+diff --git a/src/subscription_manager/repolib.py b/src/subscription_manager/repolib.py
+index 103517d..64454b9 100644
+--- a/src/subscription_manager/repolib.py
++++ b/src/subscription_manager/repolib.py
+@@ -86,7 +86,7 @@ class YumPluginManager(object):
      @staticmethod
      def warning_message(enabled_yum_plugins):
          message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
@@ -69,3 +74,6 @@ diff -Naurp subscription-manager-1.28.28/src/subscription_manager/repolib.py sub
                      '"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
                      'block this behavior.') % ', '.join(enabled_yum_plugins)
          return message
+-- 
+2.40.1
+