14 files changed, 260 insertions, 4 deletions
diff --git a/net-wireless/hostap-utils/ChangeLog b/net-wireless/hostap-utils/ChangeLog
index f97894c293fd..38c72c2c0a2d 100644
--- a/net-wireless/hostap-utils/ChangeLog
+++ b/net-wireless/hostap-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hostap-utils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-utils/ChangeLog,v 1.15 2004/12/20 09:10:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-utils/ChangeLog,v 1.16 2004/12/26 21:35:51 brix Exp $
+
+*hostap-utils-0.2.6 (26 Dec 2004)
+
+  26 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +hostap-utils-0.2.6.ebuild:
+  Version bump.
 
 *hostap-utils-0.3.2 (20 Dec 2004)
 
diff --git a/net-wireless/hostap-utils/Manifest b/net-wireless/hostap-utils/Manifest
index 962689a78e2d..576641b04f31 100644
--- a/net-wireless/hostap-utils/Manifest
+++ b/net-wireless/hostap-utils/Manifest
@@ -1,8 +1,10 @@
 MD5 addf782e18fdfbb92b692304d9d7ce9f hostap-utils-0.2.4.ebuild 778
 MD5 baf94d95657b541309f508272f993b10 hostap-utils-0.3.2.ebuild 739
+MD5 4c084d707bed79d47fde3a95c57bbb8f hostap-utils-0.2.6.ebuild 628
 MD5 d40ad4fa47942b6943d8ea357b5ab48e ChangeLog 2358
 MD5 0d08d740672bf3b41532938b6f9c0a19 metadata.xml 337
 MD5 3f0e001cdac352dd106e6f63e0f7fc4d hostap-utils-0.3.0.ebuild 739
 MD5 b31ab184e34a7e5d3443d51d91c5008f files/digest-hostap-utils-0.2.4 69
+MD5 8fe4afb5fcbb29a994a4fa244b962665 files/digest-hostap-utils-0.2.6 69
 MD5 bd6d6d04e2ba70a469fa52ec8afaae4b files/digest-hostap-utils-0.3.0 69
 MD5 66bac96f1cd07eff01bee01597a115d3 files/digest-hostap-utils-0.3.2 69
diff --git a/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.6 b/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.6
new file mode 100644
index 000000000000..7a39f89f21b5
--- /dev/null
+++ b/net-wireless/hostap-utils/files/digest-hostap-utils-0.2.6
@@ -0,0 +1 @@
+MD5 50e9cc79492ad0f3dbc9dc5eb299e6e7 hostap-utils-0.2.6.tar.gz 56135
diff --git a/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild b/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild
new file mode 100644
index 000000000000..aea734b5e0d7
--- /dev/null
+++ b/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostap-utils/hostap-utils-0.2.6.ebuild,v 1.1 2004/12/26 21:35:51 brix Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="HostAP wireless utils"
+
+HOMEPAGE="http://hostap.epitest.fi/"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE=""
+
+RDEPEND=">=net-wireless/hostap-driver-0.2.0"
+DEPEND="virtual/libc"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+
+	dosbin hostap_{crypt_conf,diag,fw_load,io_debug,rid}
+	dosbin prism2_{param,srec}
+	dosbin split_combined_hex
+
+	dodoc README
+}
diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 7cf2cd107aa0..98b98ebdee6c 100644
--- a/net-wireless/hostapd/ChangeLog
+++ b/net-wireless/hostapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/hostapd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.14 2004/12/20 09:09:59 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.15 2004/12/26 21:34:04 brix Exp $
+
+*hostapd-0.2.6 (26 Dec 2004)
+
+  26 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.2.6.ebuild:
+  Version bump.
 
 *hostapd-0.3.2 (20 Dec 2004)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 921408d565f1..94dd37aef594 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -2,11 +2,13 @@ MD5 2474cf4180f7290f9e5e8a47f1702e7a hostapd-0.2.5.ebuild 1072
 MD5 7416e361c8dc181f353a4bd936d7844c hostapd-0.3.0.ebuild 1735
 MD5 73fcafdf3db141b6061f35c727a9e5db hostapd-0.2.4.ebuild 1075
 MD5 93c577fac5d8854660907e87d3ba5297 hostapd-0.3.2.ebuild 1932
+MD5 b0f9f648ca3b153d0bd4d57bc56a4257 hostapd-0.2.6.ebuild 966
 MD5 8c594870afb21c781959eec10c6fb0e0 ChangeLog 2019
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
 MD5 addac32c6bc78b481ff2a74864eb1e8d hostapd-0.3.1.ebuild 1777
 MD5 44285ed8dadd7473eb41d3b67f318120 files/digest-hostapd-0.2.4 65
 MD5 ba14f3282c1fe345b2b9bc3233bc2f6d files/digest-hostapd-0.2.5 65
+MD5 9cbbd29bd90ddbddaa1abe1e726e2fd1 files/digest-hostapd-0.2.6 65
 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
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.2.6 b/net-wireless/hostapd/files/digest-hostapd-0.2.6
new file mode 100644
index 000000000000..d7b659263cda
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.2.6
@@ -0,0 +1 @@
+MD5 b09c430a2a3c8763601a1fbc4da20586 hostapd-0.2.6.tar.gz 140160
diff --git a/net-wireless/hostapd/hostapd-0.2.6.ebuild b/net-wireless/hostapd/hostapd-0.2.6.ebuild
new file mode 100644
index 000000000000..d8ecea032dbe
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.2.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-0.2.6.ebuild,v 1.1 2004/12/26 21:34:04 brix Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="HostAP wireless daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+SLOT="0"
+
+RDEPEND=">=net-wireless/hostap-driver-0.2.0"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i "s:^CC=gcc:CC=$(tc-getCC):" ${S}/Makefile
+}
+
+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
+}
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index f0339363fa4f..bcc758804c58 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.7 2004/12/20 09:11:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.8 2004/12/26 21:38:21 brix Exp $
+
+*wpa_supplicant-0.2.6 (26 Dec 2004)
+
+  26 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.2.6-conf.d, +files/wpa_supplicant-0.2.6-init.d,
+  +wpa_supplicant-0.2.6.ebuild:
+  Version bump.
 
 *wpa_supplicant-0.3.2 (20 Dec 2004)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index cabc5b79664a..4de85ce46448 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,7 +1,8 @@
+MD5 a618c9ee169a3f1b58bbeef92e306703 wpa_supplicant-0.2.6.ebuild 2608
 MD5 aebcf20783dcb62a6ae2d33d65497e19 wpa_supplicant-0.2.5-r1.ebuild 1854
 MD5 434a9cf8d7c405f7bfe3dc8b9a1796f8 wpa_supplicant-0.3.1.ebuild 2843
 MD5 c3cec75d7e12b74c46d32639369084e2 wpa_supplicant-0.3.0.ebuild 2872
-MD5 cbbcdc8f1fca97a9c97f0951435c787f ChangeLog 2827
+MD5 81a37f4c2a0e97173728dabd029664f2 ChangeLog 3041
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 3d2ad1fbf3b30558aa900c9f0aee9278 wpa_supplicant-0.3.2.ebuild 2842
 MD5 2bc46403d4bf3ae6e68ae82693a23914 files/wpa_supplicant-0.2.5-pkg-config.patch 1669
@@ -10,6 +11,7 @@ MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.3.1-init.d 975
 MD5 8ce172f90e194edc1d06ac18b81a7301 files/wpa_supplicant-0.2.5-conf.d 398
 MD5 b2bb8e6d5a1663945c4ce0d9b4c70ba1 files/wpa_supplicant-0.2.5-config 606
 MD5 4bec60e49c33275fa8e21d27c3909cc5 files/wpa_supplicant-0.2.5-init.d 974
+MD5 ea1906e324ec931c5a70f344d516dca7 files/digest-wpa_supplicant-0.2.6 156
 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
@@ -18,3 +20,5 @@ MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
 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 6f5827a2c4a23e44c33018d90ac25829 files/wpa_supplicant-0.2.6-conf.d 398
+MD5 11ecf21202cd23fc4faa511fec21a85e files/wpa_supplicant-0.2.6-init.d 975
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.6 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.6
new file mode 100644
index 000000000000..fd90603a62bd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.2.6
@@ -0,0 +1,2 @@
+MD5 7f83c74bf5e6db7dc564c391a44a9fe7 wpa_supplicant-0.2.6.tar.gz 194438
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-conf.d
new file mode 100644
index 000000000000..73f9051be681
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-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.2.6-conf.d,v 1.1 2004/12/26 21:38:21 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.2.6-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-init.d
new file mode 100644
index 000000000000..a3923e4fd3dd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.2.6-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.2.6-init.d,v 1.1 2004/12/26 21:38:21 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.2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
new file mode 100644
index 000000000000..8e9fd2d97de8
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.2.6.ebuild
@@ -0,0 +1,96 @@
+# 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/wpa_supplicant-0.2.6.ebuild,v 1.1 2004/12/26 21:38:21 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="0.1_pre20041019"
+
+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-driver-${MADWIFI_VERSION}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="gsm ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )
+		gsm? ( sys-apps/pcsc-lite )"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${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}
+
+	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
+
+	if use gsm; then
+		# Smart card authentication
+		echo "CONFIG_EAP_SIM=y"              >> ${CONFIG}
+		echo "CONFIG_PCSC=y"                 >> ${CONFIG}
+		echo "CFLAGS += -I/usr/include/PCSC" >> ${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}"  >> ${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
+}