Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2025-06-26 14:05:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.7067 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Thu Jun 26 14:05:42 2025 rev:61 rq:1288596 version:340 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2025-05-26 18:33:13.749604231 +0200 +++ /work/SRC/openSUSE:Factory/.cockpit.new.7067/cockpit.changes 2025-06-26 14:06:20.852435132 +0200 @@ -1,0 +2,14 @@ +Thu Jun 19 08:30:49 UTC 2025 - Alice Brooks <alice.bro...@suse.com> + +- Add kdump-nfs-fixes.patch to fix bsc#1241949 + +------------------------------------------------------------------- +Mon Jun 16 06:29:04 UTC 2025 - Alice Brooks <alice.bro...@suse.com> + +- Update to 340 + * Detect multiple mount points when creating btrfs subvolumes + * Disk Self-Test error warnings on the overview page + * Prevent modifying partitions in unsupported places + * Bug fixes and translation updates + +------------------------------------------------------------------- Old: ---- cockpit-338.tar.gz New: ---- cockpit-340.tar.gz kdump-nfs-fixes.patch ----------(New B)---------- New: - Add kdump-nfs-fixes.patch to fix bsc#1241949 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.h2Lj6z/_old 2025-06-26 14:06:28.668759135 +0200 +++ /var/tmp/diff_new_pack.h2Lj6z/_new 2025-06-26 14:06:28.668759135 +0200 @@ -50,7 +50,7 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 338 +Version: 340 Release: 0 Source0: cockpit-%{version}.tar.gz Source1: cockpit.pam @@ -68,6 +68,7 @@ Patch3: suse-microos-branding.patch Patch4: css-overrides.patch Patch5: storage-btrfs.patch +Patch6: kdump-nfs-fixes.patch # SLE Micro specific patches Patch101: hide-pcp.patch Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch @@ -215,6 +216,7 @@ %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 6 -p1 %patch -P 106 -p1 %patch -P 109 -p1 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.h2Lj6z/_old 2025-06-26 14:06:28.796764442 +0200 +++ /var/tmp/diff_new_pack.h2Lj6z/_new 2025-06-26 14:06:28.800764607 +0200 @@ -1,6 +1,6 @@ -mtime: 1747990537 -commit: 4041355e9ede65660aeb06ec0e8be1ccfa1db8be8b7978f148a59be12e8befb6 +mtime: 1750681336 +commit: b8985dff0b6a36542dec6f399fb154e2a2bfd071813ecbfe196ae6f2e8ce0577 url: https://src.opensuse.org/cockpit/cockpit.git -revision: 4041355e9ede65660aeb06ec0e8be1ccfa1db8be8b7978f148a59be12e8befb6 +revision: b8985dff0b6a36542dec6f399fb154e2a2bfd071813ecbfe196ae6f2e8ce0577 projectscmsync: https://src.opensuse.org/cockpit/_ObsPrj.git ++++++ build.specials.obscpio ++++++ ++++++ cockpit-338.tar.gz -> cockpit-340.tar.gz ++++++ /work/SRC/openSUSE:Factory/cockpit/cockpit-338.tar.gz /work/SRC/openSUSE:Factory/.cockpit.new.7067/cockpit-340.tar.gz differ: char 12, line 1 ++++++ kdump-nfs-fixes.patch ++++++ >From d1ffed4a006bc9f8aeb0e8f63e8d2a160720b4f6 Mon Sep 17 00:00:00 2001 From: Alice Brooks <alice.bro...@suse.com> Date: Thu, 12 Jun 2025 08:48:16 +0100 Subject: [PATCH] kdump: Remove nfs directory when using sysconfig configuration style This is because the sysconfig style only has the KDUMP_SAVEDIR field so we can't work with two path fields as it's impossible to extract them again --- pkg/kdump/kdump-client.js | 4 ++++ pkg/kdump/kdump-view.jsx | 24 +++++++++++++++--------- pkg/kdump/kdump.js | 6 ++++++ 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/pkg/kdump/kdump-client.js b/pkg/kdump/kdump-client.js index d4c3d989a42d..35add2554a39 100644 --- a/pkg/kdump/kdump-client.js +++ b/pkg/kdump/kdump-client.js @@ -48,6 +48,7 @@ export class KdumpClient { state: undefined, config: undefined, target: undefined, + sysconfig: undefined, }; cockpit.event_target(this); @@ -62,6 +63,7 @@ export class KdumpClient { // watch the config file this.configClient = new ConfigFile("/etc/kdump.conf", true); + this.state.sysconfig = false; this._watchConfigChanges(); this.configClient.wait().then(() => { @@ -69,6 +71,8 @@ export class KdumpClient { if (this.configClient.settings === null) { this.configClient.close(); this.configClient = new ConfigFileSUSE("/etc/sysconfig/kdump", true); + this.state.sysconfig = true; + this.dispatchEvent("kdumpSysconfigChanged", true); this._watchConfigChanges(); } }); diff --git a/pkg/kdump/kdump-view.jsx b/pkg/kdump/kdump-view.jsx index c6cc1e0d6bc6..8b5d74707e39 100644 --- a/pkg/kdump/kdump-view.jsx +++ b/pkg/kdump/kdump-view.jsx @@ -115,12 +115,15 @@ const exportAnsibleTask = (settings, os_release) => { return ansible; }; -function getLocation(target) { +function getLocation(target, sysconfig) { let path = target.path || DEFAULT_KDUMP_PATH; if (target.type === "ssh") { path = `${target.server}:${path}`; } else if (target.type == "nfs") { + if (sysconfig) { + path = ''; + } path = path[0] !== '/' ? '/' + path : path; path = `${target.server}:${target.export + path}`; } @@ -128,7 +131,7 @@ function getLocation(target) { return path; } -const KdumpSettingsModal = ({ settings, initialTarget, handleSave }) => { +const KdumpSettingsModal = ({ settings, initialTarget, handleSave, sysconfig }) => { const Dialogs = useDialogs(); const compressionAllowed = settings.compression?.allowed; const [isSaving, setIsSaving] = useState(false); @@ -276,13 +279,15 @@ const KdumpSettingsModal = ({ settings, initialTarget, handleSave }) => { placeholder="/export/cores" value={exportPath} onChange={(_event, value) => setExportPath(value)} isRequired /> </FormGroup> + {sysconfig === false && <FormGroup fieldId="kdump-settings-nfs-directory" label={_("Directory")} isRequired> <TextInput id="kdump-settings-nfs-directory" key="directory" - placeholder={DEFAULT_KDUMP_PATH} value={directory} - data-stored={directory} - onChange={(_event, value) => setDirectory(value)} - isRequired /> + placeholder={DEFAULT_KDUMP_PATH} value={directory} + data-stored={directory} + onChange={(_event, value) => setDirectory(value)} + isRequired /> </FormGroup> + } </> } @@ -353,7 +358,7 @@ export class KdumpPage extends React.Component { const target = this.props.kdumpStatus.target; let verifyMessage; if (!target.multipleTargets) { - const path = getLocation(target); + const path = getLocation(target, this.props.sysconfig); if (target.type === "local") { verifyMessage = fmt_to_fragments( ' ' + _("Results of the crash will be stored in $0 as $1, if kdump is properly configured."), @@ -403,7 +408,8 @@ export class KdumpPage extends React.Component { const Dialogs = this.context; Dialogs.show(<KdumpSettingsModal settings={this.props.kdumpStatus.config} initialTarget={this.props.kdumpStatus.target} - handleSave={this.props.onSaveSettings} />); + handleSave={this.props.onSaveSettings} + sysconfig={this.props.sysconfig} />); } handleAutomationClick() { @@ -459,7 +465,7 @@ ${enableCrashKernel} if (target.multipleTargets) { kdumpLocation = _("invalid: multiple targets defined"); } else { - const locationPath = getLocation(target); + const locationPath = getLocation(target, this.props.sysconfig); if (target.type == "local") { kdumpLocation = cockpit.format(_("Local, $0"), locationPath); targetCanChange = true; diff --git a/pkg/kdump/kdump.js b/pkg/kdump/kdump.js index 1a143defef15..b0f75e88c220 100644 --- a/pkg/kdump/kdump.js +++ b/pkg/kdump/kdump.js @@ -41,6 +41,7 @@ const initStore = function(rootElement) { dataStore.domRootElement = rootElement; dataStore.kdumpClient = new kdumpClient.KdumpClient(); + dataStore.sysconfig = dataStore.kdumpClient.state.sysconfig; dataStore.saveSettings = settings => dataStore.kdumpClient.validateSettings(settings) @@ -74,6 +75,7 @@ const initStore = function(rootElement) { reservedMemory: dataStore.kdumpMemory, kdumpStatus: dataStore.kdumpStatus, kdumpCmdlineEnabled: dataStore.crashkernel || false, + sysconfig: dataStore.sysconfig, onSaveSettings: dataStore.saveSettings, onCrashKernel: dataStore.kdumpClient.crashKernel, exportConfig: dataStore.exportConfig, @@ -117,6 +119,10 @@ const initStore = function(rootElement) { dataStore.kdumpStatus = status; render(); }); + dataStore.kdumpClient.addEventListener('kdumpSysconfigChanged', function(event, sysconfig) { + dataStore.sysconfig = sysconfig; + render(); + }); // render once render(); ++++++ node_modules.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/node_modules.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.7067/node_modules.obscpio differ: char 24503, line 149 ++++++ node_modules.spec.inc ++++++ ++++ 1005 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.7067/node_modules.spec.inc ++++++ package-lock.json ++++++ ++++ 2143 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/package-lock.json ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.7067/package-lock.json ++++++ remove_rh_links.patch ++++++ --- /var/tmp/diff_new_pack.h2Lj6z/_old 2025-06-26 14:06:29.216781852 +0200 +++ /var/tmp/diff_new_pack.h2Lj6z/_new 2025-06-26 14:06:29.220782018 +0200 @@ -1,8 +1,8 @@ diff --git a/pkg/networkmanager/bond.jsx b/pkg/networkmanager/bond.jsx -index 80956bd7b..de8e667aa 100644 +index b54b1db..062cd1d 100644 --- a/pkg/networkmanager/bond.jsx +++ b/pkg/networkmanager/bond.jsx -@@ -142,16 +142,6 @@ export const BondDialog = ({ connection, dev, settings }) => { +@@ -151,16 +151,6 @@ export const BondDialog = ({ connection, dev, settings }) => { {_("A network bond combines multiple network interfaces into one logical interface with higher throughput or redundancy.")} </div> } @@ -20,10 +20,10 @@ <Button id="bond-help-popup-button" variant="plain" aria-label="Help"> <HelpIcon /> diff --git a/pkg/systemd/hwinfo.jsx b/pkg/systemd/hwinfo.jsx -index 30196f0dc..d53948374 100644 +index d2d2d9b..af0bedc 100644 --- a/pkg/systemd/hwinfo.jsx +++ b/pkg/systemd/hwinfo.jsx -@@ -201,11 +201,6 @@ const CPUSecurityMitigationsDialog = () => { +@@ -205,11 +205,6 @@ const CPUSecurityMitigationsDialog = () => { <DataListCell key="primary content"> <span> <div className='nosmt-heading'>{ _("Disable simultaneous multithreading") } (nosmt)</div> @@ -36,19 +36,19 @@ </DataListCell>, ]} diff --git a/pkg/systemd/overview-cards/cryptoPolicies.jsx b/pkg/systemd/overview-cards/cryptoPolicies.jsx -index dc8b996ec..2f6fc8ac4 100644 +index fa57de9..d4dd3be 100644 --- a/pkg/systemd/overview-cards/cryptoPolicies.jsx +++ b/pkg/systemd/overview-cards/cryptoPolicies.jsx -@@ -115,7 +115,7 @@ const CryptoPolicyDialog = ({ +@@ -143,7 +143,7 @@ const CryptoPolicyDialog = ({ variant='link' isInline icon={<ExternalLinkSquareAltIcon />} iconPosition="right" -- href="https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/8/html/security_hardening/switching-rhel-to-fips-mode_security-hardening";> +- href="https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/security_hardening/using-the-system-wide-cryptographic-policies_security-hardening";> + href="https://documentation.suse.com/sle-micro/6.0/html/Micro-selinux/selinux-article.html";> {_("Learn more")} </Button> </Flex>), -@@ -154,16 +154,6 @@ const CryptoPolicyDialog = ({ +@@ -184,16 +184,6 @@ const CryptoPolicyDialog = ({ {_("Cryptographic Policies is a system component that configures the core cryptographic subsystems, covering the TLS, IPSec, SSH, DNSSec, and Kerberos protocols.")} </div> } @@ -66,10 +66,10 @@ <Button variant="plain" aria-label={_("Help")}> <HelpIcon /> diff --git a/pkg/systemd/overview-cards/tuned-dialog.jsx b/pkg/systemd/overview-cards/tuned-dialog.jsx -index 258f42640..3ec591cb7 100644 +index 38420ca..cd7e2a3 100644 --- a/pkg/systemd/overview-cards/tuned-dialog.jsx +++ b/pkg/systemd/overview-cards/tuned-dialog.jsx -@@ -275,36 +275,10 @@ const TunedDialog = ({ +@@ -278,36 +278,10 @@ const TunedDialog = ({ }; }, [tunedService]);
