Add new development version.

Package-Manager: portage-2.1.2.7

4 files changed, 234 insertions, 5 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index cf5b54c9398d..3101b87b36e7 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.93 2007/02/23 12:24:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.94 2007/05/30 11:18:40 uberlord Exp $
+
+*wpa_supplicant-0.6.0 (30 May 2007)
+
+  30 May 2007; Roy Marples <uberlord@gentoo.org>
+  +wpa_supplicant-0.6.0.ebuild:
+  Add new development version.
 
   23 Feb 2007; Roy Marples <uberlord@gentoo.org>
   wpa_supplicant-0.5.7.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 3db931ad930f..7ae38ca188e8 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -11,14 +11,19 @@ MD5 e44e6d1a019f31d680b30211607fbe43 files/wpa_supplicant.conf 183
 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 files/wpa_supplicant.conf 183
 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a files/wpa_supplicant.conf 183
 DIST wpa_supplicant-0.5.7.tar.gz 713251 RMD160 dffc3b5cbead92757840f71ccdd4548348698b28 SHA1 43f769d46fdca47b024e777331fb00577595c0ef SHA256 cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57
+DIST wpa_supplicant-0.6.0.tar.gz 842023 RMD160 17ba4903389a00527de772072dcd8e234d759fe9 SHA1 966dc49c5c2386d58696515ee8b20b1f4f45cd85 SHA256 24ce7873cbf2b23c00f931dd7f20326bea5463dd2a50a865b3d9bffd3f5780b7
 EBUILD wpa_supplicant-0.5.7.ebuild 6176 RMD160 3ec1be563cdef7049c5a5d3f1a222f5ae626d2bd SHA1 cb134a1385d0f1c47a76ecd5112c357f56133426 SHA256 aca03f37be42a3b3d9b012a996bfd9b840e1ef465f956f1b08e32d36c459192b
 MD5 89d711f7749bb6539a54bb123ff570e7 wpa_supplicant-0.5.7.ebuild 6176
 RMD160 3ec1be563cdef7049c5a5d3f1a222f5ae626d2bd wpa_supplicant-0.5.7.ebuild 6176
 SHA256 aca03f37be42a3b3d9b012a996bfd9b840e1ef465f956f1b08e32d36c459192b wpa_supplicant-0.5.7.ebuild 6176
-MISC ChangeLog 20789 RMD160 1225957b26d50b98eda9929cfa86e416ab3c04c2 SHA1 ea345d242110242bdd9aee1ec68c68c87413dfe2 SHA256 47a4d4f706a7b6ddffb65023d9cb544bf48b37aa2f44d9204921bc067ab362cc
-MD5 3c924906877cf5d63e858d28eef5dc5f ChangeLog 20789
-RMD160 1225957b26d50b98eda9929cfa86e416ab3c04c2 ChangeLog 20789
-SHA256 47a4d4f706a7b6ddffb65023d9cb544bf48b37aa2f44d9204921bc067ab362cc ChangeLog 20789
+EBUILD wpa_supplicant-0.6.0.ebuild 6185 RMD160 dea43469adce848dadb1db0b0a71f571d3f271a7 SHA1 37f3aa8d8b22a98ffffa5681631428bced8ff2aa SHA256 66388373a3759d7229e15abcfa9cdac0e994100b7657c60d700aa16b95ba387f
+MD5 fda3cb3c3358818d02e961b7c307ca7e wpa_supplicant-0.6.0.ebuild 6185
+RMD160 dea43469adce848dadb1db0b0a71f571d3f271a7 wpa_supplicant-0.6.0.ebuild 6185
+SHA256 66388373a3759d7229e15abcfa9cdac0e994100b7657c60d700aa16b95ba387f wpa_supplicant-0.6.0.ebuild 6185
+MISC ChangeLog 20939 RMD160 aeff3b20bd516848838c09b501c67f8333b1ba50 SHA1 03f881baed2f73c550bd3aa522d05ee0dc1f4abc SHA256 ebb391a96fa8725d6e3b9fe4697f950af263b8fae98efbe0680a482f8ec3917b
+MD5 e54ab04ce9044956f95179ab2e6ff032 ChangeLog 20939
+RMD160 aeff3b20bd516848838c09b501c67f8333b1ba50 ChangeLog 20939
+SHA256 ebb391a96fa8725d6e3b9fe4697f950af263b8fae98efbe0680a482f8ec3917b ChangeLog 20939
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
@@ -26,3 +31,6 @@ SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e metadata
 MD5 0055b09a5fd466d3a2e0eaec0840aeb8 files/digest-wpa_supplicant-0.5.7 262
 RMD160 489b9acb7b415af48073065511b74dcefe0032a0 files/digest-wpa_supplicant-0.5.7 262
 SHA256 15436ca18db0528215a8625bd421e9436f061c4250606497d1878252efa281ca files/digest-wpa_supplicant-0.5.7 262
+MD5 623f22d8d019dd6a82b1914a9d0117e0 files/digest-wpa_supplicant-0.6.0 262
+RMD160 f6087ecdb37a0272251973beb4cd606071853a46 files/digest-wpa_supplicant-0.6.0 262
+SHA256 1d32355d1b7d9383eef2d322c345ff7b8c08279f423d2ff1e50f6a4dd85b8263 files/digest-wpa_supplicant-0.6.0 262
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0
new file mode 100644
index 000000000000..55d395c98db1
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.6.0
@@ -0,0 +1,3 @@
+MD5 635c7af7cecb39954997146b5c734b1c wpa_supplicant-0.6.0.tar.gz 842023
+RMD160 17ba4903389a00527de772072dcd8e234d759fe9 wpa_supplicant-0.6.0.tar.gz 842023
+SHA256 24ce7873cbf2b23c00f931dd7f20326bea5463dd2a50a865b3d9bffd3f5780b7 wpa_supplicant-0.6.0.tar.gz 842023
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild
new file mode 100644
index 000000000000..0397dbc07892
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2007 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.6.0.ebuild,v 1.1 2007/05/30 11:18:40 uberlord Exp $
+
+inherit eutils toolchain-funcs
+
+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"
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+		kernel_linux? (
+			gsm? ( sys-apps/pcsc-lite )
+		 	madwifi? (
+				|| ( net-wireless/madwifi-ng net-wireless/madwifi-old )
+			)
+		)
+		!kernel_linux? ( net-libs/libpcap )
+		qt4? ( =x11-libs/qt-4* )
+		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
+		readline? ( sys-libs/ncurses sys-libs/readline )
+		ssl? ( dev-libs/openssl )
+		gnutls? ( net-libs/gnutls )
+		!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
+
+S="${WORKDIR}/${P}/${PN}"
+
+pkg_setup() {
+	if use qt3 && use qt4; then
+		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
+	fi
+
+	if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
+		if ! built_with_use x11-libs/qt qt3support ; then
+			eerror ">=qt4.2.2 requires qt3support"
+			die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > .config
+
+	# basic setup
+	echo "CONFIG_CTRL_IFACE=y" >> .config
+	echo "CONFIG_BACKEND=file" >> .config
+
+	# basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	echo "CONFIG_EAP_GTC=y"         >> .config
+	echo "CONFIG_EAP_MD5=y"         >> .config
+	echo "CONFIG_EAP_OTP=y"         >> .config
+	echo "CONFIG_EAP_PAX=y"         >> .config
+	echo "CONFIG_EAP_PSK=y"         >> .config
+	echo "CONFIG_EAP_TLV=y"         >> .config
+	echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
+	echo "CONFIG_PKCS12=y"          >> .config
+	echo "CONFIG_PEERKEY=y"         >> .config
+	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
+
+	if use dbus ; then
+		echo "CONFIG_CTRL_IFACE_DBUS=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
+
+	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_TLS=openssl" >> .config
+		echo "CONFIG_SMARTCARD=y" >> .config
+	elif use gnutls ; then
+		echo "CONFIG_TLS=gnutls" >> .config
+		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
+	else
+		echo "CONFIG_TLS=internal" >> .config
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		echo "CONFIG_DRIVER_ATMEL=y"       >> .config
+		#echo "CONFIG_DRIVER_BROADCOM=y"   >> .config
+		#echo "CONFIG_DRIVER_HERMES=y"	   >> .config
+		echo "CONFIG_DRIVER_HOSTAP=y"      >> .config
+		echo "CONFIG_DRIVER_IPW=y"         >> .config
+		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
+		echo "CONFIG_DRIVER_PRISM54=y"     >> .config
+		echo "CONFIG_DRIVER_WEXT=y"        >> .config
+		echo "CONFIG_DRIVER_WIRED=y"       >> .config
+
+		if use madwifi ; then
+			# Add include path for madwifi-driver headers
+			echo "CFLAGS += -I/usr/include/madwifi" >> .config
+			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
+		fi
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		echo "CONFIG_DRIVER_BSD=y" >> .config
+	fi
+
+	# people seem to take the example configuration file too literally
+	# bug #102361
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations, #143750
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use qt4 ; then
+		qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
+		cd "${S}"/wpa_gui-qt4
+		emake || die "emake wpa_gui-qt4 failed"
+	elif use qt3 ; then
+		[[ -d ${QTDIR}/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
+		/usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
+		cd "${S}"/wpa_gui
+		emake || die "emake wpa_gui failed"
+	fi
+}
+
+src_install() {
+	into /
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
+	insinto /etc/wpa_supplicant/
+	newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
+
+	dodoc ChangeLog ../COPYING eap_testing.txt README todo.txt
+	newdoc wpa_supplicant.conf wpa_supplicant.conf
+
+	doman doc/docbook/*.8
+	doman doc/docbook/*.5
+
+	if use qt4 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+	elif use qt3 ; then
+		into /usr
+		dobin wpa_gui/wpa_gui
+	fi
+
+	if use qt3 || use qt4; then
+		make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
+	fi
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+	fi
+}
+
+pkg_postinst() {
+	einfo "A default configuration file has been installed to"
+	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file is available as"
+	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
+
+	if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	if use madwifi; then
+		echo
+		einfo "This package now compiles against the headers installed by"
+		einfo "the madwifi driver. You should reemerge ${PN} after"
+		einfo "upgrading your madwifi driver."
+	fi
+}