Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29551
Modified Files:
VirtualBox.spec
Added Files:
changeset_trunk_48529.diff
Log Message:
* Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2
- Additions/linux: fix shared folders for Linux 3.11
changeset_trunk_48529.diff:
dirops.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE changeset_trunk_48529.diff ---
Index: trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
===================================================================
--- trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 47588)
+++ trunk/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 48529)
@@ -283,8 +283,11 @@
#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)
{
@@ -294,4 +297,5 @@
return 0;
}
+#endif
dir->f_pos += 1;
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- VirtualBox.spec 20 Sep 2013 02:15:42 -0000 1.49
+++ VirtualBox.spec 29 Sep 2013 18:56:46 -0000 1.50
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.2.18
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -54,6 +54,7 @@
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
Patch26: VirtualBox-4.2.4-no-bundles.patch
+Patch27: changeset_trunk_48529.diff
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -232,6 +233,7 @@
%patch25 -p1 -b .xorg111
%endif
%patch26 -p1 -b .nobundles
+%patch27 -p1 -b .fix_shared_folders_for_Linux_3.11
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -615,6 +617,9 @@
%changelog
+* Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2
+- Additions/linux: fix shared folders for Linux 3.11
+
* Fri Sep 20 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-1
- New upstream release.
Show replies by date