gentoo auto-resync : 11:09:2023 - 04:37:21

3 files changed, 48 insertions, 1 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 201d4963209a..fa0cca6efb67 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,6 @@
 AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c59e7f17b8310cc9addf7545630fff78c73ca3f4b0dcd44e1bf69f4df5264d6f58777f7e5aeae93cbcb SHA512 00324825c369902a0383b792cd21e161853eadccbdc5abe2420f2d443bf6a74f72be6c15243107b936acd38c3547387c3771dc2cb566003c4c754c9260b4aa00
 AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2355 BLAKE2B c120f06d3597a2ff9566778afd69d80a814904726e47766b7582626d182a2703e54fd69ecf00b54bcc5541e22a3d93ff8b85c9cf8d0440623454e8e7da3aaa91 SHA512 23416ac17838f101ed73103af6aa7305609667f47288bfa3bd5ae80d1123da664ba6f9b518451b0bd5f528e069893a51444d203953be0b0644790cea0b4b9cf0
+AUX grub-2.06-arm64-linux-Remove-magic-number.patch 1831 BLAKE2B a221e26af2073c75a1b4f1b2584a7b7db6d1acf85d7f9709bf2d5cc2b42f45c0131161fa00263acb9a61bf7130c5bf276de3a0762e9ba5c03fdf8c95e2f1cd2f SHA512 057658f40e9ee3b446eaef8da8406053b4eebd38633ffa6a7e9cab051fd35501053d0fd107d4f1ebff0eb475f3403f23348e15328cd8f2cd8f25bbc2b35bc955
 AUX grub-2.06-fs-ext2-ignore-checksum-seed.patch 2744 BLAKE2B b80d0a513a3bfc3f245308775b358e508595be496e0472faa91155fd03ab08f7da2d9dc3fb5cb393f4393fd1f0fdb198b12cc7f87cc63299db77208c69c36ba3 SHA512 7f74055f95ac89e3e2110a83329169e3e3cf6aab3dad5c13c45cc2d9b942fb7e541a09dcbf3f1cc3736c9d439b59243d128a4a10c07fc18874bc583592f68bf5
 AUX grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch 1321 BLAKE2B f2c4ca271d4b5eb4b318bc084eb7d9de1703b99466e7be3e892f96757d62a6a929d02e580277429f0896d5a33b9fea906b786fb65df257970745656f15549706 SHA512 d6251a38e7a658640db8c783bfee36193d484ccc7516c828672f6a3f6903e9c0dcdf9946045fe7a7b60b06275d1b06dce49f7eb85ce6f696f99deface1a6981e
 AUX grub-2.06-grub-mkconfig-restore-umask.patch 1377 BLAKE2B ea5369b79a1ec0dbb4e212749a406aa361a5f12baf38737e273b19fb94eba78d7734bd532d91f40889f0cc7f0573d1a247baa548b6ac1963961181a85ff928ce SHA512 e899e6f0575e35b747aae6d14140dcecb453485abf0f7d53649fe35301313d7de16a350301a53e476d4b18ad1909ed4d4ce26cbd986728154137c970c7ce3bca
@@ -16,7 +17,7 @@ DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B edfad62a01970026ca4ad088056da6225ef131
 DIST grub-2.12~rc1.tar.xz.sig 566 BLAKE2B 4b0563623498d06f512d29d9a84a4f8386e7d5adf257d0f2ea8f3301e5112b7ad669741d78519dfa35d16e7f1695b0c74740d679f07e41774ecc8910c3f6bc5c SHA512 b8b3c818679b50810e2d9e597a01c34b05fbc1218a88bdf35aaec798ce29b376c7aa696c50233d416306a480f6ee602dfcbe7eaf481c503f3c203a7b8e8db7a2
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
-EBUILD grub-2.06-r7.ebuild 9052 BLAKE2B 2c2b838227a56053427617005a7724cd3ee4133e1a6e3c87357693448cc8c045be25652b32a7fec514c4f65355badb3ccdfe870d0a06292c39ff97603cebfafe SHA512 5b9b3389787f801c95e949038710c89d51dbb50f9585f886864f007dc09c6d958e28c4fe499dcf81f2bf29d5cf598942741419837284360269db0a475b0be49d
+EBUILD grub-2.06-r8.ebuild 9115 BLAKE2B ac00fb6740548b627ff095c5e8cf42cbf3393ee27ad7cdece13250adb44846ef12495ee43ab93b6324dbb2685031d442050481f6cc5cc474c0d5055e8650f32d SHA512 2276f5e7019063051977f04b74091dd64cf313e12073d67af040e1496f0a9bcf3bafa3e8d9cef3ba56c2feb9d6dfddfaf22fe56e466e3f88d2b739518fae837c
 EBUILD grub-2.12_rc1-r1.ebuild 8810 BLAKE2B 1a8e5c03a1dfc52242a80686c9312f5e5b0e6e82089f0ae69e05d50c23010dee61aaa1387c40afdf9970ace1d559acd785872a979e00d343641fe60086f0d786 SHA512 08cb79c21f5f4986f23e8b7627c8174bc21fa0481cc322d9352419b4c404c74822a89d6b8fec947cf3cda6c5d3e0005364863c89ef63376be06d531589fc9731
 EBUILD grub-9999.ebuild 8350 BLAKE2B a837dcfb5ec8bbc0fa99ee5e7eaf5aeb270f923b45d6f7fea8f5d6de57f632edef949107fad12e077004f9a95bf2d8e968c9c4658d9c10c53168dccd970a05e3 SHA512 3d7ebdca907c937c7b638345dcbb13c408ff3dbf945b3b3685ac461de1b54e3b92db737506d68a3f7808d3aa4885940dddba8adca2a9063a84349b033bb1d6ef
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch b/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
new file mode 100644
index 000000000000..eed3bf0ca93d
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
@@ -0,0 +1,45 @@
+https://git.savannah.gnu.org/cgit/grub.git/patch/?id=69edb31205602c29293a8c6e67363bba2a4a1e66
+https://bugs.gentoo.org/913935
+
+From 69edb31205602c29293a8c6e67363bba2a4a1e66 Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel <ardb@kernel.org>
+Date: Thu, 11 Aug 2022 16:51:57 +0200
+Subject: loader/arm64/linux: Remove magic number header field check
+
+The "ARM\x64" magic number in the file header identifies an image as one
+that implements the bare metal boot protocol, allowing the loader to
+simply move the file to a suitably aligned address in memory, with
+sufficient headroom for the trailing .bss segment (the required memory
+size is described in the header as well).
+
+Note of this matters for GRUB, as it only supports EFI boot. EFI does
+not care about this magic number, and nor should GRUB: this prevents us
+from booting other PE linux images, such as the generic EFI zboot
+decompressor, which is a pure PE/COFF image, and does not implement the
+bare metal boot protocol.
+
+So drop the magic number check.
+
+Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/loader/arm64/linux.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index ef3e9f9..4c92e48 100644
+--- a/grub-core/loader/arm64/linux.c
++++ b/grub-core/loader/arm64/linux.c
+@@ -51,9 +51,6 @@ static grub_addr_t initrd_end;
+ grub_err_t
+ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+ {
+-  if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
+-    return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
+-
+   if ((lh->code0 & 0xffff) != GRUB_PE32_MAGIC)
+     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ 		       N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
+-- 
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r7.ebuild b/sys-boot/grub/grub-2.06-r8.ebuild
index c56c06edbcba..98de90a6d4a3 100644
--- a/sys-boot/grub/grub-2.06-r7.ebuild
+++ b/sys-boot/grub/grub-2.06-r8.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
 	"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
 	"${FILESDIR}"/grub-2.06-riscv.patch
 	"${FILESDIR}"/grub-2.06-locale.patch
+	"${FILESDIR}"/grub-2.06-arm64-linux-Remove-magic-number.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37