Bumpage and fixes

4 files changed, 247 insertions, 3 deletions

diff --git a/net-wireless/linux-wlan-ng/ChangeLog b/net-wireless/linux-wlan-ng/ChangeLog
index 80fc846fc783..2d8c389d2d24 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.31 2004/02/01 23:33:51 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/linux-wlan-ng/ChangeLog,v 1.32 2004/02/04 00:14:28 latexer Exp $
+
+*linux-wlan-ng-0.2.1_pre17 (03 Feb 2004)
+
+  03 Feb 2004; Peter Johanson <latexer@gentoo.org>
+  linux-wlan-ng-0.2.1_pre17.ebuild:
+  Added 0.2.1_pre17 which is ready for pcmcia-cs 3.2.7, unsets ARCH and tells
+  people to not bother with symlinks for 2.6 kernsl, and includes
+  module-init-tools fix for pcmcia-cs configure stage.
 
 *linux-wlan-ng-0.2.0-r3 (01 Feb 2004)
 
diff --git a/net-wireless/linux-wlan-ng/Manifest b/net-wireless/linux-wlan-ng/Manifest
index 99439216ffdc..a8a4066b8f1e 100644
--- a/net-wireless/linux-wlan-ng/Manifest
+++ b/net-wireless/linux-wlan-ng/Manifest
@@ -4,8 +4,8 @@ MD5 1b50a6c92eefec354e814d0c0b930dd8 linux-wlan-ng-0.2.1_pre11.ebuild 6519
 MD5 3f657575611c9d4cf56f33f46be4a2b6 linux-wlan-ng-0.2.0-r1.ebuild 6237
 MD5 e7e41202c86b856c3791606b0cd09cee linux-wlan-ng-0.2.1_pre8.ebuild 6518
 MD5 d98e7ecdefa98cf58bd3a62484969c20 linux-wlan-ng-0.2.0-r3.ebuild 6655
-MD5 b1eed130d80f61c32c2fe62f923aace6 linux-wlan-ng-0.2.1_pre17.ebuild 6859
-MD5 93fa2fab1ec2861fa6f642697d57f2af ChangeLog 6104
+MD5 105bb42e47bc7c1f2cbc62ca7a20c737 linux-wlan-ng-0.2.1_pre17.ebuild 6853
+MD5 3a28e8a5f736cee4bb44808b47d60325 ChangeLog 6433
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
 MD5 4ba4f50725309cebf376a17edd220b89 files/digest-linux-wlan-ng-0.2.1_pre8 436
 MD5 8dab46b657f6e8498e9cb48cfa346b5c files/digest-linux-wlan-ng-0.2.1_pre11 437
diff --git a/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre17 b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre17
new file mode 100644
index 000000000000..77aab9b1088f
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/files/digest-linux-wlan-ng-0.2.1_pre17
@@ -0,0 +1,6 @@
+MD5 d759cd71db0789d1bf4f412b8db8788d linux-wlan-ng-0.2.1-pre17.tar.gz 354207
+MD5 686631f6942aa47fc0503203c26bfe16 linux-wlan-ng-gentoo-init.gz 859
+MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
+MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+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
diff --git a/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild
new file mode 100644
index 000000000000..279b20d2a969
--- /dev/null
+++ b/net-wireless/linux-wlan-ng/linux-wlan-ng-0.2.1_pre17.ebuild
@@ -0,0 +1,230 @@
+# 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.ebuild,v 1.1 2004/02/04 00:14:28 latexer Exp $
+
+inherit eutils
+
+IUSE="pcmcia usb build"
+
+PCMCIA_CS="pcmcia-cs-3.2.5"
+PATCH_3_2_6="pcmcia-cs-3.2.5-3.2.6.diff"
+PATCH_3_2_7="pcmcia-cs-3.2.5-3.2.7.diff"
+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 \
+			http://dev.gentoo.org/~latexer/files/patches/${PCMCIA_CS}-module-init-tools.diff.gz
+			http://dev.gentoo.org/~latexer/files/patches/${PATCH_3_2_6}.gz \
+			http://dev.gentoo.org/~latexer/files/patches/${PATCH_3_2_7}.gz )"
+
+HOMEPAGE="http://linux-wlan.org"
+DEPEND="sys-kernel/linux-headers
+		dev-libs/openssl
+		>=sys-apps/sed-4.0*
+		pcmcia?	( >=sys-apps/pcmcia-cs-3.2.5 )"
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="~x86"
+
+KERNEL_MOD_SOURCES="${MY_P}.tar.gz ${PN}-gentoo-init.gz"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	unpack ${PN}-gentoo-init.gz
+
+	cp ${WORKDIR}/${PN}-gentoo-init ${S}/etc/rc.wlan
+
+	cd ${S}
+
+	if [ -n "`use pcmcia`" ]; then
+		if egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null
+		then
+			# Sadly, we still need to download these sources in SRC_URI
+			# til portage can handle more dynamic SRC_URIs
+			einfo "Kernel PCMCIA detected. Skipping external pcmcia-cs sources."
+		else
+			cd ${WORKDIR}
+			unpack ${PCMCIA_CS}.tar.gz
+			cd ${PCMCIA_DIR}
+			epatch ${DISTDIR}/${PCMCIA_CS}-module-init-tools.diff.gz
+			PCMCIA_CS_EBUILD=(/var/db/pkg/sys-apps/pcmcia-cs-*/pcmcia-cs-*.ebuild) ## use bash globbing
+			if [ ! -f "${PCMCIA_CS_EBUILD}" ]; then
+				die "ERROR: pcmcia-cs ebuild (${PCMCIA_CS_EBUILD}) not found - are you sure pcmcia-cs is installed?"
+			fi
+			PCMCIA_CS_VER="${PCMCIA_CS_EBUILD##*/}" ## -> pcmcia-cs-VER.ebuild
+			PCMCIA_CS_VER="${PCMCIA_CS_VER/pcmcia-cs-/}" ## strip 'pcmcia-cs-'
+			PCMCIA_CS_VER="${PCMCIA_CS_VER/.ebuild/}" ## strip '.ebuild'
+			if [ "${PCMCIA_CS_VER/-*/}" = "3.2.7" ]; then
+				einfo "Using pcmcia-cs-3.2.7"
+				epatch ${DISTDIR}/${PATCH_3_2_7}.gz
+			elif [ "${PCMCIA_CS_VER/-*/}" = "3.2.6" ]; then
+				einfo "Using pcmcia-cs-3.2.6"
+				epatch ${DISTDIR}/${PATCH_3_2_6}.gz
+			else
+				einfo "Using pcmcia-cs-3.2.5"
+			fi
+		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}
+	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() {
+	local kernelpcmcia
+	#
+	# 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 egrep '^CONFIG_PCMCIA=[ym]' /usr/src/linux/.config >&/dev/null; then
+		kernelpcmcia="yes"
+	else
+		kernelpcmcia="no"
+	fi
+
+	if [ -n "`use pcmcia`" ]; then
+		if [ "${kernelpcmcia}" = "no" ]; then
+			local myarch myconf
+
+			# pcmcia-cs expects "i386" not "x86"
+			case "${ARCH}" in
+					x86) myarch="i386" ;;
+					*) myarch="${ARCH}" ;;
+			esac
+
+			cd ${PCMCIA_DIR}
+
+			#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="${myarch}" \
+				--uflags="${CFLAGS}" \
+				--kflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer" \
+				$myconf || die "failed configuring pcmcia-cs"
+		fi
+	fi
+
+	# 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 [ "${kernelpcmcia}" = "no" ];
+		then
+			export PCMCIA_CS=${PCMCIA_CS}
+			sed -i -e 's:PCMCIA_SRC=:PCMCIA_SRC=${WORKDIR}/${PCMCIA_CS}:' \
+				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
+
+	emake default_config || die "failed configuring WLAN"
+	# 2.6 needs ARCH unset since it uses it
+	unset ARCH
+	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."
+}
+
+