diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-12-24 06:30:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-24 06:30:58 +0000 |
| commit | 17e417b73cb3e25edbc6541bd107bc9c593d66bd (patch) | |
| tree | 866f98b73f846149d0c9e7e5a1cf0527b7c54e08 /app-crypt/sbctl | |
| parent | 338095605b6c9c82690f77f27a32490c9a57bdcb (diff) | |
gentoo auto-resync : 24:12:2024 - 06:30:57
Diffstat (limited to 'app-crypt/sbctl')
| -rw-r--r-- | app-crypt/sbctl/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch | 27 | ||||
| -rw-r--r-- | app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch | 37 |
3 files changed, 0 insertions, 66 deletions
diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest index 7d16c6d69a28..8cec577cb854 100644 --- a/app-crypt/sbctl/Manifest +++ b/app-crypt/sbctl/Manifest @@ -1,5 +1,3 @@ -AUX sbctl-0.13-no-installkernel-error.patch 896 BLAKE2B aa75eacbe2ce3b99f6491d33284c8fad4594ad09998714015e82ccead7d975c9f8f521c63857ec80879620448405ff4b4701cf02d5d49f27a3cf49734203ee76 SHA512 cc9b45ecde8703d56d0603e6061ba0407277a1ea0d5429565123e134926ad250f45f537d129fb1a559ede3544b72dea233ac6641bc7c8c87d1cb9d7c3bb8bc1e -AUX sbctl-0.14-installkernel-bashism.patch 1361 BLAKE2B 7caebd45b6f3ae4810a1111dbcc6cb15724c7e9c8853a5dd022b10ad52416afc5645e03c70b130ae8c3dc8b484b76756d964badfce47b60671a50c37881bf72d SHA512 e450ddea3578e1d54e52af965b69b16e608464fb40f850ca39925a91db8b3ed03d83413759b0b5675d90d9354fd226309a22b2b2b559a1fd98f4f8aad52cf61a DIST sbctl-0.15.4-deps.tar.xz 123785076 BLAKE2B c54b60e89b4ea0bf6ce414198a74465b5e176a5a200f070e092fa536f81d48945a2c2ac88fdcaadfd4d7bc6511c32cbfe9e8c8a4c30c7ea8ea9947af9fdf9545 SHA512 7c5ca431e8832e576cef662d5ba806b4be07a23567d86f7b8e8cb16c57167aaeafe8bafa8875806db2ba7aced9979d5999b837dccd1d90ade60c029de244b242 DIST sbctl-0.15.4.tar.gz 17822565 BLAKE2B a2c7f1c49ac3052a30af9245b015c730cdc0cc9d9bca011e52de967da5d733f0de0bee2da8ba28da00418553ce4d86cfd3859a5f029f44ae8cfec6f18da50102 SHA512 98278b816c14f61191d3aadeb7bcf22b5482315b36b201764ce88d3287420f488b7c9cb2cc1468800bfa2351cb0e8c8dbc32ecabbe4f6ab275f375859379fc03 DIST sbctl-0.15.4.tar.gz.sig 566 BLAKE2B 678351ba31138e2b1bb90e2dbfe20f0af333b47c6f1cfb5caf5d473efa716d5ac00d407f858ab6510130430a0f54fc61edb8e261f2c11faa49763a97395850d5 SHA512 3cc14391c4d2446a64bd9f34b29816f05e1e2ff2db2c65228b536298bca0035eb991322264f03f5c68e7b488af0df09fb77276d942b265e43f831e5d9777fcfe 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 |