rpms/VirtualBox/F-18 changeset_trunk_48529.diff, NONE, 1.1 .cvsignore, 1.47, 1.48 VirtualBox.spec, 1.36, 1.37 sources, 1.47, 1.48
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31208
Modified Files:
.cvsignore VirtualBox.spec sources
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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 6 Jul 2013 02:37:59 -0000 1.47
+++ .cvsignore 3 Oct 2013 19:37:50 -0000 1.48
@@ -1 +1 @@
-VirtualBox-4.2.16.tar.bz2
+VirtualBox-4.2.18.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- VirtualBox.spec 6 Jul 2013 02:37:59 -0000 1.36
+++ VirtualBox.spec 3 Oct 2013 19:37:50 -0000 1.37
@@ -26,8 +26,8 @@
#endif
Name: VirtualBox
-Version: 4.2.16
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.18
+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,18 @@
%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.
+
+* Sun Sep 01 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-2
+- fixes for Kernel 3.11:
+ https://www.virtualbox.org/changeset/47484/vbox/trunk
+ and
+ https://www.virtualbox.org/changeset/47588/vbox/trunk
+
* Fri Jul 05 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.16-1
- New upstream release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 6 Jul 2013 02:37:59 -0000 1.47
+++ sources 3 Oct 2013 19:37:50 -0000 1.48
@@ -1 +1 @@
-c4a36e2099a317f4715cd3861cdae238 VirtualBox-4.2.16.tar.bz2
+99cdf054b5e36aa83b60bd49fb50f943 VirtualBox-4.2.18.tar.bz2