diff -Nru efitools-1.9.2/debian/changelog efitools-1.9.2/debian/changelog --- efitools-1.9.2/debian/changelog 2022-06-16 18:53:21.000000000 -0500 +++ efitools-1.9.2/debian/changelog 2023-11-20 22:39:12.000000000 -0600 @@ -1,3 +1,11 @@ +efitools (1.9.2-3ubuntu1) noble; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Cherrypick patch from Chris to fix generating ESL for SBAT binaries. + - Use --no-parallel switch with dh to avoid potential build failures. + + -- Aaron Rainbolt Mon, 20 Nov 2023 22:39:12 -0600 + efitools (1.9.2-3) unstable; urgency=medium [ Bo YU ] @@ -17,6 +25,24 @@ -- Steve McIntyre <93sam@debian.org> Tue, 24 May 2022 18:44:35 +0000 +efitools (1.9.2-1ubuntu3) jammy; urgency=medium + + * No-change rebuild against openssl3 + + -- Simon Chopin Wed, 01 Dec 2021 12:04:46 +0100 + +efitools (1.9.2-1ubuntu2) impish; urgency=medium + + * Enable building on RISC-V (LP: #1938582) + + -- Heinrich Schuchardt Fri, 30 Jul 2021 17:23:23 +0200 + +efitools (1.9.2-1ubuntu1) hirsute; urgency=medium + + * Cherrypick patch from Chris to fix generating ESL for SBAT binaries. + + -- Dimitri John Ledkov Wed, 24 Mar 2021 15:12:39 +0000 + efitools (1.9.2-1) unstable; urgency=medium [ Luca Boccassi ] diff -Nru efitools-1.9.2/debian/control efitools-1.9.2/debian/control --- efitools-1.9.2/debian/control 2022-05-24 12:48:58.000000000 -0500 +++ efitools-1.9.2/debian/control 2022-06-16 22:16:46.000000000 -0500 @@ -1,7 +1,8 @@ Source: efitools Section: admin Priority: optional -Maintainer: Debian UEFI Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian UEFI Maintainers Uploaders: Arnaud Rebillout , Steve McIntyre <93sam@debian.org> Build-Depends: debhelper-compat (= 12), libfile-slurp-perl, diff -Nru efitools-1.9.2/debian/patches/sbat-compat.patch efitools-1.9.2/debian/patches/sbat-compat.patch --- efitools-1.9.2/debian/patches/sbat-compat.patch 1969-12-31 18:00:00.000000000 -0600 +++ efitools-1.9.2/debian/patches/sbat-compat.patch 2021-07-30 10:23:23.000000000 -0500 @@ -0,0 +1,84 @@ +diff --git a/include/pecoff.h b/include/pecoff.h +index 537d134..6ac57d1 100644 +--- a/include/pecoff.h ++++ b/include/pecoff.h +@@ -1,7 +1,8 @@ + #include + + EFI_STATUS +-pecoff_read_header(PE_COFF_LOADER_IMAGE_CONTEXT *context, void *data); ++pecoff_read_header(PE_COFF_LOADER_IMAGE_CONTEXT *context, void *data, ++ UINTN size); + EFI_STATUS + pecoff_relocate(PE_COFF_LOADER_IMAGE_CONTEXT *context, void **data); + EFI_STATUS +diff --git a/lib/pecoff.c b/lib/pecoff.c +index 26d9dcf..96878b9 100644 +--- a/lib/pecoff.c ++++ b/lib/pecoff.c +@@ -69,7 +69,7 @@ + #include + + EFI_STATUS +-pecoff_read_header(PE_COFF_LOADER_IMAGE_CONTEXT *context, void *data) ++pecoff_read_header(PE_COFF_LOADER_IMAGE_CONTEXT *context, void *data, UINTN size) + { + EFI_IMAGE_DOS_HEADER *DosHdr = data; + EFI_IMAGE_OPTIONAL_HEADER_UNION *PEHdr = data; +@@ -116,7 +116,7 @@ pecoff_read_header(PE_COFF_LOADER_IMAGE_CONTEXT *context, void *data) + context->NumberOfSections = PEHdr->Pe32.FileHeader.NumberOfSections; + context->FirstSection = (EFI_IMAGE_SECTION_HEADER *)((char *)PEHdr + PEHdr->Pe32.FileHeader.SizeOfOptionalHeader + sizeof(UINT32) + sizeof(EFI_IMAGE_FILE_HEADER)); + +- if (context->SecDir->VirtualAddress >= context->ImageSize) { ++ if (context->SecDir->VirtualAddress >= size) { + Print(L"Malformed security header\n"); + return EFI_INVALID_PARAMETER; + } +@@ -404,7 +404,7 @@ pecoff_execute_image(EFI_FILE *file, CHAR16 *name, EFI_HANDLE image, + } + + Print(L"Read %d bytes from %s\n", DataSize, name); +- efi_status = pecoff_read_header(&context, buffer); ++ efi_status = pecoff_read_header(&context, buffer, DataSize); + if (efi_status != EFI_SUCCESS) { + Print(L"Failed to read header\n"); + goto out; +diff --git a/lib/pkcs7verify.c b/lib/pkcs7verify.c +index 06701fd..2bdadbe 100644 +--- a/lib/pkcs7verify.c ++++ b/lib/pkcs7verify.c +@@ -172,7 +172,7 @@ pkcs7verify_allow(VOID *data, UINTN len) + EFI_STATUS status; + int i; + +- status = pecoff_read_header(&context, data); ++ status = pecoff_read_header(&context, data, len); + if (status != EFI_SUCCESS) + goto out; + +diff --git a/lib/sha256.c b/lib/sha256.c +index 180fa16..9ca1c21 100644 +--- a/lib/sha256.c ++++ b/lib/sha256.c +@@ -290,7 +290,7 @@ sha256_get_pecoff_digest_mem(void *buffer, UINTN DataSize, + * filled to the end of the page */ + DataSize = ALIGN_VALUE(DataSize, 8); + +- efi_status = pecoff_read_header(&context, buffer); ++ efi_status = pecoff_read_header(&context, buffer, DataSize); + if (efi_status != EFI_SUCCESS) { + Print(L"Failed to read header\n"); + return efi_status; +diff --git a/lib/shim_protocol.c b/lib/shim_protocol.c +index a735aa1..9ef4a20 100644 +--- a/lib/shim_protocol.c ++++ b/lib/shim_protocol.c +@@ -13,7 +13,7 @@ + static EFI_STATUS shimprotocol_context(void *data, unsigned int size, + PE_COFF_LOADER_IMAGE_CONTEXT *context) + { +- return pecoff_read_header(context, data); ++ return pecoff_read_header(context, data, size); + } + + static EFI_STATUS shimprotocol_verify(void *buffer, UINT32 size) diff -Nru efitools-1.9.2/debian/patches/series efitools-1.9.2/debian/patches/series --- efitools-1.9.2/debian/patches/series 2022-06-16 18:52:49.000000000 -0500 +++ efitools-1.9.2/debian/patches/series 2023-11-20 22:38:38.000000000 -0600 @@ -1,3 +1,4 @@ makefile-enable-harden-local-files.patch fix-deps.patch allow-riscv64-build.patch +sbat-compat.patch diff -Nru efitools-1.9.2/debian/rules efitools-1.9.2/debian/rules --- efitools-1.9.2/debian/rules 2022-05-24 12:48:58.000000000 -0500 +++ efitools-1.9.2/debian/rules 2022-06-16 22:16:46.000000000 -0500 @@ -7,5 +7,6 @@ override_dh_auto_install: dh_auto_install -- EFIDIR="debian/efitools/usr/lib/efitools/${DEB_TARGET_MULTIARCH}" +# Building 0.9.2 with parallel=8 failed. %: - dh $@ + dh $@ --no-parallel