bumping for 3.17 support

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 61 insertions, 2 deletions

diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index ce1f643c2107..4cacd66da155 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.153 2014/07/18 13:47:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.154 2014/09/03 16:27:36 prometheanfire Exp $
+
+*virtualbox-modules-4.3.14-r1 (03 Sep 2014)
+
+  03 Sep 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +files/virtualbox-modules-3.17.patch, +virtualbox-modules-4.3.14-r1.ebuild,
+  -virtualbox-modules-4.3.14.ebuild:
+  bumping for 3.17 support
 
 *virtualbox-modules-4.3.14 (18 Jul 2014)
 *virtualbox-modules-4.2.26 (18 Jul 2014)
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
new file mode 100644
index 000000000000..1d059c5af361
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
@@ -0,0 +1,49 @@
+diff -rupN work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
+--- work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c	2014-01-14 04:27:06.000000000 -0600
++++ work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c	2014-09-03 11:12:28.247795756 -0500
+@@ -191,7 +191,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
+         struct page **papPagesIterator = papPages;
+         pVmArea->nr_pages = cPages;
+         pVmArea->pages    = papPages;
+-        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, &papPagesIterator))
++        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, papPagesIterator))
+         {
+             PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
+             pHdrEx->pVmArea     = pVmArea;
+diff -rupN work/vboxnetadp/linux/VBoxNetAdp-linux.c work.new/vboxnetadp/linux/VBoxNetAdp-linux.c
+--- work/vboxnetadp/linux/VBoxNetAdp-linux.c	2013-10-09 06:02:09.000000000 -0500
++++ work.new/vboxnetadp/linux/VBoxNetAdp-linux.c	2014-09-03 11:13:55.999687819 -0500
+@@ -52,6 +52,25 @@
+ 
+ #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
+ 
++/*******************************
++source for the 4th parameter alloc_netdev fix for kernel 3.17-rc1 is:
++https://github.com/proski/madwifi/commit/c5246021b7b8580c2aeb0a145903acc07d246ac1
++*/
++#ifndef NET_NAME_UNKNOWN
++#undef alloc_netdev
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
++#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
++  alloc_netdev(sizeof_priv, name, setup)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
++#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
++  alloc_netdev_mq(sizeof_priv, name, setup, 1)
++#else
++#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
++  alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
++#endif
++#endif
++/*******************************/
++
+ /*******************************************************************************
+ *   Internal Functions                                                         *
+ *******************************************************************************/
+@@ -183,6 +202,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
+     /* No need for private data. */
+     pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
+                            pThis->szName[0] ? pThis->szName : VBOXNETADP_LINUX_NAME,
++			   NET_NAME_UNKNOWN,
+                            vboxNetAdpNetDevInit);
+     if (pNetDev)
+     {
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild
index e45574f80220..2c6e817c1e53 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14.ebuild,v 1.1 2014/07/18 13:47:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.14-r1.ebuild,v 1.1 2014/09/03 16:27:36 prometheanfire Exp $
 
 # XXX: the tarball here is just the kernel modules split out of the binary
 #      package that comes from virtualbox-bin
@@ -43,6 +43,9 @@ src_prepare() {
 	if use pax_kernel && kernel_is -ge 3 0 0 ; then
 		epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
 	fi
+	if kernel_is -ge 3 17 ; then
+		epatch "${FILESDIR}"/${PN}-3.17.patch
+	fi
 }
 
 src_install() {