gentoo auto-resync : 28:06:2024 - 07:59:59

3 files changed, 43 insertions, 1 deletions

diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index 66cb47cc17df..7bba525a6c85 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -1,4 +1,5 @@
 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.13-deps.tar.xz 21415148 BLAKE2B cf16f7dd3341f7fef273d542f879d5e0a60b8b648fcd1efc8c85a66f0342b0631c5d273417777ecdd4231709ba6ef59592d40adc70a55b59af1aa36987019492 SHA512 f969ca335f14b9f3df52188e00ea68dbd69eef3bcbf71bbd162d0487f28f040ab14ce755ef56b554e7bde3e1c587f0f09ee7b4331edf5baa380b904694f0ad9f
 DIST sbctl-0.13.tar.gz 1642040 BLAKE2B 569f42ca5694a4db0b1b66ef58dc255ec337a99f8025c61c58d5b54860e09f543e29e63b0e3adf65e3883abacabf6c1554e8849a8b25569ea05414d86fe0cfc4 SHA512 02c1f3e745f83f0e0a2fe90974f940a314aadbe26bd0d0c3e314bb3720b72c74715a26c891f8b22023f40eb8d1d8d24a7d2b1bc1c5d60f9781971f7e97224a4c
 DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714e8b985bf5ad8b6d662dff99ddd4f4269374cf8e9e206c1ae8884ad312cd20cc8fcf33ed0af1ca0d1d81e967 SHA512 9435943dda069a5ae5629ab1880158349127654f122a2e5251cf8625db00cb12e85a671c24dda630c2e9beb312cc1c6cf2c24edc7d3a37e6b22ddb871e5c8682
@@ -6,5 +7,5 @@ DIST sbctl-0.14-deps.tar.xz 114919252 BLAKE2B a2baa7cca501d924c1353404725999fb83
 DIST sbctl-0.14.tar.gz 17809255 BLAKE2B a59eb3c5a32cb73cb2993c785d16798cbc83b70186eda8c8ce064a17fc338d3e70b93b277ad55c20991952e8d807c77f2a23ae4467c045019ba717ba342d5442 SHA512 a541324ec0b42503f5b5837b18e5f3076aa6fbe3c32041c3362945be52c281c6d057a856512cd134df37bf133106061af34d2b4fbfc377852ae4a86078e65fd8
 DIST sbctl-0.14.tar.gz.sig 566 BLAKE2B a5ec700d7ebf42393114c7b193483218df285977622f8ca6c2fb50b622478889647083b34c008fe8618244232416b374f099dd0ca7fce0f961949ef8b9cddbd8 SHA512 8508cc4a77e8bd08d77b2119d59c65d8724ace4576e1d233d0801c0b470afaac96981915c86a185ad0a29e94b7ad6aae1c6c3d52574f353d75d20d11cd503b0f
 EBUILD sbctl-0.13-r1.ebuild 1097 BLAKE2B 77f40f0c608b9f84a6a28f1a2cc2077664e7fc0e3aa5a08023935ceb797e36ed92b2637c558a3dd3587bcd255c394ec75cf80ff80cb5ecfcc98e0983ed677771 SHA512 594e65a3c57ae5bef6045916514b79c47370525c539346e578b760ee32da146b18ff8890b757c1c55acad78c2b29dd4edaf14218256dbb684383673cdfd82d14
-EBUILD sbctl-0.14.ebuild 1031 BLAKE2B fa2e03eee278837ea66c5a071f62f0c4c3898f36b0301a8863e950aaaf99075a04c64d13f67ef6cc9bfc0f15d99516557c1ca06f586e490fab635ef61435c8b5 SHA512 f63a686caaff2319ead6738fb3da90d3b8b966ae855f7173772d3f90c776503316c7b18beb6ff6fc7180e6f0533a76307e6de83077703ff18ac89f3aad78a529
+EBUILD sbctl-0.14-r1.ebuild 1098 BLAKE2B e57f11a6a3ed0ea80f2fd77317828846bb38d68b3a203eaff1d62b6de44b26adcf555dd41b7d12da4a566ad3ead5fa68a43f682f99e832d581dd17ac28bebb67 SHA512 f0bf436d40cc7ab2e7d2a590781a83bc23a587b40494a95f48a3e8d700b9578608ec36fe09217702d046f73a0b49d136206d1e310a99ef545c7033fd1e550697
 MISC metadata.xml 395 BLAKE2B 97800aba6234078f4a8cb45403e13ce6b0c38c27480d8b351d8d28c11daee6672c920d8a713bde6ff861e15137df4c4c4991fe717008d81a1e4fa3e3299a5cdc SHA512 3c6022f6d5fe33aa7d22469ea24c46adafa90d12024f9f13f76ca55d1d7930560a31640247ac8ceef54eb6789654f06733e685ef2b8a68e68816784215f165f2
diff --git a/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch b/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
new file mode 100644
index 000000000000..bc1b988769fc
--- /dev/null
+++ b/app-crypt/sbctl/files/sbctl-0.14-installkernel-bashism.patch
@@ -0,0 +1,37 @@
+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
diff --git a/app-crypt/sbctl/sbctl-0.14.ebuild b/app-crypt/sbctl/sbctl-0.14-r1.ebuild
index 97f67663daf4..8cdded303c60 100644
--- a/app-crypt/sbctl/sbctl-0.14.ebuild
+++ b/app-crypt/sbctl/sbctl-0.14-r1.ebuild
@@ -20,6 +20,10 @@ BDEPEND="app-text/asciidoc
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
 
+PATCHES=(
+	"${FILESDIR}/sbctl-0.14-installkernel-bashism.patch"
+)
+
 src_unpack() {
 	if use verify-sig; then
 		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}