Adding support for background scanning, fixing bug #494014

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0x15AE484C

3 files changed, 335 insertions, 5 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index d1429dabc7ee..07b4770a666b 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.203 2013/10/17 20:55:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.204 2013/12/13 19:36:05 gurligebis Exp $
+
+*wpa_supplicant-2.0-r3 (13 Dec 2013)
+
+  13 Dec 2013; <gurligebis@gentoo.org> +wpa_supplicant-2.0-r3.ebuild:
+  Adding support for background scanning, fixing bug #494014
 
   17 Oct 2013; Markus Meier <maekke@gentoo.org> wpa_supplicant-2.0-r2.ebuild:
   arm stable, bug #486008
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 02dc21ac3b36..96f710fc69c1 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -25,12 +25,13 @@ DIST wpa_supplicant-0.7.3.tar.gz 1638224 SHA256 d0cd50caa85346ccc376dcda5ed3c258
 DIST wpa_supplicant-2.0.tar.gz 2044281 SHA256 2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 SHA512 c3a599e1dfa5e0bb4b8d35ed49501696ce68c807ff458c1e3bff9ed5619c780f7117c6d8d7cb9a11351e9fad27cf83fc114f255c92552e7ba084de70c5f8e254 WHIRLPOOL 603f9ac54505166690516a0f1e3112a8279a7184a54066699ad24b1f6269ad90c46a01a87d23bb62df782cdf561aa6f8b5a11e7ee59914cb36be8daea470389e
 EBUILD wpa_supplicant-0.7.3-r5.ebuild 8993 SHA256 ae802134af12a5e2d7dbd0dd1bb1326a9fed29d3707a10643fb8ac3a80b9f091 SHA512 a6b583f0dfde3123deb5b7145fc416092dbbe0652d9433347dfb1aca5e32f652ce55dc0618e70cda8b66a5a9a31f47469c7ff0d2b4b7bd0a8bdc58cf603e70ea WHIRLPOOL 6dad309403a376a6297559de07a954faea89dd5eb5b11fc9282fca2ae24f7852dffb066b89cd2f31246f6b2afdbb67b3cf8fcb12ab52239f0ca821362cd942aa
 EBUILD wpa_supplicant-2.0-r2.ebuild 9091 SHA256 9e502e4f205be61617d67e498b403f516b9e7a8a389020bf05b470d15d1f0cb4 SHA512 a7f716bfab6a499c367674550f51b46cf0e37e434e015cc1c6eba4c62e9ff63d1b0df0e864835317d5b920904c63e9ac4078e56330b75d8f74b27edff86725fe WHIRLPOOL 0e96ef0f0f97ec8dd7323407513ce8098c3100d857d7909af17f21e74f5164dbb8ccac94ecf6a69fe0684a0d6f32c4527cff9685546d7089cd4d68a37e3e31ef
-MISC ChangeLog 41452 SHA256 0b1c4677e666ff80cfb0b374d5f2f15e5efe9040c984c17092e492027c2ca1f0 SHA512 aa7c1774aa717972fb31ea107c6ea3a2f0cf8a991811db44479db8367b85533178cc46a79f9d1d767857025538a84800b1fd11d09958ac9344e954b70204bfa6 WHIRLPOOL de2d149c0a2888ed087c13cbb3e8dcbcc0e1c2a4aa54471f404561690baab099ecf06bf06deeafd93e84031290a421edf3aeea596f8723d898cc5049b273654d
+EBUILD wpa_supplicant-2.0-r3.ebuild 9215 SHA256 0bdb32f7e92d3575ce0166de13083b4c98f08ad77622ab3714611d333fb78be1 SHA512 47b71f7fc1dc26d2696cbf162c8338fcbb118547049dd46f2e5dd4cb122830bbde51f6f7de3487066d42c40f95621c470bd316d8a2c145a96638509d4d1d2464 WHIRLPOOL d7b00daf3ed94bd276073d15e2703349f96a43700b8958d28f6b3dc2588ddbef6d3c0f64677403b523b75cdd57dfcb554961067c36c3dc6304350da0bb016653
+MISC ChangeLog 41626 SHA256 8dae27ad4cc24d7ea8caf006008ad45a0db96d220549a7a5c19d5a0659d83520 SHA512 25027f20e44fb40a79770ffb6b5b0d702d529b794f957631a9939a53eb3340c6129350ad4e5bacb7fbbbe6344266e8e2e8dbd7191f8817ed0ff816ad5da9f7f5 WHIRLPOOL c495c121989a11b932dabe67ebde555f698e95ad68cc76ad48b85dadae1128195a2098a77c44588d20ebceef43f4366130b5bd1742fbadeb48da67619d182107
 MISC metadata.xml 1179 SHA256 e6c44e08d38abba2645ab7b081783f2fe7e8962fa1b038086d4f6a986cd0e3f8 SHA512 392bc5e00c0c37c16fb84840bbca085b2dffecc0f7ce7d3a38872666bd3e17332533ca4e07c0cfbfe3ed78a639c7ca6ace164efb7df28fc5d7b275321e517622 WHIRLPOOL 03c040317c8fb74f901cd35a10d2befd3b2b2e0b3a6adec5a7a5c78adf369282931f938ab824386efbe4f6c0ac8dea8d42554ea65f0ab833a97b84cb14174a61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJgUGIACgkQkKaRLQcq0GIn8gCfXit4TvAiUGbhlgEA0yWYySuN
-8kEAoIfEZC2ZhPuqv+PLaAWvo9dRSlCB
-=dxrG
+iEYEAREIAAYFAlKrYawACgkQsR7PQhRXYElU9gCeM4duZ5g4EHgu2puYdt9pH34P
+G48AnjRqUXOUmb1bSW3mjtWsgEy48j4S
+=/cFk
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild
new file mode 100644
index 000000000000..cb199eacfcfa
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r3.ebuild,v 1.1 2013/12/13 19:36:05 gurligebis Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs qt4-r2 systemd multilib
+
+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="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )"
+
+RDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		eap-sim? ( sys-apps/pcsc-lite )
+		dev-libs/libnl:3
+		net-wireless/crda
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	readline? (
+		sys-libs/ncurses
+		sys-libs/readline
+	)
+	ssl? ( dev-libs/openssl )
+	!ssl? ( gnutls? ( net-libs/gnutls ) )
+	!ssl? ( !gnutls? ( dev-libs/libtommath ) )
+	selinux? ( sec-policy/selinux-networkmanager )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/${PN}"
+
+pkg_setup() {
+	if use gnutls && use ssl ; then
+		elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\""
+	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
+
+	if use dbus; then
+		epatch "${FILESDIR}/${P}-dbus-path-fix.patch"
+	fi
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}"
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
+		epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
+	fi
+
+	# bug (320097)
+	epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX,
+	# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED.
+	# bug (374089)
+	#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch"
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	# 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
+
+	# Enabling background scanning.
+	echo "CONFIG_BGSCAN_SIMPLE=y"	>> .config
+	echo "CONFIG_BGSCAN_LEARN=y"	>> .config
+
+	if use dbus ; then
+		echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
+		echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config
+		echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config
+	fi
+
+	# Enable support for writing debug info to a log file.
+	echo "CONFIG_DEBUG_FILE=y" >> .config
+
+	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 fasteap ; then
+		echo "CONFIG_EAP_FAST=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
+	elif use gnutls ; then
+		echo "CONFIG_TLS=gnutls"     >> .config
+		echo "CONFIG_GNUTLS_EXTRA=y" >> .config
+	else
+		echo "CONFIG_TLS=internal"   >> .config
+	fi
+
+	if use smartcard ; then
+		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_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 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
+		echo "CONFIG_WPS2=y" >> .config
+		# USB Flash Drive
+		echo "CONFIG_WPS_UFD=y" >> .config
+		# External Registrar
+		echo "CONFIG_WPS_ER=y" >> .config
+		# Universal Plug'n'Play
+		echo "CONFIG_WPS_UPNP=y" >> .config
+		# Near Field Communication
+		echo "CONFIG_WPS_NFC=y" >> .config
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		echo "CONFIG_P2P=y" >> .config
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		echo "CONFIG_AP=y" >> .config
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	if use qt4 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		eqmake4 wpa_gui.pro
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt4 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null
+		einfo "Building wpa_gui"
+		emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym /usr/bin/wpa_cli /bin/wpa_cli
+	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
+
+	doman doc/docbook/*.{5,8}
+
+	if use qt4 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+		keepdir /var/run/wpa_supplicant
+		popd > /dev/null
+	fi
+
+	# systemd stuff
+	systemd_dounit "${FILESDIR}"/wpa_supplicant.service
+	systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service'
+}
+
+pkg_postinst() {
+	elog "If this is a clean installation of wpa_supplicant, you"
+	elog "have to create a configuration file named"
+	elog "/etc/wpa_supplicant/wpa_supplicant.conf"
+	elog
+	elog "An example configuration file is available for reference in"
+	elog "/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
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \
+				"${ROOT}"/etc/systemd/system/multi-user.target.wants/
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+}