Bumping to 0.6.9 and adding dbus service path fix

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

5 files changed, 262 insertions, 3 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 5db5b1c7553d..37809cfb9db7 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.114 2009/03/30 16:29:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.115 2009/04/15 21:45:22 gurligebis Exp $
+
+*wpa_supplicant-0.6.9 (15 Apr 2009)
+
+  15 Apr 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +files/dbus_path_fix.patch, metadata.xml, +wpa_supplicant-0.6.9.ebuild:
+  Bumping to 0.6.9 and adding dbus service path fix
 
   30 Mar 2009; Raúl Porcel <armin76@gentoo.org>
   wpa_supplicant-0.5.7.ebuild, wpa_supplicant-0.5.8.ebuild,
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 65aba4136129..f65f283afedd 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,3 +1,4 @@
+AUX dbus_path_fix.patch 286 RMD160 891b3b8dc1ed75089a5be31e4a6937fe52178ad0 SHA1 8bf3cc3e970a039c282ca8e01d3096273f1d19f7 SHA256 1d64d21d9a38a41665b054775bfa77c3c3849d2d60d30575434c77b3630ff52f
 AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8
 AUX wpa_supplicant-0.5.10-gcc-4.3.patch 1362 RMD160 2d3e8ee4cdda932e83127203db261e8fdcb5754d SHA1 f676db4ff6938b043e654e876c8976223b181b7d SHA256 e71a75a2a16741598d7f4588537e147271e960c1d0f9991ce9e0734850ef9944
 AUX wpa_supplicant-0.5.7-gnutls.patch 375 RMD160 b8868a503a71d2cc4ebd4826430654c3a6645ec0 SHA1 fdfa5fefc507fa133f7d41a7ca75c33b14d876f7 SHA256 7d4a2a6f70fd18757e139ca1d1dc2734fe854ea1879d62d378febce49feef3aa
@@ -8,10 +9,12 @@ DIST wpa_supplicant-0.5.7.tar.gz 713251 RMD160 dffc3b5cbead92757840f71ccdd454834
 DIST wpa_supplicant-0.5.8.tar.gz 714467 RMD160 322cd5cba8afffe8343bd8c574e8941fd595dbad SHA1 434545faf4758044629f574d82939511be8deb0b SHA256 2f9755e2e3f96d26380857ef95be7765e6e276f6b53194c70633c027485d67f0
 DIST wpa_supplicant-0.6.3.tar.gz 952273 RMD160 4aa954040e3eae572fe600fda8587885e1fface1 SHA1 0e15731bb3fc5c84a1292d665afd53e2fc176998 SHA256 f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2
 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
 EBUILD wpa_supplicant-0.5.10.ebuild 6580 RMD160 66358e7c289fab065e57adc66ea50c38f2334afb SHA1 57f19c8c4e29ba6781c1531efffaa8939241e0a8 SHA256 f9bcabdc160c97262784bc5941c7aea8419257bccac6f3191489b23fba063bd4
 EBUILD wpa_supplicant-0.5.7.ebuild 6314 RMD160 3561801836964d581a4fa611ba16a26d8840dc0e SHA1 3c38d29c923e7849f099a41a87dc5482f2061b5c SHA256 0faedd572173bb788f07914158fc535579e72b443f9e74779295a2ab1cd9b48c
 EBUILD wpa_supplicant-0.5.8.ebuild 6274 RMD160 bdb4e4c150f081a39aa44b520df82384b0120c8b SHA1 102faf08c273a62fff18105d0bae165c82802248 SHA256 db380ed91e59e99c316030e154192e997ee7a3b05c15119dac48e5c2bbf27068
 EBUILD wpa_supplicant-0.6.3.ebuild 6550 RMD160 58e54ca17c86e42b484c425413b249c012630145 SHA1 c8d45349ef85064da22c74076908964816694e3c SHA256 34e1d85690f0fb8bc184ff65ceca76595f56fffffaac862253ace7d2e49813d0
 EBUILD wpa_supplicant-0.6.4.ebuild 6695 RMD160 2a3b755be383632cc4ee24f4e1fc267baf4a9568 SHA1 37a8ef5d040d357f98daeefdf9e58ec1334c8f7b SHA256 19b6728ae7f2cc1a10396c05955c3f2fc3e0e659ad50812ba5e9b7c87775bef6
-MISC ChangeLog 24855 RMD160 f76c5862cbc387b2b330ac83cea603d866f4c386 SHA1 1dcc4b9fef13be791caea4863711d116ae584a5c SHA256 519ca5b6370c8e97da13ffaf9b82abe98ba2c79fc59d4b261b8759fd449394c6
-MISC metadata.xml 397 RMD160 677556714b4e08b5fce74f03b97a1f24bb2051dc SHA1 9562cfefd4475a2d823ccabfe5a66b3f75d23989 SHA256 270277631823002469cc49c134bd0359ee144bea746b9da46f6bca8878e3ac89
+EBUILD wpa_supplicant-0.6.9.ebuild 6884 RMD160 dec79529315be59e8aa6073ee95f42e71850bdb2 SHA1 14e615f476e4c24a9d054f09be17a793adc7b35e SHA256 4f0d2f99a2eb4ba63a1286fdcf9588328225829714e5f0e157e098b31fc8730d
+MISC ChangeLog 25084 RMD160 73b2a39df197b8330079a23a58b51bf3f9b72129 SHA1 39736411069d90ba50154994fda532edbcf5472a SHA256 4a04dc0161e8b207b7be706dacbd4da372505b73098cdeecf910866f4137cb46
+MISC metadata.xml 567 RMD160 d80753be048613d751f030d90d264a3cd0a36f65 SHA1 f9235195654bb8f3782f47b45cbd930437efdd9f SHA256 b6765ad39d0f561bfb62d1777da0bd962f65c4d2917d08ab9e1edb330e14283c
diff --git a/net-wireless/wpa_supplicant/files/dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/dbus_path_fix.patch
new file mode 100644
index 000000000000..e6348894cccd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/dbus_path_fix.patch
@@ -0,0 +1,8 @@
+--- dbus-wpa_supplicant.service.old	2009-04-15 23:16:19.000000000 +0000
++++ dbus-wpa_supplicant.service	2009-04-15 23:16:29.000000000 +0000
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=/sbin/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 53c6b5bf8ee2..eafa29d26321 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
 	<herd>mobile</herd>
 	<use>
 		<flag name='gsm'>Add support for EAP-SIM authentication algorithm</flag>
 		<flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag>
 		<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
+		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
new file mode 100644
index 000000000000..98243fc8a88c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.9.ebuild
@@ -0,0 +1,237 @@
+# 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.6.9.ebuild,v 1.1 2009/04/15 21:45:22 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 gsm madwifi ps3 qt3 qt4 readline ssl wps kernel_linux kernel_FreeBSD"
+
+DEPEND="dev-libs/libnl
+	dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		gsm? ( 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 )
+	!qt4? ( qt3? ( x11-libs/qt:3 ) )
+	readline? ( sys-libs/ncurses sys-libs/readline )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	!gnutls? ( !ssl? ( 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 gsm ; 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
+	dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die
+	dosym /usr/bin/wpa_cli /bin/wpa_cli || die
+
+	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
+		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
+}