Version bump.

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 201 insertions, 5 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 51190360ee67..04b3707d0b60 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.69 2006/08/13 10:58:13 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.70 2006/09/03 16:06:20 uberlord Exp $
+
+*wpa_supplicant-0.5.5 (03 Sep 2006)
+
+  03 Sep 2006; Roy Marples <uberlord@gentoo.org>
+  +wpa_supplicant-0.5.5.ebuild:
+  Version bump.
 
   13 Aug 2006; Roy Marples <uberlord@gentoo.org>
   wpa_supplicant-0.5.4.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index b3db42cab2a4..0aa02ced3b7c 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -4,6 +4,7 @@ RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 files/wpa_cli.sh 1312
 SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8 files/wpa_cli.sh 1312
 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
 EBUILD wpa_supplicant-0.4.9.ebuild 4767 RMD160 812ab2339e453201e91aa4805e3eec01df0d2a9e SHA1 6f32ae99431fcf97480badbc13e232bd50e8803f SHA256 89b6e6f95a720680694e767c566b137f8f3a0e49883b6a3c8a1f4c9eb7acdff6
 MD5 3f8419ab93dcfc1ddc287c669cff2bcd wpa_supplicant-0.4.9.ebuild 4767
 RMD160 812ab2339e453201e91aa4805e3eec01df0d2a9e wpa_supplicant-0.4.9.ebuild 4767
@@ -12,10 +13,14 @@ EBUILD wpa_supplicant-0.5.4.ebuild 5333 RMD160 344935aee3bbadf6de4a67f6f663dc1a4
 MD5 8f57caf0c241208570824936f077a4eb wpa_supplicant-0.5.4.ebuild 5333
 RMD160 344935aee3bbadf6de4a67f6f663dc1a4435eaf0 wpa_supplicant-0.5.4.ebuild 5333
 SHA256 6a05efeb01886f95270b05a4923ab5a723569e785f16d4882b69d02454f92953 wpa_supplicant-0.5.4.ebuild 5333
-MISC ChangeLog 16698 RMD160 82d7ae29e29093e5604ca48cef5a5d21b7cf4b80 SHA1 ec9bab96246ad04eda54b5feda3e158b5c46ec72 SHA256 f7c0c4033dfe6230b7346bd964d1caff8f9c2f9e98326a2510f126b07dd8aa86
-MD5 a37112892f5231a261d7af6ae42b0ab7 ChangeLog 16698
-RMD160 82d7ae29e29093e5604ca48cef5a5d21b7cf4b80 ChangeLog 16698
-SHA256 f7c0c4033dfe6230b7346bd964d1caff8f9c2f9e98326a2510f126b07dd8aa86 ChangeLog 16698
+EBUILD wpa_supplicant-0.5.5.ebuild 5227 RMD160 7462ea3bde12d83ff2a406a930cbf65f4a5b1cf1 SHA1 c2a10e51aa95f458101877f5d2a542ea5f74795d SHA256 59e8e5af3ee8b01b323ae92d87dcdfecec437d5a2fa6244afb95518d16062bab
+MD5 e802c0ab9162ae6898e81a8412adc707 wpa_supplicant-0.5.5.ebuild 5227
+RMD160 7462ea3bde12d83ff2a406a930cbf65f4a5b1cf1 wpa_supplicant-0.5.5.ebuild 5227
+SHA256 59e8e5af3ee8b01b323ae92d87dcdfecec437d5a2fa6244afb95518d16062bab wpa_supplicant-0.5.5.ebuild 5227
+MISC ChangeLog 16833 RMD160 e0f99336504db6ec992149a80968dd5aa527aff4 SHA1 eeb63cb84305147aa5b4787c2d272ed79acb06cb SHA256 87590e0cf768043cfd0143fb6d445e2f76983ea282bfb60b28d6811957435dbb
+MD5 0e731e02154593cfb946c3d9e4428ee5 ChangeLog 16833
+RMD160 e0f99336504db6ec992149a80968dd5aa527aff4 ChangeLog 16833
+SHA256 87590e0cf768043cfd0143fb6d445e2f76983ea282bfb60b28d6811957435dbb ChangeLog 16833
 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 89e08134872e00e168ba46e453f08a97f41a4b2c367f22be029e008c75040c8d files/di
 MD5 8bc6186dec3b75eb9acfbc258ac43c4e files/digest-wpa_supplicant-0.5.4 262
 RMD160 baeffb742a55a82a0e766e97ada122560dbe2089 files/digest-wpa_supplicant-0.5.4 262
 SHA256 cf40b2e1294e49fbea6768688eae6922adf0bd1311ffed322301b8a308b2fc0f files/digest-wpa_supplicant-0.5.4 262
+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
diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.5 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.5
new file mode 100644
index 000000000000..5b43cdbe9c60
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.5
@@ -0,0 +1,3 @@
+MD5 482dd85949c82aa15309e5ab3d2cf5c3 wpa_supplicant-0.5.5.tar.gz 661097
+RMD160 eda95756c49fb140063c14e0b9950b7045f47972 wpa_supplicant-0.5.5.tar.gz 661097
+SHA256 d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543 wpa_supplicant-0.5.5.tar.gz 661097
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
new file mode 100644
index 000000000000..b9c134e5806c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
@@ -0,0 +1,179 @@
+# 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.5.ebuild,v 1.1 2006/09/03 16:06:20 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"
+IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+		gsm? ( sys-apps/pcsc-lite )
+		qt4? ( =x11-libs/qt-4* )
+		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
+		readline? ( sys-libs/ncurses sys-libs/readline )
+		ssl? ( dev-libs/openssl )
+		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
+		!kernel_linux? ( net-libs/libpcap )"
+DEPEND="sys-apps/sed
+		${RDEPEND}"
+
+pkg_setup() {
+	if use qt3 && use qt4; then
+		einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
+	fi
+}
+
+src_unpack() {
+	local CONFIG="${S}/.config"
+
+	unpack ${A}
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		"${S}"/l2_packet_freebsd.c
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > "${CONFIG}"
+
+	# basic setup
+	echo "CONFIG_CTRL_IFACE=y" >> "${CONFIG}"
+	echo "CONFIG_BACKEND=file" >> "${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_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_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:" \
+		${S}/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):" \
+		"${S}"/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
+
+	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.example
+
+	doman doc/docbook/*.8
+	doman doc/docbook/*.5
+}
+
+pkg_postinst() {
+	einfo "To use ${MY_P} you must create the configuration file"
+	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file is available as"
+	einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.example.gz"
+
+	if use madwifi; then
+		einfo
+		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
+}