Bump, fix issue with ARCH not being unset soon enough, and make prism2dl use header includes.

6 files changed, 217 insertions, 14 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index 4f5490d84199..589adf0cf2c6 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-wireless/linux-wlan-ng
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.35 2004/02/21 20:32:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.36 2004/02/29 22:47:54 latexer Exp $
+
+*linux-wlan-ng-0.2.1_pre19 (29 Feb 2004)
+
+  29 Feb 2004; Peter Johanson <latexer@gentoo.org>
+  linux-wlan-ng-0.2.1_pre17-r1.ebuild, linux-wlan-ng-0.2.1_pre19.ebuild,
+  files/linux-wlan-ng-0.2.1_pre19-prism2dl.diff:
+  Bump, and fix pre17-r1 to unset ARCH earlier. This was causing breakage where
+  the topleve Makefile in the kernel was not found, so the kernel version was
+  not being set, and modules ended up in /lib/modules/kernel. Also includes fix so
+  that prism2dl uses includes from /usr/include/linux and not /usr/src/linux/include.
 
   21 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
   linux-wlan-ng-0.2.1_pre17-r1.ebuild:
diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index e86a05eb06d9..aaa8963ca6ff 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -1,18 +1,21 @@
+MD5 e3a61aabbe3eca8c1c40da2e450967cb linux-wlan-ng-0.2.1_pre19.ebuild 4610
 MD5 6e9afe051c9cab1a7af88bc328adbc1f linux-wlan-ng-0.2.0-r2.ebuild 6384
+MD5 ab5ee2a8be5f3ca74da56ba5b72c58f2 linux-wlan-ng-0.2.1_pre16.ebuild 6878
+MD5 1b50a6c92eefec354e814d0c0b930dd8 linux-wlan-ng-0.2.1_pre11.ebuild 6519
+MD5 f46dddf7883429717a48c4fc38c16488 linux-wlan-ng-0.2.1_pre17-r1.ebuild 4505
+MD5 3f657575611c9d4cf56f33f46be4a2b6 linux-wlan-ng-0.2.0-r1.ebuild 6237
+MD5 e7e41202c86b856c3791606b0cd09cee linux-wlan-ng-0.2.1_pre8.ebuild 6518
+MD5 a2d508b5b435b1d9ef70e666e1fd4ee6 linux-wlan-ng-0.2.0-r3.ebuild 4790
+MD5 105bb42e47bc7c1f2cbc62ca7a20c737 linux-wlan-ng-0.2.1_pre17.ebuild 6853
+MD5 5c504aed860c14afa172a0c3aa4f364e ChangeLog 7478
+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 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 3fe98f9e8ac97ff51584ca1de89350de files/digest-linux-wlan-ng-0.2.1_pre19 517
 MD5 193d2642942fbefda8f9b4f38992289d files/digest-linux-wlan-ng-0.2.1_pre17-r1 517
 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 ab5ee2a8be5f3ca74da56ba5b72c58f2 linux-wlan-ng-0.2.1_pre16.ebuild 6878
-MD5 1b50a6c92eefec354e814d0c0b930dd8 linux-wlan-ng-0.2.1_pre11.ebuild 6519
-MD5 8a7cbedb6f4655184aaa9e2bfc0b040a linux-wlan-ng-0.2.1_pre17-r1.ebuild 4298
-MD5 3f657575611c9d4cf56f33f46be4a2b6 linux-wlan-ng-0.2.0-r1.ebuild 6237
-MD5 e7e41202c86b856c3791606b0cd09cee linux-wlan-ng-0.2.1_pre8.ebuild 6518
-MD5 a2d508b5b435b1d9ef70e666e1fd4ee6 linux-wlan-ng-0.2.0-r3.ebuild 4790
-MD5 105bb42e47bc7c1f2cbc62ca7a20c737 linux-wlan-ng-0.2.1_pre17.ebuild 6853
-MD5 c3297ac1cf02007a19a8b48cc4d01b99 ChangeLog 6935
-MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre19 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre19
new file mode 100644
index 000000000000..9cc440d3a34d
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre19
@@ -0,0 +1,7 @@
+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 55740b3e4715c7eecc9442bb8c1595b1 linux-wlan-ng-0.2.1-pre19.tar.gz 356525
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
diff --git a/net-wireless/linux-wlan-ng/files/linux-wlan-ng-0.2.1_pre19-prism2dl.diff b/net-wireless/linux-wlan-ng/files/linux-wlan-ng-0.2.1_pre19-prism2dl.diff
new file mode 100644
index 000000000000..48651b0107cd
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/linux-wlan-ng-0.2.1_pre19-prism2dl.diff
@@ -0,0 +1,12 @@
+diff -aur linux-wlan-ng-0.2.1-pre19-orig/src/prism2/download/Makefile linux-wlan-ng-0.2.1-pre19/src/prism2/download/Makefile
+--- linux-wlan-ng-0.2.1-pre19-orig/src/prism2/download/Makefile	2002-09-11 14:08:32.000000000 -0400
++++ linux-wlan-ng-0.2.1-pre19/src/prism2/download/Makefile	2004-02-25 16:24:20.344449424 -0500
+@@ -46,7 +46,7 @@
+ 
+ include ../../../config.mk
+ 
+-CPPFLAGS= -I../../include -I../include -I$(LINUX_SRC)/include -D__LINUX_WLAN__
++CPPFLAGS= -I../../include -I../include -D__LINUX_WLAN__
+ 
+ SRCS =	prism2dl.c
+ 
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
index 496e57bc24b0..d78747e3bdde 100644
--- a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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_pre17-r1.ebuild,v 1.2 2004/02/21 20:32:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17-r1.ebuild,v 1.3 2004/02/29 22:47:54 latexer Exp $
 
-inherit pcmcia
+inherit pcmcia kernel-mod
 
 IUSE="${IUSE} usb build"
 
@@ -87,9 +87,9 @@ src_compile() {
 
 	cp config.in default.config
 
-	emake default_config || die "failed configuring WLAN"
 	# 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.
@@ -97,6 +97,11 @@ src_compile() {
 	emake || die "Failed to compile add-on keygen program"
 	cd ${S}/add-ons/lwepgen
 	emake || die "Failed to compile add-on lwepgen program"
+	if kernel-mod_is_2_4_kernel
+	then
+		cd ${S}/src/prism2/download
+		emake || die "Failed to compile prism2dl program"
+	fi
 }
 
 src_install () {
@@ -121,7 +126,10 @@ src_install () {
 	exeinto /sbin
 	doexe add-ons/keygen/keygen
 	doexe add-ons/lwepgen/lwepgen
-
+	if kernel-mod_is_2_4_kernel
+	then
+		doexe src/prism2/download/prism2dl
+	fi
 }
 
 pkg_postinst() {
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild
new file mode 100644
index 000000000000..1ba43fde1d73
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre19.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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_pre19.ebuild,v 1.1 2004/02/29 22:47:54 latexer Exp $
+
+inherit pcmcia
+
+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.gz
+		mirror://gentoo/${PN}-gentoo-init.gz"
+
+HOMEPAGE="http://linux-wlan.org"
+DEPEND="sys-kernel/linux-headers
+		dev-libs/openssl
+		>=sys-apps/sed-4.0*"
+
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86"
+
+src_unpack() {
+	check_KV
+
+	unpack ${MY_P}.tar.gz
+	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
+
+	# Small fix to make sure prism2dl compiles against /usr/include/linux
+	# and not /usr/src/linux/include/linux. Userland shouldn't use
+	# /usr/src/linux (especially this seems to break under 2.6 headers)
+
+	cd ${S}
+	EPATCH_SINGLE_MSG="Fixing prism2dl includes to use /usr/include/linux" \
+		epatch ${FILESDIR}/${P}-prism2dl.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:mkdir:#mkdir:" \
+		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
+		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
+		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
+
+}
+
+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 [ -n "`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 [ -n "`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 [ -z "`use build`" ]; then
+
+		dodir /usr/share/man/man1
+		newman ${S}/man/nwepgen.man nwepgen.1
+		newman ${S}/man/wlancfg.man wlancfg.1
+		newman ${S}/man/wlanctl-ng.man wlanctl-ng.1
+		newman ${S}/man/wland.man wland.1
+
+		dodoc CHANGES COPYING LICENSE FAQ README THANKS TODO \
+		      doc/config* doc/capturefrm.txt
+	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."
+
+	ewarn "Previous versions of linux-wlan-ng recommended creating symlinks in"
+	ewarn "/usr/src/linux for 2.6 kernel merges. This is NOT needed and will"
+	ewarn "merely clutter things. This has been fixed in the ebuild where it"
+	ewarn "should be handled."
+	ewarn "Users emerging this with a 2.6 kernel still need to disable"
+	ewarn "sandbox and userpriv from FEATURES."
+}
+
+