gentoo auto-resync : 20:07:2023 - 13:07:51

5 files changed, 13 insertions, 6 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index c5b558477711..e76b2274454a 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 52d48f1d64c2..a70f6eaf176c 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -2,5 +2,5 @@ AUX refind-0.13.2-gnuefi-3.0.14.patch 2031 BLAKE2B f70d92f26eab16baaa58ffeee1294
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9 SHA512 7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
 EBUILD refind-0.13.2.ebuild 3732 BLAKE2B d1b19ff08c3d8a414fd605daeaca564e92f0ba3efd9180dc7e960eecabcfaf4f0fb2144d6603be97e486601b1c330129e92523ce1a41b5ca183d19c505d82495 SHA512 281213176e580222e11e33559dfb5002d9ce2de45674cd193f489f3ecdc9632abb52a05e06c07b4a1a06c8d15ff720b08e1fa382f1a58305b773a655fa53ef84
-EBUILD refind-0.13.3.1.ebuild 3665 BLAKE2B 0cdf94490bc840b28bd241f841508189525bd2c120901a3275b9ee057253891d7eaa5f1710c7b4870fcd63f068e47a35012d76306ba495b7b7e96827011eff06 SHA512 63e8a6a180fa5ed56f081206b3958c6310bcad095b2dd244a1e515909aa01ce03c26d84b73de25f6eaaabbfe1e2be4c0523fe1af254abbf9e35dbed36367870d
+EBUILD refind-0.13.3.1.ebuild 3732 BLAKE2B f2c79de6359ae53cbfe0ac186de6c981f2cb9b1b7fb38cd2089311f848a3b57242f0ded54aa628669c2087f3347c7c6097375aefde24e244213d90aacecc8e5d SHA512 656542681fbf69dfe70e2679ce5155aa1015ee0a7feb12b85b275245b4e89b67ffaaa5e4f3c3a644c6d380f72808fd8aebc280305b3caf444d472a0f310814c1
 MISC metadata.xml 3700 BLAKE2B a09550c178969a92b11ef722b092c418f75b3d48d53b1a4395a0c350703ff0ee0d85f2c32e4895bee9a15fefc4b43dc0e1e107a3693a1e88a3866536581a75ee SHA512 4caab08d933f006512ff2f3d98094d26c7f3b00b1141f3e1f2882de2997c0138d4a2e250e933d253fbd68b4713bdfca289216fd270401566ea3717d3fc150409
diff --git a/sys-boot/refind/refind-0.13.3.1.ebuild b/sys-boot/refind/refind-0.13.3.1.ebuild
index 73f27787890e..327f17b7022b 100644
--- a/sys-boot/refind/refind-0.13.3.1.ebuild
+++ b/sys-boot/refind/refind-0.13.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit toolchain-funcs secureboot
 
 DESCRIPTION="The UEFI Boot Manager by Rod Smith"
 HOMEPAGE="https://www.rodsbooks.com/refind/"
@@ -39,6 +39,7 @@ pkg_setup() {
 		export EFIARCH=x64
 		export BUILDARCH=x86_64
 	fi
+	secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -111,6 +112,8 @@ src_install() {
 	dosbin "mkrlconf"
 	dosbin "mvrefind"
 	dosbin "refind-mkdefault"
+
+	secureboot_auto_sign --in-place
 }
 
 pkg_postinst() {
diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 85e06e99fdd6..54d0e879179d 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,5 +1,5 @@
 DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 706f31835be24fee7202b8f8eb49204741d7726f106fad993ff524f475434ab3f23bebcd427f8a2aa4cd9a9c2494fdec9c2a49c29025364f0ebe989786f74c2f SHA512 72c2a62f380e76c3ea0fe5b13ef4e4bcd5e62e1b26b0b277c6ed8dd5d5e76f0f92770497da09e8ce12e6c60ee57d679d134f960a10639644dd751811563f1f29
 DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150 SHA512 045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
 DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275 SHA512 971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf
-EBUILD shim-15.6.ebuild 904 BLAKE2B a59fa0d03273b6dd4b5d95e06cea3642bde3cb8e7223ba0375593e01b8fb07d6ca9bdf2c22b32ab3f84ce2a9bfd80d8d17a0491c70cab044923d327c171e6449 SHA512 491bf669e378c6de103f745e051639468042cacdf4e8d7bc560fb3d57aec9d76c1c34ba73f0a886e73c99c9f044f165f8c7ba95b237e9727c076073cd608a18f
+EBUILD shim-15.6.ebuild 1101 BLAKE2B acaf1e14d7f1d91690fb4a30bfb60e944ce2a3fbe2f7c2ce8b03be80dc0f98fc2c7b12be632581cb59dd75fa31469c4d8c590ac274c27b386a7d3c4f61314aee SHA512 ee2c70bef201d28ed09f544489e0449861e954fb43c73d34b5b373b631b566e3658cdb6541e1d10e9b54e204f3cbd5847359ae845b1f82e79d8c05bceedab97a
 MISC metadata.xml 379 BLAKE2B b6eb0f18d22675a68c22cb8cffe964bb21d65fa2f2958740aab82cb96ced8922f7c0163aab8d19f9c9815bc237a9f841c2deb5391a7715c55f591742b4f8ca3c SHA512 d1283d44596721c8ac5c4e812124bf167cd3c834ef63d5a48917ab7995b69751a8400b00608eea1888ee9dab4dcb26a055664aa7feca6d2e8647c0bc7c2c0c24
diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
index 21fc211e6607..c4f33913bd22 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit rpm
+inherit rpm secureboot
 
 DESCRIPTION="Fedora's signed UEFI shim"
 HOMEPAGE="https://src.fedoraproject.org/rpms/shim"
@@ -23,4 +23,8 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins BOOT/BOOT*.EFI
 	doins fedora/mm*.efi
+
+	# Shim is already signed with Microsoft keys, but MokManager still needs
+	# signing with our key otherwise we have to enrol the Fedora key in Mok list
+	secureboot_auto_sign --in-place
 }