Bumping to 0.7.0

Package-Manager: portage-2.2_rc59/cvs/Linux i686

3 files changed, 262 insertions, 6 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 8aba1319b0e9..a8430351724e 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.125 2009/11/21 12:03:21 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.126 2009/12/14 12:50:27 gurligebis Exp $
+
+*wpa_supplicant-0.7.0 (14 Dec 2009)
+
+  14 Dec 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +wpa_supplicant-0.7.0.ebuild:
+  Bumping to 0.7.0
 
   21 Nov 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   wpa_supplicant-0.6.9.ebuild, +files/wpa_supplicant-conf.d,
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index ee739b3b590c..83d80fb50e9e 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -11,15 +11,17 @@ AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f S
 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a
 DIST wpa_supplicant-0.6.4.tar.gz 995486 RMD160 338b901726779a47cb3c3cb43b11d3d38af3fe7d SHA1 c17a992bdcbe0d2427f0968c5a921e54cf28306f SHA256 0c10e59dd079c4e5d9ec6eebe9a8ac0e1b9e472cccef49c705f87a78391e79fa
 DIST wpa_supplicant-0.6.9.tar.gz 1178238 RMD160 e8427935b17c354c2654250501236dcd3f239307 SHA1 3764f7bda4e5c87caac2b9e134cb59996f073f09 SHA256 6e5284fa3f7c56e001fae92486eaa31340db5dd925dcb38bd572d2e8ed70f570
+DIST wpa_supplicant-0.7.0.tar.gz 1666796 RMD160 fce5f77f7d85947ba22c50ea0a661ceb1b10f379 SHA1 647655f0fc194499e97976a016de67a5d4f29543 SHA256 9d34f678881b21eb685b730bfed2dc56f4c9eb50bf79245c246f0b8266b75e21
 EBUILD wpa_supplicant-0.6.4.ebuild 6465 RMD160 24e22e1c3f51df2c9edca1f4186d6c93704ccf84 SHA1 d190555fd05a1fbf591a54d9b3e50c8c551beee0 SHA256 56e3782f15e48c4315be606329383bec49d56084a3fe18dc175972fdd9eb9c88
 EBUILD wpa_supplicant-0.6.9.ebuild 7211 RMD160 23e79b285214864ac67a52887d035fc6c5ce5449 SHA1 5abae798141667e8197d6eedbda6c88afdbe5109 SHA256 52e61e1616a47c3799700db4229f65222bac7cd6b7114e425e5ff55a292594c9
+EBUILD wpa_supplicant-0.7.0.ebuild 7215 RMD160 a738fd429958ad798d246689202733a0c5f2c978 SHA1 414910ab9cc9101656ac1af054cbabcd538a4415 SHA256 848d8c9cb42936f6c2f04001cf099a7630a049a03682ce59f0f40aee981613cb
 EBUILD wpa_supplicant-9999.ebuild 7581 RMD160 b988d4b5427c8b5b3c8716d76f07a857685b6aa5 SHA1 908209ae2fe0bf625d84c32f0575063e2eca02b2 SHA256 e35822c796849541ed403f4ca6b9487f3d2bcb28347087c3db975222e3d707d7
-MISC ChangeLog 26939 RMD160 cbab11c6f3d4c3f1cfdb484d48947db95385320b SHA1 84c01114ed81e0e52cb09e260f69331adc262d2d SHA256 e6dd948bff18aa6f6eb1c5a6032537b2beb66112ddeba7e8827e3aedcae7ac4e
+MISC ChangeLog 27090 RMD160 1bd5c208fc1d2773fc8ba77213e73e25329723fe SHA1 c1e3197be47df06a4a5e96656f9ccfb2c0180ea0 SHA256 949324ccace9e68dd4e47c37a89e12cb05ed52adb473cacc3afff4c407a9a75c
 MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksH1x0ACgkQsR7PQhRXYEm/9wCfah7a6SMNMcPJl9CE8H1fQYtZ
-BbMAnRmy0IDoMEY4sdVWkR0kV8Fh/kie
-=9fYt
+iEUEARECAAYFAksmNKAACgkQsR7PQhRXYEkr/ACffTORPBzLCXucQ/PAL2fD5tc1
+S8QAl0lrsf+q7tt9qDupeBs3jfq4wIc=
+=itJ8
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild
new file mode 100644
index 000000000000..e9f844bf7499
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.0.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2009 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.7.0.ebuild,v 1.1 2009/12/14 12:50:27 gurligebis Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs qt3 qt4
+
+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 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus debug gnutls eap-sim madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+
+DEPEND="dev-libs/libnl
+	dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		eap-sim? ( sys-apps/pcsc-lite )
+		madwifi? ( ||
+			( >net-wireless/madwifi-ng-tools-0.9.3
+			net-wireless/madwifi-old )
+		)
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-svg:4 )
+	!qt4? ( qt3? ( x11-libs/qt:3 ) )
+	readline? ( sys-libs/ncurses sys-libs/readline )
+	ssl? ( dev-libs/openssl )
+	!ssl? ( gnutls? ( net-libs/gnutls ) )
+	!ssl? ( !gnutls? ( dev-libs/libtommath ) )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/${PN}"
+
+pkg_setup() {
+	if use gnutls && use ssl ; then
+		einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
+	fi
+
+	if use qt3 && use qt4 ; then
+		einfo "You have both 'qt3' and 'qt4' USE flags enabled: defaulting to USE=\"qt4\""
+	fi
+}
+
+src_prepare() {
+	# 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
+
+	# 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 (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	epatch "${FILESDIR}"/dbus_path_fix.patch
+}
+
+src_configure() {
+	# 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 debug ; then
+		echo "CONFIG_DEBUG_FILE=y" >> .config
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		echo "CONFIG_EAP_SIM=y"       >> .config
+		echo "CONFIG_EAP_AKA=y"       >> .config
+		echo "CONFIG_EAP_AKA_PRIME=y" >> .config
+		echo "CONFIG_PCSC=y"          >> .config
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		echo "CONFIG_READLINE=y" >> .config
+	fi
+
+	# SSL authentication methods
+	if use ssl ; then
+		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_NL80211=y"     >> .config
+		#echo "CONFIG_DRIVER_PRISM54=y"    >> .config
+		echo "CONFIG_DRIVER_RALINK=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
+
+		if use ps3 ; then
+			echo "CONFIG_DRIVER_PS3=y" >> .config
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		echo "CONFIG_DRIVER_BSD=y" >> .config
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		echo "CONFIG_WPS=y" >> .config
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use qt4 ; then
+		cd "${S}"/wpa_gui-qt4
+		eqmake4 wpa_gui.pro
+		emake || die "Qt4 wpa_gui compilation failed"
+	elif use qt3 ; then
+		cd "${S}"/wpa_gui
+		eqmake3 wpa_gui.pro
+		emake || die "Qt3 wpa_gui compilation failed"
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant || die
+	dobin wpa_cli wpa_passphrase || die
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
+		dodir /bin
+		dosym /usr/bin/wpa_cli /bin/wpa_cli || die
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "$FILESDIR"/${PN}-init.d wpa_supplicant
+		newconfd "$FILESDIR"/${PN}-conf.d wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
+
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf || die "dodoc failed"
+
+	doman doc/docbook/*.{5,8} || die "doman failed"
+
+	if use qt4 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui || die
+	elif use qt3 ; then
+		into /usr
+		dobin wpa_gui/wpa_gui || die
+	fi
+
+	if use qt3 || use qt4 ; then
+		doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found"
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	fi
+
+	if use dbus ; then
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die
+		insinto /usr/share/dbus-1/system-services
+		newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' || die
+		keepdir /var/run/wpa_supplicant
+	fi
+}
+
+pkg_postinst() {
+	einfo "If this is a clean installation of wpa_supplicant, you"
+	einfo "have to create a configuration file named"
+	einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
+	einfo
+	einfo "An example configuration file is available for reference in"
+	einfo "/usr/share/doc/${PF}/"
+
+	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 compiles against the headers installed by"
+		einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
+		einfo "You should re-emerge ${PN} after upgrading these packages."
+	fi
+}