Fix compilation against linux 3.14 (bug #507348)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x84F20B43

4 files changed, 69 insertions, 5 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index febaa7cd0e0c..6a22258c92e5 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.131 2014/03/22 11:49:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.132 2014/04/11 18:17:47 angelos Exp $
+
+  11 Apr 2014; Christoph Mende <angelos@gentoo.org>
+  +files/ndiswrapper-1.59-3.14.patch, ndiswrapper-1.59.ebuild:
+  Fix compilation against linux 3.14 (bug #507348)
 
 *ndiswrapper-1.59 (22 Mar 2014)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index c60d9ac367eb..612823eeb87d 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ndiswrapper-1.56-cflags.patch 421 SHA256 aa6192da73358cc0db1ff5a234537245e5f60ef06a4a73c1090190db25404595 SHA512 b06961d57c59a8357303784705dff4f614705bd2cbca698b046be6db969eb1efb9c7bf6ad3b38151e4b973f6f4660356f3bbe44eb928402f7ef4ba47a1c5b562 WHIRLPOOL 38902c0d69a2182181dddd1947688e4046b4e1789e1bad35c604d6ff7ed8eae88d2a880451912f1129134069ea4bd177ec9eaeceecb7cdfa83eb03fdd7334bf1
 AUX ndiswrapper-1.58-3.9.patch 1026 SHA256 bef0c73c3e936a9b9f57cdb94c3af4b70f229ed73a80491f55b0b82b5e0ee090 SHA512 dd8f74f6e59de567a76d009ed54fed62fb2943af74fea7818e12c3021ed0a9caf3b980eb0a57fb6b84e052145fef2a32897f0611f65d1a58fc68f4219cad5d5c WHIRLPOOL 5131acb24076baf43f9657c847c482a778c1d6f889a00b91a275c4e77e8df8915e198df30a7bda0658bd7d8dfceceb39bcc50e5b8e2a23ebb899215b20ae3a1d
+AUX ndiswrapper-1.59-3.14.patch 1282 SHA256 0c9dcf7520e586d8f66fda1b1495897c83ba62d3e48c055cb56213ab80e87373 SHA512 d85b2c9f6ecc5ea7724756d17c1ab703f84d301bac6b00c990081e33481d6788093bfbd0298ce72404120862c04205b588469e7747842eb3b48dabbed1bc5e7d WHIRLPOOL 39c005020bb44770865a66095238bd2bc910cbd4e4ac130a96c679bb58bda48383ab5426563d23768405caf0d92837a8044711b60980875b0521ed084ff97633
 AUX ndiswrapper-1.59-cflags.patch 357 SHA256 3f1c98336b5ef582db9556c9f2b9b459084eafb1bedb639c2cb795fcda958919 SHA512 8c65a5af71bf3035e2d784b29ad45dc48bd70b155d988c2e6d511eb03d9a319d355d67f74e3270816e943abe051e442efe891de1d649e871b7e3b05690c71a9d WHIRLPOOL 6b14014639e1f8e275feae73bcc7b009cc46f52379cb2c5bf456bfddd453d567afac8eb97734950c39dc6d015ed2e2f194618b64d8a894e343affb7ab622e8fc
 DIST ndiswrapper-1.58.tar.gz 199065 SHA256 cbd225ecb0b835be7d05012483f61518fe97a52c67f20b35846412c692be24aa SHA512 161e87df13143841ff29f424e979cd9648a0022f0ad74c1189e398c832f5c4a77834fc9dde941c8202773064f2b312968c21b39c5023167fb67ae67ebd86795a WHIRLPOOL ffa5d625ddac2b58b45415eea0713666e77ec1806830921bf605c1f28a16239f367c78abe9af8d895647b577868e2f57581eb37d94e498d8a11c53afce586031
 DIST ndiswrapper-1.59.tar.gz 201257 SHA256 66a5d3ffb3fc8a63d87e381bbc627511597dfd25c4c37dda3b953ccf98f5d4bc SHA512 dd1d486b6178185e813217e4fff38f6ea6b21f8a3544c5cc25be9edbca60f34b21656e5d46b9d02cb1e43c8cc82856283aaa428964b8f85cb07146a41e40e44d WHIRLPOOL ae4dca59911625146de4e2da02b72bcf1b695e63c8d0d900a91ec9b0c5b7452c9ba0de37ad95129d330d96be16d9c4b488b5d40936f51af14dca2597281b7b84
 EBUILD ndiswrapper-1.58.ebuild 2880 SHA256 ae6459c71c5c2435bc796a0bddd3e162bd14165b6596fca046b76b315c7fbbca SHA512 4fc1cb8c5a87aec4ffd4aeeda110bc0e1ca94c62c4830d21a795f80e7008f03b568c8cf2a33236c5c9bb6e2df2addea2130758263f38d87a3e5049745663c186 WHIRLPOOL a0d46f905b4cc86e935946980af3f726d74d8c1a87f89683a6cf900bcd9b04262d0f30b0e88b46ce1b9d026c2ca4b5592188adee180112ad902f877301e82ef9
-EBUILD ndiswrapper-1.59.ebuild 2847 SHA256 85d3b00b13362fb21aeb7b9f220fe5f58f06b95093aa97e7c7d4e69f4d9ff58f SHA512 44c7b08054109de9800ecde04126ec12ac59766f68929ae4c08db43f190d98a5e40babfc966705669ba246bac5ab9ef99fb9add70dc0ab4e704881a877d4716b WHIRLPOOL 16a7e96683df3cf5809a78eb9377ccaeb1d37d692d190bb90392d76be9e74c1029b830a32f8240aff23b5652a43a1e41f7bf18e91d0696f135d6c027c4797161
-MISC ChangeLog 23058 SHA256 c9937a2afe354be915799ef81fa319742f5004286a045f2fa7809f22f923dba1 SHA512 10e69ac580d925cdbf46b3d30ce2f338f2cf21650c3e335c42bf148e72be8430ceb1bfcf9870aa6de1ef432bf3658400eeed3d50d9094102ec4ca9c467976261 WHIRLPOOL e5e9a2010ad7327a6ec19487555adba32aec4f66ad809f961b2cd6acb61231fef0b339fe9adc687790154691669e8365c1f379cfb3998d08f22ad3c3b7c0b7a7
+EBUILD ndiswrapper-1.59.ebuild 2878 SHA256 4bc997861ad56d6b226adaed9b0fa5b48a2c6950e9d95c88cdb5f3784998ebbe SHA512 526b2a8253353eb894e556e832fe092195d9bf28ee6e76b5da8dfb15b0b8c5baf6f9b17508d86a23de51b6875efc394ef06ff132b7d765a2fb4a3878539da876 WHIRLPOOL b1a6d381c70f6b66f1b1ce54ecf7fc73fd74397b5e52a1b25cb5313f4f0389a24d74f6dddb0ac276e3e4c741c5b087cfc5b41abce7e0fb5d236df22d7dc66564
+MISC ChangeLog 23225 SHA256 9524db3a4487bb4ca7e5745e5e7e742144d2da137c81207549b6506e742a73eb SHA512 d7f765d3526108f6d6c49ba8500b71c7a45f38f683785903fd98eb147bd926a7764b1e167c296b5e32f4545b2a1ab4ca7eb1985f51855697c2288e61cd7b08f2 WHIRLPOOL 5ee2a2267828589ed1e1e92274c307ae9530924cb0d62d63f75ec66ab01d02cd276d8f3dac5e2a4d8a7939dbca3f7eb4680f1db03ad452b3336dc4dcdb6d0ca7
 MISC metadata.xml 458 SHA256 918f28df787928f1c599f290e325d4ba68a89c728a8ad65542a129298f2f8779 SHA512 98486e5a9129d0b2bd7c6ecef286b1bcfdeb9ef6f6343255f0e90e9b9aae0264ec08303c896ed364eea66de23aefda0270f8d780e58283495262b558e89cb014 WHIRLPOOL 6d834683baceb3d1ab7f378e75c347e7340bf89b2270e1d485a2f8c463420c00c17cb0bf4ed03a66cecb47432fecb9f10c3493c5309b02b0e9e4eb12adf6293a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlNIMc0ACgkQmWq1bYTyC0N5LAEAu9dOu8p/Y5I//N4D3oh2ekJ+
+UpJoXBIKXm8Huj94QzIBAJmCPR1UJSbbH/MPAIFzAfrCzmRHBWkyEuPWWE459pxx
+=pbO7
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-3.14.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-3.14.patch
new file mode 100644
index 000000000000..9a696f8817f1
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-3.14.patch
@@ -0,0 +1,48 @@
+Index: driver/crt.c
+===================================================================
+--- driver/crt.c	(revision 3197)
++++ driver/crt.c	(working copy)
+@@ -467,7 +467,7 @@
+ noregparm void WIN_FUNC(_win_srand,1)
+ 	(UINT seed)
+ {
+-	net_srandom(seed);
++	prandom_seed(seed);
+ }
+ 
+ noregparm int WIN_FUNC(rand,0)
+Index: driver/ntoskernel.h
+===================================================================
+--- driver/ntoskernel.h	(revision 3197)
++++ driver/ntoskernel.h	(working copy)
+@@ -347,7 +347,7 @@
+ #define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
+ #endif
+ 
+-#ifdef INIT_COMPLETION
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
+ static inline void reinit_completion(struct completion *x)
+ {
+ 	INIT_COMPLETION(*x);
+@@ -354,6 +354,10 @@
+ }
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
++#define prandom_seed(seed) net_srandom(seed)
++#endif
++
+ /* TICK is 100ns */
+ #define TICKSPERSEC		10000000
+ #define TICKSPERMSEC		10000
+@@ -797,9 +801,8 @@
+ #define nt_spin_unlock_irqrestore(lock, flags)				\
+ do {									\
+ 	nt_spin_unlock(lock);						\
+-	preempt_enable_no_resched();					\
++	preempt_enable();						\
+ 	local_irq_restore(flags);					\
+-	preempt_check_resched();					\
+ } while (0)
+ 
+ static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
index 9ae093785b4f..36abd6193017 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.59.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/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild,v 1.1 2014/03/22 11:49:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild,v 1.2 2014/04/11 18:17:47 angelos Exp $
 
 EAPI=4
 inherit base linux-mod toolchain-funcs
@@ -17,7 +17,8 @@ DEPEND="sys-apps/pciutils"
 RDEPEND="${DEPEND}
 	net-wireless/wireless-tools"
 
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-3.14.patch )
 MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
 BUILD_TARGETS="all"
 MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")