| 1 |
commit: f469ae69f5f647aeb091ada20079ad19709a67da |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 8 17:10:47 2017 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 8 17:11:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f469ae69 |
| 7 |
|
| 8 |
net-wireless/wpa_supplicant: mostly fix bug #598138 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-wireless/wpa_supplicant/metadata.xml | 2 ++ |
| 13 |
.../wpa_supplicant/wpa_supplicant-2.6-r4.ebuild | 33 +++++++++++++++++++++- |
| 14 |
2 files changed, 34 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml |
| 17 |
index f0eca57a1d8..807ccfc0e03 100644 |
| 18 |
--- a/net-wireless/wpa_supplicant/metadata.xml |
| 19 |
+++ b/net-wireless/wpa_supplicant/metadata.xml |
| 20 |
@@ -12,10 +12,12 @@ |
| 21 |
<use> |
| 22 |
<flag name="ap">Add support for access point mode</flag> |
| 23 |
<flag name="eap-sim">Add support for EAP-SIM authentication algorithm</flag> |
| 24 |
+ <flag name="eapol_test">Build and install eapol_test binary</flag> |
| 25 |
<flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag> |
| 26 |
<flag name="hs2-0">Add support for 802.11u and Passpoint for HotSpot 2.0</flag> |
| 27 |
<flag name="p2p">Add support for Wi-Fi Direct mode</flag> |
| 28 |
<flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag> |
| 29 |
+ <flag name="privsep">Enable wpa_priv privledge separation binary</flag> |
| 30 |
<flag name="tdls">Add support for Tunneled Direct Link Setup (802.11z)</flag> |
| 31 |
<flag name="uncommon-eap-types">Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE</flag> |
| 32 |
<flag name="wps">Add support for Wi-Fi Protected Setup</flag> |
| 33 |
|
| 34 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild |
| 35 |
index bbcfd91a660..d33978b98b0 100644 |
| 36 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild |
| 37 |
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r4.ebuild |
| 38 |
@@ -12,7 +12,7 @@ LICENSE="|| ( GPL-2 BSD )" |
| 39 |
|
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 42 |
-IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" |
| 43 |
+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" |
| 44 |
REQUIRED_USE="fasteap? ( !ssl ) smartcard? ( ssl )" |
| 45 |
|
| 46 |
CDEPEND="dbus? ( sys-apps/dbus ) |
| 47 |
@@ -72,6 +72,9 @@ Kconfig_style_config() { |
| 48 |
sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" |
| 49 |
#set item = $setting (defaulting to y) |
| 50 |
sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" |
| 51 |
+ if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then |
| 52 |
+ echo "$CONFIG_PARAM=$setting" >>.config |
| 53 |
+ fi |
| 54 |
else |
| 55 |
#ensure item commented out |
| 56 |
sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" |
| 57 |
@@ -188,6 +191,10 @@ src_configure() { |
| 58 |
Kconfig_style_config CTRL_IFACE_DBUS_INTRO |
| 59 |
fi |
| 60 |
|
| 61 |
+ if use eapol_test ; then |
| 62 |
+ Kconfig_style_config EAPOL_TEST |
| 63 |
+ fi |
| 64 |
+ |
| 65 |
# Enable support for writing debug info to a log file and syslog. |
| 66 |
Kconfig_style_config DEBUG_FILE |
| 67 |
Kconfig_style_config DEBUG_SYSLOG |
| 68 |
@@ -289,9 +296,22 @@ src_configure() { |
| 69 |
Kconfig_style_config AP |
| 70 |
fi |
| 71 |
|
| 72 |
+ # Enable essentials for AP/P2P |
| 73 |
+ if use ap || use p2p ; then |
| 74 |
+ # Enabling HT support (802.11n) |
| 75 |
+ Kconfig_style_config IEEE80211N |
| 76 |
+ |
| 77 |
+ # Enabling VHT support (802.11ac) |
| 78 |
+ Kconfig_style_config IEEE80211AC |
| 79 |
+ fi |
| 80 |
+ |
| 81 |
# Enable mitigation against certain attacks against TKIP |
| 82 |
Kconfig_style_config DELAYED_MIC_ERROR_REPORT |
| 83 |
|
| 84 |
+ if use privsep ; then |
| 85 |
+ Kconfig_style_config PRIVSEP |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
# If we are using libnl 2.0 and above, enable support for it |
| 89 |
# Bug 382159 |
| 90 |
# Removed for now, since the 3.2 version is broken, and we don't |
| 91 |
@@ -320,10 +340,15 @@ src_compile() { |
| 92 |
einfo "Building wpa_gui" |
| 93 |
emake -C "${S}"/wpa_gui-qt4 |
| 94 |
fi |
| 95 |
+ |
| 96 |
+ if use eapol_test ; then |
| 97 |
+ emake eapol_test |
| 98 |
+ fi |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
| 102 |
dosbin wpa_supplicant |
| 103 |
+ use privsep && dosbin wpa_priv |
| 104 |
dobin wpa_cli wpa_passphrase |
| 105 |
|
| 106 |
# baselayout-1 compat |
| 107 |
@@ -355,6 +380,8 @@ src_install() { |
| 108 |
dobin wpa_gui-qt4/wpa_gui |
| 109 |
doicon wpa_gui-qt4/icons/wpa_gui.svg |
| 110 |
make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" |
| 111 |
+ else |
| 112 |
+ rm "${ED}"/usr/share/man/man8/wpa_gui.8 |
| 113 |
fi |
| 114 |
|
| 115 |
use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install |
| 116 |
@@ -371,6 +398,10 @@ src_install() { |
| 117 |
systemd_dounit systemd/wpa_supplicant.service |
| 118 |
fi |
| 119 |
|
| 120 |
+ if use eapol_test ; then |
| 121 |
+ dobin eapol_test |
| 122 |
+ fi |
| 123 |
+ |
| 124 |
systemd_dounit "systemd/wpa_supplicant@.service" |
| 125 |
systemd_dounit "systemd/wpa_supplicant-nl80211@.service" |
| 126 |
systemd_dounit "systemd/wpa_supplicant-wired@.service" |
Archives