diff options
Diffstat (limited to 'net-wireless/wpa_supplicant')
-rw-r--r-- | net-wireless/wpa_supplicant/Manifest | 9 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/metadata.xml | 1 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild | 436 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild | 1 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild) | 87 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild | 87 |
6 files changed, 551 insertions, 70 deletions
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index e4462ad901ff..11661dd546a2 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -19,7 +19,8 @@ AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535 DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac SHA512 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa SHA512 8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3 EBUILD wpa_supplicant-2.6-r10.ebuild 12648 BLAKE2B c67a87d8edae237a17d8799fb79c2aad65da5ba6a8c80d2a8ad925542e8fb0494a5f7732a0b9e4915d64f564507c347559c459e29190e10713474b4d00c27afe SHA512 518d7f5ba4f7cd0587151af95024b8d42d7220677ba2fc73a7b29a7e6a5c47b0947e7c353d74f38fe46f17f5fe91dc6c4bd61688a8a4fe2769e55f7e48131a20 -EBUILD wpa_supplicant-2.7-r1.ebuild 11750 BLAKE2B eb1e7a72330890822359cc0d006957cd6e25723bc063ee739148a9923aa5d966287e5f35049190dbf730f116025bfc960545561d869ca8d06ad35a92c88bbd26 SHA512 b9bd97e080835f1aeec619cab60e5bf23382b6a91bead57373edef72064b53945ee4722ec4ebd23ce8d5d95d342a56f72d9c508910176d890e796067802b1746 -EBUILD wpa_supplicant-2.7-r2.ebuild 11270 BLAKE2B 1ac5d009139055a44a2879354268e8a730b4fd7b6a925d3d9ff0e58f4191bb64a8813c4e1537a06cb692c7b38bd62dca3f5d849db7aed6d32dc5c1f2e27b4b6d SHA512 3bc2eb8541e3de4303b2f947ee1cd2e51dd8e684e073b89674f5ef2b8fb4d3dc88a38ff272ee1c36b3ad57d2728a0b2b65e894d2342c0ddd68fbb264f2cf264d -EBUILD wpa_supplicant-9999.ebuild 11115 BLAKE2B 2472a9b7048cba9b89b3897688791c8ec58ad1d91eadecf96f457565af94a592412c508a1a2716f2dbb31c50ce36f2bfb7f51eac978fa80318b6ae07fe8b9e1d SHA512 44347702a69a244f3c6f599dfb0e59ec114d3a737b15ba1a25fce99ddfe8e3bae9a54429888d7f2cbb37ddbf09818135a94786abf842b2fd36cde6857d0ec4bf -MISC metadata.xml 1445 BLAKE2B ef11ad35ecd137b01122d8545607e450ddffe4f015d91ac548f3e040a519aca1d08cf60c136a8a56fef7baccbc56d7acb884779c9e51b873906bce67a34155b7 SHA512 ed650c94e746ab3f4c8e6a2f105472f212053bc1c8934c2a1234740da0cdb75faa512d0d677557e1ca5ee38db1d1eba59f94ac63e3aaf83d8fa2b898989ce3e8 +EBUILD wpa_supplicant-2.6-r6.ebuild 11810 BLAKE2B 2c4dccf5392657392567b56598a9cf98ab968b34da44210a7608e1eda9e2eea3fbadcd6c51bbd6cffab841295cf49aa8f17d2602be537fc107b7d08370282955 SHA512 eb1a814b2cb50a5b0752061b3563c514c69c4bd637b83f9ee0e477310510869d05a1f5cbc9e2f3f894886e4309fc60c10d2f77b30adcba9d590bf9c8adde93eb +EBUILD wpa_supplicant-2.7-r1.ebuild 11763 BLAKE2B fba2545d7c383f4df338dce069c1011c803efd2d2e70cf43efe26b46df4d72ab60856759febc13af936baae7ff7d159b16a4b304deaf318ee99991469e14802f SHA512 eacaaeb231b4dfc79ecd4e49cfd8fdbcb0e95aca7a497de4daf127581cd70c1935df7fa0e4c62fb2a518b3a20bfd486933cc63dbc829e53960cfbbcf66e59e16 +EBUILD wpa_supplicant-2.7.ebuild 11704 BLAKE2B ee03f052b3e896025970ae8be65aea336c3c0cee3eed18af4e0f6e8d5a91b1fe1a851954b3114fbdbb8a7cca99b193f9a84509e3ec0ff5cfeff6fa03d6b79d4a SHA512 ad8dedda2a83e5ba230a60b3e32471eba5334ebe7bb80f9e048a09c0701f29652ea4184d29a84736b4708db9325481056301fdff868b085e32f952577507e33b +EBUILD wpa_supplicant-9999.ebuild 11604 BLAKE2B bba465e8a711a22fda12cfea28378e9cef2b0f634f1c268e55bd8da5a9f630f4ca0001709c54f37160a4aa1dcdd6888f6d20c18fcd53c2b843c7399c00f54b15 SHA512 005f63ab95bdd23156ba9a878fdd06dd119b9a4bf8de2a06a12e48c24851975f8a9d20ace85883184a5ca42289cbb60d578ff8ea1b2aabecde39b79ebf99e2da +MISC metadata.xml 1387 BLAKE2B d18ad59ec0e7852ed299596a6217d705f3344b1e215875fa5eb4afb9aeb91d17edd77ed35e5cb83b6868b529d3c173574f7d1810f2f145c8398860f72b0792fe SHA512 ab26df54e5dc68ef0db3f654df1dbf144b38d78e63d11d428bd04a4b374c6b704b334e3812a4042b4827bdab887bebe6de24a82c05edb7df7d614d4d4b8925fb diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml index 4d369c2c3865..885b7c3d6bbd 100644 --- a/net-wireless/wpa_supplicant/metadata.xml +++ b/net-wireless/wpa_supplicant/metadata.xml @@ -11,7 +11,6 @@ <flag name="eapol_test">Build and install eapol_test binary</flag> <flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag> <flag name="hs2-0">Add support for 802.11u and Passpoint for HotSpot 2.0</flag> - <flag name="macsec">Add support for wired macsec</flag> <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="privsep">Enable wpa_priv privledge separation binary</flag> diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild new file mode 100644 index 000000000000..df073740892b --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild @@ -0,0 +1,436 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 + +DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" +HOMEPAGE="https://w1.fi/wpa_supplicant/" +SRC_URI="https://w1.fi/releases/${P}.tar.gz" +LICENSE="|| ( GPL-2 BSD )" + +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd" +IUSE="ap dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="smartcard? ( ssl )" + +CDEPEND="dbus? ( sys-apps/dbus ) + kernel_linux? ( + dev-libs/libnl:3 + net-wireless/crda + eap-sim? ( sys-apps/pcsc-lite ) + ) + !kernel_linux? ( net-libs/libpcap ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + ) + readline? ( + sys-libs/ncurses:0= + sys-libs/readline:0= + ) + ssl? ( + gnutls? ( + dev-libs/libgcrypt:0= + net-libs/gnutls:= + ) + !gnutls? ( + !libressl? ( >=dev-libs/openssl-1.0.2k:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + !ssl? ( dev-libs/libtommath ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-networkmanager ) +" + +DOC_CONTENTS=" + If this is a clean installation of wpa_supplicant, you + have to create a configuration file named + ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf + An example configuration file is available for reference in + ${EROOT%/}/usr/share/doc/${PF}/ +" + +S="${WORKDIR}/${P}/${PN}" + +Kconfig_style_config() { + #param 1 is CONFIG_* item + #param 2 is what to set it = to, defaulting in y + CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" + setting="${2:-y}" + + if [ ! $setting = n ]; then + #first remove any leading "# " if $2 is not n + sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" + #set item = $setting (defaulting to y) + sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" + if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then + echo "$CONFIG_PARAM=$setting" >>.config + fi + else + #ensure item commented out + sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" + fi +} + +pkg_setup() { + if use ssl ; then + if use gnutls && use libressl ; then + elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\"" + fi + else + elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation" + fi +} + +src_prepare() { + default + + # 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 + + # systemd entries to D-Bus service files (bug #372877) + echo 'SystemdService=wpa_supplicant.service' \ + | tee -a dbus/*.service >/dev/null || die + + cd "${WORKDIR}/${P}" || die + + if use wimax; then + # generate-libeap-peer.patch comes before + # fix-undefined-reference-to-random_get_bytes.patch + eapply "${FILESDIR}/${P}-generate-libeap-peer.patch" + + # multilib-strict fix (bug #373685) + sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die + fi + + # bug (320097) + eapply "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" + + # bug (596332 & 651314) + eapply "${FILESDIR}/${P}-libressl-compatibility.patch" + + # https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt + eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch" + eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch" + + # bug (640492) + sed -i 's#-Werror ##' wpa_supplicant/Makefile || die +} + +src_configure() { + # Toolchain setup + tc-export CC + + cp defconfig .config || die + + # Basic setup + Kconfig_style_config CTRL_IFACE + Kconfig_style_config MATCH_IFACE + Kconfig_style_config BACKEND file + Kconfig_style_config IBSS_RSN + Kconfig_style_config IEEE80211W + Kconfig_style_config IEEE80211R + + # Basic authentication methods + # NOTE: we don't set GPSK or SAKE as they conflict + # with the below options + Kconfig_style_config EAP_GTC + Kconfig_style_config EAP_MD5 + Kconfig_style_config EAP_OTP + Kconfig_style_config EAP_PAX + Kconfig_style_config EAP_PSK + Kconfig_style_config EAP_TLV + Kconfig_style_config EAP_EXE + Kconfig_style_config IEEE8021X_EAPOL + Kconfig_style_config PKCS12 + Kconfig_style_config PEERKEY + Kconfig_style_config EAP_LEAP + Kconfig_style_config EAP_MSCHAPV2 + Kconfig_style_config EAP_PEAP + Kconfig_style_config EAP_TLS + Kconfig_style_config EAP_TTLS + + # Enabling background scanning. + Kconfig_style_config BGSCAN_SIMPLE + Kconfig_style_config BGSCAN_LEARN + + if use dbus ; then + Kconfig_style_config CTRL_IFACE_DBUS + Kconfig_style_config CTRL_IFACE_DBUS_NEW + Kconfig_style_config CTRL_IFACE_DBUS_INTRO + fi + + if use eapol_test ; then + Kconfig_style_config EAPOL_TEST + fi + + # Enable support for writing debug info to a log file and syslog. + Kconfig_style_config DEBUG_FILE + Kconfig_style_config DEBUG_SYSLOG + + if use hs2-0 ; then + Kconfig_style_config INTERWORKING + Kconfig_style_config HS20 + fi + + if use uncommon-eap-types; then + Kconfig_style_config EAP_GPSK + Kconfig_style_config EAP_SAKE + Kconfig_style_config EAP_GPSK_SHA256 + Kconfig_style_config EAP_IKEV2 + Kconfig_style_config EAP_EKE + fi + + if use eap-sim ; then + # Smart card authentication + Kconfig_style_config EAP_SIM + Kconfig_style_config EAP_AKA + Kconfig_style_config EAP_AKA_PRIME + Kconfig_style_config PCSC + fi + + if use fasteap ; then + Kconfig_style_config EAP_FAST + fi + + if use readline ; then + # readline/history support for wpa_cli + Kconfig_style_config READLINE + else + #internal line edit mode for wpa_cli + Kconfig_style_config WPA_CLI_EDIT + fi + + # SSL authentication methods + if use ssl ; then + if use gnutls ; then + Kconfig_style_config TLS gnutls + Kconfig_style_config GNUTLS_EXTRA + else + Kconfig_style_config TLS openssl + Kconfig_style_config EAP_PWD + + # Enabling mesh networks. + Kconfig_style_config MESH + fi + else + Kconfig_style_config TLS internal + fi + + if use smartcard ; then + Kconfig_style_config SMARTCARD + fi + + if use tdls ; then + Kconfig_style_config TDLS + fi + + if use kernel_linux ; then + # Linux specific drivers + Kconfig_style_config DRIVER_ATMEL + Kconfig_style_config DRIVER_HOSTAP + Kconfig_style_config DRIVER_IPW + Kconfig_style_config DRIVER_NL80211 + Kconfig_style_config DRIVER_RALINK + Kconfig_style_config DRIVER_WEXT + Kconfig_style_config DRIVER_WIRED + + if use ps3 ; then + Kconfig_style_config DRIVER_PS3 + fi + + elif use kernel_FreeBSD ; then + # FreeBSD specific driver + Kconfig_style_config DRIVER_BSD + fi + + # Wi-Fi Protected Setup (WPS) + if use wps ; then + Kconfig_style_config WPS + Kconfig_style_config WPS2 + # USB Flash Drive + Kconfig_style_config WPS_UFD + # External Registrar + Kconfig_style_config WPS_ER + # Universal Plug'n'Play + Kconfig_style_config WPS_UPNP + # Near Field Communication + Kconfig_style_config WPS_NFC + fi + + # Wi-Fi Direct (WiDi) + if use p2p ; then + Kconfig_style_config P2P + Kconfig_style_config WIFI_DISPLAY + fi + + # Access Point Mode + if use ap ; then + Kconfig_style_config AP + fi + + # Enable essentials for AP/P2P + if use ap || use p2p ; then + # Enabling HT support (802.11n) + Kconfig_style_config IEEE80211N + + # Enabling VHT support (802.11ac) + Kconfig_style_config IEEE80211AC + fi + + # Enable mitigation against certain attacks against TKIP + Kconfig_style_config DELAYED_MIC_ERROR_REPORT + + if use privsep ; then + Kconfig_style_config PRIVSEP + fi + + # 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 + Kconfig_style_config LIBNL32 + fi + + if use qt5 ; then + pushd "${S}"/wpa_gui-qt4 > /dev/null || die + eqmake5 wpa_gui.pro + popd > /dev/null || die + fi +} + +src_compile() { + einfo "Building wpa_supplicant" + emake V=1 BINDIR=/usr/sbin + + if use wimax; then + emake -C ../src/eap_peer clean + emake -C ../src/eap_peer + fi + + if use qt5; then + einfo "Building wpa_gui" + emake -C "${S}"/wpa_gui-qt4 + fi + + if use eapol_test ; then + emake eapol_test + fi +} + +src_install() { + dosbin wpa_supplicant + use privsep && dosbin wpa_priv + 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 + + readme.gentoo_create_doc + dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ + wpa_supplicant.conf + + newdoc .config build-config + + doman doc/docbook/*.{5,8} + + if use qt5 ; 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;" + else + rm "${ED}"/usr/share/man/man8/wpa_gui.8 + fi + + use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install + + if use dbus ; then + pushd "${S}"/dbus > /dev/null || die + 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 + popd > /dev/null || die + + # This unit relies on dbus support, bug 538600. + systemd_dounit systemd/wpa_supplicant.service + fi + + if use eapol_test ; then + dobin eapol_test + fi + + systemd_dounit "systemd/wpa_supplicant@.service" + systemd_dounit "systemd/wpa_supplicant-nl80211@.service" + systemd_dounit "systemd/wpa_supplicant-wired@.service" +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then + echo + ewarn "WARNING: your old configuration file ${EROOT%/}/etc/wpa_supplicant.conf" + ewarn "needs to be moved to ${EROOT%/}/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 "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]] + then + ebegin "Moving ${fn} to multi-user.target" + mv "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \ + "${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die + eend ${?} \ + "Please try to re-enable ${fn}" + fi + done + + systemd_reenable wpa_supplicant.service +} diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild index 54a02a98ae6c..16e14e933ddc 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild @@ -12,6 +12,7 @@ LICENSE="|| ( GPL-2 BSD )" if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" + KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" SRC_URI="https://w1.fi/releases/${P}.tar.gz" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild index 311119d282de..12a69aa090d4 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,13 +12,15 @@ LICENSE="|| ( GPL-2 BSD )" if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" + KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" SRC_URI="https://w1.fi/releases/${P}.tar.gz" fi SLOT="0" -IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="smartcard? ( ssl )" CDEPEND="dbus? ( sys-apps/dbus ) kernel_linux? ( @@ -37,8 +39,17 @@ CDEPEND="dbus? ( sys-apps/dbus ) sys-libs/ncurses:0= sys-libs/readline:0= ) - !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) + ssl? ( + gnutls? ( + dev-libs/libgcrypt:0= + net-libs/gnutls:= + ) + !gnutls? ( + !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + !ssl? ( dev-libs/libtommath ) " DEPEND="${CDEPEND} virtual/pkgconfig @@ -77,6 +88,16 @@ Kconfig_style_config() { fi } +pkg_setup() { + if use ssl ; then + if use gnutls && use libressl ; then + elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\"" + fi + else + elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation" + fi +} + src_prepare() { default @@ -119,9 +140,6 @@ src_prepare() { # fix undefined reference to remove_ie() eapply "${FILESDIR}/${P}-fix-undefined-remove-ie.patch" - # bug (672632) - eapply "${FILESDIR}/${P}-libressl.patch" - # bug (640492) sed -i 's#-Werror ##' wpa_supplicant/Makefile || die } @@ -139,11 +157,6 @@ src_configure() { Kconfig_style_config IBSS_RSN Kconfig_style_config IEEE80211W Kconfig_style_config IEEE80211R - Kconfig_style_config HT_OVERRIDES - Kconfig_style_config VHT_OVERRIDES - Kconfig_style_config OCV - Kconfig_style_config TLSV11 - Kconfig_style_config TLSV12 # Basic authentication methods # NOTE: we don't set GPSK or SAKE as they conflict @@ -215,20 +228,34 @@ src_configure() { Kconfig_style_config WPA_CLI_EDIT fi - Kconfig_style_config TLS openssl - Kconfig_style_config FST - if ! use bindist; then - Kconfig_style_config EAP_PWD - Kconfig_style_config FILS - Kconfig_style_config FILS_SK_PFS - # Enabling mesh networks. - Kconfig_style_config MESH - #WPA3 - Kconfig_style_config OWE - Kconfig_style_config SAE - Kconfig_style_config DPP + if use suiteb; then Kconfig_style_config SUITEB - Kconfig_style_config SUITEB192 + fi + + # SSL authentication methods + if use ssl ; then + if use gnutls ; then + Kconfig_style_config TLS gnutls + Kconfig_style_config GNUTLS_EXTRA + else + #this fails for gnutls + Kconfig_style_config SUITEB192 + Kconfig_style_config TLS openssl + if ! use bindist; then + #this fails for gnutls + Kconfig_style_config EAP_PWD + # SAE fails on gnutls and everything below here needs SAE + # Enabling mesh networks. + Kconfig_style_config MESH + #WPA3 + Kconfig_style_config OWE + Kconfig_style_config SAE + #we also need to disable FILS, except that isn't enabled yet + fi + + fi + else + Kconfig_style_config TLS internal fi if use smartcard ; then @@ -249,12 +276,6 @@ src_configure() { Kconfig_style_config DRIVER_WEXT Kconfig_style_config DRIVER_WIRED - if use macsec ; then - #requires something, no idea what - #Kconfig_style_config DRIVER_MACSEC_QCA - Kconfig_style_config MACSEC - fi - if use ps3 ; then Kconfig_style_config DRIVER_PS3 fi @@ -411,9 +432,9 @@ pkg_postinst() { ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf" fi - if use bindist; then + if use bindist || use gnutls; then if ! use libressl; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." + ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)." ewarn "This is incredibly undesirable" fi fi diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild index e0e179eeae04..df34e7baa75c 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,13 +12,15 @@ LICENSE="|| ( GPL-2 BSD )" if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git" + KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" SRC_URI="https://w1.fi/releases/${P}.tar.gz" fi SLOT="0" -IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" +REQUIRED_USE="smartcard? ( ssl )" CDEPEND="dbus? ( sys-apps/dbus ) kernel_linux? ( @@ -37,8 +39,17 @@ CDEPEND="dbus? ( sys-apps/dbus ) sys-libs/ncurses:0= sys-libs/readline:0= ) - !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) + ssl? ( + gnutls? ( + dev-libs/libgcrypt:0= + net-libs/gnutls:= + ) + !gnutls? ( + !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + !ssl? ( dev-libs/libtommath ) " DEPEND="${CDEPEND} virtual/pkgconfig @@ -77,6 +88,16 @@ Kconfig_style_config() { fi } +pkg_setup() { + if use ssl ; then + if use gnutls && use libressl ; then + elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\"" + fi + else + elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation" + fi +} + src_prepare() { default @@ -133,11 +154,6 @@ src_configure() { Kconfig_style_config IBSS_RSN Kconfig_style_config IEEE80211W Kconfig_style_config IEEE80211R - Kconfig_style_config HT_OVERRIDES - Kconfig_style_config VHT_OVERRIDES - Kconfig_style_config OCV - Kconfig_style_config TLSV11 - Kconfig_style_config TLSV12 # Basic authentication methods # NOTE: we don't set GPSK or SAKE as they conflict @@ -209,20 +225,34 @@ src_configure() { Kconfig_style_config WPA_CLI_EDIT fi - Kconfig_style_config TLS openssl - Kconfig_style_config FST - if ! use bindist; then - Kconfig_style_config EAP_PWD - Kconfig_style_config FILS - Kconfig_style_config FILS_SK_PFS - # Enabling mesh networks. - Kconfig_style_config MESH - #WPA3 - Kconfig_style_config OWE - Kconfig_style_config SAE - Kconfig_style_config DPP + if use suiteb; then Kconfig_style_config SUITEB - Kconfig_style_config SUITEB192 + fi + + # SSL authentication methods + if use ssl ; then + if use gnutls ; then + Kconfig_style_config TLS gnutls + Kconfig_style_config GNUTLS_EXTRA + else + #this fails for gnutls + Kconfig_style_config SUITEB192 + Kconfig_style_config TLS openssl + if ! use bindist; then + #this fails for gnutls + Kconfig_style_config EAP_PWD + # SAE fails on gnutls and everything below here needs SAE + # Enabling mesh networks. + Kconfig_style_config MESH + #WPA3 + Kconfig_style_config OWE + Kconfig_style_config SAE + #we also need to disable FILS, except that isn't enabled yet + fi + + fi + else + Kconfig_style_config TLS internal fi if use smartcard ; then @@ -243,13 +273,6 @@ src_configure() { Kconfig_style_config DRIVER_WEXT Kconfig_style_config DRIVER_WIRED - if use macsec ; then - #requires something, no idea what - #Kconfig_style_config DRIVER_MACSEC_QCA - Kconfig_style_config DRIVER_MACSEC_LINUX - Kconfig_style_config MACSEC - fi - if use ps3 ; then Kconfig_style_config DRIVER_PS3 fi @@ -381,7 +404,7 @@ src_install() { insinto /etc/dbus-1/system.d newins dbus-wpa_supplicant.conf wpa_supplicant.conf insinto /usr/share/dbus-1/system-services - doins fi.w1.wpa_supplicant1.service + doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service popd > /dev/null || die # This unit relies on dbus support, bug 538600. @@ -406,9 +429,9 @@ pkg_postinst() { ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf" fi - if use bindist; then + if use bindist || use gnutls; then if ! use libressl; then - ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." + ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)." ewarn "This is incredibly undesirable" fi fi |