Version bump (development snapshot)

10 files changed, 249 insertions, 2 deletions

diff --git a/net-wireless/hostapd/ChangeLog b/net-wireless/hostapd/ChangeLog
index 7f5a837800a6..54c8655ecd4c 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.12 2004/12/12 11:32:43 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.13 2004/12/13 09:26:11 brix Exp $
+
+*hostapd-0.3.1 (13 Dec 2004)
+
+  13 Dec 2004; Henrik Brix Andersen <brix@gentoo.org> +hostapd-0.3.1.ebuild:
+  Version bump (development snapshot)
 
 *hostapd-0.3.0 (12 Dec 2004)
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 65321cd57ce5..bf7a2ed6f62f 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -3,7 +3,9 @@ MD5 7416e361c8dc181f353a4bd936d7844c hostapd-0.3.0.ebuild 1735
 MD5 73fcafdf3db141b6061f35c727a9e5db hostapd-0.2.4.ebuild 1075
 MD5 b65b3a3d777b7e4d2ed689511da99e76 ChangeLog 1731
 MD5 52a4b928b36a98e530ae455b73f868f5 metadata.xml 462
+MD5 d9fcdafb8919761bdce362f47aec8e95 hostapd-0.3.1.ebuild 1676
 MD5 44285ed8dadd7473eb41d3b67f318120 files/digest-hostapd-0.2.4 65
 MD5 ba14f3282c1fe345b2b9bc3233bc2f6d files/digest-hostapd-0.2.5 65
 MD5 1ba76b2b1bb9b838b8b72d9d99348f46 files/digest-hostapd-0.3.0 149
+MD5 3545835b787224800fe3423a60f29808 files/digest-hostapd-0.3.1 149
 MD5 cf287b50f0ccd832a08fb3031281cd4f files/hostapd.init.d 858
diff --git a/net-wireless/hostapd/files/digest-hostapd-0.3.1 b/net-wireless/hostapd/files/digest-hostapd-0.3.1
new file mode 100644
index 000000000000..544f6f9dfe17
--- /dev/null
+++ b/net-wireless/hostapd/files/digest-hostapd-0.3.1
@@ -0,0 +1,2 @@
+MD5 d4aa9ed2677c7f59496a0b1385842600 hostapd-0.3.1.tar.gz 209202
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/hostapd/hostapd-0.3.1.ebuild b/net-wireless/hostapd/hostapd-0.3.1.ebuild
new file mode 100644
index 000000000000..662eacee3bd6
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-0.3.1.ebuild
@@ -0,0 +1,70 @@
+# 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.3.1.ebuild,v 1.1 2004/12/13 09:26:11 brix Exp $
+
+inherit toolchain-funcs
+
+MADWIFI_VERSION="0.1_pre20041019"
+
+DESCRIPTION="HostAP wireless daemon"
+HOMEPAGE="http://hostap.epitest.fi"
+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"
+
+IUSE=""
+
+RDEPEND=">=net-wireless/hostap-driver-0.3.0"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	local CONFIG=${S}/.config
+
+	unpack ${A}
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# authentication methods
+	echo "CONFIG_IAPP=y"        >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_EAP=y"         >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y"     >> ${CONFIG}
+	echo "CONFIG_PKCS12=y"      >> ${CONFIG}
+
+	# 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}"  >> ${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 34ce78c6128b..be0121a229f9 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.3 2004/12/11 14:39:12 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.4 2004/12/13 09:24:34 brix Exp $
+
+*wpa_supplicant-0.3.1 (13 Dec 2004)
+
+  13 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/wpa_supplicant-0.3.1-conf.d, +files/wpa_supplicant-0.3.1-init.d,
+  +wpa_supplicant-0.3.1.ebuild:
+  Version bump (development snapshot)
 
 *wpa_supplicant-0.3.0 (11 Dec 2004)
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index d6bacfeab5d8..d5171d8d6cb3 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,15 +1,19 @@
+MD5 92dad6007dd8778d707dd65227a76773 wpa_supplicant-0.3.1.ebuild 2728
 MD5 1b0071ea237d4b8c4334ae80fd1e8ddf wpa_supplicant-0.2.5.ebuild 1844
 MD5 c3cec75d7e12b74c46d32639369084e2 wpa_supplicant-0.3.0.ebuild 2872
 MD5 de54ed7b83a5d2ee0324a140c6c7db8b wpa_supplicant-0.2.4.ebuild 1439
 MD5 8825024ebaea3898a61be89cf28a2bfc ChangeLog 2005
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2bc46403d4bf3ae6e68ae82693a23914 files/wpa_supplicant-0.2.5-pkg-config.patch 1669
+MD5 61ce9cacb6827fa1c2552515fad9d1d1 files/wpa_supplicant-0.3.1-conf.d 398
+MD5 c7e5e005eaace812105e7948cd2bd8b2 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 1f91b0edd54ee435426f50cd10807c6d files/digest-wpa_supplicant-0.2.4 156
 MD5 a9249a7ed61a912ddd1b561317e76f43 files/digest-wpa_supplicant-0.2.5 235
 MD5 1b08e42f180b3bee6247776212a5fb4f files/digest-wpa_supplicant-0.3.0 156
+MD5 d6b9d13af0f01e8b7fa70b880b8ecdfe files/digest-wpa_supplicant-0.3.1 156
 MD5 6dbdde5c93f286b00afacc10673e4de7 files/wpa_supplicant-0.3.0-conf.d 398
 MD5 4290cd41db8ead604b3096f53d6795e4 files/wpa_supplicant-0.3.0-init.d 975
 MD5 a0d0816840e412152255c4a62bfde94c files/wpa_supplicant-0.2.4-config 582
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.1 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.1
new file mode 100644
index 000000000000..b48c7f15689a
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.3.1
@@ -0,0 +1,2 @@
+MD5 52bf01f4a930a41b2d08288b31b39512 wpa_supplicant-0.3.1.tar.gz 264159
+MD5 3dc7bcc46ade7ab9ff7ea25fb7377366 madwifi-driver-0.1_pre20041019.tar.bz2 1570237
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-conf.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-conf.d
new file mode 100644
index 000000000000..da61e3b107c1
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-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.1-conf.d,v 1.1 2004/12/13 09:24:34 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.1-init.d b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-init.d
new file mode 100644
index 000000000000..abc8398e4e7e
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.3.1-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.1-init.d,v 1.1 2004/12/13 09:24:34 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.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
new file mode 100644
index 000000000000..68d183b75fc2
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.3.1.ebuild
@@ -0,0 +1,101 @@
+# 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.3.1.ebuild,v 1.1 2004/12/13 09:24:34 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"
+
+RDEPEND="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 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 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_EAP_AKA=y" >> ${CONFIG}
+		echo "CONFIG_PCSC=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}"  >> ${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
+}