From 416aa9163d1b8de4091c35f889f67ad8008b2bb60ba87d63209a6e02db4c05d4 Mon Sep 17 00:00:00 2001 From: Alice Brooks Date: Tue, 8 Oct 2024 11:59:32 +0100 Subject: [PATCH] Add various patches for slfo-1.1 - suse_docs.patch: update documentation to point at new links (bsc#1226050) - remove_rh_links.patch: remove additional hardcoded RH refs (bsc#1221336) - hide-pcp.patch: correct patch to properly disable pcp on micro (bsc#1226049) - suse-microos-branding.patch: use suse ID as branding instead of sle-micro (bsc#1227441) --- cockpit.changes | 10 ++ cockpit.spec | 10 +- hide-pcp.patch | 28 ++++- remove_rh_links.patch | 108 +++++++++++++++++ suse-microos-branding.patch | 22 ++-- suse_docs.patch | 235 +++++++++++++++++++----------------- 6 files changed, 288 insertions(+), 125 deletions(-) create mode 100644 remove_rh_links.patch diff --git a/cockpit.changes b/cockpit.changes index 8f1b897..c14f8f9 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 9 12:14:14 UTC 2024 - Alice Brooks + +- suse_docs.patch: update documentation to point at new links (bsc#1226050) +- remove_rh_links.patch: remove additional hardcoded RH refs (bsc#1221336) +- hide-pcp.patch: correct patch to properly disable pcp on micro + (bsc#1226049) +- suse-microos-branding.patch: use suse ID as branding instead of sle-micro + (bsc#1227441) + ------------------------------------------------------------------- Mon Sep 30 07:08:12 UTC 2024 - Alice Brooks diff --git a/cockpit.spec b/cockpit.spec index aadc09e..c9bddd9 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -75,6 +75,8 @@ Patch104: selinux_libdir.patch Patch105: fix-libexecdir.patch Patch106: 0005-cockpit-ws-user-remove-default-deps.patch +Patch201: remove_rh_links.patch + %define build_all 1 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} @@ -247,6 +249,8 @@ BuildRequires: python3-tox-current-env %patch -P 105 -p1 %endif +%patch -P 201 -p1 + cp %SOURCE1 tools/cockpit.pam # local-npm-registry %{_sourcedir} install --include=dev --ignore-scripts @@ -430,13 +434,13 @@ sed -i "s|%{buildroot}||" *.list # remove brandings with stale symlinks. Means they don't match # the distro. pushd %{buildroot}/%{_datadir}/cockpit/branding -ls --hide={default,kubernetes,opensuse,registry,sle-micro,suse} | xargs rm -rv +ls --hide={default,kubernetes,opensuse,registry,suse} | xargs rm -rv popd # need this in SUSE as post build checks dislike stale symlinks install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd test -e %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg -test -e %{buildroot}/usr/share/cockpit/branding/sle-micro/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/sle-micro/apple-touch-icon.png -test -e %{buildroot}/usr/share/cockpit/branding/sle-micro/default-1920x1200.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/sle-micro/default-1920x1200.png +test -e %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png +test -e %{buildroot}/usr/share/cockpit/branding/suse/default-1920x1200.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/default-1920x1200.png # remove files of not installable packages rm -r %{buildroot}%{_datadir}/cockpit/sosreport rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml diff --git a/hide-pcp.patch b/hide-pcp.patch index aa64c1c..9585301 100644 --- a/hide-pcp.patch +++ b/hide-pcp.patch @@ -2,11 +2,33 @@ Index: cockpit/pkg/metrics/metrics.jsx =================================================================== --- cockpit.orig/pkg/metrics/metrics.jsx +++ cockpit/pkg/metrics/metrics.jsx -@@ -1551,6 +1551,7 @@ const PCPConfig = ({ buttonVariant, fire +@@ -1565,6 +1565,7 @@ const PCPConfig = ({ buttonVariant, firewalldRequest, needsLogout, setNeedsLogou return ( } + />; ++*/ + + if (!this.state.metricsAvailable) { + let action; diff --git a/remove_rh_links.patch b/remove_rh_links.patch new file mode 100644 index 0000000..b4c7610 --- /dev/null +++ b/remove_rh_links.patch @@ -0,0 +1,108 @@ +Index: cockpit-309/pkg/systemd/overview-cards/cryptoPolicies.jsx +=================================================================== +--- cockpit-309.orig/pkg/systemd/overview-cards/cryptoPolicies.jsx ++++ cockpit-309/pkg/systemd/overview-cards/cryptoPolicies.jsx +@@ -115,7 +115,7 @@ const CryptoPolicyDialog = ({ + variant='link' + isInline + icon={} iconPosition="right" +- href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/security_hardening/assembly_installing-the-system-in-fips-mode_security-hardening"> ++ href="https://documentation.suse.com/sle-micro/6.0/html/Micro-selinux/selinux-article.html"> + {_("Learn more")} + + ), +@@ -154,16 +154,6 @@ const CryptoPolicyDialog = ({ + {_("Cryptographic Policies is a system component that configures the core cryptographic subsystems, covering the TLS, IPSec, SSH, DNSSec, and Kerberos protocols.")} + + } +- footerContent={ +- +- } + > + +- } +- > +- +- +- ); +- + return ( + { + + +
{ _("Disable simultaneous multithreading") } (nosmt)
+- +- +- { _("Read more...") } +- +- + + , + ]} +Index: cockpit-309/pkg/networkmanager/bond.jsx +=================================================================== +--- cockpit-309.orig/pkg/networkmanager/bond.jsx ++++ cockpit-309/pkg/networkmanager/bond.jsx +@@ -142,16 +142,6 @@ export const BondDialog = ({ connection, dev, settings }) => { + {_("A network bond combines multiple network interfaces into one logical interface with higher throughput or redundancy.")} + + } +- footerContent={ +- +- } + > +