added pre16 for 2.6 kernels (temporary work-around in ewarn)

4 files changed, 247 insertions, 3 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index afa9a49d2f91..6b915882d118 100644
--- a/net-wireless/linux-wlan-ng/ChangeLog
+++ b/net-wireless/linux-wlan-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/linux-wlan-ng
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.29 2003/12/18 22:19:16 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.30 2004/01/24 22:59:20 nerdboy Exp $
+
+*linux-wlan-ng-0.2.1_pre16 (24 Jan 2004)
+
+  24 Jan 2004; <nerdboy@gentoo.org> linux-wlan-ng-0.2.1_pre16.ebuild:
+  Added pre16 for 2.6.x kernels, with ewarn info
 
   18 Dec 2003; Peter Johanson <latexer@gentoo.org> metadata.xml:
   Added metadata.xml
diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index b35cd3415b00..4ac6c12e026f 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -1,4 +1,4 @@
-MD5 a29a0b68b983967fbf98bc0149fdda57 ChangeLog 5387
+MD5 d270ceec756203969758281ac8cc749e ChangeLog 5387
 MD5 e12100bb6b7564c5b4ba7e3a1f91f5e5 linux-wlan-ng-0.1.16_pre4.ebuild 4704
 MD5 e6934c6aa99a3c73c2c15a462ff72d66 linux-wlan-ng-0.1.16_pre6.ebuild 4901
 MD5 6a29d04d5f54af20e1ab14ae8ebf09d0 linux-wlan-ng-0.1.16_pre7.ebuild 4902
@@ -12,7 +12,7 @@ MD5 1bccf6dbfc6a7ebfd0a9d21397da1c8e linux-wlan-ng-0.2.1_pre2.ebuild 6519
 MD5 46490ae4daf5cf0ac61148342711698f linux-wlan-ng-0.2.1_pre3.ebuild 6519
 MD5 0f3bbf01e01b0ad8950115719898bb72 linux-wlan-ng-0.2.1_pre8.ebuild 6519
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
-MD5 927db28fc640ba13e1418de69af97e70 linux-wlan-ng-0.2.1_pre16.ebuild 6755
+MD5 ab5ee2a8be5f3ca74da56ba5b72c58f2 linux-wlan-ng-0.2.1_pre16.ebuild 6878
 MD5 c10d43bfb357d5c75d5fb21c56ee0d4d files/digest-linux-wlan-ng-0.1.16_pre4 221
 MD5 7c13fff9828e7491a397b11164b288eb files/digest-linux-wlan-ng-0.1.16_pre6 221
 MD5 eaf97b29f3669aa218397fa8e55e6ea2 files/digest-linux-wlan-ng-0.1.16_pre7 221
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre16 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre16
new file mode 100644
index 000000000000..4efaed8b8087
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre16
@@ -0,0 +1,6 @@
+MD5 0672ccd871def6842814c2d9d8c0689a linux-wlan-ng-0.2.1-pre16.tar.gz 335208
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
+MD5 7e9f01a697d2e3e5164340d79474ea30 pcmcia-cs-3.2.1.tar.gz 1250413
+MD5 24e8c68d0eac2a9b3446acdd259c22a0 pcmcia-cs-3.2.1-3.2.2.diff.gz 246919
+MD5 9ed9491a743b7400b382b199377c7279 pcmcia-cs-3.2.1-3.2.3.diff.gz 247541
+MD5 c94ce648d1e420be0cf02246236dc387 pcmcia-cs-3.2.1-3.2.4.diff.gz 305171
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild
new file mode 100644
index 000000000000..4d861a90e8df
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre16.ebuild
@@ -0,0 +1,233 @@
+# 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_pre16.ebuild,v 1.1 2004/01/24 22:59:20 nerdboy Exp $
+
+inherit eutils
+
+IUSE="apm build nocardbus pcmcia pnp trusted usb"
+
+PCMCIA_CS="pcmcia-cs-3.2.1"
+PATCH_3_2_2="pcmcia-cs-3.2.1-3.2.2.diff.gz"
+PATCH_3_2_3="pcmcia-cs-3.2.1-3.2.3.diff.gz"
+PATCH_3_2_4="pcmcia-cs-3.2.1-3.2.4.diff.gz"
+PCMCIA_DIR="${WORKDIR}/${PCMCIA_CS}"
+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.gz
+		mirror://gentoo/${PN}-gentoo-init.gz
+		pcmcia?	( mirror://sourceforge/pcmcia-cs/${PCMCIA_CS}.tar.gz )
+		pcmcia? ( mirror://gentoo/${PATCH_3_2_2} )
+		pcmcia? ( mirror://gentoo/${PATCH_3_2_3} )
+		pcmcia? ( mirror://gentoo/${PATCH_3_2_4} )"
+
+HOMEPAGE="http://linux-wlan.org"
+DEPEND="sys-kernel/linux-headers
+		dev-libs/openssl
+		sys-apps/baselayout
+		pcmcia?	( sys-apps/pcmcia-cs )"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86 ~ppc"
+
+# check arch for configure
+if [ ${ARCH} = "x86" ] ; then
+	MY_ARCH="i386"
+else
+	MY_ARCH="ppc"
+fi
+
+# Note: To use this ebuild, you should have the usr/src/linux symlink to
+# the kernel directory that linux-wlan-ng should use for configuration.
+#
+# linux-wlan-ng requires a configured pcmcia-cs source tree.
+# unpack/configure it in WORKDIR.  No need to compile it though.
+
+src_unpack() {
+
+	unpack ${MY_P}.tar.gz
+	unpack ${PN}-gentoo-init.gz
+	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
+
+	if [ -n "`use pcmcia`" ]; then
+		unpack ${PCMCIA_CS}.tar.gz
+		cd ${PCMCIA_DIR}
+		if [ -z "`has_version =sys-apps/pcmcia-cs-3.2.4*`" ]; then
+			epatch ${DISTDIR}/${PATCH_3_2_4}
+		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.3*`" ]; then
+			epatch ${DISTDIR}/${PATCH_3_2_3}
+		elif [ -z "`has_version =sys-apps/pcmcia-cs-3.2.2*`" ]; then
+			epatch ${DISTDIR}/${PATCH_3_2_2}
+		fi
+	fi
+
+
+	# Lots of sedding to do to get the man pages and a few other
+	# things to end up in the right place.
+
+	cd ${S}
+	mv man/Makefile man/Makefile.orig
+	sed -e "s:mkdir:#mkdir:" \
+		-e "s:cp nwepgen.man:#cp nwepgen.man:" \
+		-e "s:\t\$(TARGET_:\t#\$(TARGET_:" \
+		man/Makefile.orig > man/Makefile
+
+	mv etc/wlan/Makefile etc/wlan/Makefile.orig
+	sed -e "s:/etc/wlan:/etc/conf.d:g" \
+		etc/wlan/Makefile.orig > etc/wlan/Makefile
+
+	mv etc/wlan/wlancfg-DEFAULT etc/wlan/wlancfg-DEFAULT.orig
+	sed -e "s:/sbin/nwepgen:/sbin/keygen:" \
+		etc/wlan/wlancfg-DEFAULT.orig > etc/wlan/wlancfg-DEFAULT
+
+	mv etc/wlan/shared etc/wlan/shared.orig
+	sed -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.orig > etc/wlan/shared
+
+}
+
+src_compile() {
+
+	#
+	# configure pcmcia-cs - we need this for wlan to compile
+	# use same USE flags that the pcmcia-cs ebuild does.
+	# no need to actually compile pcmcia-cs...
+	# * This is actually only used if pcmcia_cs is NOT compiled into
+	# the kernel tree.
+	#
+
+	if [ -n "`use pcmcia`" ]; then
+		cd ${WORKDIR}/${PCMCIA_CS}
+		local myconf
+		if [ -n "`use trusted`" ] ; then
+			myconf="--trust"
+		else
+			myconf="--notrust"
+		fi
+
+		if [ -n "`use apm`" ] ; then
+			myconf="$myconf --apm"
+		else
+			myconf="$myconf --noapm"
+		fi
+
+		if [ -n "`use pnp`" ] ; then
+			myconf="$myconf --pnp"
+		else
+			myconf="$myconf --nopnp"
+		fi
+
+		if [ -n "`use nocardbus`" ] ; then
+			myconf="$myconf --nocardbus"
+		else
+			myconf="$myconf --cardbus"
+		fi
+
+		#use $CFLAGS for user tools, but standard kernel optimizations for
+		#the kernel modules (for compatibility)
+		./Configure -n \
+			--target=${D} \
+			--srctree \
+			--kernel=/usr/src/linux \
+			--arch="${MY_ARCH}" \
+			--uflags="${CFLAGS}" \
+			--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
+			$myconf || die "failed configuring pcmcia-cs"
+	fi
+	# now lets build wlan-ng
+	cd ${S}
+
+	sed -e 's:TARGET_ROOT_ON_HOST=:TARGET_ROOT_ON_HOST=${D}:' \
+		-e 's:PRISM2_PCI=n:PRISM2_PCI=y:' \
+		config.in > default.config
+	mv default.config config.in
+
+	if [ -n "`use pcmcia`" ]; then
+		export PCMCIA_CS=${PCMCIA_CS}
+		sed -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
+			-e 's:PRISM2_PLX=n:PRISM2_PLX=y:' \
+			config.in > default.config
+	else
+		sed -e 's:PRISM2_PCMCIA=y:PRISM2_PCMCIA=n:' \
+		config.in > default.config
+	fi
+	mv default.config config.in
+
+	if [ -n "`use usb`" ]; then
+		sed -e 's:PRISM2_USB=n:PRISM2_USB=y:' \
+			config.in > default.config
+		mv default.config config.in
+	fi
+
+	mv default.config config.in
+	cp config.in default.config
+
+	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 "Configuration of the WLAN package has changed since 0.1.16-pre4."
+	einfo ""
+	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 "The wlan-ng.opts file in /etc/pcmcia/ is now depricated."
+	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 ""
+	ewarn "This ebuild will work with a 2.6.1(0) kernel, if you add the symlinks:"
+	ewarn "ln -sf /usr/src/linux-2.6.1 /usr/src/linux"
+	ewarn "ln -sf /usr/src/linux-2.6.1/arch/i386 /usr/src/linux-2.6.1/arch/x86"
+	ewarn "and disable any userpriv or sandbox settings in make.conf."
+	ewarn "Work is underway to upgrade portage for kernel 2.6 drivers."
+}
+