From 9e6892623aad67253fa0db4a8e5cd0f715f32e57 Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Thu, 14 Sep 2023 18:16:44 +0300 Subject: [PATCH] Debrand and for MSVSphere 8.8 --- SOURCES/0001-Debrand-for-MSVSphere.patch | 440 ++++++++++++++++++ SOURCES/0002-Set-MSVSphere-syspurposes.patch | 28 ++ SOURCES/0003-Disable-repo-file-creation.patch | 30 ++ ...-Disable-subscription-manager-plugin.patch | 23 + SPECS/subscription-manager.spec | 40 +- 5 files changed, 549 insertions(+), 12 deletions(-) create mode 100644 SOURCES/0001-Debrand-for-MSVSphere.patch create mode 100644 SOURCES/0002-Set-MSVSphere-syspurposes.patch create mode 100644 SOURCES/0003-Disable-repo-file-creation.patch create mode 100644 SOURCES/0004-Disable-subscription-manager-plugin.patch diff --git a/SOURCES/0001-Debrand-for-MSVSphere.patch b/SOURCES/0001-Debrand-for-MSVSphere.patch new file mode 100644 index 0000000..48a1a8b --- /dev/null +++ b/SOURCES/0001-Debrand-for-MSVSphere.patch @@ -0,0 +1,440 @@ +From 588e4b403dc701db0a5dec9231ffc6d4e5fe46f7 Mon Sep 17 00:00:00 2001 +From: Sergey Cherevko +Date: Thu, 14 Sep 2023 17:44:07 +0300 +Subject: [PATCH 1/4] Debrand for MSVSphere + +--- + po/as.po | 4 ++-- + po/bn_IN.po | 4 ++-- + po/de.po | 6 +++--- + po/es.po | 8 ++++---- + po/fr.po | 8 ++++---- + po/gu.po | 4 ++-- + po/hi.po | 4 ++-- + po/it.po | 6 +++--- + po/ja.po | 6 +++--- + po/keys.pot | 4 ++-- + po/kn.po | 4 ++-- + po/ko.po | 6 +++--- + po/ml.po | 4 ++-- + po/mr.po | 4 ++-- + po/or.po | 4 ++-- + po/pa.po | 4 ++-- + po/pt_BR.po | 6 +++--- + po/ru.po | 6 +++--- + po/si.po | 4 ++-- + po/ta_IN.po | 4 ++-- + po/te.po | 4 ++-- + po/zh_CN.po | 6 +++--- + po/zh_TW.po | 6 +++--- + src/subscription_manager/repolib.py | 2 +- + 24 files changed, 59 insertions(+), 59 deletions(-) + +diff --git a/po/as.po b/po/as.po +index db99d31..2fc31cf 100644 +--- a/po/as.po ++++ b/po/as.po +@@ -7482,8 +7482,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/bn_IN.po b/po/bn_IN.po +index 5e9e917..3b7f061 100644 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -7545,8 +7545,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/de.po b/po/de.po +index 015481f..2b0be83 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -7081,11 +7081,11 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"Die yum/dnf-Plugins: %s wurden automatisch zum Nutzen von Red Hat " ++"Die yum/dnf-Plugins: %s wurden automatisch zum Nutzen von " + "Subscription Management aktiviert. Wenn nicht gewünscht, verwenden Sie " + "\"subscription-manager config --rhsm.auto_enable_yum_plugins=0\", um dies zu " + "blockieren." +diff --git a/po/es.po b/po/es.po +index a9d9117..86fc513 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -7036,12 +7036,12 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"Los plugins yum/dnf: %s se habilitaron automáticamente en beneficio de Red " +-"Hat Subscription Management. Si no lo desea, use \"subscription-manager " ++"Los plugins yum/dnf: %s se habilitaron automáticamente en beneficio de " ++"Subscription Management. Si no lo desea, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" para bloquear este comportamiento." + + #: src/subscription_manager/repolib.py:663 +diff --git a/po/fr.po b/po/fr.po +index 599357c..aaa4c37 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -7078,12 +7078,12 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"Les greffons yum : %s ont été activées automatiquement au bénéfice de Red " +-"Hat Subscription Management. Si vous ne le souhaitez pas, utiliser " ++"Les greffons yum : %s ont été activées automatiquement au bénéfice de " ++"Subscription Management. Si vous ne le souhaitez pas, utiliser " + "« subscription-manager config --rhsm.auto_enable_yum_plugins=0 » pour " + "bloquer ce comportement." + +diff --git a/po/gu.po b/po/gu.po +index 83ea0a5..9170815 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -7464,8 +7464,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/hi.po b/po/hi.po +index b0badc1..9d3e47f 100644 +--- a/po/hi.po ++++ b/po/hi.po +@@ -7482,8 +7482,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/it.po b/po/it.po +index 4f72793..0fde60a 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -7059,12 +7059,12 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + "I plugin yum / dnf: %s sono stati abilitati automaticamente a vantaggio di " +-"Red Hat Subscription Management. Se non lo si desidera, utilizzare " ++"Subscription Management. Se non lo si desidera, utilizzare " + "\"subscription-manager config --rhsm.auto_enable_yum_plugins=0\" per " + "bloccare questo comportamento." + +diff --git a/po/ja.po b/po/ja.po +index 673e45f..53c5c4c 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -6914,11 +6914,11 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"yum/dnf プラグイン: Red Hat サブスクリプション管理に対して %s が自動的に有効" ++"yum/dnf プラグイン: サブスクリプション管理に対して %s が自動的に有効" + "になりました。自動的に有効化しない場合は、\"subscription-manager config --" + "rhsm.auto_enable_yum_plugins=0\" で無効にします。" + +diff --git a/po/keys.pot b/po/keys.pot +index f47d1f4..38573e6 100644 +--- a/po/keys.pot ++++ b/po/keys.pot +@@ -5854,8 +5854,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/kn.po b/po/kn.po +index a59f097..20b58e9 100644 +--- a/po/kn.po ++++ b/po/kn.po +@@ -7766,8 +7766,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/ko.po b/po/ko.po +index 1cd42be..1ef4812 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -6873,11 +6873,11 @@ msgstr "오류: 출시 제품 인증서가 두 개 이상 설치되어 있습니 + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"yum 플러그인: %s이 Red Hat 서브스크립션 관리를 통해 자동으로 활성화되었습니" ++"yum 플러그인: %s이 서브스크립션 관리를 통해 자동으로 활성화되었습니" + "다. 원하지 않을 경우 \"subscription-manager config --rhsm." + "auto_enable_yum_plugins=0\"을 사용하여 이 동작을 차단하십시오." + +diff --git a/po/ml.po b/po/ml.po +index a83e436..f0647a9 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -7692,8 +7692,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/mr.po b/po/mr.po +index 8e98518..2c86d1a 100644 +--- a/po/mr.po ++++ b/po/mr.po +@@ -7673,8 +7673,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/or.po b/po/or.po +index 5edaa1e..930a989 100644 +--- a/po/or.po ++++ b/po/or.po +@@ -7683,8 +7683,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/pa.po b/po/pa.po +index d8b529c..b1e14c8 100644 +--- a/po/pa.po ++++ b/po/pa.po +@@ -7603,8 +7603,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/pt_BR.po b/po/pt_BR.po +index bb06481..5cc6da5 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -7121,12 +7121,12 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + "Os plugins do yum / dnf: %s foram ativados automaticamente para o benefício " +-"do Red Hat Subscription Management. Se não desejar, use \"subscription-" ++"do Subscription Management. Se não desejar, use \"subscription-" + "manager config --rhsm.auto_enable_yum_plugins=0\" para bloquear este " + "comportamento." + +diff --git a/po/ru.po b/po/ru.po +index d5eabbb..681ca90 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -7008,12 +7008,12 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + "Плагины yum / dnf: %s были автоматически включены в интересах управления " +-"подпиской Red Hat. Если это нежелательно, используйте «subscription-manager " ++"подпиской. Если это нежелательно, используйте «subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0» для блокировки этого поведения." + + #: src/subscription_manager/repolib.py:663 +diff --git a/po/si.po b/po/si.po +index 5679f14..fd6f0cc 100644 +--- a/po/si.po ++++ b/po/si.po +@@ -5856,8 +5856,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/ta_IN.po b/po/ta_IN.po +index 0c24da9..985e1f8 100644 +--- a/po/ta_IN.po ++++ b/po/ta_IN.po +@@ -7750,8 +7750,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/te.po b/po/te.po +index f5a7efd..64a7ab6 100644 +--- a/po/te.po ++++ b/po/te.po +@@ -7644,8 +7644,8 @@ msgstr "" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index a2c7216..4d75163 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -6739,11 +6739,11 @@ msgstr "错误：安装了多个发行产品证书。证书路径：%s" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"yum/dnf plugins: %s 会为 Red Hat Subscription Management 自动启用。如果不需" ++"yum/dnf plugins: %s 会为 Subscription Management 自动启用。如果不需" + "要，使用 \"subscription-manager config --rhsm.auto_enable_yum_plugins=0\" 来" + "禁用它。" + +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 5b62286..405cd15 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -6856,11 +6856,11 @@ msgstr "錯誤：安裝了超過一個發行產品憑證。憑證路徑：%s" + #: src/subscription_manager/repolib.py:88 + #, python-format + msgid "" +-"The yum/dnf plugins: %s were automatically enabled for the benefit of Red " +-"Hat Subscription Management. If not desired, use \"subscription-manager " ++"The yum/dnf plugins: %s were automatically enabled for the benefit of " ++"Subscription Management. If not desired, use \"subscription-manager " + "config --rhsm.auto_enable_yum_plugins=0\" to block this behavior." + msgstr "" +-"yum / dnf插件：%s自動啟用以獲得Red Hat訂閱管理。 如果不需要，請使" ++"yum / dnf插件：%s自動啟用以獲得 訂閱管理。 如果不需要，請使" + "用“subscription-manager config --rhsm.auto_enable_yum_plugins=0”來阻止此行" + "為。" + +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 ' +- '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 +-- +2.41.0 + diff --git a/SOURCES/0002-Set-MSVSphere-syspurposes.patch b/SOURCES/0002-Set-MSVSphere-syspurposes.patch new file mode 100644 index 0000000..60c0ca5 --- /dev/null +++ b/SOURCES/0002-Set-MSVSphere-syspurposes.patch @@ -0,0 +1,28 @@ +From b022b3d2fe9b0e5f9b3af76433b6c729f58e5b1a Mon Sep 17 00:00:00 2001 +From: Sergey Cherevko +Date: Thu, 14 Sep 2023 17:46:00 +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.41.0 + diff --git a/SOURCES/0003-Disable-repo-file-creation.patch b/SOURCES/0003-Disable-repo-file-creation.patch new file mode 100644 index 0000000..70065cc --- /dev/null +++ b/SOURCES/0003-Disable-repo-file-creation.patch @@ -0,0 +1,30 @@ +From 8db12d9bd15c40a314ab7bd0c4b1da9293847aa4 Mon Sep 17 00:00:00 2001 +From: Sergey Cherevko +Date: Thu, 14 Sep 2023 17:47:20 +0300 +Subject: [PATCH 3/4] Disable repo file creation + +--- + src/subscription_manager/repofile.py | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/subscription_manager/repofile.py b/src/subscription_manager/repofile.py +index 8b523c3..f67b0e1 100644 +--- a/src/subscription_manager/repofile.py ++++ b/src/subscription_manager/repofile.py +@@ -369,12 +369,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 + +-- +2.41.0 + diff --git a/SOURCES/0004-Disable-subscription-manager-plugin.patch b/SOURCES/0004-Disable-subscription-manager-plugin.patch new file mode 100644 index 0000000..f19650f --- /dev/null +++ b/SOURCES/0004-Disable-subscription-manager-plugin.patch @@ -0,0 +1,23 @@ +From 6cb552e4543beab1b88cb44facd1725e2d57bc46 Mon Sep 17 00:00:00 2001 +From: Sergey Cherevko +Date: Thu, 14 Sep 2023 17:48:19 +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.41.0 + diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 73142ac..90fdd41 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -245,7 +245,7 @@ Name: subscription-manager Version: 1.28.36 -Release: 2%{?dist} +Release: 2%{?dist}.inferit Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} Group: Productivity/Networking/System @@ -262,6 +262,12 @@ URL: http://www.candlepinproject.org/ # yum install tito # 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 + # this is a little different from the Source0, because of limitations in tito, # namely that tito expects only one source tarball %if %{use_cockpit} @@ -402,9 +408,15 @@ BuildRequires: systemd Obsoletes: subscription-manager-plugin-container %endif +# MSVSphere doesn't provide those packages +Obsoletes: subscription-manager-cockpit +Obsoletes: subscription-manager-initial-setup-addon +Obsoletes: rhsm-gtk +Obsoletes: rhsm-icons + %description The Subscription Manager package provides programs and libraries to allow users -to manage subscriptions and yum repositories from the Red Hat entitlement +to manage subscriptions and yum repositories from the EL entitlement platform. @@ -488,7 +500,7 @@ Requires(postun): scrollkeeper %description -n subscription-manager-gui This package contains a GTK+ graphical interface for configuring and -registering a system with a Red Hat Entitlement platform and manage +registering a system with an Entitlement platform and manage subscriptions. %endif @@ -551,7 +563,7 @@ Requires: dnf >= 1.0.0 %description -n dnf-plugin-subscription-manager This package provides plugins to interact with repositories and subscriptions -from the Red Hat entitlement platform; contains subscription-manager and +from an entitlement platform; contains subscription-manager and product-id plugins. %endif @@ -617,7 +629,7 @@ the remote in the currently deployed .origin file. %package -n %{rhsm_package_name} -Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform +Summary: A Python library to communicate with an Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -652,14 +664,14 @@ Obsoletes: python-rhsm <= 1.20.3-1 %endif %description -n %{rhsm_package_name} -A small library for communicating with the REST interface of a Red Hat Unified +A small library for communicating with the REST interface of an Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. %if %{with python2_rhsm} %package -n python2-subscription-manager-rhsm -Summary: A Python library to communicate with a Red Hat Unified Entitlement Platform +Summary: A Python library to communicate with an Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -683,13 +695,13 @@ Provides: python-rhsm = %{version}-%{release} Obsoletes: python-rhsm <= 1.20.3-1 %description -n python2-subscription-manager-rhsm -A small library for communicating with the REST interface of a Red Hat Unified +A small library for communicating with the REST interface of an Unified Entitlement Platform. This interface is used for the management of system entitlements, certificates, and access to content. %endif %package -n subscription-manager-rhsm-certificates -Summary: Certificates required to communicate with a Red Hat Unified Entitlement Platform +Summary: Certificates required to communicate with an Unified Entitlement Platform %if 0%{?suse_version} Group: Development/Libraries/Python %else @@ -700,7 +712,7 @@ Obsoletes: python-rhsm-certificates <= 1.20.3-1 %description -n subscription-manager-rhsm-certificates This package contains certificates required for communicating with the REST interface -of a Red Hat Unified Entitlement Platform, used for the management of system entitlements +of an Unified Entitlement Platform, used for the management of system entitlements and to receive access to content. %if %use_cockpit @@ -722,7 +734,7 @@ Subscription Manager Cockpit UI %if %{use_rhsm_icons} %package -n rhsm-icons -Summary: Icons for Red Hat Subscription Management client tools +Summary: Icons for Subscription Management client tools License: GPLv2 BuildArch: noarch @@ -737,7 +749,7 @@ Conflicts: subscription-manager-cockpit < 1.26.7 %description -n rhsm-icons This package contains the desktop icons for the graphical interfaces provided for management -of Red Hat subscriptions. There are many such interfaces, subscription-manager-gui, +of subscriptions. There are many such interfaces, subscription-manager-gui, subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily. %endif @@ -757,6 +769,7 @@ cloud metadata and signatures. %prep %setup -q +%autopatch -p1 %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ @@ -1483,6 +1496,9 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Sep 14 2023 Sergey Cherevko - 1.28.36-2.inferit +- Debrand and rebuilt for MSVSphere 8.8 + * Wed Jul 26 2023 MSVSphere Packaging Team - 1.28.36-2 - Rebuilt for MSVSphere 8.8