[gentoo-commits] repo/gentoo:master commit in: app-crypt/sbctl/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/sbctl/files/

[Conrad Kostecki]

commit:     06faa17074ad1657c5c6a0ac9cf7aedd7a6ed22b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 11 18:36:46 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 19:50:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06faa170

app-crypt/sbctl: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/sbctl-0.13-no-installkernel-error.patch  | 27 ----------------
 .../files/sbctl-0.14-installkernel-bashism.patch   | 37 ----------------------
 2 files changed, 64 deletions(-)

diff --git a/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch b/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch
deleted file mode 100644
index 18e28eb39b1d..000000000000
--- a/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: https://github.com/Foxboron/sbctl/pull/188
-From: John Helmert III <ajak@gentoo.org>
-Date: Sat, 10 Feb 2024 11:46:01 -0800
-Subject: [PATCH] 91-sbctl.install: don't sign without signing keys
-
-It's expected that signing doesn't work without having previously
-generated keys, so don't try to sign when keys don't exist.
-
-Closes: https://github.com/Foxboron/sbctl/issues/187
-Signed-off-by: John Helmert III <ajak@gentoo.org>
---- a/contrib/kernel-install/91-sbctl.install
-+++ b/contrib/kernel-install/91-sbctl.install
-@@ -28,6 +28,14 @@ fi
- case "$COMMAND" in
- add)
- 	printf 'sbctl: Signing kernel %s\n' "$IMAGE_FILE"
-+
-+	# exit without error if keys don't exist
-+	# https://github.com/Foxboron/sbctl/issues/187
-+	if ! test -d /usr/share/secureboot/keys; then
-+		echo "Secureboot key directory doesn't exist, not signing!"
-+		exit 0
-+	fi
-+
- 	sbctl sign -s "$IMAGE_FILE" 1>/dev/null
- 	;;
- remove)

diff --git a/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch b/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
deleted file mode 100644
index bc1b988769fc..000000000000
--- a/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1167500b9da76febe85342e09b1bf9eeaf367ca6 Mon Sep 17 00:00:00 2001
-From: MithicSpirit <rpc01234@gmail.com>
-Date: Fri, 10 May 2024 17:51:59 -0400
-Subject: [PATCH] nit(91-sbctl.install): consistent syntax for tests
-
-Unifies usage of testing commands like `[]`, `test`, and `[[]]` to just
-use `[]` everywhere. This also improves compatibility, as `[[]]` is not
-available in POSIX sh.
-
-Bug: https://bugs.gentoo.org/934768
-Signed-off-by: Steffen Winter <steffen.winter@proton.me>
---- a/contrib/kernel-install/91-sbctl.install
-+++ b/contrib/kernel-install/91-sbctl.install
-@@ -31,7 +31,7 @@ add)
- 
- 	# exit without error if keys don't exist
- 	# https://github.com/Foxboron/sbctl/issues/187
--	if ! test -d /usr/share/secureboot/keys; then
-+	if ! [ -d /usr/share/secureboot/keys ]; then
- 		echo "Secureboot key directory doesn't exist, not signing!"
- 		exit 0
- 	fi
-@@ -39,10 +39,10 @@ add)
- 	sbctl sign -s "$IMAGE_FILE" 1>/dev/null
- 	;;
- remove)
--	if [[ -e "$IMAGE_FILE" ]]; then
--	    [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] &&
--		printf 'sbctl: Removing kernel %s from signing database\n' "$IMAGE_FILE"
--	    sbctl remove-file "$IMAGE_FILE" 1>/dev/null
-+	if [ -e "$IMAGE_FILE" ]; then
-+		[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] &&
-+			printf 'sbctl: Removing kernel %s from signing database\n' "$IMAGE_FILE"
-+		sbctl remove-file "$IMAGE_FILE" 1>/dev/null
- 	fi
- 	;;
- esac