Imported upstream patch for 2.6.36 (bug 342159)

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 41 insertions, 6 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 39b82d613349..0225d92d956e 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.113 2010/09/11 07:20:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.114 2010/12/14 18:49:44 angelos Exp $
 
-  06 Sep 2010; <angelos@gentoo.org> ndiswrapper-1.56.ebuild,
+  14 Dec 2010; Christoph Mende <angelos@gentoo.org> ndiswrapper-1.56.ebuild,
+  +files/ndiswrapper-1.56-2.6.36.patch:
+  Imported upstream patch for 2.6.36 (bug 342159)
+
+  06 Sep 2010; Christoph Mende <angelos@gentoo.org> ndiswrapper-1.56.ebuild,
   +files/ndiswrapper-1.56-2.6.35.patch,
   +files/ndiswrapper-1.56-cflags.patch:
   Fix compilation with 2.6.35 (bug #331961) and respect CFLAGS (bug #331963)
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 75d0c2f300e6..b31c68a67b4f 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,10 +1,11 @@
 AUX ndiswrapper-1.55-2.6.31.patch 549 RMD160 4f4a25b18de205116a79c5790b49c82316a22118 SHA1 ad48179ae62cb8e71a6a19d0ef0130a523245acc SHA256 8b13dc047acfa480022addfb38885079240f8addb6e259f535b82f446b4db480
 AUX ndiswrapper-1.56-2.6.35.patch 3369 RMD160 4fc4ab3c9e962370405893c8a54140a1c0cb585e SHA1 501b4d7c3ff3254fe3a3275d80eebddcb3869877 SHA256 d96cd5e7edbbe578b935394b7030a8de1f0e8c031662824021d30b2146c8dbf9
+AUX ndiswrapper-1.56-2.6.36.patch 756 RMD160 c3e82dab06422ea37134ead7d011096bdc1f5691 SHA1 065cc642a9197424ed656c3202fd17ac82e392ca SHA256 cd115553bc4caf9b53d2ca20259399547cc2b2519586c9c63f80b5e5ad6bf2ef
 AUX ndiswrapper-1.56-cflags.patch 421 RMD160 4f16ca9bd3155edab8fb3cf0f7eeeec20f6e9ea8 SHA1 fe52070e80a134dca90916f3301e518785f1e0fd SHA256 aa6192da73358cc0db1ff5a234537245e5f60ef06a4a73c1090190db25404595
 AUX ndiswrapper-1.56-ldflags.patch 365 RMD160 cc52c077e0f36bec53c4f327bffaa4bf40c59602 SHA1 43280b74396d25d9ffd5a0e124b7e6511c06ab24 SHA256 d17f6d84b1dddbe2da2c35370e20ea51e1802e74496918fed4648cf0af66c304
 DIST ndiswrapper-1.55.tar.gz 199019 RMD160 121574be765da889cdb3446af3facab840aa2054 SHA1 84f7b08347f09df109722dccfdf18cf439fbc3be SHA256 dc9ca11c8ff6eaf8b10d4e6a04e982ad46055dfefe619b5f79914aa4fb52f0fe
 DIST ndiswrapper-1.56.tar.gz 200770 RMD160 2bbe46fe310999074c78bbfe0761cad3cbd012d8 SHA1 c461cf8e2c1f9e1f87e2a5c5e717f13d2fef5364 SHA256 a738e4271467dc9d40beeaabfc1f48ac0c0a57263b641c2a0edf6c045478d883
 EBUILD ndiswrapper-1.55-r1.ebuild 2999 RMD160 678779f46797fde5699a5f62b8480a8a056e9578 SHA1 93f6fcf25e4154848b816ffb718e1cdb85069465 SHA256 3fa951bf0c35c17f92f8cdf25f99ebe9073cbac4075d4a870fd51921cdb59b4c
-EBUILD ndiswrapper-1.56.ebuild 3170 RMD160 4ea83b7e23b7436df5e45bce8558fef6abf63e55 SHA1 e80ed543476580ab39ebfe7a50089920d1501e35 SHA256 16e7b7b6369e1742f9aeee6e5b101f1b20b79ce56e761e0923bde48e3d85d868
-MISC ChangeLog 20434 RMD160 ddc95e5c1bc566c12863ae19a8a51fff3317e0c5 SHA1 93c1c005b6059bc8f7709a5d13f153671003762d SHA256 7c05518e36a56e23e1053e34ab92e721022387eaa64f7345e7f7f0ffb1bebca5
+EBUILD ndiswrapper-1.56.ebuild 3204 RMD160 b2ccbb63ed906b6f42c78fc9173263e4965d62d3 SHA1 7f4611b6068d372e037bf886945fa65864a318d5 SHA256 a4ba1e2bedad148a04acddb9fd69936805b540fc839f525da9b64c4fe9756da1
+MISC ChangeLog 20618 RMD160 6af6fb035e3aa34ad919101e9c58798853ed7dd5 SHA1 e76830d18b91e80e6d5621809ef6ab559b7febec SHA256 1b997cae2671f83d732b36146b6e13b1d57c38fb456bf1fc3bcc88cd0ce30aaf
 MISC metadata.xml 479 RMD160 0be4804aa2a6c2f15156b1866cf979cb34af0cef SHA1 613ebfb1aaae3a4c53aece4a44e95031dc374ce2 SHA256 3b6604467d120503201846a0201c60bc1426dcf697e4cf16db3293380959e819
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch
new file mode 100644
index 000000000000..1c32151360cd
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch
@@ -0,0 +1,29 @@
+--- trunk/ndiswrapper/driver/loader.c	2010/09/13 08:35:26	2725
++++ trunk/ndiswrapper/driver/loader.c	2010/09/13 08:43:15	2726
+@@ -750,8 +750,13 @@
+ }
+ 
+ /* called with loader_mutex is down */
++#ifdef HAVE_UNLOCKED_IOCTL
++static long wrapper_ioctl(struct file *file,
++			 unsigned int cmd, unsigned long arg)
++#else
+ static int wrapper_ioctl(struct inode *inode, struct file *file,
+ 			 unsigned int cmd, unsigned long arg)
++#endif
+ {
+ 	struct load_driver *load_driver;
+ 	struct load_device load_device;
+@@ -831,7 +836,12 @@
+ 
+ static struct file_operations wrapper_fops = {
+ 	.owner          = THIS_MODULE,
++
++#ifdef HAVE_UNLOCKED_IOCTL
++	.unlocked_ioctl	= wrapper_ioctl,
++#else
+ 	.ioctl		= wrapper_ioctl,
++#endif
+ 	.release	= wrapper_ioctl_release,
+ };
+ 
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild
index 4cefa3ba7b44..fa91e7b0376b 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild,v 1.5 2010/09/11 07:20:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild,v 1.6 2010/12/14 18:49:44 angelos Exp $
 
 EAPI=2
 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 "${FILESDIR}"/${P}-ldflags.patch "${FILESDIR}"/${P}-2.6.35.patch )
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-2.6.35.patch "${FILESDIR}"/${P}-2.6.36.patch )
 MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
 BUILD_TARGETS="all"
 MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")