Version bump. Now using linux-info.eclass for a cleaner output. Added ~hppa to KEYWORDS.

5 files changed, 279 insertions, 26 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index bac5b3fa3f0e..d006bf0408ba 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2004/11/23 00:10:26 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.44 2005/01/06 01:01:05 gmsoft Exp $
+
+*linux-wlan-ng-0.2.1_pre23 (06 Jan 2005)
+
+  06 Jan 2005; Guy Martin <gmsoft@gentoo.org>
+  +files/linux-wlan-2.6.10-fix.diff, +linux-wlan-ng-0.2.1_pre23.ebuild:
+  Version bump. Now using linux-info.eclass for a cleaner output. Added ~hppa to
+  KEYWORDS.
 
   23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed digest.
diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index d797ab81a9eb..e93edfe7c1ce 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -1,35 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5f20cd22b439d1a271f774aa9db4bf72 linux-wlan-ng-0.2.1_pre19.ebuild 4566
+MD5 a1f6a8a4a21f2f245e4270d1b0894a41 ChangeLog 8971
+MD5 c5d2407f9ec86c63abf08a2be2aaaae8 linux-wlan-ng-0.2.0-r1.ebuild 6120
 MD5 3f703fb7e945cf4edfe987b2b1c4cb9d linux-wlan-ng-0.2.0-r2.ebuild 6267
-MD5 a272f6f39e5af8fc1e39598ae4c0667e linux-wlan-ng-0.2.1_pre20.ebuild 4241
-MD5 c168181a96c7f088deb95c53a98e27a5 linux-wlan-ng-0.2.1_pre16.ebuild 6761
+MD5 1bdb04ea69c20af9560e579178e5c662 linux-wlan-ng-0.2.0-r3.ebuild 4739
 MD5 e91904c8bce3ee9baf117ccf36618f75 linux-wlan-ng-0.2.1_pre11.ebuild 6402
+MD5 c168181a96c7f088deb95c53a98e27a5 linux-wlan-ng-0.2.1_pre16.ebuild 6761
 MD5 e0398151878b5fdeb344b674e9ec3ed4 linux-wlan-ng-0.2.1_pre17-r1.ebuild 4454
-MD5 60cc8eb1e22dd2687151ab3c15159d1c linux-wlan-ng-0.2.1_pre22.ebuild 3690
-MD5 c5d2407f9ec86c63abf08a2be2aaaae8 linux-wlan-ng-0.2.0-r1.ebuild 6120
-MD5 5140505a872e4bd746b0e47cdf6f17bd linux-wlan-ng-0.2.1_pre8.ebuild 6401
-MD5 1bdb04ea69c20af9560e579178e5c662 linux-wlan-ng-0.2.0-r3.ebuild 4739
 MD5 2143ccfbbc0399744c01740304610f4f linux-wlan-ng-0.2.1_pre17.ebuild 6780
-MD5 a1f6a8a4a21f2f245e4270d1b0894a41 ChangeLog 8971
+MD5 5f20cd22b439d1a271f774aa9db4bf72 linux-wlan-ng-0.2.1_pre19.ebuild 4566
+MD5 a272f6f39e5af8fc1e39598ae4c0667e linux-wlan-ng-0.2.1_pre20.ebuild 4241
+MD5 5140505a872e4bd746b0e47cdf6f17bd linux-wlan-ng-0.2.1_pre8.ebuild 6401
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
-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 60cc8eb1e22dd2687151ab3c15159d1c linux-wlan-ng-0.2.1_pre22.ebuild 3690
+MD5 80408b2ed825841e6ee563a3ba4b0f33 linux-wlan-ng-0.2.1_pre23.ebuild 3704
+MD5 b09dfb0819abe63be2b5937a286d0800 files/digest-linux-wlan-ng-0.2.0-r1 361
+MD5 9a9c7518b8823042cda9d67dd6edcb73 files/digest-linux-wlan-ng-0.2.0-r2 431
+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 6dd9338796686cbdd00a8fb47462c42e files/digest-linux-wlan-ng-0.2.1_pre17 444
+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 193d2642942fbefda8f9b4f38992289d files/digest-linux-wlan-ng-0.2.1_pre17-r1 517
-MD5 b09dfb0819abe63be2b5937a286d0800 files/digest-linux-wlan-ng-0.2.0-r1 361
-MD5 9a9c7518b8823042cda9d67dd6edcb73 files/digest-linux-wlan-ng-0.2.0-r2 431
-MD5 296af9529b8492a5a12f1ba06d2a71de files/digest-linux-wlan-ng-0.2.0-r3 511
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBon/5I1lqEGTUzyQRAh5OAKCTe/tttBGa8ySXBieaWHlsjtrY8gCePHFw
-JmSQERHzBg0SZVgtunCZIqY=
-=2Yqy
------END PGP SIGNATURE-----
+MD5 e2ca4c6c0bc3d8daef9ea0f822b88dca files/linux-wlan-2.6.10-fix.diff 3670
+MD5 b11e06135cc8790abe78af54fa4fe95d files/digest-linux-wlan-ng-0.2.1_pre23 147
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre23 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre23
new file mode 100644
index 000000000000..3759643c75ec
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre23
@@ -0,0 +1,2 @@
+MD5 873d73d092cdc00200dc5230160d8f65 linux-wlan-ng-0.2.1pre23.tar.bz2 447233
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
diff --git a/net-wireless/linux-wlan-ng/files/linux-wlan-2.6.10-fix.diff b/net-wireless/linux-wlan-ng/files/linux-wlan-2.6.10-fix.diff
new file mode 100644
index 000000000000..e6e05595e67d
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/linux-wlan-2.6.10-fix.diff
@@ -0,0 +1,107 @@
+diff -uNr linux-wlan-ng-0.2.1pre23.orig/src/p80211/p80211netdev.c linux-wlan-ng-0.2.1pre23/src/p80211/p80211netdev.c
+--- linux-wlan-ng-0.2.1pre23.orig/src/p80211/p80211netdev.c	2005-01-02 18:55:44.054613192 +0100
++++ linux-wlan-ng-0.2.1pre23/src/p80211/p80211netdev.c	2005-01-02 18:56:53.988981552 +0100
+@@ -1051,7 +1051,7 @@
+ 	if (wlandev->name[0] == '\0' || wlandev->name[0] == ' ') {
+ 		do {
+ 			sprintf(wlandev->name, "wlan%d", i++);
+-		} while (dev_get(wlandev->name));
++		} while (dev_get_by_name(wlandev->name));
+ 	}
+ 
+ #if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) )
+@@ -1456,7 +1456,7 @@
+         sprintf(action_str, "ACTION=%s", action);
+ 
+         i = 0;
+-        argv[i++] = hotplug_path;
++        argv[i++] = "/sbin/hotplug";
+         argv[i++] = "wlan";
+         argv[i] = 0;
+ 
+diff -uNr linux-wlan-ng-0.2.1pre23.orig/src/prism2/driver/hfa384x_usb.c linux-wlan-ng-0.2.1pre23/src/prism2/driver/hfa384x_usb.c
+--- linux-wlan-ng-0.2.1pre23.orig/src/prism2/driver/hfa384x_usb.c	2005-01-02 18:55:44.089607872 +0100
++++ linux-wlan-ng-0.2.1pre23/src/prism2/driver/hfa384x_usb.c	2005-01-02 18:57:01.889780448 +0100
+@@ -533,7 +533,7 @@
+ 	if (test_bit(WORK_RX_HALT, &hw->work_flags)) {
+ 		int ret;
+ 
+-		usb_unlink_urb(&hw->rx_urb);  /* Cannot be holding spinlock! */
++		usb_kill_urb(&hw->rx_urb);  /* Cannot be holding spinlock! */
+ 		ret = usb_clear_halt(hw->usb,
+ 		                     usb_rcvbulkpipe(hw->usb, hw->endp_in));
+ 		if (ret != 0) {
+@@ -553,7 +553,7 @@
+ 	if (test_bit(WORK_TX_HALT, &hw->work_flags)) {
+ 		int ret;
+ 
+-		usb_unlink_urb(&hw->tx_urb);
++		usb_kill_urb(&hw->tx_urb);
+ 		ret = usb_clear_halt(hw->usb,
+ 		                     usb_sndbulkpipe(hw->usb, hw->endp_out));
+ 		if (ret != 0) {
+@@ -3363,7 +3363,9 @@
+ 
+ 	spin_unlock_irqrestore(&hw->ctlxq.lock, flags);
+ 
+-	return usb_unlink_urb(&ctlx->outurb);
++	usb_kill_urb(&ctlx->outurb);
++
++	return 0;
+ }
+ 
+ /*----------------------------------------------------------------
+@@ -4614,19 +4616,19 @@
+ 	 * the system, if it hasn't already expired.
+ 	 */
+ 	ctlx->outurb.transfer_flags |= URB_ASYNC_UNLINK;
+-	if (usb_unlink_urb(&ctlx->outurb) == -EINPROGRESS) {
++	usb_kill_urb(&ctlx->outurb);
+ 
+-		/* We are cancelling this CTLX, so we're
+-		 * not going to need to wait for a response.
+-		 */
+-		del_timer(&ctlx->resptimer);
++	/* We are cancelling this CTLX, so we're
++	 * not going to need to wait for a response.
++	 */
++	del_timer(&ctlx->resptimer);
++
++	/* This URB was active, but has now been
++	 * cancelled. It will now have a status of
++	 * -ECONNRESET in the callback function.
++	 */
++	ctlx->state = CTLX_REQ_TIMEOUT;
+ 
+-		/* This URB was active, but has now been
+-		 * cancelled. It will now have a status of
+-		 * -ECONNRESET in the callback function.
+-		 */
+-		ctlx->state = CTLX_REQ_TIMEOUT;
+-	}
+ 
+ 	spin_unlock_irqrestore(&hw->ctlxq.lock, flags);
+ 
+diff -uNr linux-wlan-ng-0.2.1pre23.orig/src/prism2/driver/prism2_usb.c linux-wlan-ng-0.2.1pre23/src/prism2/driver/prism2_usb.c
+--- linux-wlan-ng-0.2.1pre23.orig/src/prism2/driver/prism2_usb.c	2005-01-02 18:55:44.093607264 +0100
++++ linux-wlan-ng-0.2.1pre23/src/prism2/driver/prism2_usb.c	2005-01-02 18:57:06.661055104 +0100
+@@ -247,8 +247,8 @@
+ 		/* Unlink the tx/rx URBs. This "removes the wheels"
+ 		 * from the entire CTLX handling mechanism.
+ 		 */
+-		usb_unlink_urb(&hw->rx_urb);
+-		usb_unlink_urb(&hw->tx_urb);
++		usb_kill_urb(&hw->rx_urb);
++		usb_kill_urb(&hw->tx_urb);
+ 
+ 		flush_scheduled_work();
+ 
+@@ -266,7 +266,7 @@
+ 			del_timer_sync(&ctlx->reqtimer);
+ 
+ 			/* Unlink the CTLX OUT URB */
+-			usb_unlink_urb(&ctlx->outurb);
++			usb_kill_urb(&ctlx->outurb);
+ 
+ 			if (ctlx->is_async) {
+ 				/* We've stopped the BULK-IN pipe,
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre23.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre23.ebuild
new file mode 100644
index 000000000000..172204f7903d
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre23.ebuild
@@ -0,0 +1,144 @@
+# 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_pre23.ebuild,v 1.1 2005/01/06 01:01:05 gmsoft Exp $
+
+inherit linux-info pcmcia
+
+IUSE="${IUSE} usb build"
+
+MY_P=${PN}-${PV/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="The linux-wlan Project"
+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 ~hppa"
+
+src_unpack() {
+
+	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
+
+	cd ${S}
+	epatch ${FILESDIR}/linux-wlan-2.6.10-fix.diff
+
+	# 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."
+}
+
+