revision bump with some fixes

4 files changed, 174 insertions, 14 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index 773baf8ebb9d..c12fede187fc 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/linux-wlan-ng
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.41 2004/07/09 22:11:18 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.42 2004/10/09 09:04:59 cardoe Exp $
+
+*linux-wlan-ng-0.2.1_pre22 (09 Oct 2004)
+
+  09 Oct 2004; Doug Goldstein <cardoe@gentoo.org>
+  +linux-wlan-ng-0.2.1_pre22.ebuild:
+  revision bump to pre22, masked because no testable hardware
+  includes the fixes from bug 64176 
+  should fix access violation compiler error
 
   09 Jul 2004; Travis Tilley <lv@gentoo.org> linux-wlan-ng-0.2.0-r1.ebuild,
   linux-wlan-ng-0.2.0-r2.ebuild, linux-wlan-ng-0.2.0-r3.ebuild,
diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index d8bcb9785f87..eb8a439a0e61 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -1,23 +1,25 @@
-MD5 152de0f1653adfcde102794b90ec5623 ChangeLog 8622
-MD5 c5d2407f9ec86c63abf08a2be2aaaae8 linux-wlan-ng-0.2.0-r1.ebuild 6120
+MD5 a272f6f39e5af8fc1e39598ae4c0667e linux-wlan-ng-0.2.1_pre20.ebuild 4241
 MD5 3f703fb7e945cf4edfe987b2b1c4cb9d linux-wlan-ng-0.2.0-r2.ebuild 6267
-MD5 1bdb04ea69c20af9560e579178e5c662 linux-wlan-ng-0.2.0-r3.ebuild 4739
 MD5 e91904c8bce3ee9baf117ccf36618f75 linux-wlan-ng-0.2.1_pre11.ebuild 6402
+MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
 MD5 c168181a96c7f088deb95c53a98e27a5 linux-wlan-ng-0.2.1_pre16.ebuild 6761
-MD5 e0398151878b5fdeb344b674e9ec3ed4 linux-wlan-ng-0.2.1_pre17-r1.ebuild 4454
+MD5 c5d2407f9ec86c63abf08a2be2aaaae8 linux-wlan-ng-0.2.0-r1.ebuild 6120
 MD5 2143ccfbbc0399744c01740304610f4f linux-wlan-ng-0.2.1_pre17.ebuild 6780
+MD5 f99bc9476aabed2cdab28dc5edd6d1d2 linux-wlan-ng-0.2.1_pre22.ebuild 3692
+MD5 152de0f1653adfcde102794b90ec5623 ChangeLog 8622
 MD5 5f20cd22b439d1a271f774aa9db4bf72 linux-wlan-ng-0.2.1_pre19.ebuild 4566
-MD5 a272f6f39e5af8fc1e39598ae4c0667e linux-wlan-ng-0.2.1_pre20.ebuild 4241
+MD5 e0398151878b5fdeb344b674e9ec3ed4 linux-wlan-ng-0.2.1_pre17-r1.ebuild 4454
+MD5 1bdb04ea69c20af9560e579178e5c662 linux-wlan-ng-0.2.0-r3.ebuild 4739
 MD5 5140505a872e4bd746b0e47cdf6f17bd linux-wlan-ng-0.2.1_pre8.ebuild 6401
-MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
-MD5 f57572b64b73079ae2e9bab008d602bc files/digest-linux-wlan-ng-0.2.0-r1 434
-MD5 38926f085b2f76693be9b930c7d216ba files/digest-linux-wlan-ng-0.2.0-r2 504
 MD5 296af9529b8492a5a12f1ba06d2a71de files/digest-linux-wlan-ng-0.2.0-r3 511
-MD5 8dab46b657f6e8498e9cb48cfa346b5c files/digest-linux-wlan-ng-0.2.1_pre11 437
-MD5 bca89201c544fb1c9e32d08dcc635584 files/digest-linux-wlan-ng-0.2.1_pre16 437
+MD5 9845ef8525638f66a43b2b1ca8b1d544 files/linux-wlan-ng-0.2.1_pre19-prism2dl.diff 530
+MD5 4ba4f50725309cebf376a17edd220b89 files/digest-linux-wlan-ng-0.2.1_pre8 436
+MD5 3fe98f9e8ac97ff51584ca1de89350de files/digest-linux-wlan-ng-0.2.1_pre19 517
 MD5 6dd9338796686cbdd00a8fb47462c42e files/digest-linux-wlan-ng-0.2.1_pre17 444
+MD5 bca89201c544fb1c9e32d08dcc635584 files/digest-linux-wlan-ng-0.2.1_pre16 437
+MD5 38926f085b2f76693be9b930c7d216ba files/digest-linux-wlan-ng-0.2.0-r2 504
 MD5 193d2642942fbefda8f9b4f38992289d files/digest-linux-wlan-ng-0.2.1_pre17-r1 517
-MD5 3fe98f9e8ac97ff51584ca1de89350de files/digest-linux-wlan-ng-0.2.1_pre19 517
 MD5 44bd75f98be313622f43eb03b494e125 files/digest-linux-wlan-ng-0.2.1_pre20 517
-MD5 4ba4f50725309cebf376a17edd220b89 files/digest-linux-wlan-ng-0.2.1_pre8 436
-MD5 9845ef8525638f66a43b2b1ca8b1d544 files/linux-wlan-ng-0.2.1_pre19-prism2dl.diff 530
+MD5 e4c172b032c7b8e5b4f2784eee9293bd files/digest-linux-wlan-ng-0.2.1_pre22 516
+MD5 8dab46b657f6e8498e9cb48cfa346b5c files/digest-linux-wlan-ng-0.2.1_pre11 437
+MD5 f57572b64b73079ae2e9bab008d602bc files/digest-linux-wlan-ng-0.2.0-r1 434
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre22 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre22
new file mode 100644
index 000000000000..729ef6ea66b9
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre22
@@ -0,0 +1,7 @@
+MD5 15aec99aecf0a9a1fa06fc297c110aca pcmcia-cs-3.2.5.tar.gz 434400
+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 f9178fcb9650096df6b9299000984968 linux-wlan-ng-0.2.1pre22.tar.bz2 447099
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre22.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre22.ebuild
new file mode 100644
index 000000000000..8dad70eb0ec8
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre22.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre22.ebuild,v 1.1 2004/10/09 09:04:59 cardoe Exp $
+
+inherit pcmcia kernel-mod
+
+IUSE="${IUSE} usb build"
+
+MY_P=${PN}-${PV/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="The linux-wlan Project"
+SRC_URI="${SRC_URI}
+		ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/${MY_P}.tar.bz2
+		mirror://gentoo/${PN}-gentoo-init.gz"
+
+HOMEPAGE="http://linux-wlan.org"
+DEPEND="virtual/os-headers
+		dev-libs/openssl
+		>=sys-apps/sed-4.0*"
+
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86 ~ppc"
+
+src_unpack() {
+	check_KV
+	kernel_mod-getversion
+
+	unpack ${MY_P}.tar.bz2
+	unpack ${PN}-gentoo-init.gz
+
+	# Use pcmcia.eclass to setup pcmcia-cs sources as needed
+	pcmcia_src_unpack
+
+	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
+
+	# Lots of sedding to do to get the man pages and a few other
+	# things to end up in the right place.
+
+	sed -i -e "s:/usr/local/man/:/usr/share/man/:" \
+		man/Makefile
+
+	sed -i -e "s:/etc/wlan:/etc/conf.d:g" \
+		etc/wlan/Makefile
+
+	sed -i -e "s:/sbin/nwepgen:/sbin/keygen:" \
+		etc/wlan/wlancfg-DEFAULT
+
+	sed -i -e "s:/etc/wlan/wlan.conf:/etc/conf.d/wlan.conf:g" \
+	    -e "s:/etc/wlan/wlancfg:/etc/conf.d/wlancfg:g" \
+		etc/wlan/shared
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	# Configure the pcmcia-cs tree if it exists
+	pcmcia_configure
+
+	# now lets build wlan-ng
+	cd ${S}
+
+	sed -i -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
+		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
+		config.in
+
+	if use pcmcia; then
+		if [ -n "${PCMCIA_SOURCE_DIR}" ];
+		then
+			export PCMCIA_SOURCE_DIR=${PCMCIA_SOURCE_DIR}
+			sed -i -e 's:PCMCIA_SRC=:PCMCIA_SRC=${PCMCIA_SOURCE_DIR}:' \
+				config.in
+		fi
+		sed -i -e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
+			config.in
+	else
+		sed -i -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
+		config.in
+	fi
+
+	if use usb; then
+		sed -i -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
+			config.in
+	fi
+
+	cp config.in default.config
+
+	# 2.6 needs ARCH unset since it uses it
+	unset ARCH
+	emake default_config || die "failed configuring WLAN"
+	emake all || die "failed compiling"
+
+	# compile add-on keygen program.  It seems to actually provide usable keys.
+	cd ${S}/add-ons/keygen
+	emake || die "Failed to compile add-on keygen program"
+	cd ${S}/add-ons/lwepgen
+	emake || die "Failed to compile add-on lwepgen program"
+}
+
+src_install () {
+
+	make install || die "failed installing"
+
+	dodir etc/wlan
+	mv ${D}/etc/conf.d/shared ${D}/etc/wlan/
+
+	if use build; then
+		( cd ${D}/usr/share && rm -r man )
+	fi
+
+	exeinto /sbin
+	doexe add-ons/keygen/keygen
+	doexe add-ons/lwepgen/lwepgen
+
+}
+
+pkg_postinst() {
+	depmod -a
+
+	einfo "/etc/init.d/wlan is used to control startup and shutdown of non-PCMCIA devices."
+	einfo "/etc/init.d/pcmcia from pcmcia-cs is used to control startup and shutdown of"
+	einfo "PCMCIA devices."
+	einfo ""
+	einfo "Modify /etc/conf.d/wlan.conf to set global parameters."
+	einfo "Modify /etc/conf.d/wlancfg-* to set individual card parameters."
+	einfo "There are detailed instructions in these config files."
+	einfo ""
+	einfo "Three keygen programs are included: nwepgen, keygen, and lwepgen."
+	einfo "keygen seems provide more usable keys at the moment."
+	einfo ""
+	einfo "Be sure to add iface_wlan0 parameters to /etc/conf.d/net."
+	einfo ""
+	ewarn "Wireless cards which you want to use drivers other than wlan-ng for"
+	ewarn "need to have the appropriate line removed from /etc/pcmcia/wlan-ng.conf"
+	ewarn "Do 'cardctl info' to see the manufacturer ID and remove the corresponding"
+	ewarn "line from that file."
+}
+
+