Attachment #242215 for bug #270189

Lines 1-3 Link Here

(-)b/emulators/virtualbox-ose-additions/distinfo (-1 / +1 lines)
1	TIMESTAMP = 1683653403	1	TIMESTAMP = 1682671010
2	SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c	2	SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
3	SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421	3	SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421

Lines 1-3 Link Here

(-)b/emulators/virtualbox-ose-kmod/distinfo (-1 / +1 lines)
1	TIMESTAMP = 1683653444	1	TIMESTAMP = 1682670994
2	SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c	2	SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
3	SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421	3	SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421

Lines 1-5 Link Here

(-)b/emulators/virtualbox-ose/Makefile (-9 / +11 lines)
1	PORTNAME= virtualbox-ose	1	PORTNAME= virtualbox-ose
2	PORTVERSION= 6.1.44	2	PORTVERSION= 6.1.44
		3	PORTREVISION= 1
3	CATEGORIES= emulators	4	CATEGORIES= emulators
4	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/	5	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
5	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	6	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
Lines 31-37 USE_GNOME= libidl libxml2 Link Here
31		32
32	HAS_CONFIGURE= yes	33	HAS_CONFIGURE= yes
33	CONFIGURE_ARGS= --disable-java --passive-mesa	34	CONFIGURE_ARGS= --disable-java --passive-mesa
34	CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}"
35		35
36	CONFLICTS_INSTALL= virtualbox-ose-additions-* \	36	CONFLICTS_INSTALL= virtualbox-ose-additions-* \
37	virtualbox-ose-devel \	37	virtualbox-ose-devel \
Lines 114-119 USE_RC_SUBR= vboxheadless vboxwatchdog Link Here
114		114
115	.include <bsd.port.options.mk>	115	.include <bsd.port.options.mk>
116		116
		117	# llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.
		118	# llvm15 builds but the executable throws error "VERR_INTERNAL_ERROR_3"
		119	# force llvm from ports to be between 11 and 14
		120	USES+= llvm:min=11,max=14
		121
117	.if ${SLAVE_PORT} == no	122	.if ${SLAVE_PORT} == no
118	CONFLICTS_INSTALL+= virtualbox-ose-nox11	123	CONFLICTS_INSTALL+= virtualbox-ose-nox11
119	OPTIONS_DEFAULT+= PYTHON	124	OPTIONS_DEFAULT+= PYTHON
Lines 211-226 KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} Link Here
211	.include <bsd.port.pre.mk>	216	.include <bsd.port.pre.mk>
212		217
213	.if ${CHOSEN_COMPILER_TYPE} == clang	218	.if ${CHOSEN_COMPILER_TYPE} == clang
214	# llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.	219	CONFIGURE_ARGS+= --with-gcc="clang${LLVM_VERSION}" --with-g++="clang++${LLVM_VERSION}"
215	# force llvm11 from ports
216	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109
217	BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
218	CC= clang${VBOX_LLVM_VER}
219	CXX= clang++${VBOX_LLVM_VER}
220	VBOX_LLVM_VER?= 11
221	.endif
222	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild	220	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
223	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk	221	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
		222	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c
		223	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c
		224	.else
		225	CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}"
224	.endif	226	.endif
225		227
226	.if ${PYTHON_MAJOR_VER} >= 3	228	.if ${PYTHON_MAJOR_VER} >= 3

Lines 1-4 Link Here

(-)b/emulators/virtualbox-ose/distinfo (-1 / +1 lines)
1	TIMESTAMP = 1683653391	1	TIMESTAMP = 1682670965
2	SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c	2	SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
3	SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421	3	SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
4	SHA256 (VBoxGuestAdditions_6.1.44.iso) = a88d947b0055ae0f08962fa1b5788247272903b6bca3f1a9ad0cb6bc8706ecf8	4	SHA256 (VBoxGuestAdditions_6.1.44.iso) = a88d947b0055ae0f08962fa1b5788247272903b6bca3f1a9ad0cb6bc8706ecf8

Added Link Here

(-)b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c (+11 lines)
1	--- src/VBox/Devices/PC/ipxe/src/core/settings.c.orig 2023-04-13 11:24:00.000000000 +0200
2	+++ src/VBox/Devices/PC/ipxe/src/core/settings.c 2023-04-28 11:09:40.133502000 +0200
3	@@ -286,7 +286,7 @@
4	const char *name ) {
5	struct {
6	struct autovivified_settings autovivified;
7	- char name[ strlen ( name ) + 1 /* NUL */ ];
8	+ char name[ 32 ];
9	} *new_child;
10	struct settings *settings;
11




--- 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;

Return to bug 270189

Added Link Here

(-)b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c (+15 lines)
1	--- src/VBox/Devices/PC/ipxe/src/net/tcp/httpcore.c.orig 2023-04-13 11:24:16.000000000 +0200
2	+++ src/VBox/Devices/PC/ipxe/src/net/tcp/httpcore.c 2023-04-28 20:13:10.781920000 +0200
3	@@ -646,9 +646,9 @@
4	int request_len = unparse_uri ( NULL, 0, http->uri,
5	URI_PATH_BIT \| URI_QUERY_BIT );
6	struct {
7	- uint8_t user_pw[ user_pw_len + 1 /* NUL */ ];
8	- char user_pw_base64[ user_pw_base64_len + 1 /* NUL */ ];
9	- char request[ request_len + 1 /* NUL */ ];
10	+ uint8_t user_pw[ 32 ];
11	+ char user_pw_base64[ 64 ];
12	+ char request[ 1024 ];
13	char range[48]; /* Enough for two 64-bit integers in decimal */
14	} *dynamic;
15	int partial;