added prism2 firmware download patch

4 files changed, 119 insertions, 3 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 0619883f193a..5dd1d4b7a789 100644
--- a/net-wireless/hostap-driver/ChangeLog
+++ b/net-wireless/hostap-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostap-driver
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.4 2003/12/16 19:09:38 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.5 2004/01/03 00:18:21 wschlich Exp $
+
+*hostap-driver-0.1.2-r1 (03 Jan 2004)
+
+  03 Jan 2004; Wolfram Schlich <wschlich@gentoo.org>
+  hostap-driver-0.1.2-r1.ebuild, files/hostap-driver-0.1.2.firmware.diff.bz2:
+  added prism2 firmware download patch
 
   16 Dec 2003; Wolfram Schlich <wschlich@gentoo.org>
   hostap-driver-0.1.1.ebuild, hostap-driver-0.1.2.ebuild:
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index 8ea0bd47e2e8..2d36a42b70e1 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,8 +1,8 @@
-MD5 deadd57d02618828d0e1256d97959d44 ChangeLog 970
+MD5 0443c8e878e2eaffa9a339fc05a4c4a3 ChangeLog 970
 MD5 15502f469f44d910a0268b287d1d3411 hostap-driver-0.1.1.ebuild 3756
 MD5 027bb2fbaac5d3c8fd4e268a2ddd4682 metadata.xml 721
 MD5 e2e5d0a27d54c5708f7d94653dbdb85d hostap-driver-0.1.2.ebuild 3756
-MD5 e344133ca0b83e6ef01646ca2e671176 hostap-driver-0.1.2-r1.ebuild 3801
+MD5 e49ea72e41adc8548d66d666b2c981ec hostap-driver-0.1.2-r1.ebuild 3804
 MD5 75dda0e477834ba5a6c5c88cfb402fe7 files/digest-hostap-driver-0.1.1 71
 MD5 5c57e0825ccb41c219c9d86c6a9114e5 files/digest-hostap-driver-0.1.2 71
 MD5 afb604f5408986228ad8cc60236339dc files/hostap-driver-0.1.2.firmware.diff.bz2 590
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.1.2.firmware.diff.bz2 b/net-wireless/hostap-driver/files/hostap-driver-0.1.2.firmware.diff.bz2
new file mode 100644
index 000000000000..fbd8c0649bc7
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.1.2.firmware.diff.bz2
diff --git a/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild b/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..65e09fee0432
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.1.2-r1.ebuild,v 1.1 2004/01/03 00:18:21 wschlich Exp $
+
+inherit eutils
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="pcmcia hostap-nopci hostap-noplx"
+DEPEND=">=net-wireless/wireless-tools-25
+		pcmcia? ( >=sys-apps/pcmcia-cs-3.2.1 )"
+RDEPEND="!net-wireless/hostap"
+S="${WORKDIR}/${P}"
+LIB_PATH="/lib/modules/${KV}"
+
+src_unpack() {
+	check_KV
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.firmware.diff.bz2"
+
+	## set compiler options
+	sed -i -e "s:gcc:${CC}:" "${S}/Makefile"
+	# sed -i -e "s:-O2:${CFLAGS}:" "${S}/Makefile" # improper CFLAGS could cause unresolved symbols in the modules
+
+	## fix for new coreutils (#31801)
+	sed -i -e "s:tail -1:tail -n 1:" "${S}/Makefile"
+
+	## use pcmcia-cs sources if kernel tree pcmcia support is disabled and USE=pcmcia is set
+	if use pcmcia >&/dev/null; then
+		if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null; then
+			einfo "Kernel PCMCIA is enabled, skipping external pcmcia-cs sources"
+		else
+			einfo "Kernel PCMCIA is disabled, using external pcmcia-cs sources"
+			## get ebuild of currently installed pcmcia-cs package
+			PCMCIA_CS_EBUILD=(/var/db/pkg/sys-apps/pcmcia-cs-*/pcmcia-cs-*.ebuild) ## use bash globbing
+			if [ ! -f "${PCMCIA_CS_EBUILD}" ]; then
+				die "ERROR: pcmcia-cs ebuild (${PCMCIA_CS_EBUILD}) not found - are you sure pcmcia-cs is installed?"
+			fi
+			PCMCIA_CS_VER="${PCMCIA_CS_EBUILD##*/}" ## -> pcmcia-cs-VER.ebuild
+			PCMCIA_CS_VER="${PCMCIA_CS_VER/pcmcia-cs-/}" ## strip 'pcmcia-cs-'
+			PCMCIA_CS_VER="${PCMCIA_CS_VER/.ebuild/}" ## strip '.ebuild'
+			PCMCIA_PATH="${WORKDIR}/pcmcia-cs-${PCMCIA_CS_VER}"
+			sed -i -e "s:^PCMCIA_PATH=:PCMCIA_PATH=${PCMCIA_PATH}:" "${S}/Makefile"
+			## unpack external pcmcia-cs sources
+			cd "${WORKDIR}"
+			unpack pcmcia-cs-${PCMCIA_CS_VER}.tar.gz ## unpack the pcmcia-cs sources to PCMCIA_PATH
+			cd pcmcia-cs-${PCMCIA_CS_VER}
+			## when not configured, pcmcia-cs spits out lots of errors (since 3.2.5)
+			if ! ./Configure -n --srctree --kernel=/usr/src/linux >&/dev/null; then
+				eerror "External pcmcia-cs configuration failed"
+				die
+			fi
+		fi
+	fi
+}
+
+src_compile() {
+
+	local mydrivers
+
+	use pcmcia && mydrivers="${mydrivers} pccard"
+	use hostap-nopci || mydrivers="${mydrivers} pci"
+	use hostap-noplx || mydrivers="${mydrivers} plx"
+
+	einfo "Building the following drivers: ${mydrivers}"
+	emake EXTRA_CFLAGS="-DPRISM2_DOWNLOAD_SUPPORT" ${mydrivers} || die
+}
+
+src_install() {
+	dodir ${LIB_PATH}/net
+	cp ${S}/driver/modules/{hostap.o,hostap_crypt_wep.o} \
+		${D}${LIB_PATH}/net/
+#	local myinstall="install_hostap install_crypt"
+
+	if use pcmcia >&/dev/null; then
+		dodir ${LIB_PATH}/pcmcia
+		dodir /etc/pcmcia
+		cp ${S}/driver/modules/hostap_cs.o ${D}/${LIB_PATH}/pcmcia/
+		cp ${S}/driver/etc/hostap_cs.conf ${D}/etc/pcmcia/
+		if [ -r /etc/pcmcia/prism2.conf ]; then
+			einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+			einfo "This is usually a result of conflicts with the"
+			einfo "linux-wlan-ng drivers."
+		fi
+#		myinstall="${myinstall} install_pccard"
+	fi
+
+	if ! use hostap-nopci >&/dev/null; then
+		cp ${S}/driver/modules/hostap_pci.o \
+			${D}${LIB_PATH}/net/
+#		myinstall="${myinstall} install_pci"
+	fi
+
+	if ! use hostap-noplx >&/dev/null; then
+		cp ${S}/driver/modules/hostap_plx.o \
+			${D}${LIB_PATH}/net/
+#		myinstall="${myinstall} install_plx"
+	fi
+#	emake DESTDIR="${D}" ${myinstall}
+	dodoc README ChangeLog
+}
+pkg_postinst(){
+	einfo "Checking kernel module dependancies"
+	cd /usr/src/linux && make _modinst_post ## depmod
+}