[arch-commits] Commit in virtualbox/trunk (005-fix-311-sharedfolders.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Wednesday, October 2, 2013 @ 00:59:17
  Author: seblu
Revision: 97954

upgpkg: virtualbox 4.2.18-2

- fix FS#37110

Added:
  virtualbox/trunk/005-fix-311-sharedfolders.patch
Modified:
  virtualbox/trunk/PKGBUILD

---------------------------------+
 005-fix-311-sharedfolders.patch |   28 ++++++++++++++++++++++++++++
 PKGBUILD                        |    8 +++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

Added: 005-fix-311-sharedfolders.patch
===================================================================
--- 005-fix-311-sharedfolders.patch	                        (rev 0)
+++ 005-fix-311-sharedfolders.patch	2013-10-01 22:59:17 UTC (rev 97954)
@@ -0,0 +1,28 @@
+Index: src/VBox/Additions/linux/sharedfolders/dirops.c
+===================================================================
+--- a/src/VBox/Additions/linux/sharedfolders/dirops.c	(revision 48528)
++++ b/src/VBox/Additions/linux/sharedfolders/dirops.c	(revision 48529)
+@@ -282,10 +282,13 @@
+         }
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+-        err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN);
++        if (!dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN))
++        {
++            LogFunc(("dir_emit failed\n"));
++            return 0;
++        }
+ #else
+         err = filldir(opaque, d_name, strlen(d_name), dir->f_pos, fake_ino, DT_UNKNOWN);
+-#endif
+         if (err)
+         {
+             LogFunc(("filldir returned error %d\n", err));
+@@ -293,6 +296,7 @@
+                only when it runs out of space in opaque */
+             return 0;
+         }
++#endif
+ 
+         dir->f_pos += 1;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-01 19:47:06 UTC (rev 97953)
+++ PKGBUILD	2013-10-01 22:59:17 UTC (rev 97954)
@@ -10,7 +10,7 @@
          'virtualbox-guest-utils'
          'virtualbox-ext-vnc')
 pkgver=4.2.18
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -55,7 +55,8 @@
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
-        '004-system-xorg.patch')
+        '004-system-xorg.patch'
+        '005-fix-311-sharedfolders.patch')
 md5sums=('99cdf054b5e36aa83b60bd49fb50f943'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
@@ -64,7 +65,8 @@
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          '6dbd16b9d1530fc42ff6904cd80be91d'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '4da461f8c90caa123b47c62479f426b4')
+         '4da461f8c90caa123b47c62479f426b4'
+         'b2752647a96bb9a63c2a724a8750dcd2')
 
 prepare() {
     cd "VirtualBox-$pkgver"