Fix building with Linux 2.6.31 wrt #280057.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 153 insertions, 2 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 2b281c886dd8..ed7a431a5a3b 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.106 2009/08/01 12:46:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.107 2009/09/16 13:04:35 ssuominen Exp $
+
+*ndiswrapper-1.55-r1 (16 Sep 2009)
+
+  16 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +ndiswrapper-1.55-r1.ebuild, +files/ndiswrapper-1.55-2.6.31.patch:
+  Fix building with Linux 2.6.31 wrt #280057.
 
 *ndiswrapper-1.55 (01 Aug 2009)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index e33681e4f4fe..907c97d03a48 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,6 +1,7 @@
 AUX ndiswrapper-1.46-ksrc.patch 1635 RMD160 705a2ebc0198eb9c94e041e544128adb44824733 SHA1 fc44ca239c8a8ab067d88a8371fbafb85a1421e9 SHA256 6b46e194ec4418f6497c97d88679f2ecc02451516396cffda43e3945b02dcf52
 AUX ndiswrapper-1.47-ksrc.patch 592 RMD160 ac2831b9f676ab4348875f4fae3e54b99b151790 SHA1 4ab7a69f56251f6055a1ec0e4153a6835792d2cf SHA256 38cc21054be40c047c8135d4eb009dd72573a4fa7edb8ee310769e5c54ee16c1
 AUX ndiswrapper-1.50_rc1-makefile.patch 600 RMD160 f8b4f17ba938538303e6c895711933a9464f99cb SHA1 ab868623df14704eb4e09cda7cc7b03801afe09b SHA256 8188c4eb1d6ca8353e3c3de27803563c96db5607492e23ef71bcfbdad9336648
+AUX ndiswrapper-1.55-2.6.31.patch 549 RMD160 4f4a25b18de205116a79c5790b49c82316a22118 SHA1 ad48179ae62cb8e71a6a19d0ef0130a523245acc SHA256 8b13dc047acfa480022addfb38885079240f8addb6e259f535b82f446b4db480
 AUX ndiswrapper-2.6.27.patch 5115 RMD160 4587f44cc92ea1f5bca7703feff344a66ee4f68a SHA1 4e57a4998cd801bc3752f5bfc486bab65be9d14e SHA256 1ebf7e49f4324a20347ccd4d3f7b2bc4b449328a63bc3f08f734167620daf1ba
 AUX ndiswrapper-CVE-2008-4395.patch 3032 RMD160 ef09a1bed8d81adb62fe700c144a11e0a3ff9a90 SHA1 d333ef0fc877587a0947b3f4dba49f9586136f86 SHA256 62860197b6f9fa749a3c94c2577a8bd0fd101a518592625b3884ca30b97bf71e
 AUX ndiswrapper-new_suspend2.patch 891 RMD160 1dbb59e400ea8cac62bbc6cbb2c757b08b078c91 SHA1 6fdde32982d8c422838a3b5f9934245dd5869459 SHA256 dec61532d2c7eec07f387681616026e0472bc1d9024785a1bb5178769f6c2e5c
@@ -20,6 +21,7 @@ EBUILD ndiswrapper-1.51.ebuild 2946 RMD160 bb0235e729f18a4aa989b07844a884d7b9c52
 EBUILD ndiswrapper-1.52.ebuild 2946 RMD160 b38da9817441a0eea032ba4ac0d020bc6e5dc7c0 SHA1 890ae187b4ce48b2f4546cf2341e0027586be228 SHA256 f819c3337caa94702a22c8d6e401f990cef384494f311b58724f7add646bae1a
 EBUILD ndiswrapper-1.53-r1.ebuild 3115 RMD160 9d4b0549cefd7b99d442437c4fcab5b776e43676 SHA1 c94515526657bf4c96a5d1fa3ff7c2623e289603 SHA256 2058b393b9bbc87e9d269e95a5d70b8e499f84e5df17fb7865aa32663b841907
 EBUILD ndiswrapper-1.53.ebuild 2946 RMD160 374bbb2e51718b38ab33d9ee07184390362bed20 SHA1 bc9d6a89299c6a99a912d64f09c5e9e9cb66e794 SHA256 a5ad6aedd1effd912e3f0496c6a317bc81c9b936b8a179854d98685ff2b271ac
+EBUILD ndiswrapper-1.55-r1.ebuild 3004 RMD160 55c3956d1839cf75447f7ece3e95dec8f4678464 SHA1 eb1d3638a0b151a8a02bba2ec2317d152fe30e10 SHA256 d67c6cd781001e80c94dab07a3ec26c156f3c9b4177e143c9f4fea09f9c692f6
 EBUILD ndiswrapper-1.55.ebuild 2950 RMD160 ca3769825ccfc77cfcd5f3e418999695e342f6db SHA1 5eb4c63be6963746750d40f7a1abba20f9f4ca7d SHA256 ad5952d3bbb9919014afd4f85c8a3d6e6d38290b770c63cf5f056294514becdf
-MISC ChangeLog 19284 RMD160 7e626c274a789840af5567402dafa622df4d3667 SHA1 1d867c3d7f851c8c4df3a1ba576d458801f68318 SHA256 8b49edecd73f2659908410451c7cde0fb4ff1ed9bbd1f99ea1ff03ecb4539378
+MISC ChangeLog 19490 RMD160 d9f40f387b0f2275e66accb7c5d8ddaee41afb46 SHA1 99bf996ae0407994b2a846787ba25af71ebe125c SHA256 4300a358f5a55dcf066fa70f5522216571c8c67b8baea29b5e0cae266fc1456f
 MISC metadata.xml 480 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 SHA1 14a2b92b64b18b0b79653fe64a9c282ae16331f2 SHA256 7ca20f317d16e17be26b34401258fc10ceb6d5698e89fc853fae59aa74cb0e66
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.55-2.6.31.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.55-2.6.31.patch
new file mode 100644
index 000000000000..d6f7fa67e41d
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.55-2.6.31.patch
@@ -0,0 +1,20 @@
+--- driver/ntoskernel.h
++++ driver/ntoskernel.h
+@@ -875,7 +875,7 @@
+ #define u64_low_32(x) ((u32)x)
+ #define u64_high_32(x) ((u32)(x >> 32))
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
++//#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ static inline u64 cmpxchg8b(volatile u64 *ptr, u64 old, u64 new)
+ {
+        u64 prev;
+@@ -887,7 +887,7 @@
+                : "A" (old), "b" (u64_low_32(new)), "c" (u64_high_32(new)));
+        return prev;
+ }
+-#endif
++//#endif
+
+ /* slist routines below update slist atomically - no need for
+  * spinlocks */
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.55-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.55-r1.ebuild
new file mode 100644
index 000000000000..f04a5de46689
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.55-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.55-r1.ebuild,v 1.1 2009/09/16 13:04:35 ssuominen Exp $
+
+inherit eutils linux-mod
+
+MY_P=${PN}-${PV/_/}
+
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug usb"
+
+DEPEND="sys-apps/pciutils"
+RDEPEND="${DEPEND}
+	net-wireless/wireless-tools"
+
+CONFIG_CHECK="WIRELESS_EXT"
+
+S=${WORKDIR}/${MY_P}
+
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+ERROR_USB="You need to enable USB support in your kernel
+to use usb support in ndiswrapper."
+
+pkg_setup() {
+	echo
+	einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml"
+	einfo "for a list of supported kernels."
+	echo
+
+	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-2.6.31.patch
+	convert_to_m driver/Makefile
+}
+
+src_compile() {
+	local params
+
+	# Enable verbose debugging information
+	if use debug; then
+		params="DEBUG=3"
+		use usb && params="${params} USB_DEBUG=1"
+	fi
+
+	cd utils
+	emake || die "Compile of utils failed!"
+
+	use usb || params="DISABLE_USB=1"
+
+	# Does not like parallel builds
+	# http://bugs.gentoo.org/show_bug.cgi?id=154213
+	# KBUILD value can't be quoted
+	# http://bugs.gentoo.org/show_bug.cgi?id=156319
+	BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD=${KV_OUT_DIR} ${params} -j1"
+	linux-mod_src_compile
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog INSTALL README
+	doman ndiswrapper.8 || die
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_install
+
+	cd utils
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	echo
+	elog "NDISwrapper requires .inf and .sys files from a Windows(tm) driver"
+	elog "to function. Download these to /root for example, then"
+	elog "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them."
+	elog "They will be copied to /etc/ndiswrapper/."
+	elog "Once done, please run 'update-modules'."
+	elog
+
+	elog "Please look at ${HOMEPAGE}"
+	elog "for the FAQ, HowTos, tips, configuration, and installation"
+	elog "information."
+	elog
+
+	local i=$(lspci -n | egrep 'Class (0280|0200):' |  cut -d' ' -f4)
+	if [[ -n "${i}" ]] ; then
+		elog "Possible hardware: ${i}"
+		elog
+	fi
+
+	elog "NDISwrapper devs need support (_hardware_, cash)."
+	elog "Don't hesitate if you can help."
+	elog "See ${HOMEPAGE} for details."
+	echo
+
+	if [[ ${ROOT} == "/" ]]; then
+
+		einfo "Attempting to automatically reinstall any Windows drivers"
+		einfo "you might already have."
+		echo
+
+		local driver
+		for driver in $(ls /etc/ndiswrapper) ; do
+			einfo "Driver: ${driver}"
+			mv "/etc/ndiswrapper/${driver}" "${T}"
+			ndiswrapper -i "${T}/${driver}/${driver}.inf"
+		done
+	fi
+}