New upstream release.

Package-Manager: portage-2.1.2_rc2-r1

5 files changed, 245 insertions, 5 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index ffb9b9a9a5bb..86ec30e6fb88 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.84 2006/11/12 14:08:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.85 2006/11/25 09:53:06 uberlord Exp $
+
+*wpa_supplicant-0.5.6 (25 Nov 2006)
+
+  25 Nov 2006; Roy Marples <uberlord@gentoo.org>
+  +files/wpa_supplicant-0.5.6-sigpoll.patch, +wpa_supplicant-0.5.6.ebuild:
+  New upstream release.
 
   12 Nov 2006; Roy Marples <uberlord@gentoo.org>
   wpa_supplicant-0.5.5.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index fbeab005c73d..42f97ee660e5 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -18,6 +18,10 @@ AUX wpa_supplicant-0.5.5-sigpoll.patch 346 RMD160 40e2fb841ff85a675beae80f12728c
 MD5 aec461f191665981e231a872586fbddc files/wpa_supplicant-0.5.5-sigpoll.patch 346
 RMD160 40e2fb841ff85a675beae80f12728c7c1a6ef974 files/wpa_supplicant-0.5.5-sigpoll.patch 346
 SHA256 5d3ef256e5d0a2a0c731bd86e459655b628160db44ed5c58a65b1b748d47e033 files/wpa_supplicant-0.5.5-sigpoll.patch 346
+AUX wpa_supplicant-0.5.6-sigpoll.patch 359 RMD160 646fc970548d021fef8756768a855f716fabe420 SHA1 0c847bb325e4e8d3de06825f724a6f9754c4bb80 SHA256 94c78c3010cb5e3a8d30d1f42368191f839ac9ef52585927ebe32d916acadfe6
+MD5 2f35cf8d766a1bc9944bdef5ca76afc8 files/wpa_supplicant-0.5.6-sigpoll.patch 359
+RMD160 646fc970548d021fef8756768a855f716fabe420 files/wpa_supplicant-0.5.6-sigpoll.patch 359
+SHA256 94c78c3010cb5e3a8d30d1f42368191f839ac9ef52585927ebe32d916acadfe6 files/wpa_supplicant-0.5.6-sigpoll.patch 359
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
 MD5 e44e6d1a019f31d680b30211607fbe43 files/wpa_supplicant.conf 183
 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 files/wpa_supplicant.conf 183
@@ -25,6 +29,7 @@ SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a files/wp
 DIST wpa_supplicant-0.4.9.tar.gz 483279 RMD160 627ddb6c12f15e08448606f24b3082b50f814a43 SHA1 e6a5cd6fbb7f12cc0a074da212f4fd7fbde0aec0 SHA256 bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857
 DIST wpa_supplicant-0.5.4.tar.gz 630779 RMD160 34074a4d1ebab4d455eb021a18ef9012943b1fd9 SHA1 53a03be9c39c783cb83f5e32f7aab493ef8b529e SHA256 6c14c9c6c68acc40aa1c860d4fde58424c57b48ea90700da189e6cf5c1dd6bd7
 DIST wpa_supplicant-0.5.5.tar.gz 661097 RMD160 eda95756c49fb140063c14e0b9950b7045f47972 SHA1 b0992a71e759432fa3536bc4013885f0fe65aba1 SHA256 d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543
+DIST wpa_supplicant-0.5.6.tar.gz 710441 RMD160 a00dfdf4874a09b6ee89d7a691f0e48e75325133 SHA1 8fa8f940b96340220fb51f8bf2baeef07edcca8d SHA256 892c6972b0940aa5d96d5a49ea924eb0f0504210213ba1134993e69dc395363f
 EBUILD wpa_supplicant-0.4.9.ebuild 4890 RMD160 1822d2cd3ac39345f5d78d8b2c4826f6c56945c5 SHA1 3360894abc7e63b691b84d509dfbc1e5052cf0b6 SHA256 4d998e3bea3ad6326af6dbe93cbc032f6c46c2306fe42d0e5e0d32f7f671afa1
 MD5 8d9c18fe9b4a757e2634583a8fd0205a wpa_supplicant-0.4.9.ebuild 4890
 RMD160 1822d2cd3ac39345f5d78d8b2c4826f6c56945c5 wpa_supplicant-0.4.9.ebuild 4890
@@ -37,10 +42,14 @@ EBUILD wpa_supplicant-0.5.5.ebuild 6190 RMD160 c5bbede293fb14c6975802b4f87acedaf
 MD5 bdaa9579901b28dd7979bed86d5f2d86 wpa_supplicant-0.5.5.ebuild 6190
 RMD160 c5bbede293fb14c6975802b4f87acedaf9bd56af wpa_supplicant-0.5.5.ebuild 6190
 SHA256 75c70cb803711e318217eef13600370a1af32e3045d8c8e8a78075d2462ee2c0 wpa_supplicant-0.5.5.ebuild 6190
-MISC ChangeLog 19379 RMD160 52b2d006faff4da95fa049315678b6ea2d317217 SHA1 94ba75daeb71045b8c85be9a05d5e29cd5671c9a SHA256 44789b4aba581229d729f2c7ef9a4eda3e95c4448dac3a29d3cd2c0bd8c637ea
-MD5 d057dcbe350881884523d83fb3b0d0fb ChangeLog 19379
-RMD160 52b2d006faff4da95fa049315678b6ea2d317217 ChangeLog 19379
-SHA256 44789b4aba581229d729f2c7ef9a4eda3e95c4448dac3a29d3cd2c0bd8c637ea ChangeLog 19379
+EBUILD wpa_supplicant-0.5.6.ebuild 5877 RMD160 8c6569f4fa81e59b52a0a553b9e2fd8f7c8fe699 SHA1 c16dfd348ef574e8eb86d50fb94a87fd19119d87 SHA256 c6d31ea75b4ebfb8ec39d836fba37b1edcef82e8d4602483d9a300e865889a24
+MD5 b689b739de2a5418d548b037df73407c wpa_supplicant-0.5.6.ebuild 5877
+RMD160 8c6569f4fa81e59b52a0a553b9e2fd8f7c8fe699 wpa_supplicant-0.5.6.ebuild 5877
+SHA256 c6d31ea75b4ebfb8ec39d836fba37b1edcef82e8d4602483d9a300e865889a24 wpa_supplicant-0.5.6.ebuild 5877
+MISC ChangeLog 19565 RMD160 2ed7c4bf5468dfce1dd986d6234115b42348aab2 SHA1 0f49fd55bfc170c6b37977252715f4aa168806c1 SHA256 e90388f4d9e3e1a724f8d9290d72af5a0d2599fcfe87d1852d8d156706d31e87
+MD5 07d06e7aa89c796200731855f2d3e588 ChangeLog 19565
+RMD160 2ed7c4bf5468dfce1dd986d6234115b42348aab2 ChangeLog 19565
+SHA256 e90388f4d9e3e1a724f8d9290d72af5a0d2599fcfe87d1852d8d156706d31e87 ChangeLog 19565
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
@@ -54,3 +63,6 @@ SHA256 cf40b2e1294e49fbea6768688eae6922adf0bd1311ffed322301b8a308b2fc0f files/di
 MD5 2a188bdf07a37a8031d8d31dc28efeb6 files/digest-wpa_supplicant-0.5.5 262
 RMD160 2e8cd7e252339dda731fb0472d3cb839000b7e7e files/digest-wpa_supplicant-0.5.5 262
 SHA256 65a0548f39630b87564a5192c8f9a8812ce4d69b204dd6eaada607e77ad112b2 files/digest-wpa_supplicant-0.5.5 262
+MD5 b5ccb88b2fa4e9a8ed6ef6f0a2d13698 files/digest-wpa_supplicant-0.5.6 262
+RMD160 99cebda2ff98f9bd98e44e6e521461a0bb6100f0 files/digest-wpa_supplicant-0.5.6 262
+SHA256 beb9ceed89120a41c72fa2e31f5ed2112788104c20bd2b912ff342a95a85e738 files/digest-wpa_supplicant-0.5.6 262
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.6 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.6
new file mode 100644
index 000000000000..4b6b5c50b91c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.6
@@ -0,0 +1,3 @@
+MD5 c90eca479fa0cb58c7f447dc45d7cef1 wpa_supplicant-0.5.6.tar.gz 710441
+RMD160 a00dfdf4874a09b6ee89d7a691f0e48e75325133 wpa_supplicant-0.5.6.tar.gz 710441
+SHA256 892c6972b0940aa5d96d5a49ea924eb0f0504210213ba1134993e69dc395363f wpa_supplicant-0.5.6.tar.gz 710441
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.6-sigpoll.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.6-sigpoll.patch
new file mode 100644
index 000000000000..6a9be745fb7f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.6-sigpoll.patch
@@ -0,0 +1,16 @@
+--- ctrl_iface_dbus.h.orig	2006-11-25 09:01:16 +0000
++++ ctrl_iface_dbus.h	2006-11-25 09:00:53 +0000
+@@ -15,6 +15,13 @@
+ #ifndef CTRL_IFACE_DBUS_H
+ #define CTRL_IFACE_DBUS_H
+ 
++/* If we don't have SIGPOLL, so use SIGIO instead */
++#ifndef SIGPOLL
++#ifdef SIGIO
++#define SIGPOLL SIGIO
++#endif
++#endif
++
+ #ifdef CONFIG_CTRL_IFACE_DBUS
+ 
+ #include <dbus/dbus.h>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild
new file mode 100644
index 000000000000..acea134dea57
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.6.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2006 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.5.6.ebuild,v 1.1 2006/11/25 09:53:06 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 ~x86 ~x86-fbsd"
+IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+
+#When dbus-core is out of package mask, this is how it works
+#RDEPEND="dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )"
+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 )"
+
+pkg_setup() {
+	if use kernel_linux ; then
+		ewarn
+		ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)."
+		ewarn
+	fi
+
+	if use qt3 && use qt4; then
+		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# If we don't have SIGPOLL (like FreeBSD), use SIGIO instead
+	epatch "${FILESDIR}/${P}-sigpoll.patch"
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		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
+
+	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_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
+		echo "CONFIG_SMARTCARD=y"    >> .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${ROOT}/usr/include/madwifi" >> .config
+			echo "CONFIG_DRIVER_MADWIFI=y"                 >> .config
+		fi
+	fi
+
+	if 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
+
+	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
+
+	dodoc ChangeLog COPYING eap_testing.txt README todo.txt
+	newdoc wpa_supplicant.conf wpa_supplicant.conf
+
+	doman doc/docbook/*.8
+	doman doc/docbook/*.5
+}
+
+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
+}