Adding upstream patch for kernel 2.6.24 compatibility

Package-Manager: portage-2.1.4.1

4 files changed, 133 insertions, 3 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 20367bba39af..2160af8e34ef 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw3945
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.37 2007/12/06 23:58:20 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.38 2008/02/11 15:45:20 lack Exp $
+
+*ipw3945-1.2.2-r1 (11 Feb 2008)
+
+  11 Feb 2008; Jim Ramsay <lack@gentoo.org>
+  +files/ipw3945-1.2.2-kernel-2.6.24.patch, +ipw3945-1.2.2-r1.ebuild:
+  Added upstream patch for building with linux kernel 2.6.24
 
   06 Dec 2007; Christian Faulhammer <opfer@gentoo.org> ipw3945-1.2.2.ebuild:
   stable x86, bug 197806
diff --git a/net-wireless/ipw3945/Manifest b/net-wireless/ipw3945/Manifest
index 87b627bbb53f..a38898837442 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -1,6 +1,7 @@
 AUX ipw3945-1.0.5-linux-2.6.19.patch 356 RMD160 322ba91a6096b09dd5a5dfb2f1dfe07c1b3ea08a SHA1 06d82253361c0ab570788443e31e87f234d99730 SHA256 6d931054664ecf1545fd6f94e28e3549c1178bdbe247e0579e8f93334f9c9cd4
 AUX ipw3945-1.2.0-Makefile.patch 2849 RMD160 0e5557d6d33f28815e98ac2801048d227f716b07 SHA1 22331e3bacbaa613748ebb7ead509ba8719ec06f SHA256 dec634d0538d12a3109f99be0481d367d423ba79a7a59a7da3c18b020dbe0009
 AUX ipw3945-1.2.2-build.patch 2570 RMD160 b484cea095c240e63ade5a281eadee29b8211692 SHA1 ff280b615817c2b0a58d93e82f82b2cd61b293c7 SHA256 f0c3eab6452927ec28d051c035c819050765235989a7267efad257171597be08
+AUX ipw3945-1.2.2-kernel-2.6.24.patch 545 RMD160 93ed84753de95d9cdc7fa9de0a8a41c5ecdf3ec1 SHA1 c3b71de13b02169652d7c7b3607953d9604f9de8 SHA256 27e3ab51b32b1a9c711f5ccf2be2a3517433290f8fdaeafebd2319664132ab4a
 DIST ipw3945-1.0.5.tgz 174149 RMD160 485f8dbe3404d5e7f32d6f3a6f955de322b0d7c9 SHA1 8dc4a59a4228aaf69e605ed3ad48cabc84b41a31 SHA256 c2acb3403d623b43e432e09c34739c9265cadc586effc1dac2444ae701c4aa45
 DIST ipw3945-1.2.0.tgz 200122 RMD160 333c94962e302c8dd50664f2d2d70f2c7878c84e SHA1 89d01b2cd86b3050115d230526d1eaefb6d9be5f SHA256 c581a2b9537e2b70c615ca12e6b0eff8439ea792d10e18ecaa4e8486bf20e545
 DIST ipw3945-1.2.1.tgz 200925 RMD160 6ae2089715a6b66f3c16bd113bd3f758550d2461 SHA1 adadefc7b9f6af8faa9fb57bace25ad543fd631d SHA256 ec717823129d98265f3bc7afb0d5c888a98b8d2f2353bfb7d46fc4f579487e2b
@@ -8,6 +9,7 @@ DIST ipw3945-1.2.2.tgz 201005 RMD160 07f7b585540ff38ba61cc2365e0073ad0259563a SH
 EBUILD ipw3945-1.0.5.ebuild 2632 RMD160 3320918dd7539aeb15479e46cc2665a8a798e33d SHA1 a152900b4341bf34b2afa2edff0e5ca278e567a2 SHA256 70f8dcd7cad0e00efd010f23b402509462be558feb690eded7b3ca3d32ddc51a
 EBUILD ipw3945-1.2.0.ebuild 2537 RMD160 f21732b7ba56b57dd85670493c3c00e155d453d1 SHA1 711532f38db6f74bfe749ae580e844b8c0b71d1a SHA256 9704a881fa2e0bc6f08aa449f4d0ba6743cca353f02805f321fd6b0210833087
 EBUILD ipw3945-1.2.1.ebuild 2546 RMD160 223269dde550dd78b28cdad25217fe93ac3e3bf3 SHA1 810b78a2e4ec00338fcaa8143956f1cfe8fff0bb SHA256 b9fe431a10e58f21c4bc8131818e40a1cbf5b7f3b95f17e31b6ce5a98a113e4e
+EBUILD ipw3945-1.2.2-r1.ebuild 3375 RMD160 7e0f6d95f5facb699840f82d9fce07c2e89e57d2 SHA1 b5a5eb8a1f8c387ad455389a4b018ba8558a9ab9 SHA256 645ad6464a6537865080ece4ffaca052378620c75e81d2a4225ba2d30921fd34
 EBUILD ipw3945-1.2.2.ebuild 3086 RMD160 56941939df19f7a19cb177c3771018848768fd9f SHA1 78dbd5f7b3ebb6bc35c3f922a5dc5d0151d61700 SHA256 442341b6e5d375d21c7ff52fc20fe294ac16eaa0e056fd83d1a83b61d465ab66
-MISC ChangeLog 6964 RMD160 35f955c0fc7066ccf50bb12f13477319d2f523c1 SHA1 a36bbd90ab4e18b47cb37b7cebee56c442ed0470 SHA256 335311510ae8a54e107f3f700286d59b1b605d8052c3ccf19af1ca3ca24b7cb7
+MISC ChangeLog 7172 RMD160 e7dd031722d8fdb0712fa0d8fc829ee3b2940cc1 SHA1 fa7fd39d27e0ee94a8370e28f3fdb01a3ba025f6 SHA256 5e53ae23c1fca70d4eb04f6ed39d7e23188fe6e694584f61176ffe729c691d1a
 MISC metadata.xml 472 RMD160 a1abc57734ad8b295b6a4396edd7a45a6b27eecb SHA1 4938eeb6b377f59dc585c22a5d671db7cb590143 SHA256 29d7cca82850751f863570d26bc7b32a931c31344641651f04c4ce921c3d90de
diff --git a/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch b/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch
new file mode 100644
index 000000000000..27f7304d7f01
--- /dev/null
+++ b/net-wireless/ipw3945/files/ipw3945-1.2.2-kernel-2.6.24.patch
@@ -0,0 +1,21 @@
+--- ipw3945.h.orig	2007-07-31 09:53:39.000000000 +0300
++++ ipw3945.h	2007-12-23 04:09:59.000000000 +0200
+@@ -2414,6 +2414,18 @@ enum {
+ #define IPW_ORD_TABLE_7_MASK              0x0000F700
+ 
+ /*
++ * For backword Kernel compatibility (after 2.6.24)
++ */
++#if !defined(MAC_ARG)
++#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
++#endif
++
++#if !defined(SET_MODULE_OWNER)
++#define SET_MODULE_OWNER(dev) do { } while (0)
++#endif
++
++
++/*
+  * Table 0 Entries (all entries are 32 bits)
+  */
+ enum {
diff --git a/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild b/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..1f809a62eb5b
--- /dev/null
+++ b/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.2-r1.ebuild,v 1.1 2008/02/11 15:45:20 lack Exp $
+
+inherit linux-mod eutils
+
+S=${WORKDIR}/${P/_pre/-pre}
+
+UCODE_VERSION="1.14.2"
+DAEMON_VERSION="1.7.22"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 3945ABG miniPCI express adapter"
+HOMEPAGE="http://ipw3945.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-pre}.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+RDEPEND=">=net-wireless/ipw3945-ucode-${UCODE_VERSION}
+	>=net-wireless/ipw3945d-${DAEMON_VERSION}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw3945(net/wireless:)"
+MODULESD_IPW3945_DOCS="README.ipw3945"
+KV_OBJ="ko"
+
+CONFIG_CHECK="WIRELESS_EXT FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+ERROR_IEEE80211="${P} requires support for Generic IEEE 802.11 Networking Stack (CONFIG_IEEE80211)."
+
+pkg_setup() {
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		die "${P} needs a kernel >=2.6.18! Please set your KERNEL_DIR or /usr/src/linux suitably"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} SHELL=/bin/bash"
+	BUILD_PARAMS="${BUILD_PARAMS} T=${T}"
+	BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IPW3945_MONITOR=y CONFIG_IEEE80211_RADIOTAP=y CONFIG_IPW3945_PROMISCUOUS=y"
+	if use debug; then
+		BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IPW3945_DEBUG=y"
+	else
+		BUILD_PARAMS="${BUILD_PARAMS} CONFIG_IPW3945_DEBUG=n"
+	fi
+
+	# users don't read the ChangeLog and wonder why the kernel check fails
+	# (1) check if the kernel dir (/usr/src/linux) is missing ieee80211
+
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] && \
+		[[ -f ${KV_OUT_DIR}/include/config/ieee80211.h ]] && \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_OUT_DIR}/include/linux/autoconf.h; then
+		return 0
+	else
+		echo
+		ewarn "${CATEGORY}/${PF} does NOT use net-wireless/ieee80211 any more."
+		ewarn "We are now relying on the in-kernel ieee80211 instead."
+		echo
+		eerror "Please remove net-wireless/ieee80211 using emerge, and remerge"
+		eerror "your current kernel (${KV_FULL}), as it has been altered"
+		eerror "by net-wireless/ieee80211."
+		die "Incompatible ieee80211 subsystem detected in ${KV_FULL}"
+	fi
+}
+
+src_unpack() {
+	unpack ${P/_pre/-pre}.tgz
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-kernel-2.6.24.patch"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc CHANGES ISSUES
+}
+
+pkg_postinst() {
+	ewarn "The ipw3945 driver is deprecated since the fully open iwl3945 driver"
+	ewarn "is present in the 2.6.24 linux kernel.  Please try using the new"
+	ewarn "driver first, and help improve it by reporting any problems you may"
+	ewarn "have."
+	echo
+	elog "If you want your wireless device started up by udev, please make sure"
+	elog "you add something like this to your /etc/conf.d/net:"
+	elog "preup() {"
+	elog "	if [[ \${IFACE} = \"wlan0\" ]]; then"
+	elog "		sleep 3"
+	elog "	fi"
+	elog "	return 0"
+	elog "}"
+	elog "Otherwise, you're going to hit bug #177869 since the driver needs some"
+	elog "time to initialize and thus, baselayout is going to start it even if"
+	elog "the device isn't useable yet."
+}