From 6d1f9f4a80c5ab1c80a60667ce41a0a14f287c0a Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Tue, 22 Aug 2023 14:25:39 +0200 Subject: [PATCH] efi/http: change uint32_t to uintn_t Signed-off-by: Nicolas Frayer --- ...-efi-http-change-uint32_t-to-uintn_t.patch | 30 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 5 +++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0334-efi-http-change-uint32_t-to-uintn_t.patch diff --git a/0334-efi-http-change-uint32_t-to-uintn_t.patch b/0334-efi-http-change-uint32_t-to-uintn_t.patch new file mode 100644 index 0000000..f970eb1 --- /dev/null +++ b/0334-efi-http-change-uint32_t-to-uintn_t.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Keng-Yu Lin +Date: Wed, 26 Apr 2023 01:43:16 -0400 +Subject: [PATCH] efi/http: change uint32_t to uintn_t + +Modify UINT32 to UINTN in EFI_HTTP_MESSAGE to +be UEFI 2.9 compliant. + +Signed-off-by: Keng-Yu Lin +Signed-off-by: Nicolas Frayer +--- + include/grub/efi/http.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h +index c5e9a89f5050..ad164ba1913d 100644 +--- a/include/grub/efi/http.h ++++ b/include/grub/efi/http.h +@@ -171,9 +171,9 @@ typedef struct { + grub_efi_http_request_data_t *request; + grub_efi_http_response_data_t *response; + } data; +- grub_efi_uint32_t header_count; ++ grub_efi_uintn_t header_count; + grub_efi_http_header_t *headers; +- grub_efi_uint32_t body_length; ++ grub_efi_uintn_t body_length; + void *body; + } grub_efi_http_message_t; + diff --git a/grub.patches b/grub.patches index 37eb21c..7e0f096 100644 --- a/grub.patches +++ b/grub.patches @@ -331,3 +331,4 @@ Patch0330: 0330-grub_dl_set_mem_attrs-add-self-check-for-the-tramp-G.patch Patch0331: 0331-grub_dl_load_segments-page-align-the-tramp-GOT-areas.patch Patch0332: 0332-emu-Add-switch-root-to-grub-emu.patch Patch0333: 0333-util-Enable-default-kernel-for-updates.patch +Patch0334: 0334-efi-http-change-uint32_t-to-uintn_t.patch diff --git a/grub2.spec b/grub2.spec index e13bad0..3d20581 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 96%{?dist} +Release: 97%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Aug 22 2023 Nicolas Frayer - 2.06-97 +- efi/http: change uint32_t to uintn_t + * Tue Aug 22 2023 Nicolas Frayer - 2.06-96 - util: Enable default kernel for updates