Version bump.

5 files changed, 165 insertions, 2 deletions

diff --git a/net-wireless/hostap-driver/ChangeLog b/net-wireless/hostap-driver/ChangeLog
index 63773b28600a..6fa5b4675f32 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.25 2004/12/20 09:09:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/ChangeLog,v 1.26 2004/12/26 21:30:46 brix Exp $
+
+*hostap-driver-0.2.6 (26 Dec 2004)
+
+  26 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/hostap-driver-0.2.6-firmware.patch, +hostap-driver-0.2.6.ebuild:
+  Version bump.
 
 *hostap-driver-0.3.2 (20 Dec 2004)
 
diff --git a/net-wireless/hostap-driver/Manifest b/net-wireless/hostap-driver/Manifest
index ba0e20e061a5..e0ef06ef9d2b 100644
--- a/net-wireless/hostap-driver/Manifest
+++ b/net-wireless/hostap-driver/Manifest
@@ -1,8 +1,9 @@
 MD5 c477c184eacaf3f581d69829a158bcb3 hostap-driver-0.3.2.ebuild 3621
+MD5 05f7673c403a2988e7328dded4284836 hostap-driver-0.2.6.ebuild 3508
 MD5 08b001ac4fb3ad3de51ef019a8833f6c hostap-driver-0.2.5.ebuild 3201
 MD5 b57d0a31b3dfcc88c5828e116cf20994 hostap-driver-0.2.5-r1.ebuild 3614
 MD5 a7a1a62076c4baa3e507e2a7340af162 hostap-driver-0.3.0.ebuild 3621
-MD5 ae8c34a07000c5195080de948e1f891c ChangeLog 4653
+MD5 1b6f4dad085c57869b706ce8c2b84936 ChangeLog 4834
 MD5 5f6ec5c50fa3a91a429fec8670cf241b metadata.xml 722
 MD5 d6feaba6faa14fd7f48bfbe13a2309dc hostap-driver-0.2.4.ebuild 2700
 MD5 f7a49c3b2764821383db2a933661eacb files/hostap-driver-0.3.2-firmware.patch 739
@@ -10,6 +11,8 @@ MD5 c45be0cf6326f054520ce15096361e84 files/hostap-driver-0.3.0-firmware.patch 73
 MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5-r1 441
 MD5 fe9ca923fd63e570f4f47be989fd810f files/digest-hostap-driver-0.2.4 441
 MD5 702e5e315551f06833fde599816fd65a files/digest-hostap-driver-0.2.5 441
+MD5 2867dcc26d843b380c5c6be06a89a9af files/digest-hostap-driver-0.2.6 441
 MD5 31eba7db39a7678ae7619995f6d96370 files/digest-hostap-driver-0.3.0 441
 MD5 b86779810351ad030a68fabc4dda44f8 files/digest-hostap-driver-0.3.2 441
+MD5 d76aa90f71a4ef13a49ccca8863b66ba files/hostap-driver-0.2.6-firmware.patch 739
 MD5 9451f65d0b1724a60a07b9310d9ebc52 files/hostap-driver-0.2.5.firmware.diff.bz2 472
diff --git a/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6 b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6
new file mode 100644
index 000000000000..f5cd35b6b549
--- /dev/null
+++ b/net-wireless/hostap-driver/files/digest-hostap-driver-0.2.6
@@ -0,0 +1,6 @@
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
+MD5 2b2cba3fdd498b001ea3c27d8b2da31b pcmcia-cs-3.2.5-3.2.6.diff.gz 23034
+MD5 f2feda5eb46c1a2b99ae9db274879afc pcmcia-cs-3.2.5-3.2.7.diff.gz 28244
+MD5 1815e82419cb83d32d6e416f090e9330 hostap-driver-0.2.6.tar.gz 196183
diff --git a/net-wireless/hostap-driver/files/hostap-driver-0.2.6-firmware.patch b/net-wireless/hostap-driver/files/hostap-driver-0.2.6-firmware.patch
new file mode 100644
index 000000000000..06806dd6121e
--- /dev/null
+++ b/net-wireless/hostap-driver/files/hostap-driver-0.2.6-firmware.patch
@@ -0,0 +1,12 @@
+diff -urp hostap-driver-0.2.6/driver/modules/hostap_config.h hostap-driver-0.2.6-firmware/driver/modules/hostap_config.h
+--- hostap-driver-0.2.6/driver/modules/hostap_config.h	2004-12-25 19:59:32.000000000 +0100
++++ hostap-driver-0.2.6-firmware/driver/modules/hostap_config.h	2004-12-26 21:49:43.405265416 +0100
+@@ -59,7 +59,7 @@
+  * In addition, please note that it is possible to kill your card with
+  * non-volatile download if you are using incorrect image. This feature has not
+  * been fully tested, so please be careful with it. */
+-/* #define PRISM2_NON_VOLATILE_DOWNLOAD */
++#define PRISM2_NON_VOLATILE_DOWNLOAD
+ #endif /* PRISM2_DOWNLOAD_SUPPORT */
+ 
+ /* Include wireless extensions sub-ioctl support even if wireless extensions
diff --git a/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild b/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild
new file mode 100644
index 000000000000..571c3f56e3cf
--- /dev/null
+++ b/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-driver/hostap-driver-0.2.6.ebuild,v 1.1 2004/12/26 21:30:46 brix Exp $
+
+inherit toolchain-funcs pcmcia kernel-mod eutils
+
+DESCRIPTION="HostAP wireless drivers"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="${SRC_URI} http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="0"
+
+DEPEND="!net-wireless/hostap
+		virtual/linux-sources
+		sys-apps/sed"
+RDEPEND=">=net-wireless/wireless-tools-25"
+
+pkg_setup() {
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		eerror ""
+		die "CONFIG_NET_RADIO support not detected."
+	fi
+
+	kernel-mod_check_modules_supported
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# set compiler
+	sed -i -e "s:gcc:$(tc-getCC):" ${S}/Makefile
+
+	# unpack the pcmcia-cs sources if needed
+	pcmcia_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-firmware.patch
+
+	# fix for new coreutils (#31801)
+	sed -i "s:tail -1:tail -n 1:" ${S}/Makefile
+
+	# set correct pcmcia path (PCMCIA_VERSION gets set from pcmcia_src_unpack)
+	if [ -n "${PCMCIA_VERSION}" ]
+	then
+		sed -i "s:^\(PCMCIA_PATH\)=:\1=${PCMCIA_SOURCE_DIR}:" ${S}/Makefile
+	fi
+
+	# install to /lib/modules/${KV}/net
+	sed -i "s:\$(MODPATH)/kernel/drivers/net/wireless:\$(MODPATH)/net:g" ${S}/Makefile
+	sed -i "s:MODPATH_CS \:= \$(MODPATH)/pcmcia:MODPATH_CS \:= \$(MODPATH)/net:" ${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -ae; \\\:\\\:" ${S}/Makefile
+	sed -i "s:/sbin/depmod -ae::" ${S}/Makefile
+
+	if ! use pcmcia &> /dev/null
+	then
+		# remove install_pccard dependency from install_2.4 target
+		sed -i "s#^\(install_2.4:.*\)install_pccard#\1#" ${S}/Makefile
+	fi
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i "s:SUBDIRS=:M=:" ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	pcmcia_configure
+
+	set_arch_to_kernel
+	emake all || die "emake failed"
+	set_arch_to_portage
+}
+
+src_install() {
+	# Makefile relies on existing /lib/modules/${KV}
+	dodir /lib/modules/${KV}
+
+	if use pcmcia &> /dev/null
+	then
+		# pcmcia configuration file is only installed if /etc/pcmcia exist
+		dodir /etc/pcmcia
+	else
+		# make sure we do not install the hostap_cs module
+		rm -rf ${S}/driver/modules/hostap_cs.*o
+	fi
+
+	set_arch_to_kernel
+	emake DESTDIR=${D} install || die "emake install failed"
+	set_arch_to_portage
+
+	dodoc README ChangeLog
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+
+	if [ -e /etc/pcmcia/prism2.conf ]
+	then
+		einfo ""
+		einfo "You may need to edit or remove /etc/pcmcia/prism2.conf"
+		einfo "This is usually a result of conflicts with the"
+		einfo "net-wireless/linux-wlan-ng drivers."
+		einfo ""
+	fi
+
+	einfo ""
+	einfo "Please notice that all ${PN} modules are now installed to"
+	einfo "/lib/modules/${KV}/net/."
+	einfo ""
+	einfo "You may have to manually delete the old modules if upgrading from from"
+	einfo "<=net-wireless/${PN}-0.2.4."
+	einfo ""
+
+	ewarn ""
+	ewarn "Please note that this installation of HostAP contains support"
+	ewarn "for downloading binary firmware images into the non-volatile"
+	ewarn "(permanent) flash memory of wireless LAN cards."
+	ewarn ""
+	ewarn "Albeit being a great feature, this can lead to A DEAD CARD"
+	ewarn "when inappropriately used (e.g. wrong firmware)."
+	ewarn ""
+
+}