[arch-commits] Commit in virtualbox/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Tue Apr 20 19:39:16 UTC 2021
Date: Tuesday, April 20, 2021 @ 19:39:16
Author: eworm
Revision: 920280
upgpkg: virtualbox 6.1.20-1: new upstream release
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
virtualbox/trunk/019-python3.9.patch
virtualbox/trunk/020-linux-5-11.patch
----------------------------------------------------------------+
016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch | 189 ----------
019-python3.9.patch | 101 -----
020-linux-5-11.patch | 12
PKGBUILD | 16
4 files changed, 5 insertions(+), 313 deletions(-)
Deleted: 016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
===================================================================
--- 016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch 2021-04-20 19:38:47 UTC (rev 920279)
+++ 016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch 2021-04-20 19:39:16 UTC (rev 920280)
@@ -1,189 +0,0 @@
-From 369dd2ee3c82c4417fee04aeec933c74fd198e78 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede at redhat.com>
-Date: Tue, 23 Jan 2018 15:09:20 +0100
-Subject: [PATCH resend] VBoxServiceAutoMount: Change Linux mount code to use
- an options string
-
-Signed-off-by: Hans de Goede <hdegoede at redhat.com>
----
- .../common/VBoxService/VBoxServiceAutoMount.cpp | 62 +++-------------------
- 1 file changed, 8 insertions(+), 54 deletions(-)
-
-diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
---- ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp.orig 2019-04-16 11:09:11.000000000 +0100
-+++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2019-04-26 17:10:47.178485356 +0100
-@@ -40,6 +40,7 @@
- #include <iprt/ctype.h>
- #include <iprt/dir.h>
- #include <iprt/mem.h>
-+#include <iprt/param.h>
- #include <iprt/path.h>
- #include <iprt/semaphore.h>
- #include <iprt/sort.h>
-@@ -114,6 +115,9 @@ RT_C_DECLS_END
- # define VBOXSERVICE_AUTOMOUNT_MIQF SHFL_MIQF_PATH
- #endif
-
-+#ifndef MAX_MNTOPT_STR
-+#define MAX_MNTOPT_STR PAGE_SIZE
-+#endif
-
- /*********************************************************************************************************************************
- * Structures and Typedefs *
-@@ -400,13 +399,13 @@ static int vbsvcAutoMountSharedFolderOld
- int rc = vbsvcAutoMountPrepareMountPointOld(pszMountPoint, pszShareName, &Opts);
- if (RT_SUCCESS(rc))
- {
-+ char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
-+ RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
-+ Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
- # ifdef RT_OS_SOLARIS
- int fFlags = 0;
- if (Opts.ronly)
- fFlags |= MS_RDONLY;
-- char szOptBuf[MAX_MNTOPT_STR] = { '\0', };
-- RTStrPrintf(szOptBuf, sizeof(szOptBuf), "uid=%d,gid=%d,dmode=%0o,fmode=%0o,dmask=%0o,fmask=%0o",
-- Opts.uid, Opts.gid, Opts.dmode, Opts.fmode, Opts.dmask, Opts.fmask);
- int r = mount(pszShareName,
- pszMountPoint,
- fFlags | MS_OPTIONSTR,
-@@ -423,35 +422,11 @@ static int vbsvcAutoMountSharedFolderOld
-
- # else /* RT_OS_LINUX */
- unsigned long fFlags = MS_NODEV;
--
-- /*const char *szOptions = { "rw" }; - ??? */
-- struct vbsf_mount_info_new mntinf;
-- RT_ZERO(mntinf);
--
-- mntinf.nullchar = '\0';
-- mntinf.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
-- mntinf.signature[1] = VBSF_MOUNT_SIGNATURE_BYTE_1;
-- mntinf.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
-- mntinf.length = sizeof(mntinf);
--
-- mntinf.uid = Opts.uid;
-- mntinf.gid = Opts.gid;
-- mntinf.ttl = Opts.ttl;
-- mntinf.dmode = Opts.dmode;
-- mntinf.fmode = Opts.fmode;
-- mntinf.dmask = Opts.dmask;
-- mntinf.fmask = Opts.fmask;
-- mntinf.cMaxIoPages = Opts.cMaxIoPages;
-- mntinf.szTag[0] = '\0';
--
-- strcpy(mntinf.name, pszShareName);
-- strcpy(mntinf.nls_name, "\0");
--
- int r = mount(pszShareName,
- pszMountPoint,
- "vboxsf",
- fFlags,
-- &mntinf);
-+ szOptBuf);
- if (r == 0)
- {
- VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
-@@ -484,34 +459,6 @@ static int vbsvcAutoMountSharedFolderOld
- }
- else /* r == -1, we got some error in errno. */
- {
-- if (errno == EPROTO)
-- {
-- VGSvcVerbose(3, "vbsvcAutoMountWorker: Messed up share name, re-trying ...\n");
--
-- /** @todo r=bird: What on earth is going on here????? Why can't you
-- * strcpy(mntinf.name, pszShareName) to fix it again? */
--
-- /* Sometimes the mount utility messes up the share name. Try to
-- * un-mangle it again. */
-- char szCWD[RTPATH_MAX];
-- size_t cchCWD;
-- if (!getcwd(szCWD, sizeof(szCWD)))
-- {
-- VGSvcError("vbsvcAutoMountWorker: Failed to get the current working directory\n");
-- szCWD[0] = '\0';
-- }
-- cchCWD = strlen(szCWD);
-- if (!strncmp(pszMountPoint, szCWD, cchCWD))
-- {
-- while (pszMountPoint[cchCWD] == '/')
-- ++cchCWD;
-- /* We checked before that we have enough space */
-- strcpy(mntinf.name, pszMountPoint + cchCWD);
-- }
-- r = mount(mntinf.name, pszMountPoint, "vboxsf", fFlags, &mntinf);
-- }
-- if (r == -1) /* Was there some error from one of the tries above? */
-- {
- switch (errno)
- {
- /* If we get EINVAL here, the system already has mounted the Shared Folder to another
-@@ -530,7 +477,6 @@ static int vbsvcAutoMountSharedFolderOld
- rc = RTErrConvertFromErrno(errno);
- break;
- }
-- }
- }
- # endif
- }
-@@ -1464,51 +1410,21 @@ static int vbsvcAutomounterMountIt(PVBSV
- }
-
- # if defined(RT_OS_LINUX)
-- /*
-- * Linux a bit more work...
-- */
-- struct vbsf_mount_info_new MntInfo;
-- RT_ZERO(MntInfo);
-- struct vbsf_mount_opts MntOpts;
-- RT_ZERO(MntOpts);
-- MntInfo.nullchar = '\0';
-- MntInfo.signature[0] = VBSF_MOUNT_SIGNATURE_BYTE_0;
-- MntInfo.signature[1] = VBSF_MOUNT_SIGNATURE_BYTE_1;
-- MntInfo.signature[2] = VBSF_MOUNT_SIGNATURE_BYTE_2;
-- MntInfo.length = sizeof(MntInfo);
-- MntInfo.ttl = MntOpts.ttl = -1 /*default*/;
-- MntInfo.msDirCacheTTL= MntOpts.msDirCacheTTL = -1 /*default*/;
-- MntInfo.msInodeTTL = MntOpts.msInodeTTL = -1 /*default*/;
-- MntInfo.cMaxIoPages = MntOpts.cMaxIoPages = 0 /*default*/;
-- MntInfo.cbDirBuf = MntOpts.cbDirBuf = 0 /*default*/;
-- MntInfo.enmCacheMode = MntOpts.enmCacheMode = kVbsfCacheMode_Default;
-- MntInfo.uid = MntOpts.uid = 0;
-- MntInfo.gid = MntOpts.gid = gidMount;
-- MntInfo.dmode = MntOpts.dmode = 0770;
-- MntInfo.fmode = MntOpts.fmode = 0770;
-- MntInfo.dmask = MntOpts.dmask = 0000;
-- MntInfo.fmask = MntOpts.fmask = 0000;
-- memcpy(MntInfo.szTag, g_szTag, sizeof(g_szTag)); AssertCompile(sizeof(MntInfo.szTag) >= sizeof(g_szTag));
-- rc = RTStrCopy(MntInfo.name, sizeof(MntInfo.name), pEntry->pszName);
-- if (RT_FAILURE(rc))
-+ unsigned long fFlags = MS_NODEV;
-+ char szOpts[MAX_MNTOPT_STR] = { '\0', };
-+ ssize_t cchOpts = RTStrPrintf2(szOpts, sizeof(szOpts),
-+ "uid=0,gid=%d,dmode=0770,fmode=0770,dmask=0000,fmask=0000", gidMount);
-+ if (cchOpts <= 0)
- {
-- VGSvcError("vbsvcAutomounterMountIt: Share name '%s' is too long for the MntInfo.name field!\n", pEntry->pszName);
-- return rc;
-+ VGSvcError("vbsvcAutomounterMountIt: szOpts overflow! %zd\n", cchOpts);
-+ return VERR_BUFFER_OVERFLOW;
- }
-
-- errno = 0;
-- unsigned long fFlags = MS_NODEV;
-- rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, &MntInfo);
-+ rc = mount(pEntry->pszName, pEntry->pszActualMountPoint, "vboxsf", fFlags, szOpts);
- if (rc == 0)
- {
- VGSvcVerbose(0, "vbsvcAutomounterMountIt: Successfully mounted '%s' on '%s'\n",
- pEntry->pszName, pEntry->pszActualMountPoint);
--
-- errno = 0;
-- rc = vbsfmount_complete(pEntry->pszName, pEntry->pszActualMountPoint, fFlags, &MntOpts);
-- if (rc != 0) /* Ignorable. /etc/mtab is probably a link to /proc/mounts. */
-- VGSvcVerbose(1, "vbsvcAutomounterMountIt: vbsfmount_complete failed: %s (%d/%d)\n",
-- rc == 1 ? "open_memstream" : rc == 2 ? "setmntent" : rc == 3 ? "addmntent" : "unknown", rc, errno);
- return VINF_SUCCESS;
- }
- else if (errno == EINVAL)
Deleted: 019-python3.9.patch
===================================================================
--- 019-python3.9.patch 2021-04-20 19:38:47 UTC (rev 920279)
+++ 019-python3.9.patch 2021-04-20 19:39:16 UTC (rev 920280)
@@ -1,101 +0,0 @@
---- ./src/libs/xpcom18a4/python/gen_python_deps.py.orig 2020-06-01 05:15:00.905907651 +0100
-+++ ./src/libs/xpcom18a4/python/gen_python_deps.py 2020-06-01 05:15:48.161226499 +0100
-@@ -16,7 +16,7 @@ from __future__ import print_function
- import os,sys
- from distutils.version import StrictVersion
-
--versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m" ]
-+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m" ]
- prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
- known = {}
-
---- ./configure.orig 2020-06-01 01:15:53.880747364 +0100
-+++ ./configure 2020-06-01 01:17:42.231478707 +0100
-@@ -1992,7 +1992,7 @@ extern "C" int main(void)
- }
- EOF
- found=
-- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m"
-+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m"
- for p in $PYTHONDIR; do
- for d in $SUPPYTHONLIBS; do
- for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
---- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2020-06-01 05:16:07.610357728 +0100
-+++ ./src/libs/xpcom18a4/python/Makefile.kmk 2020-06-01 05:22:44.735037239 +0100
-@@ -26,7 +26,7 @@ endif
-
- #
- # List of supported Python versions, defining a number of
--# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables
-+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables
- # which get picked up below.
- #
- ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-@@ -532,6 +532,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_P
- endif
- endif
- endif
-+
-+ifdef VBOX_PYTHON39_INC
-+#
-+# Python 3.9 version
-+#
-+DLLS += VBoxPython3_9
-+VBoxPython3_9_EXTENDS = VBoxPythonBase
-+VBoxPython3_9_EXTENDS_BY = appending
-+VBoxPython3_9_TEMPLATE = XPCOM
-+VBoxPython3_9_INCS = $(VBOX_PYTHON39_INC)
-+VBoxPython3_9_LIBS = $(VBOX_PYTHON39_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+ ifdef VBOX_PYTHON39_LIB_X86
-+DLLS += VBoxPython3_9_x86
-+VBoxPython3_9_x86_EXTENDS = VBoxPythonBase_x86
-+VBoxPython3_9_x86_EXTENDS_BY = appending
-+VBoxPython3_9_x86_TEMPLATE = XPCOM
-+VBoxPython3_9_x86_INCS = $(VBOX_PYTHON39_INC)
-+VBoxPython3_9_x86_LIBS = $(VBOX_PYTHON39_LIB_X86)
-+ endif
-+ endif
-+endif
-+
-+ifdef VBOX_PYTHON39M_INC
-+#
-+# Python 3.9 version with pymalloc
-+#
-+DLLS += VBoxPython3_9m
-+VBoxPython3_9m_EXTENDS = VBoxPythonBase_m
-+VBoxPython3_9m_EXTENDS_BY = appending
-+VBoxPython3_9m_TEMPLATE = XPCOM
-+VBoxPython3_9m_INCS = $(VBOX_PYTHON39M_INC)
-+VBoxPython3_9m_LIBS = $(VBOX_PYTHON39M_LIB)
-+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+ ifdef VBOX_PYTHON39M_LIB_X86
-+DLLS += VBoxPython3_9m_x86
-+VBoxPython3_9m_x86_EXTENDS = VBoxPythonBase_x86_m
-+VBoxPython3_9m_x86_EXTENDS_BY = appending
-+VBoxPython3_9m_x86_TEMPLATE_ = XPCOM
-+VBoxPython3_9m_x86_INCS = $(VBOX_PYTHON39M_INC)
-+VBoxPython3_9m_x86_LIBS = $(VBOX_PYTHON39M_LIB_X86)
-+ endif
-+ endif
-+endif
-
- ifdef VBOX_PYTHONDEF_INC
- #
---- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2020-06-01 06:01:12.923522302 +0100
-+++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2020-06-01 06:02:25.704013030 +0100
-@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter
- # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
- # endif
- # ifdef VBOX_PYXPCOM_VERSIONED
--# if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
-+# if PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x03100000
-+# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_9")
-+# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9)
-+
-+# elif PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
- # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_8")
- # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_8)
-
Deleted: 020-linux-5-11.patch
===================================================================
--- 020-linux-5-11.patch 2021-04-20 19:38:47 UTC (rev 920279)
+++ 020-linux-5-11.patch 2021-04-20 19:39:16 UTC (rev 920280)
@@ -1,12 +0,0 @@
-diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-index 7033b45..c8178a6 100644
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -39,6 +39,7 @@
- #endif
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
- #include <linux/rtnetlink.h>
- #include <linux/miscdevice.h>
- #include <linux/inetdevice.h>
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-20 19:38:47 UTC (rev 920279)
+++ PKGBUILD 2021-04-20 19:39:16 UTC (rev 920280)
@@ -9,9 +9,9 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=6.1.18
+pkgver=6.1.20
_tarver=${pkgver}
-pkgrel=2
+pkgrel=1
_vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
arch=('x86_64')
url='https://virtualbox.org/'
@@ -76,12 +76,9 @@
'008-no-vboxvideo.patch'
'012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
'013-Makefile.patch'
- '016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch'
'017-fix-narrowing-conversion.patch'
- '018-xclient.patch'
- '019-python3.9.patch'
- '020-linux-5-11.patch')
-sha256sums=('108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40'
+ '018-xclient.patch')
+sha256sums=('e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7'
'SKIP'
'76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252'
@@ -102,11 +99,8 @@
'053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
'81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
- '100c9e14e9cfb12ae65364e830153d2481cf272ceeb39d11c6b203bc6e35bf0c'
'5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
- 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3'
- '039c7b520ae589bc52dc6c0e658f7ec28ca8defb12ccbc32ad9834361d23162c'
- 'a8fb9e4d0bb662a60953c17df79f60f225aaebf192bbd2319aa2b5d7a8a28bbc')
+ 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3')
prepare() {
cd "VirtualBox-$pkgver"
More information about the arch-commits
mailing list