New development version, bumped included madwifi-driver.

10 files changed, 267 insertions, 2 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 259a8fb57fb7..707c06ae22a7 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.16 2005/01/03 11:06:53 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.17 2005/01/10 07:41:24 brix Exp $
+
+*hostapd-0.3.4 (10 Jan 2005)
+
+  10 Jan 2005; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.4.ebuild:
+  New development version, bumped included madwifi-driver.
 
 *hostapd-0.3.3 (03 Jan 2005)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index bca7fa9b73f1..5e20093d9ae6 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,6 +4,7 @@ MD5 b1c88d1ba7b37d7583fe25b17c403083 hostapd-0.3.0.ebuild 1735
 MD5 fd633ac9308f504fa6bab995401e65d7 hostapd-0.2.4.ebuild 1075
 MD5 8836c297bffc5ae941dc55c190b653e5 hostapd-0.3.2.ebuild 1932
 MD5 133443d07434d26d0bb2cf59a76a0072 hostapd-0.2.6.ebuild 1067
+MD5 56060bf403819c426f8ce5f8c7b9ec84 hostapd-0.3.4.ebuild 2071
 MD5 deacc7f59da5342bae4878d319ba9b1c ChangeLog 2279
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
 MD5 711605de7af0e29bef5ea35a1ad30c94 hostapd-0.3.1.ebuild 1777
@@ -14,4 +15,5 @@ MD5 1ba76b2b1bb9b838b8b72d9d99348f46 files/digest-hostapd-0.3.0 149
 MD5 3545835b787224800fe3423a60f29808 files/digest-hostapd-0.3.1 149
 MD5 30d8ea24bfd552e0638487411450495e files/digest-hostapd-0.3.2 149
 MD5 f713d9fe7806353e0d9a06dd39d389c4 files/digest-hostapd-0.3.3 149
+MD5 7b6b425aae76d68299b011725e1de3b7 files/digest-hostapd-0.3.4 150
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.3.4 b/net-wireless/hostapd/files/digest-hostapd-0.3.4
new file mode 100644
index 000000000000..778e339036af
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.3.4
@@ -0,0 +1,2 @@
+MD5 e6eadcb979df1aa570bd26b3d2e0faab hostapd-0.3.4.tar.gz 244134
+MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/hostapd/hostapd-0.3.4.ebuild b/net-wireless/hostapd/hostapd-0.3.4.ebuild
new file mode 100644
index 000000000000..6c67badb9909
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.3.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.3.4.ebuild,v 1.1 2005/01/10 07:41:24 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="2005-01-07"
+
+DESCRIPTION="HostAP wireless daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="ssl"
+
+DEPEND=">=net-wireless/hostap-driver-0.3.0
+		ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# authentication methods
+	echo "CONFIG_EAP=y"           >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"       >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y"       >> ${CONFIG}
+	echo "CONFIG_IAPP=y"          >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"        >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y"   >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y"       >> ${CONFIG}
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_DRIVER_HOSTAP=y"  >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y"   >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}/madwifi" >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y"        >> ${CONFIG}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc/hostapd
+	doins hostapd.conf hostapd.accept hostapd.deny
+
+	dosed 's:\(accept_mac_file=\)/etc/hostapd.accept:\1/etc/hostapd/hostapd.accept:g' \
+		/etc/hostapd/hostapd.conf
+	dosed 's:\(deny_mac_file=\)/etc/hostapd.deny:\1/etc/hostapd/hostapd.deny:g' \
+		/etc/hostapd/hostapd.conf
+
+	dosbin hostapd
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/hostapd.init.d hostapd
+
+	dodoc ChangeLog developer.txt README
+
+	docinto examples
+	dodoc madwifi.conf wired.conf
+}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 2739e7c9e0b6..51cf536c8cf7 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.9 2005/01/03 11:09:01 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.10 2005/01/10 07:42:11 brix Exp $
+
+*wpa_supplicant-0.3.4 (10 Jan 2005)
+
+  10 Jan 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.3.4-conf.d, +files/wpa_supplicant-0.3.4-init.d,
+  +wpa_supplicant-0.3.4.ebuild:
+  New development version, bumped included madwifi-driver.
 
 *wpa_supplicant-0.3.3 (03 Jan 2005)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index e8e85a0c1848..a1eeba662290 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,4 +1,5 @@
 MD5 cb59597f9ea571572a8fd2031e11dc80 wpa_supplicant-0.2.6.ebuild 2723
+MD5 6aae6e2938861831df76e5fed4dc5642 wpa_supplicant-0.3.4.ebuild 2916
 MD5 577620ac0a76e46bea0eb793f2e83ad8 wpa_supplicant-0.2.5-r1.ebuild 1854
 MD5 9011acca2ca6283f800a8553e3d0bbdd wpa_supplicant-0.3.1.ebuild 2843
 MD5 443b36aa0cd3f745cadf73c6378a7914 wpa_supplicant-0.3.3.ebuild 3016
@@ -6,6 +7,7 @@ MD5 8e5bce452597424813b48e7e9132d584 wpa_supplicant-0.3.0.ebuild 2872
 MD5 11c7d1532ab8a396ecd7cd7ab14b2712 ChangeLog 3267
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 e60ab8ed1c92edd42a672f488e97369b wpa_supplicant-0.3.2.ebuild 2842
+MD5 30b483b9200b67ee26b21e3287e0842d files/wpa_supplicant-0.3.4-init.d 975
 MD5 2bc46403d4bf3ae6e68ae82693a23914 files/wpa_supplicant-0.2.5-pkg-config.patch 1669
 MD5 6f5827a2c4a23e44c33018d90ac25829 files/wpa_supplicant-0.3.1-conf.d 398
 MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.3.1-init.d 975
@@ -18,6 +20,7 @@ MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
 MD5 d6b9d13af0f01e8b7fa70b880b8ecdfe files/digest-wpa_supplicant-0.3.1 156
 MD5 3b2cce8cf6663297d567b4f0a7402776 files/digest-wpa_supplicant-0.3.2 156
 MD5 a64b1197d398c9f9c7f2fb9b18f4bfb3 files/digest-wpa_supplicant-0.3.3 156
+MD5 a58834cdce1fe9d8ee712bf79c5d5ee6 files/digest-wpa_supplicant-0.3.4 157
 MD5 30b483b9200b67ee26b21e3287e0842d files/wpa_supplicant-0.3.3-init.d 975
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5-r1 235
 MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
@@ -25,4 +28,5 @@ MD5 4290cd41db8ead604b3096f53d6795e4 files/wpa_supplicant-0.3.0-init.d 975
 MD5 586a30fb3487cfd6155df0de2871dedf files/wpa_supplicant-0.3.2-conf.d 398
 MD5 f6319e9891f7bf22f32419bf16535324 files/wpa_supplicant-0.3.2-init.d 975
 MD5 85f5f0949d17e5513602360ba202149c files/wpa_supplicant-0.2.6-conf.d 398
+MD5 f426212b6404b81c4cbdbf5c119489da files/wpa_supplicant-0.3.4-conf.d 398
 MD5 a75b4655a25978797324051b552a363b files/wpa_supplicant-0.2.6-init.d 975
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.4 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.4
new file mode 100644
index 000000000000..9b7941d04b78
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.4
@@ -0,0 +1,2 @@
+MD5 17ed1bdbe2124173ff09275a3fa13209 wpa_supplicant-0.3.4.tar.gz 295329
+MD5 8237d57be31464ddd7a710704e6755f0 madwifi-cvs-snapshot-2005-01-07.tar.bz2 1586914
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d
new file mode 100644
index 000000000000..55121e944ea0
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-conf.d,v 1.1 2005/01/10 07:42:11 brix Exp $
+
+# List of interfaces
+INTERFACES="eth1"
+
+# Common arguments to all wpa_supplicant instances
+ARGS="-w"
+
+# Interface specific arguments
+#ARGS_eth1="-Dipw2100"
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d
new file mode 100644
index 000000000000..37c464e80141
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.4-init.d,v 1.1 2005/01/10 07:42:11 brix Exp $
+
+depend() {
+	before net
+}
+
+start() {
+	ebegin "Starting wpa_supplicant"
+
+	if [ ! -f /etc/wpa_supplicant.conf ]; then
+		eerror "Configuration file /etc/wpa_supplicant.conf not found"
+		return 1
+	fi
+
+	if [ -z "$INTERFACES" ]; then
+		eerror "No interfaces specified in /etc/conf.d/wpa_supplicant"
+		return 1
+	fi
+
+	for IFACE in $INTERFACES; do
+		ebegin "  ${IFACE}"
+
+		eval ARGS_IFACE=\"\$\{ARGS_$IFACE\}\"
+
+		/sbin/ifconfig ${IFACE} up
+
+		start-stop-daemon --start --quiet --exec /usr/sbin/wpa_supplicant \
+			 -- -B -i${IFACE} -c/etc/wpa_supplicant.conf ${ARGS} ${ARGS_IFACE}
+		eend $?
+	done
+}
+
+stop() {
+	ebegin "Stopping wpa_supplicant"
+
+	start-stop-daemon --stop --quiet --exec /usr/sbin/wpa_supplicant
+	eend ${?}
+}
+
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild
new file mode 100644
index 000000000000..f2b21e900dcf
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.3.4.ebuild,v 1.1 2005/01/10 07:42:11 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="2005-01-07"
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz
+		mirror://gentoo/madwifi-cvs-snapshot-${MADWIFI_VERSION}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gsm readline ssl"
+
+DEPEND="gsm? ( sys-apps/pcsc-lite )
+		readline? ( sys-libs/ncurses
+					sys-libs/readline )
+		ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# basic setup
+	echo "CONFIG_CTRL_IFACE=y"        >> ${CONFIG}
+	echo "CONFIG_XSUPPLICANT_IFACE=y" >> ${CONFIG}
+
+	# basic authentication methods
+	echo "CONFIG_EAP_GTC=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_OTP=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y"         >> ${CONFIG}
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"          >> ${CONFIG}
+
+	if use gsm; then
+		# smart card authentication
+		echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+		echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+		echo "CONFIG_PCSC=y"    >> ${CONFIG}
+	fi
+
+	if use readline; then
+		# readline/history support for wpa_cli
+		echo "CONFIG_READLINE=y" >> ${CONFIG}
+	fi
+
+	if use ssl; then
+		# SSL authentication methods
+		echo "CONFIG_EAP_LEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y"     >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y"      >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y"     >> ${CONFIG}
+	fi
+
+	# Linux specific drivers
+	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
+	echo "CONFIG_DRIVER_IPW2100=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
+	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
+
+	# Add include path for madwifi-driver headers
+	echo "CFLAGS += -I${WORKDIR}/madwifi" >> ${CONFIG}
+	echo "CONFIG_DRIVER_MADWIFI=y"        >> ${CONFIG}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	dodoc ChangeLog COPYING developer.txt eap_testing.txt README todo.txt
+	dodoc doc/wpa_supplicant.fig
+
+	insinto /etc
+	newins wpa_supplicant.conf wpa_supplicant.conf.example
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${P}-init.d wpa_supplicant || die
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${P}-conf.d wpa_supplicant || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use ${P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file has been installed as"
+	einfo "/etc/wpa_supplicant.conf.example"
+	einfo
+}