View | Details | Raw Unified | Return to bug 270189 | Differences between
and this patch

Collapse All | Expand All

(-)b/emulators/virtualbox-ose-additions/Makefile (-2 / +1 lines)
Lines 1-6 Link Here
1 
PORTNAME=	virtualbox-ose
 1 
PORTNAME=	virtualbox-ose
2 
PORTVERSION=	6.1.36
 2 
PORTVERSION=	6.1.44
3 
PORTREVISION?=	2
4 
CATEGORIES=	emulators
 3 
CATEGORIES=	emulators
5 
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
 4 
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
6 
PKGNAMESUFFIX?=	-additions
 5 
PKGNAMESUFFIX?=	-additions
(-)b/emulators/virtualbox-ose-additions/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1 
TIMESTAMP = 1658298869
 1 
TIMESTAMP = 1682671010
2 
SHA256 (VirtualBox-6.1.36.tar.bz2) = e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047
 2 
SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
3 
SIZE (VirtualBox-6.1.36.tar.bz2) = 165685382
 3 
SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
(-)b/emulators/virtualbox-ose-kmod/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1 
PORTNAME=	virtualbox-ose
 1 
PORTNAME=	virtualbox-ose
2 
PORTVERSION=	6.1.36
 2 
PORTVERSION=	6.1.44
3 
PORTREVISION=	1
 3 
PORTREVISION=	1
4 
CATEGORIES=	emulators
 4 
CATEGORIES=	emulators
5 
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
 5 
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
(-)b/emulators/virtualbox-ose-kmod/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1 
TIMESTAMP = 1658298869
 1 
TIMESTAMP = 1682670994
2 
SHA256 (VirtualBox-6.1.36.tar.bz2) = e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047
 2 
SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c
3 
SIZE (VirtualBox-6.1.36.tar.bz2) = 165685382
 3 
SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421
(-)b/emulators/virtualbox-ose/Makefile (-15 / +13 lines)
Lines 1-5 Link Here
1 
PORTNAME=	virtualbox-ose
 1 
PORTNAME=	virtualbox-ose
2 
PORTVERSION=	6.1.36
 2 
PORTVERSION=	6.1.44
3 
PORTREVISION=	2
 3 
PORTREVISION=	2
4 
CATEGORIES=	emulators
 4 
CATEGORIES=	emulators
5 
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
 5 
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
Lines 32-38 USE_GNOME= libidl libxml2 Link Here
32 

          32
          

        

        

          33
          
HAS_CONFIGURE=	yes

          33
          
HAS_CONFIGURE=	yes

        

        

          34
          
CONFIGURE_ARGS=	--disable-java --passive-mesa

          34
          
CONFIGURE_ARGS=	--disable-java --passive-mesa

        

            

              35
              
CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"

              
              
            

        

          36
          

          35
          

        

        

          37
          
CONFLICTS_INSTALL=	virtualbox-ose-additions-* \

          36
          
CONFLICTS_INSTALL=	virtualbox-ose-additions-* \

        

        

          38
          
			virtualbox-ose-devel \

          37
          
			virtualbox-ose-devel \

        

  

    
      
            Lines 115-120
          USE_RC_SUBR=	vboxheadless vboxwatchdog
      
      
        Link Here
      
    
  

        

          115
          

          114
          

        

        

          116
          
.include <bsd.port.options.mk>

          115
          
.include <bsd.port.options.mk>

        

        

          117
          

          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
              

            

        

          118
          
.if ${SLAVE_PORT} == no

          122
          
.if ${SLAVE_PORT} == no

        

        

          119
          
CONFLICTS_INSTALL+=	virtualbox-ose-nox11

          123
          
CONFLICTS_INSTALL+=	virtualbox-ose-nox11

        

        

          120
          
OPTIONS_DEFAULT+=	PYTHON

          124
          
OPTIONS_DEFAULT+=	PYTHON

        

  

    
      
            Lines 211-229
          KMK_FLAGS+=	-j${MAKE_JOBS_NUMBER}
      
      
        Link Here
      
    
  

        

          211
          

          215
          

        

        

          212
          
.include <bsd.port.pre.mk>

          216
          
.include <bsd.port.pre.mk>

        

        

          213
          

          217
          

        

            

              214
              
.if ${CHOSEN_COMPILER_TYPE} == clang

              
              
            

            

              215
              
# llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors.

            

            

              216
              
# force llvm11 from ports

            

            

              217
              
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109

            

            

              218
              
BUILD_DEPENDS+=	clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}

            

            

              219
              
CC=		clang${VBOX_LLVM_VER}

            

            

              220
              
CXX=		clang++${VBOX_LLVM_VER}

            

            

              221
              
VBOX_LLVM_VER?=	11

            

            

              222
              
.endif

            

            

              223
              
PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild

            

            

              224
              
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk

            

            

              225
              
.endif

            

            

              226
              

            

        

          227
          
.if ${PYTHON_MAJOR_VER} >= 3

          218
          
.if ${PYTHON_MAJOR_VER} >= 3

        

        

          228
          
PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \

          219
          
PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \

        

        

          229
          
		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc

          220
          
		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc

        

  

    
      
            Lines 309-314
          post-patch:
      
      
        Link Here
      
    
  

        

          309
          
	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \

          300
          
	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \

        

        

          310
          
	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \

          301
          
	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \

        

        

          311
          
	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk

          302
          
	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk

        

            

              
              
              303
              
CONFIGURE_ARGS+=	--with-gcc="clang${LLVM_VERSION}" --with-g++="clang++${LLVM_VERSION}"

            

            

              304
              
PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild

            

            

              305
              
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk

            

            

              306
              
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c

            

            

              307
              
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c

            

            

              308
              
.else

            

            

              309
              
CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"

            

        

          312
          
.endif

          310
          
.endif

        

        

          313
          
	# Causes a "reinplace" QA warning with default LOCALBASE

          311
          
	# Causes a "reinplace" QA warning with default LOCALBASE

        

        

          314
          
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \

          312
          
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \

        



(-)b/emulators/virtualbox-ose/distinfo
      (-5 / +5 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1658298869


              1
              
TIMESTAMP = 1682670965

            

            

              2
              
SHA256 (VirtualBox-6.1.36.tar.bz2) = e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047


              2
              
SHA256 (VirtualBox-6.1.44.tar.bz2) = 34a0235d878165453f6a15e34d74ed19b8878afacbb34e6f3682556f3487a48c

            

            

              3
              
SIZE (VirtualBox-6.1.36.tar.bz2) = 165685382


              3
              
SIZE (VirtualBox-6.1.44.tar.bz2) = 165775421

            

            

              4
              
SHA256 (VBoxGuestAdditions_6.1.36.iso) = c987cdc8c08c579f56d921c85269aeeac3faf636babd01d9461ce579c9362cdd


              4
              
SHA256 (VBoxGuestAdditions_6.1.44.iso) = a88d947b0055ae0f08962fa1b5788247272903b6bca3f1a9ad0cb6bc8706ecf8

            

            

              5
              
SIZE (VBoxGuestAdditions_6.1.36.iso) = 63803392


              5
              
SIZE (VBoxGuestAdditions_6.1.44.iso) = 63952896

            



(-)b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_core_settings.c
      (+11 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              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
              
 

            



(-)b/emulators/virtualbox-ose/files/extrapatch-src_VBox_Devices_PC_ipxe_src_net_tcp_httpcore.c
      (+15 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              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;

            



(-)b/emulators/virtualbox-ose/pkg-plist
      (+2 lines)




  

    
      
            Lines 552-557
          lib/virtualbox/components/VirtualBox_XPCOM.xpt
      
      
        Link Here
      
    
  

        

          552
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm

          552
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm

        

        

          553
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_it.qm

          553
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_it.qm

        

        

          554
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_ja.qm

          554
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_ja.qm

        

            

              
              
              555
              
%%NLS%%%%DATADIR%%/nls/VirtualBox_ka.qm

            

        

          555
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_km_KH.qm

          556
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_km_KH.qm

        

        

          556
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_ko.qm

          557
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_ko.qm

        

        

          557
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_lt.qm

          558
          
%%NLS%%%%DATADIR%%/nls/VirtualBox_lt.qm

        

  

    
      
            Lines 590-595
          lib/virtualbox/components/VirtualBox_XPCOM.xpt
      
      
        Link Here
      
    
  

        

          590
          
%%NLS%%%%DATADIR%%/nls/qt_id.qm

          591
          
%%NLS%%%%DATADIR%%/nls/qt_id.qm

        

        

          591
          
%%NLS%%%%DATADIR%%/nls/qt_it.qm

          592
          
%%NLS%%%%DATADIR%%/nls/qt_it.qm

        

        

          592
          
%%NLS%%%%DATADIR%%/nls/qt_ja.qm

          593
          
%%NLS%%%%DATADIR%%/nls/qt_ja.qm

        

            

              
              
              594
              
%%NLS%%%%DATADIR%%/nls/qt_ka.qm

            

        

          593
          
%%NLS%%%%DATADIR%%/nls/qt_km_KH.qm

          595
          
%%NLS%%%%DATADIR%%/nls/qt_km_KH.qm

        

        

          594
          
%%NLS%%%%DATADIR%%/nls/qt_ko.qm

          596
          
%%NLS%%%%DATADIR%%/nls/qt_ko.qm

        

        

          595
          
%%NLS%%%%DATADIR%%/nls/qt_lt.qm

          597
          
%%NLS%%%%DATADIR%%/nls/qt_lt.qm

        






  

  Return to bug 270189