gentoo auto-resync : 28:03:2024 - 07:12:54

4 files changed, 36 insertions, 4 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 1b34b09eceff..747d328a12a7 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 54d0e879179d..360711e71e17 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,5 +1,9 @@
 DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 706f31835be24fee7202b8f8eb49204741d7726f106fad993ff524f475434ab3f23bebcd427f8a2aa4cd9a9c2494fdec9c2a49c29025364f0ebe989786f74c2f SHA512 72c2a62f380e76c3ea0fe5b13ef4e4bcd5e62e1b26b0b277c6ed8dd5d5e76f0f92770497da09e8ce12e6c60ee57d679d134f960a10639644dd751811563f1f29
+DIST shim-aa64-15.8-3.aarch64.rpm 466590 BLAKE2B ebd77148d363020d14b418dbb3107981b213b39914daa80765cc2db16c7b365eaebcbcba19b88459364967f2764f417aeffd34754aa92c2efc7aaa4e9d45b712 SHA512 d9b879706f7f6c7f7bfea92a443191811d39835074b3b6db3979c707b406b00884baff66ac79bf9bd66869240f668c6e6f987f8954a570d648933c85ea0da1c2
 DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150 SHA512 045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
+DIST shim-ia32-15.8-3.x86_64.rpm 422489 BLAKE2B 00aa14d10ac0351e39f2b7bb2da6b31e048757ee9413b73f5a1638688e2b242c161b39b5d897c9414e435caab13456763dbe2c6bc46061ab3c29e14ab487e587 SHA512 10ef47014637f9df9f199d90e3869e96341723c23628cfd22465638028cc38b006a003c41ea7fd7f1885e4cb573a2f23034a237ea03ba231f8f0d37573bb2e23
 DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275 SHA512 971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf
-EBUILD shim-15.6.ebuild 1101 BLAKE2B acaf1e14d7f1d91690fb4a30bfb60e944ce2a3fbe2f7c2ce8b03be80dc0f98fc2c7b12be632581cb59dd75fa31469c4d8c590ac274c27b386a7d3c4f61314aee SHA512 ee2c70bef201d28ed09f544489e0449861e954fb43c73d34b5b373b631b566e3658cdb6541e1d10e9b54e204f3cbd5847359ae845b1f82e79d8c05bceedab97a
+DIST shim-x64-15.8-3.x86_64.rpm 478432 BLAKE2B cf1a032af75fc17e09444aae488c2921a8f0868d91ceb427835cd0378f6c7369e223b7fc08f0a596774b374e3f800b9ec941792e522d8c5281a395cf800c642a SHA512 4c3635d82980ccb604b568f072f30ac0c0055c6ed2985dade6a28c9070852a240bb33f15f9ef42c83fa46d212c18ae6f17abca9f3adda0a332b908ceda537e87
+EBUILD shim-15.6.ebuild 1100 BLAKE2B e835be1913762f2479311f78f28dd49e1bb647389f2a1eb3859dd0de05cffada8cc06f6def8a9c0ac0781faf9ef9ded80734e165bd3a32a66fcc7a5b6a9f54e0 SHA512 5a81058ce46f3bfaebaba9ecb5833717aa739551158b7154e2cb72e87d358dd7a41957464b15752d1fc47c49a3da30e37c761d0e9b4ce34d2c9394f351b2e951
+EBUILD shim-15.8.ebuild 1103 BLAKE2B aedc44281bd539ed24318b7daf9f916ee163bf580681c1d0e023edb51e8d8228205f99232429023b4376f8f75d6eab75aa9d6575671cf8bd164dc5097d091ea6 SHA512 d7fd45033095c44a776526e9c9eca948b3fd126b86fbd399aa61c6a3e665b3aa5bc36ed6137ec0fc6233babf25a909c15aa6b4289a15e250446bf891a8f73275
 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 c4f33913bd22..fc117bf9f5c5 100644
--- a/sys-boot/shim/shim-15.6.ebuild
+++ b/sys-boot/shim/shim-15.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,13 +12,12 @@ SRC_URI="amd64? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_6
 		x86? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
 				https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm )
 		arm64? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/aarch64/shim-aa64-${PV}-2.aarch64.rpm )"
+S="${WORKDIR}/boot/efi/EFI"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 
-S="${WORKDIR}/boot/efi/EFI"
-
 src_install() {
 	insinto /usr/share/${PN}
 	doins BOOT/BOOT*.EFI
diff --git a/sys-boot/shim/shim-15.8.ebuild b/sys-boot/shim/shim-15.8.ebuild
new file mode 100644
index 000000000000..cc0241858af6
--- /dev/null
+++ b/sys-boot/shim/shim-15.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm secureboot
+
+DESCRIPTION="Fedora's signed UEFI shim"
+HOMEPAGE="https://src.fedoraproject.org/rpms/shim"
+SRC_URI="amd64? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/3/x86_64/shim-x64-${PV}-3.x86_64.rpm
+				https://kojipkgs.fedoraproject.org/packages/shim/${PV}/3/x86_64/shim-ia32-${PV}-3.x86_64.rpm )
+		x86? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/3/x86_64/shim-x64-${PV}-3.x86_64.rpm
+				https://kojipkgs.fedoraproject.org/packages/shim/${PV}/3/x86_64/shim-ia32-${PV}-3.x86_64.rpm )
+		arm64? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/3/aarch64/shim-aa64-${PV}-3.aarch64.rpm )"
+S="${WORKDIR}/boot/efi/EFI"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+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
+}