From 0cc0a8310020afc10de6512095336e55559a84d9 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Thu, 7 Aug 2025 07:08:19 +0000 Subject: [PATCH 1/3] bumped changelog version --- changelog.upstream | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 49 insertions(+) diff --git a/changelog.upstream b/changelog.upstream index ea0f4a2..2c9ba0d 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,46 @@ +commit 505a2b7d7995ad48a17add86513ced3499f64ee9 +Merge: 4294165 3a77abe +Author: Patrick Schleizer +Date: Thu Aug 7 03:08:02 2025 -0400 + + Merge remote-tracking branch 'ArrayBolt3/arraybolt3/emerg-shutdown' + +commit 3a77abe5c9807caec530e69c41d5cf803b625e70 +Author: Aaron Rainbolt +Date: Wed Aug 6 20:05:57 2025 -0500 + + Port hardening options from kloak to emerg-shutdown, fix new compiler warnings + +commit 0c1af00aae50dba2983c3736744e0da320bb9330 +Author: Aaron Rainbolt +Date: Wed Aug 6 19:33:38 2025 -0500 + + Implement paranoid mode in emerg-shutdown + +commit 29480df770047c8ada3e993cf28f87ffbfd71dec +Author: Aaron Rainbolt +Date: Wed Aug 6 19:24:34 2025 -0500 + + Improve emerg-shutdown usage documentation + +commit 2a3bc39eba317d5f9b0e710dd3663c82d92add94 +Author: Aaron Rainbolt +Date: Wed Aug 6 19:10:37 2025 -0500 + + Use Ctrl+Alt+End as the default panic key rather than Ctrl+Alt+Delete + +commit 44e7d3059a5618991a1408f77707132bfea86fef +Author: Aaron Rainbolt +Date: Wed Aug 6 19:10:14 2025 -0500 + + Integrate emerg-shutdown into the initramfs + +commit 42941653621311187650f12e8d7aa39c45cb6984 +Author: Patrick Schleizer +Date: Wed Aug 6 08:27:15 2025 +0000 + + bumped changelog version + commit 784ff8af3616765a9c22febf66b522376ecedf12 Merge: c2690ef 5a17e67 Author: Patrick Schleizer diff --git a/debian/changelog b/debian/changelog index 14ebd05..2494b88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +security-misc (3:46.8-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Thu, 07 Aug 2025 07:08:19 +0000 + security-misc (3:46.7-1) unstable; urgency=medium * New upstream version (local package). From 046c932898290d250a7900e3c59973a698e5c55f Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 9 Aug 2025 05:40:11 -0400 Subject: [PATCH 2/3] `disable emerg-shutdown.service`: Disabled due to bug: breaks ISO Live Mode Calamares installer --- usr/lib/systemd/system-preset/50-security-misc.preset | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr/lib/systemd/system-preset/50-security-misc.preset b/usr/lib/systemd/system-preset/50-security-misc.preset index 4b44458..fda8e4d 100644 --- a/usr/lib/systemd/system-preset/50-security-misc.preset +++ b/usr/lib/systemd/system-preset/50-security-misc.preset @@ -18,7 +18,11 @@ disable proc-hidepid.service ## https://github.com/Kicksecure/security-misc/issues/159 disable harden-module-loading.service +## TODO: polish, test ## Disable due to timing difficulties. See: ## https://github.com/systemd/systemd/issues/38261#issuecomment-3134580852 disable ensure-shutdown.service disable ensure-shutdown-trigger.service + +## TODO: Disabled due to bug: breaks ISO Live Mode Calamares installer +disable emerg-shutdown.service From 5dc251c5da724092d264481740e4f6ed347aa0a7 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 9 Aug 2025 09:45:35 +0000 Subject: [PATCH 3/3] bumped changelog version --- changelog.upstream | 14 ++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/changelog.upstream b/changelog.upstream index 2c9ba0d..7cc05ee 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,17 @@ +commit 046c932898290d250a7900e3c59973a698e5c55f +Author: Patrick Schleizer +Date: Sat Aug 9 05:40:11 2025 -0400 + + `disable emerg-shutdown.service`: + + Disabled due to bug: breaks ISO Live Mode Calamares installer + +commit 0cc0a8310020afc10de6512095336e55559a84d9 +Author: Patrick Schleizer +Date: Thu Aug 7 07:08:19 2025 +0000 + + bumped changelog version + commit 505a2b7d7995ad48a17add86513ced3499f64ee9 Merge: 4294165 3a77abe Author: Patrick Schleizer diff --git a/debian/changelog b/debian/changelog index 2494b88..5efc19b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +security-misc (3:46.9-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Sat, 09 Aug 2025 09:45:34 +0000 + security-misc (3:46.8-1) unstable; urgency=medium * New upstream version (local package).