[arch-commits] Commit in virtualbox/trunk (3 files)
Christian Hesse
eworm at archlinux.org
Tue Apr 17 21:20:34 UTC 2018
Date: Tuesday, April 17, 2018 @ 21:20:34
Author: eworm
Revision: 316824
upgpkg: virtualbox 5.2.10-1
new upstream release
Added:
virtualbox/trunk/010-linux-4.16-mount-fixes.patch
(from rev 316823, virtualbox/trunk/linux-4.16-mount-fixes.patch)
Modified:
virtualbox/trunk/PKGBUILD
Deleted:
virtualbox/trunk/linux-4.16-mount-fixes.patch
----------------------------------+
010-linux-4.16-mount-fixes.patch | 35 +++++++++++++++++++++++++++++++++++
PKGBUILD | 24 ++++++++++++------------
linux-4.16-mount-fixes.patch | 35 -----------------------------------
3 files changed, 47 insertions(+), 47 deletions(-)
Copied: virtualbox/trunk/010-linux-4.16-mount-fixes.patch (from rev 316823, virtualbox/trunk/linux-4.16-mount-fixes.patch)
===================================================================
--- 010-linux-4.16-mount-fixes.patch (rev 0)
+++ 010-linux-4.16-mount-fixes.patch 2018-04-17 21:20:34 UTC (rev 316824)
@@ -0,0 +1,35 @@
+This ghetto patch attempts to fix shared folder automounting for guests running
+Linux 4.16, and also suggests an alternative to mount.vboxsf.
+
+diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+--- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-02-26 17:57:30.000000000 +0200
++++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-04-07 21:00:05.785735622 +0300
+@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
+ "vboxsf",
+ fFlags,
+ &mntinf);
++ if (r == -1 && errno == EINVAL)
++ {
++ /* Mainline vboxsf accepts regular mount opts. */
++ char mount_opts[1024];
++ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
++ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
++ }
+ if (r == 0)
+ {
+ VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
+diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c
+--- VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 2018-02-26 17:57:34.000000000 +0200
++++ VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 2018-04-07 21:39:38.121577588 +0300
+@@ -485,6 +485,11 @@ main(int argc, char **argv)
+ * to keep this code here slick without having VbglR3.
+ */
+ err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
++ if (err == -1 && errno == EINVAL)
++ {
++ /* The mount.vboxsf helper should not be used with mainline vboxsf. */
++ panic("mount.vboxsf cannot be used with mainline vboxsf; instead use:\n\n mount -cit vboxsf NAME MOUNTPOINT\n\n");
++ }
+ if (err == -1 && errno == EPROTO)
+ {
+ /* Sometimes the mount utility messes up the share name. Try to
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-17 21:09:24 UTC (rev 316823)
+++ PKGBUILD 2018-04-17 21:20:34 UTC (rev 316824)
@@ -10,8 +10,9 @@
'virtualbox-guest-utils'
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
-pkgver=5.2.8
-pkgrel=2
+pkgver=5.2.10
+pkgrel=1
+_vboxsf_commit='6a782003ad95a383c8b19b570a532271f090ad35'
arch=('x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -53,8 +54,12 @@
'xorg-server-devel')
makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
+ # We need to build a modified version of vboxsf for Linux 4.16
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
+ "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit"
'virtualbox-host-dkms.conf'
'virtualbox-guest-dkms.conf'
+ 'virtualbox-vboxsf-4.16-dkms.conf'
'virtualbox.sysusers'
'virtualbox-guest-utils.sysusers'
'60-vboxdrv.rules'
@@ -70,15 +75,12 @@
'007-python2-path.patch'
'008-no-vboxvideo.patch'
'009-include-path.patch'
- 'linux-4.16-mount-fixes.patch'
- # We need to build a modified version of vboxsf for Linux 4.16
- # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
- "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit"
- 'virtualbox-vboxsf-4.16-dkms.conf'
- )
-sha256sums=('ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8'
+ '010-linux-4.16-mount-fixes.patch')
+sha256sums=('ed9e524cef571a8dbdb7a5f18bb42442a3dddf24d7fdbb3816e0b317feb324cc'
+ 'SKIP'
'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
+ '771009b79115a9b22f00f3cfd38f94e3b5b31b48dcc95a887ceda20ffb776474'
'2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
'9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
@@ -94,9 +96,7 @@
'6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
'1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
- 'c3dc5a771a1acab274cd10e5305982aa9c149cd94ed4c71c7805327020d4d741'
- 'SKIP'
- '889266d15d45b2aca7699eec939c603149fbf536cf93091d9ad846d232cf3259')
+ 'c3dc5a771a1acab274cd10e5305982aa9c149cd94ed4c71c7805327020d4d741')
prepare() {
cd "VirtualBox-$pkgver"
Deleted: linux-4.16-mount-fixes.patch
===================================================================
--- linux-4.16-mount-fixes.patch 2018-04-17 21:09:24 UTC (rev 316823)
+++ linux-4.16-mount-fixes.patch 2018-04-17 21:20:34 UTC (rev 316824)
@@ -1,35 +0,0 @@
-This ghetto patch attempts to fix shared folder automounting for guests running
-Linux 4.16, and also suggests an alternative to mount.vboxsf.
-
-diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
---- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-02-26 17:57:30.000000000 +0200
-+++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-04-07 21:00:05.785735622 +0300
-@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
- "vboxsf",
- fFlags,
- &mntinf);
-+ if (r == -1 && errno == EINVAL)
-+ {
-+ /* Mainline vboxsf accepts regular mount opts. */
-+ char mount_opts[1024];
-+ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
-+ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
-+ }
- if (r == 0)
- {
- VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
-diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c
---- VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 2018-02-26 17:57:34.000000000 +0200
-+++ VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 2018-04-07 21:39:38.121577588 +0300
-@@ -485,6 +485,11 @@ main(int argc, char **argv)
- * to keep this code here slick without having VbglR3.
- */
- err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
-+ if (err == -1 && errno == EINVAL)
-+ {
-+ /* The mount.vboxsf helper should not be used with mainline vboxsf. */
-+ panic("mount.vboxsf cannot be used with mainline vboxsf; instead use:\n\n mount -cit vboxsf NAME MOUNTPOINT\n\n");
-+ }
- if (err == -1 && errno == EPROTO)
- {
- /* Sometimes the mount utility messes up the share name. Try to
More information about the arch-commits
mailing list