Attachment 242215 Details for Bug 270189 – Refactors patch to apply cleanly against the latest commit

[patch] Refactors patch to apply cleanly against the latest commit

refactored_patch.diff (text/plain), 5.16 KB, created by Cy Schubert on 2023-05-16 16:46:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2023-05-16 16:46:04 UTC

Size: 5.16 KB

patch

obsolete

>diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
>index c9bede2185f7..8413c585033b 100644
>--- a/emulators/virtualbox-ose-additions/distinfo
>+++ b/emulators/virtualbox-ose-additions/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1683653403
>+TIMESTAMP = 1682671010
> SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
> SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
>diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
>index 4d2f9a5a8d95..9896172468b4 100644
>--- a/emulators/virtualbox-ose-kmod/distinfo
>+++ b/emulators/virtualbox-ose-kmod/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1683653444
>+TIMESTAMP = 1682670994
> SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
> SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
>diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
>index 541d4c63ae38..b07a2ad0a4fe 100644
>--- a/emulators/virtualbox-ose/Makefile
>+++ b/emulators/virtualbox-ose/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	virtualbox-ose
> PORTVERSION=	6.1.44
>+PORTREVISION=	1
> CATEGORIES=	emulators
> MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
> DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
>@@ -31,7 +32,6 @@ USE_GNOME=	libidl libxml2
> 
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-java --passive-mesa
>-CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
> 
> CONFLICTS_INSTALL=	virtualbox-ose-additions-* \
> 			virtualbox-ose-devel \
>@@ -114,6 +114,11 @@ USE_RC_SUBR=	vboxheadless vboxwatchdog
> 
> .include <bsd.port.options.mk>
> 
>+# llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.
>+# llvm15 builds but the executable throws error "VERR_INTERNAL_ERROR_3"
>+# force llvm from ports to be between 11 and 14
>+USES+=		llvm:min=11,max=14
>+
> .if ${SLAVE_PORT} == no
> CONFLICTS_INSTALL+=	virtualbox-ose-nox11
> OPTIONS_DEFAULT+=	PYTHON
>@@ -211,16 +216,13 @@ KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
> .include <bsd.port.pre.mk>
> 
> .if ${CHOSEN_COMPILER_TYPE} == clang
>-# llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.
>-# force llvm11 from ports
>-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109
>-BUILD_DEPENDS+=	clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
>-CC=		clang${VBOX_LLVM_VER}
>-CXX=		clang++${VBOX_LLVM_VER}
>-VBOX_LLVM_VER?=	11
>-.endif
>+CONFIGURE_ARGS+=	--with-gcc="clang${LLVM_VERSION}" --with-g++="clang++${LLVM_VERSION}"
> PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
> EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
>+EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c
>+EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c
>+.else
>+CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
> .endif
> 
> .if ${PYTHON_MAJOR_VER} >= 3
>diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
>index 312bb4515358..941e8fe5bb20 100644
>--- a/emulators/virtualbox-ose/distinfo
>+++ b/emulators/virtualbox-ose/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1683653391
>+TIMESTAMP = 1682670965
> SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
> SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
> SHA256 (VBoxGuestAdditions_6.1.44.iso) = a88d947b0055ae0f08962fa1b5788247272903b6bca3f1a9ad0cb6bc8706ecf8
>diff --git a/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c
>new file mode 100644
>index 000000000000..603c0184a96f
>--- /dev/null
>+++ b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c
>@@ -0,0 +1,11 @@
>+--- src/VBox/Devices/PC/ipxe/src/core/settings.c.orig	2023-04-13 11:24:00.000000000 +0200
>++++ src/VBox/Devices/PC/ipxe/src/core/settings.c	2023-04-28 11:09:40.133502000 +0200
>+@@ -286,7 +286,7 @@
>+ 						     const char *name ) {
>+ 	struct {
>+ 		struct autovivified_settings autovivified;
>+-		char name[ strlen ( name ) + 1 /* NUL */ ];
>++		char name[ 32 ];
>+ 	} *new_child;
>+ 	struct settings *settings;
>+ 
>diff --git a/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c
>new file mode 100644
>index 000000000000..b314407b9cda
>--- /dev/null
>+++ b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c
>@@ -0,0 +1,15 @@
>+--- src/VBox/Devices/PC/ipxe/src/net/tcp/httpcore.c.orig	2023-04-13 11:24:16.000000000 +0200
>++++ src/VBox/Devices/PC/ipxe/src/net/tcp/httpcore.c	2023-04-28 20:13:10.781920000 +0200
>+@@ -646,9 +646,9 @@
>+ 	int request_len = unparse_uri ( NULL, 0, http->uri,
>+ 					URI_PATH_BIT | URI_QUERY_BIT );
>+ 	struct {
>+-		uint8_t user_pw[ user_pw_len + 1 /* NUL */ ];
>+-		char user_pw_base64[ user_pw_base64_len + 1 /* NUL */ ];
>+-		char request[ request_len + 1 /* NUL */ ];
>++		uint8_t user_pw[ 32 ];
>++		char user_pw_base64[ 64 ];
>++		char request[ 1024 ];
>+ 		char range[48]; /* Enough for two 64-bit integers in decimal */
>+ 	} *dynamic;
>+ 	int partial;

Actions: View | Diff

Attachments on bug 270189: 240856 | 241099 | 241524 | 241915 | 241924 | 242010 | 242011 | 242215 | 242284 | 242510