From nobody Fri Mar 11 21:51:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A0E4E1A10B6F; Fri, 11 Mar 2022 21:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFflp427bz3m2S; Fri, 11 Mar 2022 21:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647035510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhMRGR1XKnAMAKhT3wwv63X7AIXswUaHzphxQOYPzlc=; b=HvuECSXs5jsQoWZJHyquntFhV1+mxQiedGntGAkSqRwz/mh9YuV1+RA2OIL3Aa9ckz06vZ r2SGV/Ns6Sb9Mk3MXCaooy4OHSvEYR/i9Hmw032hg+m2733YTXvxa7nKKGxJEi15MkHYWc H5XHthza+98sgNCjXkojLZMVP4WNvmxWnnwVfE27cUd3cHAT5sjoj6SIX21uN0+PFKrUMQ 3rM4uCYHLmwdmkpPFhL2XLUPRKmM7Dc2PR93C85eOwfdTvKP6V4ulzUuMAS47M2yAwOkVM mx74PlYdN9CGHFYDxJhlmN3/1JT5JwC45yS0sD15chUQxqeXf8c2AU8LDUET+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A27420EE0; Fri, 11 Mar 2022 21:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22BLpo7S012422; Fri, 11 Mar 2022 21:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BLpoB7012421; Fri, 11 Mar 2022 21:51:50 GMT (envelope-from git) Date: Fri, 11 Mar 2022 21:51:50 GMT Message-Id: <202203112151.22BLpoB7012421@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 66635b2061da - main - emulators/virtualbox-ose: Put vbox/networks.conf in the right place List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66635b2061daf5993d8bbf80457ee59946d91da4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647035510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhMRGR1XKnAMAKhT3wwv63X7AIXswUaHzphxQOYPzlc=; b=M9MS9/y6AMaVHUgZl1fvFCwZ91IDd0QbvYK+2VbyiqX82uP+1gfAxuOYycpgA3cUy2RA3U 4set4qmIBt1G4zXCmt+676zAvzpHn1YaS7PI8PxAJXSCU8thAEhLNJNU23PiIxdZq/+tZ+ jwufvacBvJ0ezm4fz8iIuLT+DTnj/I+pA4GU9AAFpyblv4HhGuAwoInI+Ul+YswkuPxRJl b7saQVOhyxr1TIMC2je4RW4PzAfxCNh3mlO/WKfzHu6aAdohfSYsUKkWhZn1FXnf3um7BJ 3mRz04y+UyUjuXelItjGoHYiX/rpS3RtXk8DqHYNc+cd1VdXI2pX4Kw6VVVOrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647035510; a=rsa-sha256; cv=none; b=DXKtKXpCgc1yRqdETCg3qSAgxUrW2BVF9/dLdWYCmAfEbqcMbfdwbATYESa2rcEYJpnBpr ujrdxvqSiWrGwHDO1YFwP0+fAKn8gymgvEnMUXnbvxV4LmWIaGUW6+9f4DqV13Zj2lVVx4 6/R28Jear24G0Isdfnf5O7L7+17PBEys8SJGXHmVR9jO27QALSBtoWEOvQz1GKODXjAdeV hSBR84Y5xzr1bswsEhk2Aonkgf7WNzl2P9qtz0O03kmWihJsWkyRXlEnw0cJ3IxtjBksK6 FWeHo6MqU74kUynbTXmWYUojmS6ma6V0YfVNns3LMGtUDudUTs3pL8C4wWoSQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=66635b2061daf5993d8bbf80457ee59946d91da4 commit 66635b2061daf5993d8bbf80457ee59946d91da4 Author: Michael Gmelin AuthorDate: 2022-03-11 21:44:02 +0000 Commit: Guido Falsi CommitDate: 2022-03-11 21:51:31 +0000 emulators/virtualbox-ose: Put vbox/networks.conf in the right place Since virtualbox-ose 6.1.26 a new networks.conf file has been introduced and the software looks for it in /etc/vbox. This commit introduces a patch to make virtualbox look for it in PREFIX/etc/vbox. To help users with configurations already using this file in /etc/vbox notes to UPDATING, pkg-message and to the main virtualbox executable script have been added. Also adding some comments to the Makefile to note that QA warning due to reinplace being run but not having changed any file are expected due to the design of this port Makefile. PR: 261522 --- UPDATING | 8 ++++++++ emulators/virtualbox-ose/Makefile | 6 ++++++ .../files/patch-src-VBox-Installer-freebsd-VBox.sh | 13 ++++++++++--- .../patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp | 11 +++++++++++ .../virtualbox-ose/{pkg-message => files/pkg-message.in} | 15 +++++++++++++++ 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index c8e7bc2e9d04..2e49b7de64a4 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20220311: + AFFECTS: users of emulators/virtualbox-ose + AUTHOR: grembo@FreeBSD.org + + In order to comply to hier(7), VirtualBox's configuration of non-default + IP ranges to be used in host-only mode moved from /etc/vbox/networks.conf + to ${LOCALBASE}/etc/vbox/networks.conf. + 20220311: AFFECTS: users of net/nats-server AUTHOR: olgeni@FreeBSD.org diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index c308bb20cee7..b1c34f71bd68 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -2,6 +2,7 @@ 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} @@ -52,6 +53,8 @@ VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \ VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \ VBoxSVC VBoxXPCOMIPCD +SUB_FILES= pkg-message + OPTIONS_DEFINE= AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \ PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11 OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 @@ -307,10 +310,12 @@ post-patch: ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \ ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk .endif + # Causes a "reinplace" QA warning with default LOCALBASE @${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 @${REINPLACE_CMD} \ -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \ @@ -321,6 +326,7 @@ post-patch: ${WRKSRC}/src/VBox/Runtime/Makefile.kmk @${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif + # Causes a "reinplace" QA warning with default PREFIX/VBOX_DIR @${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \ -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh index deb51288deb1..6511a665a219 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh @@ -1,6 +1,6 @@ --- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC +++ src/VBox/Installer/freebsd/VBox.sh -@@ -0,0 +1,67 @@ +@@ -0,0 +1,74 @@ +#!/bin/sh +# +# Oracle VM VirtualBox startup script, FreeBSD hosts. @@ -26,10 +26,17 @@ + test -f /usr/local/lib/virtualbox/VBoxRT.so; then + INSTALL_DIR=/usr/local/lib/virtualbox + else -+ echo "Could not find VirtualBox installation. Please reinstall." ++ >&2 echo "Could not find VirtualBox installation. Please reinstall." + exit 1 + fi + ++if [ -d /etc/vbox ]; then ++ >&2 cat <<-EOH ++ WARNING: Directory /etc/vbox found, but ignored. VirtualBox ++ configuration files are stored in /usr/local/etc/vbox/. ++ EOH ++fi ++ +# workaround for the KDE dialog problem +KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES + @@ -63,7 +70,7 @@ + exec "$INSTALL_DIR/vboxwebsrv" "$@" + ;; + *) -+ echo "Unknown application - $APP" ++ >&2 echo "Unknown application - $APP" + exit 1 + ;; +esac diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp new file mode 100644 index 000000000000..dfd9105f8390 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp @@ -0,0 +1,11 @@ +--- src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp.orig 2022-01-13 18:57:40 UTC ++++ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp +@@ -737,7 +737,7 @@ 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_PATH "/usr/local/etc/vbox/networks.conf" + #define VBOXNET_DEFAULT_IPV4MASK "255.255.255.0" + + class NetworkAddress diff --git a/emulators/virtualbox-ose/pkg-message b/emulators/virtualbox-ose/files/pkg-message.in similarity index 79% rename from emulators/virtualbox-ose/pkg-message rename to emulators/virtualbox-ose/files/pkg-message.in index 20fa96d594fa..8df5a0a47ffd 100644 --- a/emulators/virtualbox-ose/pkg-message +++ b/emulators/virtualbox-ose/files/pkg-message.in @@ -60,6 +60,10 @@ vfs.aio.max_aio_per_proc=8192 vfs.aio.max_aio_queue=65536 To check if AIO is used use: kldstat -v | grep aio +When assigning IP addresses in host-only mode from ranges outside +of VirtualBox's defaults, the respective ranges need to be listed +in %%LOCALBASE%%/etc/vbox/networks.conf (PR#259399). + Check wiki page for known issues and troubleshooting: http://wiki.freebsd.org/VirtualBox @@ -78,4 +82,15 @@ machines using the Pulseaudio host audio driver to use another supported one. EOM } +{ type: upgrade + minimum_version: 6.1.26 + maximum_version: 6.1.32_1 + message: <