1:54 a.m.
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18159
Modified Files:
VirtualBox.spec
Added Files:
changeset_47484.diff changeset_47588.diff
Log Message:
* 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
changeset_47484.diff:
VBoxNetFlt-linux.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE changeset_47484.diff ---
Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (revision 46922)
+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (revision 47484)
@@ -1805,5 +1805,9 @@
{
PVBOXNETFLTINS pThis = VBOX_FLT_NB_TO_INST(self);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ struct net_device *pDev = netdev_notifier_info_to_dev(ptr);
+#else
struct net_device *pDev = (struct net_device *)ptr;
+#endif
int rc = NOTIFY_OK;
changeset_47588.diff:
dirops.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
--- NEW FILE changeset_47588.diff ---
Index: trunk/src/VBox/Additions/linux/sharedfolders/dirops.c
===================================================================
--- a/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 44843)
+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c (revision 47588)
@@ -234,5 +234,9 @@
* c. filldir returns an error (see comment on that)
*/
-static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
+#else
+static int sf_dir_read(struct file *dir, void *opaque, filldir_t filldir)
+#endif
{
TRACE();
@@ -258,4 +262,7 @@
LogFunc(("sf_getdent error %d\n", err));
dir->f_pos += 1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ ctx->pos += 1;
+#endif
continue;
}
@@ -263,5 +270,9 @@
/* d_name now contains a valid entry name */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ sanity = ctx->pos + 0xbeef;
+#else
sanity = dir->f_pos + 0xbeef;
+#endif
fake_ino = sanity;
if (sanity - fake_ino)
@@ -271,6 +282,9 @@
}
- err = filldir(opaque, d_name, strlen(d_name),
- dir->f_pos, fake_ino, DT_UNKNOWN);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN);
+#else
+ err = filldir(opaque, d_name, strlen(d_name), dir->f_pos, fake_ino,
DT_UNKNOWN);
+#endif
if (err)
{
@@ -282,4 +296,7 @@
dir->f_pos += 1;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ ctx->pos += 1;
+#endif
}
@@ -290,5 +307,9 @@
{
.open = sf_dir_open,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+ .iterate = sf_dir_iterate,
+#else
.readdir = sf_dir_read,
+#endif
.release = sf_dir_release,
.read = generic_read_dir
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- VirtualBox.spec 5 Jul 2013 23:09:19 -0000 1.47
+++ VirtualBox.spec 1 Sep 2013 01:54:34 -0000 1.48
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.2.16
-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,8 @@
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
Patch26: VirtualBox-4.2.4-no-bundles.patch
+Patch27: changeset_47484.diff
+Patch28: changeset_47588.diff
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -232,6 +234,8 @@
%patch25 -p1 -b .xorg111
%endif
%patch26 -p1 -b .nobundles
+%patch27 -p1 -b .Linux-3.11
+%patch28 -p1 -b .Linux-3.11
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -615,6 +619,12 @@
%changelog
+* 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.