summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2013-04-28 16:02:32 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2013-04-28 16:02:32 +0000
commitc3b3688f34640fe36fb082318b5eebb3652385f7 (patch)
tree136ac739209f600b2afa496e55f29bf07ea7b7b8 /net-wireless
parentUpstream patch to fix #417667 (diff)
downloadhistorical-c3b3688f34640fe36fb082318b5eebb3652385f7.tar.gz
historical-c3b3688f34640fe36fb082318b5eebb3652385f7.tar.bz2
historical-c3b3688f34640fe36fb082318b5eebb3652385f7.zip
Removing old version and making smartcard support optional, fixing bug #462548
Package-Manager: portage-2.2.0_alpha173/cvs/Linux i686 Manifest-Sign-Key: 0x15AE484C
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wpa_supplicant/ChangeLog9
-rw-r--r--net-wireless/wpa_supplicant/Manifest26
-rw-r--r--net-wireless/wpa_supplicant/metadata.xml4
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild320
-rw-r--r--net-wireless/wpa_supplicant/wpa_supplicant-2.0-r1.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-2.0.ebuild)11
5 files changed, 23 insertions, 347 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 8dd3833ebe3b..2d024c8a4938 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,13 @@
# 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.197 2013/03/02 23:13:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.198 2013/04/28 16:02:30 gurligebis Exp $
+
+*wpa_supplicant-2.0-r1 (28 Apr 2013)
+
+ 28 Apr 2013; <gurligebis@gentoo.org> -wpa_supplicant-1.1.ebuild,
+ -wpa_supplicant-2.0.ebuild, +wpa_supplicant-2.0-r1.ebuild, metadata.xml:
+ Removing old version and making smartcard support optional, fixing bug
+ #462548
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
wpa_supplicant-0.7.3-r5.ebuild, wpa_supplicant-1.1.ebuild,
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 6ee7ec2fd6cb..884c3ef1f236 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -21,29 +21,15 @@ AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b
AUX wpa_supplicant.service 264 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e384869e874585cf5720c39 SHA512 b5ff8db22a7e23e8a54a6bd018c495093c7d31f5734eb83cb652184193193d7cd0c03b7ca286eeef59b0a12f1472d5fa37990d7c10511e22f2eaf410ee15d056 WHIRLPOOL f29f175636def13bedd8519d9837fffb802dcc219e3714ac8b285ae1d411a2c19f55ae1d8c1bad3446a4172dd28ff3d5d9d8baedfdea29e2a057678b82589e3c
AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c SHA512 400e2e4b69408a4fe044409fee9639338e1fd6423e00a544b46065fe1d0215717b17b44ce1abadf0ce5da365724977ea0beffbf75d96c0c6ee1f24618c92428d WHIRLPOOL 1603e4651072e0dfb5381c9a063db64bb412c2bc640226137b7cfd56f2525a6c1e198cb042553f5a25fc234773d1d9438eea09d65fdde71d81dddfd86b5273b0
DIST wpa_supplicant-0.7.3.tar.gz 1638224 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 SHA512 81c633eac9168ac2438ea3ad7505c25dcde98befee8b65ea562b9cc6ee658e998ff147f7646531968edc596d44a38c3acef3e30c43b1db4a8cbeeab22287e888 WHIRLPOOL 594f70b2e4e78a302809ac0b3bf9eccaaba92d8a052efc22184623b1690ade39d418a221933f7f8ba885ee6c59b5a189158db333c2e11e60c8bb51ec68537929
-DIST wpa_supplicant-1.1.tar.gz 1950890 SHA256 a54dbe5cfd47b724d7433366d536f76bbc31efea2df866a8f2f87c86a48b9e02 SHA512 61afeff24d6175feb4c73a6c53f0e88acb32746739febeafc9b834652af6607c339b9fe8ef1e05bc61f6b078f85aa0a35261fc8d02f05a844cfded12c8709901 WHIRLPOOL 9421156fa03e3eb39c4fa575d02d3e2eb546cde2d81193c1ebef9fbf205b9dcd23f830471fb6dd845accd9382c53dfbd1853d52486c5ae25db8317055901e684
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-1.1.ebuild 9014 SHA256 2d5efd546225f9d3b0050358fb49f307c707fd9abef33cfb2919e173c9b35ff2 SHA512 b1d28fed653840d68a826ad6379437d7e16d886fb389b0d04e593885b76462be9a005d00aa0efaeb104e972206345bf9d7684febdfcd7abebaa2fed82a0ce6d5 WHIRLPOOL acbf46be5c5ed64749ff5f76d91603ba9873f6c3f89af6aaf1c67f0f6c265ae45dbbc166295446678a8e5bd026caa9b49d8b082179fe7801ba6b686be66448cb
-EBUILD wpa_supplicant-2.0.ebuild 8858 SHA256 091dddd5dc30b85e6892399f79de522e175ca2e29e33f6a8bd031e3e2d0cef34 SHA512 4af9b9d121625c20556e6e6a3c894590aec92399470d580c855f063d096f2bb1159db906051bf957e669eb5903317e7afb0936d7fb617738bd3902b262cb0681 WHIRLPOOL 35c1c77f1760f005f87e2d533e3cdb6f19a8c7f0fd0a875da7b6ad27c76406f1f59486768f7adeee216f67c87a62051dde0dfe8bcca536714f61b9c43f96c3a1
-MISC ChangeLog 40446 SHA256 4db2a3768881567e5dffbf02e88cc55c657193cd40c1759ab846f1687fe91da6 SHA512 b3af50686dad379de6c3606f16fffb6480b54837c96f409034fff9b00fbe80f3135d5595b54f828c08d149216987148478cb0db1d9eb7a0ab1063bbec1db2038 WHIRLPOOL 457c3665669dc98cf524f55486f612c0b7cead8f726f386562f9392a7694c57d171438c4975d9e840c5478ddddb92aa89223d3f987d39d16a810d64c9fcb4e19
-MISC metadata.xml 1024 SHA256 116ac4fba8c2ba21c544dae067ba07ffd9da3ab97c368c849e8f163f8ea082b1 SHA512 7f118689c6a01321700af47926ed8140983f2f5494ad8ef39cbe955f00d2ff6bce9a012658864a0d80bcd08752348b659de01df6eec60b266c1124ab6ca2ca38 WHIRLPOOL 466dbf56b5494e717d7b986f29dffc962c001dfcc9c76af55e2875259241c22e5715c03fc94ac7a509ebf7658e40e6824a3bb2197bc99bb74aa9e3f49c555469
+EBUILD wpa_supplicant-2.0-r1.ebuild 8922 SHA256 040ee5d03fdb3da8898de937551bec134f53aff57319fb29694677de480c52b8 SHA512 fe83055320363033ef6f62e1186db5e3f65423ac598a63130cdfb987369b1bef43f48fae6d69acdc27b7368e9de72c985696c4735bc2be9245bdf71bab424f46 WHIRLPOOL f885270602bf6c397cc1273bba306f5a01935292a40dd794cefebf780b641f566ab2e33df35520765fca9441a3600c024c51fe95632db72df811f72dfe674641
+MISC ChangeLog 40712 SHA256 8e88b3cf619d7d9b195cc4904bcf20f5e4937d88f2996c7a927a5db05bab1dbf SHA512 699d33332f2c8cdc691ed3fa16b0daa424de12985310b77867a4d1c7e443e4446f6b2f80f5ee348e9f2527058ebaeea88e7a068d42ca7cf48ba11867926fc457 WHIRLPOOL a493f2ece7209fd4ad5efa30c080344c1589a0cd5a0127fb34c816fa454ca04e4f9d33580dfef892a5fbd3462cca157057747f1447ee20cdf82a4770d9b1787a
+MISC metadata.xml 1081 SHA256 623f67f4d0cf5d87560c0acf20bbde6fc3d2fc2f61333efa72330d17dd8c5aaf SHA512 66b72278adb1d45af1b40f9ca63ba8a6222e71ed9cf80d948a5f6d5aa4cb8a7f2dc09510b0d28599f2c4b11402acda6889b85411c038f07a226e4e9bd4b69032 WHIRLPOOL 90fa113a6262f2b3a36589bd9aae3aeb7e348de8c5c0dfff1615ad6f3c2d7749fc3120c5ef03eea42ded766d8ae11bc976345fab360b87ceb7731c7fb4ab4fd8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQJ8BAEBCABmBQJRMod9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88j14QAK4whqVold6qwmON0UoXqs10
-vXRFJCtY9ZA09R1JcqDDvMBrAgGDSxNGh90SyOC7F1FXY2IKUpT5OUMHxbv4O4vU
-caegOK3UWqWXn/FFQXE7aCqDHcay26yUWRm9DqaXp/vkZP9SG9smY2ljI8EQxSPH
-Lp5jqKHqRl6r1Ob0lyYrCNohUNWnJZIGqpjOFs2dX2FT6A2qjvNSd3d6rfZR5vgA
-cQmru3CyKgrbfBsWAcADbZQzxmeaVvi298WOvCHe6835yrORMwKt2x/eryD4Qy2t
-pmUbilOKhaNzj64CmisPbUyrYD7nEI6K1sFqu4pohBnLkn+Sjj0ucTaAytWC4xim
-bewSOu5tvLOPBdHOgy2JmhpllkF/3Znx15wY+fcIlzktTUS3cV/n+hsj+xb+dNV8
-iR1a8RCs5gJNTJaSfHdQXB9boBFkgucSmD88p5ukCNgOKiJC7kA2AH6HKjZta/0L
-7K4RIAZYciickqTh6moKPL47pyfT7OQ6eLgnn1bXkRCJoje1wjnbs7woEKy3UPbo
-FUzm7zIo6CRn98Pp/+QavQjl4rxJNe31zq2BUoRY7QTAx3MUyCw4eL/565DPdd4C
-cxtQNCWYVdSYA9RPl3znjTiq5PH4rMulHRlV/noNsNWqSpaAfR5rTCnLjbE4c0ww
-Mc+ImPAmxF/hrP3ZVg/h
-=xa/j
+iEYEAREIAAYFAlF9R/QACgkQsR7PQhRXYEn9YACfduJC/QvZvJeeyppdzMS7eyOU
+cZ8AnRP0dL9WZLt3O5ujGZ9GBYh87x0H
+=z8Kn
-----END PGP SIGNATURE-----
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index e72b693eedeb..5639458a6fe2 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -21,7 +21,7 @@
<flag name='p2p'>Add support for Wi-Fi Direct mode</flag>
<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
- <flag name='wimax'>Add support for Wimax EAP-PEER authentication
- algorithm</flag>
+ <flag name='wimax'>Add support for Wimax EAP-PEER authentication algorithm</flag>
+ <flag name='smartcard'>Add support for smartcards</flag>
</use>
</pkgmetadata>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild
deleted file mode 100644
index e62085641cb6..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-1.1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# 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-1.1.ebuild,v 1.6 2013/03/02 23:13:01 hwoarang 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 ssl wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !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
- epatch "${FILESDIR}/${P}-generate-libeap-peer.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"
-
- # bug (409285) - not needed for 1.1
- #epatch "${FILESDIR}/wpa_supplicant-gcc470.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"
-
- # libnl path fix
- epatch "${FILESDIR}/${P}-libnl_path_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
-
- 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
- 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 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
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r1.ebuild
index d42cd061d724..7f62869e8985 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r1.ebuild
@@ -1,6 +1,6 @@
# 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.ebuild,v 1.2 2013/03/02 23:13:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r1.ebuild,v 1.1 2013/04/28 16:02:30 gurligebis Exp $
EAPI=4
@@ -13,8 +13,8 @@ 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 ssl wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !gnutls !ssl )"
+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? (
@@ -146,7 +146,6 @@ src_configure() {
# 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
@@ -154,6 +153,10 @@ src_configure() {
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