Attachment #231490 for bug #261522

View | Details | Raw Unified | Return to bug 261522 | Differences between
Collapse All | Expand All





PORTNAME=	virtualbox-ose
PORTVERSION=	6.1.32
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}

	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
.endif
.if ${LOCALBASE} != "/usr/local"
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
	    ${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp \
	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
.endif
	@${REINPLACE_CMD} \
	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \

	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
.endif
.if ${VBOX_DIR} != "/usr/local/lib/virtualbox" || ${PREFIX} != "/usr/local"
	@${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \
	    -e 's|/usr/local|${PREFIX}|' \
	    ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
.endif
	@${REINPLACE_CMD} \
	    -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \
	    ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py




--- src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp.orig	2022-01-13 18:57:40 UTC
+++ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
@@ -737,7 +737,8 @@ int Adapter::doIOCtl(unsigned long iCmd, VBOXNETADPREQ
 *   Global config file implementation                                                                                            *
 *********************************************************************************************************************************/
 
-#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "/etc/vbox/networks.conf"
+#define VBOX_GLOBAL_NETWORK_CONFIG_PATH1 "/usr/local/etc/vbox/networks.conf"
+#define VBOX_GLOBAL_NETWORK_CONFIG_PATH2 "/etc/vbox/networks.conf"
 #define VBOXNET_DEFAULT_IPV4MASK "255.255.255.0"
 
 class NetworkAddress
@@ -964,9 +965,17 @@ bool GlobalNetworkPermissionsConfig::forbids(const cha
 
 bool GlobalNetworkPermissionsConfig::forbids(NetworkAddress& address)
 {
-    FILE *fp = fopen(VBOX_GLOBAL_NETWORK_CONFIG_PATH, "r");
+    bool path2 = false;
+    FILE *fp = fopen(VBOX_GLOBAL_NETWORK_CONFIG_PATH1, "r");
+
     if (!fp)
     {
+        path2 = true;
+        fp = fopen(VBOX_GLOBAL_NETWORK_CONFIG_PATH2, "r");
+    }
+    
+    if (!fp)
+    {
         if (verbose)
             fprintf(stderr, "Info: matching against default '%s' => %s\n", address.defaultNetwork(),
                 address.matches(address.defaultNetwork()) ? "MATCH" : "no match");
@@ -985,11 +994,11 @@ bool GlobalNetworkPermissionsConfig::forbids(NetworkAd
         {
             if (!address.isValidString(pszToken))
             {
-                fprintf(stderr, "Warning: %s(%d) invalid network '%s'\n", VBOX_GLOBAL_NETWORK_CONFIG_PATH, line, pszToken);
+                fprintf(stderr, "Warning: %s(%d) invalid network '%s'\n", path2 ? VBOX_GLOBAL_NETWORK_CONFIG_PATH2 : VBOX_GLOBAL_NETWORK_CONFIG_PATH1, line, pszToken);
                 continue;
             }
             if (verbose)
-                fprintf(stderr, "Info: %s(%d) matching against '%s' => %s\n", VBOX_GLOBAL_NETWORK_CONFIG_PATH, line, pszToken,
+                fprintf(stderr, "Info: %s(%d) matching against '%s' => %s\n", path2 ? VBOX_GLOBAL_NETWORK_CONFIG_PATH2 : VBOX_GLOBAL_NETWORK_CONFIG_PATH1, line, pszToken,
                     address.matches(pszToken) ? "MATCH" : "no match");
             if (address.matches(pszToken))
                 return false;

Return to bug 261522

Lines 2-7 Link Here

(-)b/emulators/virtualbox-ose/Makefile (+6 lines)
2		2
3	PORTNAME= virtualbox-ose	3	PORTNAME= virtualbox-ose
4	PORTVERSION= 6.1.32	4	PORTVERSION= 6.1.32
		5	PORTREVISION= 1
5	CATEGORIES= emulators	6	CATEGORIES= emulators
6	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
7	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
Lines 307-317 post-patch: Link Here
307	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \	308	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
308	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk	309	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
309	.endif	310	.endif
		311	.if ${LOCALBASE} != "/usr/local"
310	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	312	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
311	${WRKSRC}/Config.kmk ${WRKSRC}/configure \	313	${WRKSRC}/Config.kmk ${WRKSRC}/configure \
312	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \	314	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
313	${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \	315	${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
		316	${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp \
314	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py	317	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
		318	.endif
315	@${REINPLACE_CMD} \	319	@${REINPLACE_CMD} \
316	-e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \	320	-e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \
317	-e 's\|SUPPYTHONLIBS=.*\|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"\|' \	321	-e 's\|SUPPYTHONLIBS=.*\|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"\|' \
Lines 321-329 post-patch: Link Here
321	${WRKSRC}/src/VBox/Runtime/Makefile.kmk	325	${WRKSRC}/src/VBox/Runtime/Makefile.kmk
322	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk	326	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
323	.endif	327	.endif
		328	.if ${VBOX_DIR} != "/usr/local/lib/virtualbox" \|\| ${PREFIX} != "/usr/local"
324	@${REINPLACE_CMD} -e 's\|/usr/local/lib/virtualbox\|${VBOX_DIR}\|' \	329	@${REINPLACE_CMD} -e 's\|/usr/local/lib/virtualbox\|${VBOX_DIR}\|' \
325	-e 's\|/usr/local\|${PREFIX}\|' \	330	-e 's\|/usr/local\|${PREFIX}\|' \
326	${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh	331	${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
		332	.endif
327	@${REINPLACE_CMD} \	333	@${REINPLACE_CMD} \
328	-e 's\|^versions =.*\|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]\|' \	334	-e 's\|^versions =.*\|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]\|' \
329	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py	335	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py

Added Link Here

(-)b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp (+45 lines)
1	--- src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp.orig 2022-01-13 18:57:40 UTC
2	+++ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
3	@@ -737,7 +737,8 @@ int Adapter::doIOCtl(unsigned long iCmd, VBOXNETADPREQ
4	* Global config file implementation *
5	*********************************************************************************************************************************/
6
7	-#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "/etc/vbox/networks.conf"
8	+#define VBOX_GLOBAL_NETWORK_CONFIG_PATH1 "/usr/local/etc/vbox/networks.conf"
9	+#define VBOX_GLOBAL_NETWORK_CONFIG_PATH2 "/etc/vbox/networks.conf"
10	#define VBOXNET_DEFAULT_IPV4MASK "255.255.255.0"
11
12	class NetworkAddress
13	@@ -964,9 +965,17 @@ bool GlobalNetworkPermissionsConfig::forbids(const cha
14
15	bool GlobalNetworkPermissionsConfig::forbids(NetworkAddress& address)
16	{
17	- FILE *fp = fopen(VBOX_GLOBAL_NETWORK_CONFIG_PATH, "r");
18	+ bool path2 = false;
19	+ FILE *fp = fopen(VBOX_GLOBAL_NETWORK_CONFIG_PATH1, "r");
20	+
21	if (!fp)
22	{
23	+ path2 = true;
24	+ fp = fopen(VBOX_GLOBAL_NETWORK_CONFIG_PATH2, "r");
25	+ }
26	+
27	+ if (!fp)
28	+ {
29	if (verbose)
30	fprintf(stderr, "Info: matching against default '%s' => %s\n", address.defaultNetwork(),
31	address.matches(address.defaultNetwork()) ? "MATCH" : "no match");
32	@@ -985,11 +994,11 @@ bool GlobalNetworkPermissionsConfig::forbids(NetworkAd
33	{
34	if (!address.isValidString(pszToken))
35	{
36	- fprintf(stderr, "Warning: %s(%d) invalid network '%s'\n", VBOX_GLOBAL_NETWORK_CONFIG_PATH, line, pszToken);
37	+ fprintf(stderr, "Warning: %s(%d) invalid network '%s'\n", path2 ? VBOX_GLOBAL_NETWORK_CONFIG_PATH2 : VBOX_GLOBAL_NETWORK_CONFIG_PATH1, line, pszToken);
38	continue;
39	}
40	if (verbose)
41	- fprintf(stderr, "Info: %s(%d) matching against '%s' => %s\n", VBOX_GLOBAL_NETWORK_CONFIG_PATH, line, pszToken,
42	+ fprintf(stderr, "Info: %s(%d) matching against '%s' => %s\n", path2 ? VBOX_GLOBAL_NETWORK_CONFIG_PATH2 : VBOX_GLOBAL_NETWORK_CONFIG_PATH1, line, pszToken,
43	address.matches(pszToken) ? "MATCH" : "no match");
44	if (address.matches(pszToken))
45	return false;