jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 206225 from Virtualization

Browse Source 
Changed the changes entry, so it gets accepted in Factory (forwarded request 206102 from wolfi323)

OBS-URL: https://build.opensuse.org/request/show/206225
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=77
This commit is contained in:
Stephan Kulow 2013-11-08 07:46:25 +00:00 committed by Git OBS Bridge
commit 517b052a10
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vbox-shared-folder.diff Normal file
View File

@ -0,0 +1,28 @@
Index: src/VBox/Additions/linux/sharedfolders/dirops.c
===================================================================
--- src/VBox/Additions/linux/sharedfolders/dirops.c (revision 48528)
+++ 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)

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 24 23:34:41 UTC 2013 - mgorse@suse.com
- added vbox-shared-folder.diff to fix shared folders (bnc#841673).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 25 11:35:04 UTC 2013 - wbauer@tmo.at Wed Sep 25 11:35:04 UTC 2013 - wbauer@tmo.at

3
virtualbox.spec
View File

@ -146,6 +146,8 @@ Patch101: vbox-default-os-type.diff
Patch103: vbox-disable-updates.diff Patch103: vbox-disable-updates.diff
#use pie/fPIE for setuid binaries (bnc#743143) #use pie/fPIE for setuid binaries (bnc#743143)
Patch104: vbox-fpie.diff Patch104: vbox-fpie.diff
# Fix shared folders for 3.11, taken from upstream (bnc#841673)
Patch105: vbox-shared-folder.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions PreReq: pwdutils permissions
Requires: %{name}-host-kmp = %version Requires: %{name}-host-kmp = %version
@ -270,6 +272,7 @@ Development file for %{name}
%patch101 %patch101
%patch103 %patch103
%patch104 -p1 %patch104 -p1
%patch105
#copy user manual #copy user manual
%__cp %{S:1} UserManual.pdf %__cp %{S:1} UserManual.pdf
#copy kbuild config #copy kbuild config