gentoo auto-resync : 10:02:2024 - 23:34:33

3 files changed, 69 insertions, 0 deletions

diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index 13eccb308677..51715ce6194d 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -1,3 +1,4 @@
+AUX sbctl-0.13-no-installkernel-error.patch 896 BLAKE2B aa75eacbe2ce3b99f6491d33284c8fad4594ad09998714015e82ccead7d975c9f8f521c63857ec80879620448405ff4b4701cf02d5d49f27a3cf49734203ee76 SHA512 cc9b45ecde8703d56d0603e6061ba0407277a1ea0d5429565123e134926ad250f45f537d129fb1a559ede3544b72dea233ac6641bc7c8c87d1cb9d7c3bb8bc1e
 DIST sbctl-0.11-deps.tar.xz 20914368 BLAKE2B 37fad80fc8889ad61797acc83ee0f07bb4675f8a9c7856b744c49bffdc296f94e3a115fac4ab76c9616d03c01189d4d9c666149cafa02a8e8e59d49545b63a3e SHA512 13f73c60d44c3c2dd699d3d65aa6e112e159d49997e56ec02d80a9c1730f53b551fd62272dcd96a9e8b32f148257b0aab78c64994521b0b83df2fc4450054552
 DIST sbctl-0.11.tar.gz 1634308 BLAKE2B a55b7359e1fe605f1bd972a49d559e711bfbeb6908e903530c133b188b996efdbb33c3ff33cd36073809708b4d01b42c8d2202d5e1aeed5efc43bbf6edd8912a SHA512 88d23bf40af4f19dc6b1de17df75989ec2a6e52f68bdb444bd4619a78c0ac1f2d4f6a0182ad251094884a448dc99f08d3dd39d9bb78b595ae6ed0227a78a7847
 DIST sbctl-0.11.tar.gz.sig 566 BLAKE2B c840d5375cb00be3daa5522d0dfb78bf4ba093901aa4b8bcec3188bb4ae2f5e8059b51733c6b65d10dec552d2311b65536e1652ca01a9bdbd53e63b540019631 SHA512 70fc606bb387152d6bd7e40d12c00d98a15ff1197797aeb21aeb8647982ca5ee6fde532d99afab038dbe3eb0bb262253eab6bedd113ccc46e29a9949c531be86
@@ -9,5 +10,6 @@ DIST sbctl-0.13.tar.gz 1642040 BLAKE2B 569f42ca5694a4db0b1b66ef58dc255ec337a99f8
 DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714e8b985bf5ad8b6d662dff99ddd4f4269374cf8e9e206c1ae8884ad312cd20cc8fcf33ed0af1ca0d1d81e967 SHA512 9435943dda069a5ae5629ab1880158349127654f122a2e5251cf8625db00cb12e85a671c24dda630c2e9beb312cc1c6cf2c24edc7d3a37e6b22ddb871e5c8682
 EBUILD sbctl-0.11.ebuild 1019 BLAKE2B 118db9d00d651086cbc36bb83c370e5aa0f8d9203e583c8d11a4f8c116827d6859864331dcbfbf0e2aab486b0cc6c4d1cf46a4ec26ce7142885e68eb5e605070 SHA512 bc89e3af3d8779165a607978ab2c335d7edbfa075683baa5be462efd0337d9144448053048eeee0fc3a2ffd270e86c3fadb9c7b4baa95e69bb62a58bdb4d178d
 EBUILD sbctl-0.12.ebuild 1031 BLAKE2B fa2e03eee278837ea66c5a071f62f0c4c3898f36b0301a8863e950aaaf99075a04c64d13f67ef6cc9bfc0f15d99516557c1ca06f586e490fab635ef61435c8b5 SHA512 f63a686caaff2319ead6738fb3da90d3b8b966ae855f7173772d3f90c776503316c7b18beb6ff6fc7180e6f0533a76307e6de83077703ff18ac89f3aad78a529
+EBUILD sbctl-0.13-r1.ebuild 1098 BLAKE2B bef1c2c4a09e16a4425e57553883d0d85833ea2317a6ba7d2dbbcc47bddfcd03987ba9ed470838ada4e206be2f3bdd2052250b77edfb8311b23723d9e35b3431 SHA512 2e16d60734091c2d7035146c70e4dada4a87a7e077167f837b4ed6a50549a4da8317973961362573710d1107c8a4546d297e4e79503ce4a06fa9d2a7f48c43f4
 EBUILD sbctl-0.13.ebuild 1031 BLAKE2B fa2e03eee278837ea66c5a071f62f0c4c3898f36b0301a8863e950aaaf99075a04c64d13f67ef6cc9bfc0f15d99516557c1ca06f586e490fab635ef61435c8b5 SHA512 f63a686caaff2319ead6738fb3da90d3b8b966ae855f7173772d3f90c776503316c7b18beb6ff6fc7180e6f0533a76307e6de83077703ff18ac89f3aad78a529
 MISC metadata.xml 395 BLAKE2B 97800aba6234078f4a8cb45403e13ce6b0c38c27480d8b351d8d28c11daee6672c920d8a713bde6ff861e15137df4c4c4991fe717008d81a1e4fa3e3299a5cdc SHA512 3c6022f6d5fe33aa7d22469ea24c46adafa90d12024f9f13f76ca55d1d7930560a31640247ac8ceef54eb6789654f06733e685ef2b8a68e68816784215f165f2
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
new file mode 100644
index 000000000000..18e28eb39b1d
--- /dev/null
+++ b/app-crypt/sbctl/files/sbctl-0.13-no-installkernel-error.patch
@@ -0,0 +1,27 @@
+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/sbctl-0.13-r1.ebuild b/app-crypt/sbctl/sbctl-0.13-r1.ebuild
new file mode 100644
index 000000000000..4410439fe955
--- /dev/null
+++ b/app-crypt/sbctl/sbctl-0.13-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature verify-sig
+
+DESCRIPTION="Secure Boot key manager"
+HOMEPAGE="https://github.com/Foxboron/sbctl"
+SRC_URI="https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz.sig )"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-text/asciidoc
+	verify-sig? ( sec-keys/openpgp-keys-foxboron )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.13-no-installkernel-error.patch" )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+	fi
+
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+}
+
+pkg_postinst() {
+	optfeature "automatically signing installed kernels with sbctl keys on each kernel installation" \
+		"sys-kernel/installkernel[systemd]"
+}