Adding live ebuild, fixing bug #270224

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

3 files changed, 288 insertions, 5 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 8a7704b5c378..b7c65b3e3f9a 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.118 2009/05/17 10:32:54 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.119 2009/05/18 22:27:58 gurligebis Exp $
+
+*wpa_supplicant-9999 (18 May 2009)
+
+  18 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +wpa_supplicant-9999.ebuild:
+  Adding live ebuild, fixing bug #270224
 
   17 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   wpa_supplicant-0.6.9.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 724bf61e5967..8ef874cae5e7 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -19,12 +19,13 @@ EBUILD wpa_supplicant-0.5.8.ebuild 6289 RMD160 4c656f7f675f8ed1610da6ecc91895228
 EBUILD wpa_supplicant-0.6.3.ebuild 6565 RMD160 4a235424a74e4b8ccd0bc6bc645332fe0b2bb2b8 SHA1 08bbed20b1e894af246f6d7365aa777280879c75 SHA256 edcc845695c6515fb35cb430d7c9b678fff9b9459de2908b9a7955547dca746d
 EBUILD wpa_supplicant-0.6.4.ebuild 6709 RMD160 5be6f93f12fabf7328020f8acc82362aaa75fe59 SHA1 931c3150ff167647b3f52c87722485cc7f164b77 SHA256 6c411291a5bab03dff96ad6b5b5986f13c1f54883191180886819fc620980e6b
 EBUILD wpa_supplicant-0.6.9.ebuild 7040 RMD160 f2ba4ef725534956b37bc5b63969973889a4b9e5 SHA1 42de9aa59512a03668c5da37bfda852a82a9bb96 SHA256 556eb1f5e8ce979de257714f927d9d652bd58f5c265440ff0faebb3d742a9171
-MISC ChangeLog 25618 RMD160 fbbe3d9315cc681b3f8ae4595151483b8399f05e SHA1 5822692bfd2d357fac5d9dfe25901505d51d59ec SHA256 b9f0966171a5840748a4a8db00bb1172925c738310a5cf8dd0c386a0206b30a0
+EBUILD wpa_supplicant-9999.ebuild 7583 RMD160 795263a86ce913d5b2b01171cbeb3e5b612756c2 SHA1 712112da315ba586a4362809020e5bee73a7d205 SHA256 e57a9f679466e5412119ebbd795b9b1c0c256503c59466a44d9752087b5b82be
+MISC ChangeLog 25789 RMD160 ca1f8b7fdf0b46029f9606be6abb574f0804b68c SHA1 54ac0729956a18343c94ad4ac3087552287edca0 SHA256 a4932a84c5ea9fee887e9a68fa49dfffc9f4b784d9ea4f2bab360094bab3c825
 MISC metadata.xml 571 RMD160 71dd26fb78e0841fdf8094e70f69ed8f3467767f SHA1 d506d908102c64873349b144915070b19bdd5fda SHA256 d51b505588babd99225c67330dcb85a438c3739e8aa56c2b65c14a91a46aa4fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoP5+AACgkQsR7PQhRXYEmm3ACfapdWlu3WcZJzDOeA99+OsDG7
-AnoAnRhtyToEq6yTTNl0grMJIUa4LCra
-=9ZtQ
+iEYEARECAAYFAkoR4P0ACgkQsR7PQhRXYEkkHgCfQIdhPovJA5aCrBDd2NLVF53J
+32IAnjT0FH6cWVjecczlMrqfdvlZ3uRp
+=ypuI
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
new file mode 100644
index 000000000000..c5291f2595b7
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -0,0 +1,276 @@
+# 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-9999.ebuild,v 1.1 2009/05/18 22:27:58 gurligebis Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs qt3 qt4
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://w1.fi/hostap.git"
+	inherit git
+	SRC_URI=""
+	S="${WORKDIR}/${P}/${PN}/${PN}"
+else
+	SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+	S="${WORKDIR}/${P}/${PN}"
+fi
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
+
+LICENSE="|| ( GPL-2 BSD )"
+
+SLOT="0"
+KEYWORDS="-*"
+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 )
+	!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}/${PN}"
+
+
+src_unpack() {
+	einfo "src dir ${S}/"
+	if [[ ${PV} == "9999" ]] ; then
+		S="${WORKDIR}/${P}/${PN}"
+		git_src_unpack
+		S="${WORKDIR}/${P}/${PN}/${PN}"
+	  else
+		unpack ${A}
+	fi
+	cd "${S}"
+}
+
+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() {
+	einfo "src dir ${S}/"
+
+	# 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() {
+# 	cd ${S}/${PN}
+	# 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() {
+# 	cd ${S}/${PN}
+	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() {
+
+# 	cd ${S}/${PN}
+
+	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
+
+	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"
+
+	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
+}
+
+pkg_postinst() {
+	ewarn "You are installing a live ebuild of wpa_supplicant"
+	ewarn "Since this is a moving target, bug reports must be"
+	ewarn "reported on a regular ebuild instead."
+}