net/ipxe: update g20230822 (9e99a55b) to g20240403 (59f27d69)

* delete 'files/patch-src_arch_x86_include_librm.h' as it's now landed
    in upstream code; https://github.com/ipxe/ipxe/pull/1036

  * other upstream changes include, but are not limited to:

    - [bnxt] Add support for BCM957608;
    - [build] Fix building on older versions of gcc;
    - [build] Fix building with newer binutils;
    - [crypto] Add X25519 key exchange algorithm;
    - [crypto] Add implementation of MS-CHAPv2 authentication (RFC2759);
    - [efi] Update to current EDK2 headers;
    - [intel] Add PCI ID for I219-LM (23), OK on FUJITSU LIFEBOOK U7413;
    - [libc] Replace linker_assert() with build_assert();
    - [librm] Use explicit operand size when pushing a label address;
    - [tls] Add ECDHE cipher suites;
    - [tls] Add support for Ephemeral Elliptic Curve Diffie-Hellman K.E;
    - [ucode] Add support for updating x86 microcode;
main
Vinícius Zavam 2024-04-09 15:21:18 +00:00
parent f12fd03979
commit 069a3fb3b2
No known key found for this signature in database
GPG Key ID: 415C653413B43475
3 changed files with 5 additions and 52 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= ipxe
DISTVERSION= g20230822
DISTVERSION= g20240403
PORTEPOCH= 1
CATEGORIES= net
@ -19,7 +19,7 @@ USES= gmake perl5 shebangfix
USE_BINUTILS= yes
USE_GCC= yes:build
USE_GITHUB= yes
GH_TAGNAME= 9e99a55b317f5da6
GH_TAGNAME= 59f27d69358efc91
USE_PERL5= build
MAKE_ARGS= AR=${AR} \
ARCH=${ARCH:S/amd64/i386/} \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1693026053
SHA256 (ipxe-ipxe-g20230822-9e99a55b317f5da6_GH0.tar.gz) = a145226dc3c9f2f17fe6e78d4c6301fb22c2b52f00b051520e458118bb6e669a
SIZE (ipxe-ipxe-g20230822-9e99a55b317f5da6_GH0.tar.gz) = 4137052
TIMESTAMP = 1712669011
SHA256 (ipxe-ipxe-g20240403-59f27d69358efc91_GH0.tar.gz) = f299f30f3aca6f29d4aebc456353b00e748687b4dfee7a9966a705a3350144e3
SIZE (ipxe-ipxe-g20240403-59f27d69358efc91_GH0.tar.gz) = 4223518

View File

@ -1,47 +0,0 @@
From 08caa8be3a143d6f33782f398b7937efb39ff283 Mon Sep 17 00:00:00 2001
From: Justin Cano <5184128+jstncno@users.noreply.github.com>
Date: Thu, 3 Aug 2023 09:58:11 -0700
Subject: [PATCH] Use the right sized register for the push operand based on
the size of the value being pushed
Fixes https://github.com/ipxe/ipxe/issues/997
---
src/arch/x86/include/librm.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git src/arch/x86/include/librm.h src/arch/x86/include/librm.h
index 5196d390..d9e748ad 100644
--- arch/x86/include/librm.h
+++ arch/x86/include/librm.h
@@ -250,8 +250,10 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
/* CODE_DEFAULT: restore default .code32/.code64 directive */
#ifdef __x86_64__
#define CODE_DEFAULT ".code64"
+#define PUSH "pushq"
#else
#define CODE_DEFAULT ".code32"
+#define PUSH "pushl"
#endif
/* LINE_SYMBOL: declare a symbol for the current source code line */
@@ -268,7 +270,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
/* REAL_CODE: declare a fragment of code that executes in real mode */
#define REAL_CODE( asm_code_str ) \
- "push $1f\n\t" \
+ PUSH " $1f\n\t" \
"call real_call\n\t" \
TEXT16_CODE ( "\n1:\n\t" \
asm_code_str \
@@ -277,7 +279,7 @@ extern void remove_user_from_rm_stack ( userptr_t data, size_t size );
/* PHYS_CODE: declare a fragment of code that executes in flat physical mode */
#define PHYS_CODE( asm_code_str ) \
- "push $1f\n\t" \
+ PUSH " $1f\n\t" \
"call phys_call\n\t" \
".section \".text.phys\", \"ax\", @progbits\n\t"\
"\n" LINE_SYMBOL "\n\t" \
--
2.41.0