Date: Sat, 26 Aug 2023 06:32:23 GMT From: =?utf-8?Q?Vin=C3=ADcius?= Zavam <egypcio@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 11d406a20cb1 - main - net/ipxe: update g20230719 (c1834f32) to g20230822 (9e99a55b317f5da6) Message-ID: <202308260632.37Q6WN43094605@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by egypcio: URL: https://cgit.FreeBSD.org/ports/commit/?id=11d406a20cb168fb54ef8bf843a3b711341f4fba commit 11d406a20cb168fb54ef8bf843a3b711341f4fba Author: VinÃcius Zavam <egypcio@FreeBSD.org> AuthorDate: 2023-08-26 06:17:46 +0000 Commit: VinÃcius Zavam <egypcio@FreeBSD.org> CommitDate: 2023-08-26 06:17:46 +0000 net/ipxe: update g20230719 (c1834f32) to g20230822 (9e99a55b317f5da6) * this change applies 9e99a55b317f5da6 and c30b71ee9cc2dc2a from upstream * [virtio] Fix implementation of vpm_ioread32() The current implementation of vpm_ioread32() erroneously reads only 16 bits of data, which fails when used with the (stricter) virtio device emulation in VirtualBox. Fix by using the correct readl()/inl() I/O wrappers. * [image] Check delimiters when parsing command-line key-value arguments The Linux kernel bzImage image format and the CPIO archive constructor will parse the image command line for certain arguments of the form "key=value". This parsing is currently implemented using strstr() in a way that can cause a false positive suffix match. For example, a command line containing "highmem=<n>" would erroneously be treated as containing a value for "mem=<n>". Fix by centralising the logic used for parsing such arguments, and including a check that the argument immediately follows a whitespace delimiter (or is at the start of the string). PR: 272483 Reported by: mikael@ --- net/ipxe/Makefile | 6 ++---- net/ipxe/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net/ipxe/Makefile b/net/ipxe/Makefile index 06fb4414001c..2e06aa1f3adf 100644 --- a/net/ipxe/Makefile +++ b/net/ipxe/Makefile @@ -1,5 +1,5 @@ PORTNAME= ipxe -DISTVERSION= g20230719 +DISTVERSION= g20230822 PORTEPOCH= 1 CATEGORIES= net @@ -19,7 +19,7 @@ USES= gmake perl5 shebangfix USE_BINUTILS= yes USE_GCC= yes:build USE_GITHUB= yes -GH_TAGNAME= c1834f323f4f6b9b +GH_TAGNAME= 9e99a55b317f5da6 USE_PERL5= build MAKE_ARGS= AR=${AR} \ ARCH=${ARCH:S/amd64/i386/} \ @@ -83,8 +83,6 @@ ISO_MAKE_ARGS= ISOLINUX_BIN="${WRKSRC}/isolinux.bin" \ LDLINUX_C32="${LOCALBASE}/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32" ISO_ALL_TARGET= bin/ipxe.iso -PORTSCOUT= skipv:1.21.1,v1.21.1 - .include <bsd.port.pre.mk> # Add user supplied build configuration after port options etc have diff --git a/net/ipxe/distinfo b/net/ipxe/distinfo index 0ae65b25864c..a742d6a935f4 100644 --- a/net/ipxe/distinfo +++ b/net/ipxe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690750844 -SHA256 (ipxe-ipxe-g20230719-c1834f323f4f6b9b_GH0.tar.gz) = 1d9ef5cea9081998edccf6839a7a6c8defe5f685f642ae4b4e53bab79e14123b -SIZE (ipxe-ipxe-g20230719-c1834f323f4f6b9b_GH0.tar.gz) = 4137097 +TIMESTAMP = 1693026053 +SHA256 (ipxe-ipxe-g20230822-9e99a55b317f5da6_GH0.tar.gz) = a145226dc3c9f2f17fe6e78d4c6301fb22c2b52f00b051520e458118bb6e669a +SIZE (ipxe-ipxe-g20230822-9e99a55b317f5da6_GH0.tar.gz) = 4137052
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308260632.37Q6WN43094605>