Fix compilation on linux 3.9 (bug #467956)

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)

3 files changed, 39 insertions, 3 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index cf347f492656..76eeb7d79b11 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.129 2013/04/16 16:53:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.130 2013/05/19 16:54:31 angelos Exp $
+
+  19 May 2013; Christoph Mende <angelos@gentoo.org>
+  +files/ndiswrapper-1.58-3.9.patch, ndiswrapper-1.58.ebuild:
+  Fix compilation on linux 3.9 (bug #467956)
 
   16 Apr 2013; Agostino Sarubbo <ago@gentoo.org> ndiswrapper-1.58.ebuild:
   Stable for x86, wrt bug #465220
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.58-3.9.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.58-3.9.patch
new file mode 100644
index 000000000000..d9b7f3b58085
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.58-3.9.patch
@@ -0,0 +1,32 @@
+diff --git a/driver/loader.c b/driver/loader.c
+index 406e6ba..6f2113f 100644
+--- a/driver/loader.c
++++ b/driver/loader.c
+@@ -575,7 +575,11 @@ static int load_user_space_driver(struct load_driver *load_driver)
+ 	} else {
+ 		printk(KERN_INFO "%s: driver %s (%s) loaded\n",
+ 		       DRIVER_NAME, wrap_driver->name, wrap_driver->version);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
+ 		add_taint(TAINT_PROPRIETARY_MODULE);
++#else
++		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_STILL_OK);
++#endif
+ 		EXIT1(return 0);
+ 	}
+ }
+diff --git a/driver/wrapper.c b/driver/wrapper.c
+index f77c879..4fcbbe8 100644
+--- a/driver/wrapper.c
++++ b/driver/wrapper.c
+@@ -72,7 +72,11 @@ static void module_cleanup(void)
+ static int __init wrapper_init(void)
+ {
+ #ifdef TAINT_OOT_MODULE
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
+ 	add_taint(TAINT_OOT_MODULE);
++#else
++	add_taint(TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
++#endif
+ #endif
+ 	printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n",
+ 	       DRIVER_NAME, DRIVER_VERSION,
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.58.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.58.ebuild
index 96beea65019f..e73c8aff979b 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.58.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58.ebuild,v 1.3 2013/04/16 16:53:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58.ebuild,v 1.4 2013/05/19 16:54:31 angelos Exp $
 
 EAPI=4
 inherit base linux-mod toolchain-funcs
@@ -17,7 +17,7 @@ DEPEND="sys-apps/pciutils"
 RDEPEND="${DEPEND}
 	net-wireless/wireless-tools"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.56-cflags.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.56-cflags.patch "${FILESDIR}"/${P}-3.9.patch )
 MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
 BUILD_TARGETS="all"
 MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")