aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2022-01-20 15:44:06 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2022-01-20 15:44:06 +0000
commit6348afa6983147beb3d46f9afdd72c9fbc46ca49 (patch)
treeb5f7783deed64f889f9ff49b08c8e2eac3ce4db7
parent2d48a02b9f50f9c21f3a6ebbe42e160bccb55426 (diff)
downloadports-6348afa6983147beb3d46f9afdd72c9fbc46ca49.tar.gz
ports-6348afa6983147beb3d46f9afdd72c9fbc46ca49.zip
emulators/virtualbox-ose*: Update to 6.1.32
-rw-r--r--emulators/virtualbox-ose-additions/Makefile2
-rw-r--r--emulators/virtualbox-ose-additions/distinfo6
-rw-r--r--emulators/virtualbox-ose-kmod/Makefile2
-rw-r--r--emulators/virtualbox-ose-kmod/distinfo6
-rw-r--r--emulators/virtualbox-ose-nox11/Makefile4
-rw-r--r--emulators/virtualbox-ose/Makefile2
-rw-r--r--emulators/virtualbox-ose/distinfo10
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_posix_process-creation-posix.cpp17
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_PGMPhys.cpp11
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 <decke@bluelife.at>
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 <decke@bluelife.at>
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 <decke@bluelife.at>
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 <shadow.h>
#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);