From nobody Thu Jan 20 15:44:44 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 E267A195C2D2; Thu, 20 Jan 2022 15:44:44 +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 4JfmzJ5qtlz4bLr; Thu, 20 Jan 2022 15:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642693484; 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=Fr6xDbqHjmue0aHmPphPHEl3EQFdxOJQo8aKnPR4KHw=; b=q++np5LCnXWOS3ADksBU+wHdUe3OakCgVN+sqOyUIgxyBTCHRogmBzRCYx4AyEbaLh4mq4 b2M85dEqFIcEko+CtCyJTaEV+V0vUMMlgfVEP6htVUvuWuWEXhQ9nR0NZFWsgIg80GGe1V QXMwjOYKxHH/6ud3z343loK1Rq/nVDTnAZdX/oq9oPpII0JHn717GvnYbmk/N9bbPpPRTr vflaxCHf/Egrg0BJxnYVL1dN/ZE1nk5j7k44+LoQNJIAvfatzv66yTJ4XwA2PLEXcHuLvR ajPL8O/nR0CUnj71jmXQc/csgq3l6mV40JAXxeT9zkotCZf50YLYvnro4wmIVw== 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 A86272B45; Thu, 20 Jan 2022 15:44:44 +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 20KFiitP045560; Thu, 20 Jan 2022 15:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KFiiCH045559; Thu, 20 Jan 2022 15:44:44 GMT (envelope-from git) Date: Thu, 20 Jan 2022 15:44:44 GMT Message-Id: <202201201544.20KFiiCH045559@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: 6348afa69831 - main - emulators/virtualbox-ose*: Update to 6.1.32 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: 6348afa6983147beb3d46f9afdd72c9fbc46ca49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642693484; 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=Fr6xDbqHjmue0aHmPphPHEl3EQFdxOJQo8aKnPR4KHw=; b=ZhooeXT+Vk3bdqcSdoI9ia87kd0fTD3M5mS8QnUq2gAzqt6gRheLRNf8Wj2u4KESo693U8 Be6FMeEnlNnDOZ2a1mtHhiUiD77+ee5ne/LOU7yHnBMkMLOcuqwpt2ej3EXPeWFDwXmbKZ ML2zE/erUWsqdOCz+spnOnrdKydnbrTPOekvMdGWU00vkNQhlnSzmXODSiNBJifeTkflGq xZghbUk6hvWvsgeHfmfRW0lQjXlXdCW3IjtoV5ElqEg2BKUKwq8FDPwt8oIg0jm2QaJQCv pVq6DXBmlGOgmHuPhWGUY7pIwNSUyWTEm4M3tFnxulcDTPUxd31Av70Lis7mhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642693484; a=rsa-sha256; cv=none; b=mBri4cGfIoScG6sKgK82JIddWbHcA8mCTTbrHcE4rc4+grIM6JOllCb40TUdYxvmX9sayr ZJvbJBstRUV1nPtLDKEE4Eoj9UjFgwIKYZa3NBhm6eyncK1v8A/OacytXBeLPSUp/PWyhm sKDBoBLGWQUSxm72JnM8eH49O262uOSg/awpvRRbU3bxV3M0qmdLPleabSZSZXOxbE1n0M HclLY+sP1o/PiUJPYKbGlWC/TI+U0YkURcxdU6elxbnkgsmz03FXleidJp72bUtPTgh6/6 jkF3WeHAXVrp9a8NElBA6RbQaQ4uBVFSlynowSl0CEZPOGnGbLhcoF8SsdFOmw== 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=6348afa6983147beb3d46f9afdd72c9fbc46ca49 commit 6348afa6983147beb3d46f9afdd72c9fbc46ca49 Author: Guido Falsi AuthorDate: 2022-01-20 15:44:06 +0000 Commit: Guido Falsi CommitDate: 2022-01-20 15:44:06 +0000 emulators/virtualbox-ose*: Update to 6.1.32 Changelog: https://www.virtualbox.org/wiki/Changelog-6.1#v32 --- emulators/virtualbox-ose-additions/Makefile | 2 +- emulators/virtualbox-ose-additions/distinfo | 6 +++--- emulators/virtualbox-ose-kmod/Makefile | 2 +- emulators/virtualbox-ose-kmod/distinfo | 6 +++--- emulators/virtualbox-ose-nox11/Makefile | 4 ++-- emulators/virtualbox-ose/Makefile | 2 +- emulators/virtualbox-ose/distinfo | 10 +++++----- ...src_VBox_Runtime_r3_posix_process-creation-posix.cpp | 17 +++++++++++++---- .../files/patch-src_VBox_VMM_VMMR3_PGMPhys.cpp | 11 +++++++++++ 9 files changed, 40 insertions(+), 20 deletions(-) diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index bcf20976544e..ce7eaff399e9 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -1,7 +1,7 @@ # Created by: Bernhard Froehlich PORTNAME= virtualbox-ose -PORTVERSION= 6.1.30 +PORTVERSION= 6.1.32 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo index cf043e8c0fcc..c3be108b6b83 100644 --- a/emulators/virtualbox-ose-additions/distinfo +++ b/emulators/virtualbox-ose-additions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637612955 -SHA256 (VirtualBox-6.1.30.tar.bz2) = 3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef -SIZE (VirtualBox-6.1.30.tar.bz2) = 165769447 +TIMESTAMP = 1642581950 +SHA256 (VirtualBox-6.1.32.tar.bz2) = 5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c +SIZE (VirtualBox-6.1.32.tar.bz2) = 165758238 diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 04f0cc7079f6..d917ba0a54f4 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -1,7 +1,7 @@ # Created by: Bernhard Froehlich PORTNAME= virtualbox-ose -PORTVERSION= 6.1.30 +PORTVERSION= 6.1.32 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo index cf043e8c0fcc..c3be108b6b83 100644 --- a/emulators/virtualbox-ose-kmod/distinfo +++ b/emulators/virtualbox-ose-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637612955 -SHA256 (VirtualBox-6.1.30.tar.bz2) = 3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef -SIZE (VirtualBox-6.1.30.tar.bz2) = 165769447 +TIMESTAMP = 1642581950 +SHA256 (VirtualBox-6.1.32.tar.bz2) = 5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c +SIZE (VirtualBox-6.1.32.tar.bz2) = 165758238 diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile index b1984d0d6be8..ed9100f7f098 100644 --- a/emulators/virtualbox-ose-nox11/Makefile +++ b/emulators/virtualbox-ose-nox11/Makefile @@ -1,7 +1,7 @@ PKGNAMESUFFIX= -nox11 -OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO -OPTIONS_EXCLUDE+= QT5 VPX X11 +OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \ + QT5 VPX X11 MASTERDIR= ${.CURDIR}/../virtualbox-ose diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index c1993fc01e5a..019e4d7929ad 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,7 +1,7 @@ # Created by: Bernhard Froehlich PORTNAME= virtualbox-ose -PORTVERSION= 6.1.30 +PORTVERSION= 6.1.32 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo index a411f132fc95..69cfdfa29925 100644 --- a/emulators/virtualbox-ose/distinfo +++ b/emulators/virtualbox-ose/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1637612955 -SHA256 (VirtualBox-6.1.30.tar.bz2) = 3c60a29375549ffc148aaebe859be91b27c19d6fa2deefde1373c4f6da8f18ef -SIZE (VirtualBox-6.1.30.tar.bz2) = 165769447 -SHA256 (VBoxGuestAdditions_6.1.30.iso) = d324d2d09d8dd00b1eb3ef3d80ab2e1726998421d13adc0d2a90e05d355aaa5c -SIZE (VBoxGuestAdditions_6.1.30.iso) = 62238720 +TIMESTAMP = 1642581950 +SHA256 (VirtualBox-6.1.32.tar.bz2) = 5d11384200b4e943ad0056d2cf75980ae4bee852c89650e2914e1b34eedc2d2c +SIZE (VirtualBox-6.1.32.tar.bz2) = 165758238 +SHA256 (VBoxGuestAdditions_6.1.32.iso) = 3ab8d64c209d89ffc48e71df68ac0da2cf76074579ffaf2dba008ddbef44129c +SIZE (VBoxGuestAdditions_6.1.32.iso) = 62388224 diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_posix_process-creation-posix.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_posix_process-creation-posix.cpp index e455ae88ccef..83cabcb77b97 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_posix_process-creation-posix.cpp +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_posix_process-creation-posix.cpp @@ -1,4 +1,4 @@ ---- src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig 2021-01-07 15:42:15 UTC +--- src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig 2022-01-13 18:58:24 UTC +++ src/VBox/Runtime/r3/posix/process-creation-posix.cpp @@ -30,7 +30,7 @@ *********************************************************************************************************************************/ @@ -9,7 +9,7 @@ # define IPRT_WITH_DYNAMIC_CRYPT_R #endif #if (defined(RT_OS_LINUX) || defined(RT_OS_OS2)) && !defined(_GNU_SOURCE) -@@ -64,7 +64,7 @@ +@@ -69,7 +69,7 @@ # include #endif @@ -18,8 +18,17 @@ /* While Solaris has posix_spawn() of course we don't want to use it as * we need to have the child in a different process contract, no matter * whether it is started detached or not. */ -@@ -372,7 +372,7 @@ static int rtCheckCredentials(const char *pszUser, con - if (pPwd->pw_passwd && *pPwd->pw_passwd) +@@ -157,7 +157,7 @@ + # define IPRT_LIBPAM_FILE_3 "libpam.1.dylib" + # define IPRT_LIBPAM_FILE_3_FIRST_VER 0 + # define IPRT_LIBPAM_FILE_3_END_VER 0 +-# elif RT_OS_LINUX ++# elif RT_OS_LINUX || RT_OS_FREEBSD + # define IPRT_LIBPAM_FILE_1 "libpam.so.0" + # define IPRT_LIBPAM_FILE_1_FIRST_VER 0 + # define IPRT_LIBPAM_FILE_1_END_VER 0 +@@ -572,7 +572,7 @@ static int rtCheckCredentials(const char *pszUser, con + if (pPw->pw_passwd && *pPw->pw_passwd) # endif { -# if defined(RT_OS_LINUX) || defined(RT_OS_OS2) diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_PGMPhys.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_PGMPhys.cpp new file mode 100644 index 000000000000..9080ee4b8e87 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_PGMPhys.cpp @@ -0,0 +1,11 @@ +--- src/VBox/VMM/VMMR3/PGMPhys.cpp.orig 2022-01-13 18:58:38 UTC ++++ src/VBox/VMM/VMMR3/PGMPhys.cpp +@@ -3179,7 +3179,7 @@ VMMR3_INT_DECL(int) PGMR3PhysMmio2Register(PVM pVM, PP + else + #endif + { +-#ifndef VBOX_WITH_LINEAR_HOST_PHYS_MEM ++#if defined(VBOX_WITH_RAM_IN_KERNEL) && !defined(VBOX_WITH_LINEAR_HOST_PHYS_MEM) + rc = SUPR3PageAllocEx(cPages, 0 /*fFlags*/, &pvPages, &pvPagesR0, paPages); + #else + rc = SUPR3PageAllocEx(cPages, 0 /*fFlags*/, &pvPages, NULL /*pR0Ptr*/, paPages);