From 7f3fecbb5b871825fe9632f46659869cab6a3769 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2024 00:00:19 +0100 Subject: gentoo auto-resync : 04:05:2024 - 00:00:19 --- sys-boot/gnu-efi/Manifest | 3 + sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch | 26 +++++ sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch | 126 +++++++++++++++++++++ sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild | 90 +++++++++++++++ 4 files changed, 245 insertions(+) create mode 100644 sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch create mode 100644 sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch create mode 100644 sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild (limited to 'sys-boot/gnu-efi') diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest index 22485f56c352..6664034fc99c 100644 --- a/sys-boot/gnu-efi/Manifest +++ b/sys-boot/gnu-efi/Manifest @@ -1,8 +1,11 @@ +AUX gnu-efi-3.0.18-clang.patch 904 BLAKE2B dd7c2aed740e9ecfcd918ab4ce4ab05090792f7c77493dbd401b3a54aa966748bb4aaad44d5787125c5e931506b529e91829924822413f00ab2768ef78f37bdb SHA512 9464474ec0c945d2546549f78ab38e30eaf9108dcca2ece33c3c83b3ab3bc471c8cea08197c9ffb0fcd1aa45b8544e2e57d988ca05127e5dc0dc8e945d323033 +AUX gnu-efi-3.0.18-refind.patch 3134 BLAKE2B 22c9f9b35c51dc0a6f3860d30c327b9ece84fa47bd7d867eda7d21f09a6020b200147ee4842440b43ca3b3069ef216eda7fe4e853506a6593c129aed19db3d49 SHA512 6caa3816ca98f5bdcac1204420eccf3911b1ba1faad41a8a080264a177b0f5ded60238fbb76cce279671b46776a483b696a0d51e2eebcef387a35c0330f7d58a AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584 DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f DIST gnu-efi-3.0.17.tar.bz2 165568 BLAKE2B 27f8171b411a6a8a138d44d91c7e4e4291aa399562825d51a398913572119482ffeb303d7508ae13eacd2cd10b8f5098405ab16eb56243587efe93235f661285 SHA512 0893ca234272584f889b1ae1c75341a9ceee60acfd32765daa5d704191ba00450536a287b949304c6d055d1bf125cc29e24fc41df8e5230e0da4f9d944876512 DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c30d42ee728b4c0c084258ed2f6f2099c068ec5841cee81ecf664dd658dee3b94d68324ebaa498cb49cec4f7f7df9 SHA512 39f9fa14b880441a94a04400ff8850efdd9474929e5501dfd05af06e7747b4d0f7cb742ac811c7026cf52d00508efb73018be4d61d63a1211de0cd931cbc473d EBUILD gnu-efi-3.0.15.ebuild 1923 BLAKE2B 754b9d84be37fa39d42a752c8ea63754d7acc111403dc22c9531f665ae78796ce6a2d004de4e8c1eacff4e5456091af6987a42732bc1200e4b73041079beb491 SHA512 22508b5c37a49ed29cddd57e08565bf79c5c6620921e8b262b9f930298f583ed24c5958a4862984ed5f1a9f286a7eecdc3c7f5f45ee4508b3e6ffd14b307fbd3 EBUILD gnu-efi-3.0.17.ebuild 1954 BLAKE2B 03313137ea41a1a8ad4880076296e7dbc38e1276ff3a46187c8c5fe0db7b833c437e21fb86e15a992ec45824a23798bdd53d16770b0bb1117c9a1afec578ed3d SHA512 c113cdd429bdb6c86641b8e76c859f4e28d377d7f2d441857d077cca0b7b6bc1e54071f4354cef2fc5d17ae2cf7e4312b0a76b622f6428a51ce4a02413c2bc41 +EBUILD gnu-efi-3.0.18-r1.ebuild 1975 BLAKE2B 089ab7c983802af47d20ed80f7bbde91e4dcea61e62593c406de959248536e8a554312f5fd78c62c8cf489180f0e9384ee450b1049e51ac16b34c9c8cd0ec095 SHA512 2b210502440ae3dbd5a72385acdc4ffae1e966af6437f39969c2b37a04bc9cebc144cad507cc41533c79db09980a813ddf923fc95cd2ca886880fb2acaa6ea26 EBUILD gnu-efi-3.0.18.ebuild 1897 BLAKE2B c2bf428fc4688807ea1cb6db1fce16119abd72ec9aae861f87d6bf700f1a22d040ab744cf874998dddce460680af380884066d50172ea55e79c24ade528fe037 SHA512 5ad5f279e6bb93f0f13dbcad88026f1420c23fc802224fa6db676544679e9dbd09810659bc6f0102e9ced30c88a5b6095041781a5d5b1be6e8bef9b9957d50a6 MISC metadata.xml 300 BLAKE2B 940e2ca5551c9b60b21fd08228c83c7037ba3248f96cdc2e289f0f729b622af4b88517410b6927292d5de777fecf7ad7610919ed218c17c27e8edec80d519e06 SHA512 5e6ef7a0054b0f19cedd0fcb6f07659d15bbe22902b482b6c43460143d8c25e5a4308812c70953b256f4d779ebd11515627032701ac7ab620f5e48080430a9f3 diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch new file mode 100644 index 000000000000..7819351928c5 --- /dev/null +++ b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/930538 +https://github.com/ncroxon/gnu-efi/issues/4 +https://github.com/ncroxon/gnu-efi/pull/5 +https://github.com/ncroxon/gnu-efi/commit/a0111e0df165d49cf34fc4f5fae46fc0921a756d + +From a0111e0df165d49cf34fc4f5fae46fc0921a756d Mon Sep 17 00:00:00 2001 +From: Callum Farmer +Date: Wed, 24 Apr 2024 12:04:48 +0100 +Subject: [PATCH] Disable RELRO + +No point having PT_GNU_RELRO as ELF data won't exist when merging into PE32+ file + +Unbreaks lld usage which complains about linker script +Fixes ncroxon/gnu-efi#4 +--- a/Make.defaults ++++ b/Make.defaults +@@ -199,7 +199,7 @@ endif + ARFLAGS := rDv + ASFLAGS += $(ARCH3264) + LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \ +- --build-id=sha1 -z nocombreloc ++ --build-id=sha1 -z nocombreloc -z norelro + + ifneq ($(ARCH),arm) + export LIBGCC=$(shell $(CC) $(CFLAGS) $(ARCH3264) -print-libgcc-file-name) + diff --git a/sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch new file mode 100644 index 000000000000..d198426c4635 --- /dev/null +++ b/sys-boot/gnu-efi/files/gnu-efi-3.0.18-refind.patch @@ -0,0 +1,126 @@ +https://github.com/ncroxon/gnu-efi/commit/f5bb548df572c992fe3389a586bec3a19b092c18 +https://github.com/ncroxon/gnu-efi/commit/6b9dae0bef0fab82230a6672eaadd38d739e3e1e + +From f5bb548df572c992fe3389a586bec3a19b092c18 Mon Sep 17 00:00:00 2001 +From: Callum Farmer +Date: Thu, 25 Apr 2024 15:27:26 +0100 +Subject: [PATCH] Align RTLIB CopyMem/SetMem with normal versions + +Looks like 699e452654df6de53890ae994756b0d47237e3ac broke rEFInd +(https://sourceforge.net/p/refind/code/ci/189e405630293445df8565e36b831bba56e87093/) +--- a/inc/efirtlib.h ++++ b/inc/efirtlib.h +@@ -45,6 +45,7 @@ RtZeroMem ( + ); + + VOID ++EFIAPI + RUNTIMEFUNCTION + RtSetMem ( + IN VOID *Buffer, +@@ -53,10 +54,11 @@ RtSetMem ( + ); + + VOID ++EFIAPI + RUNTIMEFUNCTION + RtCopyMem ( + IN VOID *Dest, +- IN CONST VOID *Src, ++ IN VOID *Src, + IN UINTN len + ); + +--- a/lib/runtime/efirtlib.c ++++ b/lib/runtime/efirtlib.c +@@ -42,6 +42,7 @@ RtZeroMem ( + #pragma RUNTIME_CODE(RtSetMem) + #endif + VOID ++EFIAPI + RUNTIMEFUNCTION + RtSetMem ( + IN VOID *Buffer, +@@ -61,10 +62,11 @@ RtSetMem ( + #pragma RUNTIME_CODE(RtCopyMem) + #endif + VOID ++EFIAPI + RUNTIMEFUNCTION + RtCopyMem ( + IN VOID *Dest, +- IN CONST VOID *Src, ++ IN VOID *Src, + IN UINTN len + ) + { + +From 6b9dae0bef0fab82230a6672eaadd38d739e3e1e Mon Sep 17 00:00:00 2001 +From: Callum Farmer +Date: Sat, 27 Apr 2024 13:14:28 +0100 +Subject: [PATCH] Fixup string functions for new CopyMem + +Signed-off-by: Callum Farmer +--- a/lib/runtime/rtstr.c ++++ b/lib/runtime/rtstr.c +@@ -69,10 +69,13 @@ RtStrnCpy ( + ) + // copy strings + { ++ CHAR16 CopySrc = *Src; ++ CHAR16 *PCopySrc = &CopySrc; ++ + UINTN Size = RtStrnLen(Src, Len); + if (Size != Len) + RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0'); +- RtCopyMem(Dest, Src, Size * sizeof(CHAR16)); ++ RtCopyMem(Dest, PCopySrc, Size * sizeof(CHAR16)); + } + + #ifndef __GNUC__ +@@ -105,10 +108,13 @@ RtStpnCpy ( + ) + // copy strings + { ++ CHAR16 CopySrc = *Src; ++ CHAR16 *PCopySrc = &CopySrc; ++ + UINTN Size = RtStrnLen(Src, Len); + if (Size != Len) + RtSetMem(Dest + Size, (Len - Size) * sizeof(CHAR16), '\0'); +- RtCopyMem(Dest, Src, Size * sizeof(CHAR16)); ++ RtCopyMem(Dest, PCopySrc, Size * sizeof(CHAR16)); + return Dest + Size; + } + +@@ -137,10 +143,12 @@ RtStrnCat ( + ) + { + UINTN DestSize, Size; ++ CHAR16 CopySrc = *Src; ++ CHAR16 *PCopySrc = &CopySrc; + + DestSize = RtStrLen(Dest); + Size = RtStrnLen(Src, Len); +- RtCopyMem(Dest + DestSize, Src, Size * sizeof(CHAR16)); ++ RtCopyMem(Dest + DestSize, PCopySrc, Size * sizeof(CHAR16)); + Dest[DestSize + Size] = '\0'; + } + +--- a/lib/str.c ++++ b/lib/str.c +@@ -201,11 +201,13 @@ StrDuplicate ( + { + CHAR16 *Dest; + UINTN Size; ++ CHAR16 CopySrc = *Src; ++ CHAR16 *PCopySrc = &CopySrc; + + Size = StrSize(Src); + Dest = AllocatePool (Size); + if (Dest) { +- CopyMem (Dest, (void *)Src, Size); ++ CopyMem (Dest, PCopySrc, Size); + } + return Dest; + } diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild new file mode 100644 index 000000000000..e54e5b583eef --- /dev/null +++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 2004-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Library for build EFI Applications" +HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" +SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2" + +# inc/, lib/ dirs (README.efilib) +# - BSD-2 +# gnuefi dir: +# - BSD (3-cluase): crt0-efi-ia32.S +# - GPL-2+ : setjmp_ia32.S +LICENSE="GPL-2+ BSD BSD-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86" +IUSE="abi_x86_32 abi_x86_64 custom-cflags" +REQUIRED_USE=" + amd64? ( || ( abi_x86_32 abi_x86_64 ) ) + x86? ( || ( abi_x86_32 abi_x86_64 ) ) +" + +# These objects get run early boot (i.e. not inside of Linux), +# so doing these QA checks on them doesn't make sense. +QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o" +RESTRICT="strip" + +PATCHES=( + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-refind.patch +) + +src_prepare() { + default + sed -i -e "s/-Werror//" Make.defaults || die +} + +efimake() { + local arch= + case ${CHOST} in + arm*) arch=arm ;; + aarch64*) arch=aarch64 ;; + ia64*) arch=ia64 ;; + i?86*) arch=ia32 ;; + riscv64*) arch=riscv64;; + x86_64*) arch=x86_64 ;; + *) die "Unknown CHOST" ;; + esac + + local args=( + ARCH="${arch}" + HOSTCC="${BUILD_CC}" + CC="${CC}" + AS="${AS}" + LD="${LD}" + AR="${AR}" + OBJCOPY="${OBJCOPY}" + PREFIX="${EPREFIX}/usr" + LIBDIR='$(PREFIX)'/$(get_libdir) + ) + emake -j1 "${args[@]}" "$@" +} + +src_compile() { + tc-export BUILD_CC AR AS CC LD OBJCOPY + + if ! use custom-cflags; then + unset CFLAGS CPPFLAGS LDFLAGS + fi + + if use amd64 || use x86; then + use abi_x86_32 && CHOST=i686 ABI=x86 efimake + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake + else + efimake + fi +} + +src_install() { + if use amd64 || use x86; then + use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install + else + efimake INSTALLROOT="${D}" install + fi + einstalldocs +} -- cgit v1.2.3