diff --git a/files/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch b/files/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch deleted file mode 100644 --- a/files/0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 369dd2ee3c82c4417fee04aeec933c74fd198e78 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -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 ---- - .../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 2018-11-25 02:36:31.829306539 +0000 -+++ ./src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-11-25 02:41:41.632973288 +0000 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -117,6 +118,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 * -@@ -398,13 +402,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, -@@ -421,34 +425,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.tag[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); -@@ -481,34 +462,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 -@@ -527,7 +480,6 @@ static int vbsvcAutoMountSharedFolderOld - rc = RTErrConvertFromErrno(errno); - break; - } -- } - } - # endif - } --- -2.14.3 - diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,4 +1,3 @@ Disable-automatic-check-for-updates.patch -0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch 0001-Fix-rdesktop-vrdp-keymaps-path.patch 0001-Patch-out-notify-send-call.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : virtualbox -version : 6.0.4 -release : 101 +version : 6.0.6 +release : 102 source : - - https://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4.tar.bz2 : f80b0c68182c946fb74ada8034960c38159ad91085b153da1277e4f191af6e1f - - git|https://github.com/jwrdegoede/vboxsf.git : 2f85f96e02c36e8f25abfc5c1f78fafc2ba82988 + - https://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6.tar.bz2 : 3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552 + - git|https://github.com/jwrdegoede/vboxsf.git : 87b9015c57dd7f226c768131bf8b4c0249de9835 license : GPL-2.0-only component : - virt diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ virtualbox - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net GPL-2.0-only virt @@ -23,7 +23,7 @@ virt - virtualbox-common + virtualbox-common /lib/modules/4.9.168-129.lts/extra/vboxdrv.ko @@ -348,7 +348,7 @@ virt - virtualbox-common + virtualbox-common /lib/modules/5.0.7-114.current/extra/vboxdrv.ko @@ -366,8 +366,8 @@ programming.devel - virtualbox - virtualbox-common + virtualbox + virtualbox-common /usr/lib/python3.6/site-packages/vboxapi-1.0-py3.6.egg-info @@ -819,7 +819,7 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/4.9.168-129.lts/misc/vboxguest.ko @@ -866,19 +866,19 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/5.0.7-114.current/misc/vboxsf.ko - - 2019-04-14 - 6.0.4 + + 2019-04-19 + 6.0.6 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file