commit:     f830911f2ae4e86dbc0b73d78dc52878634cb5ac
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 19:50:41 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 19:55:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f830911f

net-wireless/wpa_supplicant: add some new support

add support for a few things like FILS which are available and weren't
in gentoo.  remove gnutls and internal tls implementations for being
broken with nearly everything, especially wpa3

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 ...icant-9999.ebuild => wpa_supplicant-2.7-r2.ebuild} | 19 +++++++++++--------
 .../wpa_supplicant/wpa_supplicant-9999.ebuild         | 11 ++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
similarity index 95%
copy from net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
copy to net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
index 487ffc5b611..02ae5e792d5 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p 
privsep ps3 qt5 readline selinux smartcard suiteb tdls uncommon-eap-types wimax 
wps kernel_linux kernel_FreeBSD"
+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"
 
 CDEPEND="dbus? ( sys-apps/dbus )
        kernel_linux? (
@@ -116,6 +116,12 @@ src_prepare() {
        # bug (320097)
        eapply 
"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
 
+       # 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
 }
@@ -209,11 +215,6 @@ src_configure() {
                Kconfig_style_config WPA_CLI_EDIT
        fi
 
-       if use suiteb; then
-               Kconfig_style_config SUITEB
-       fi
-
-       Kconfig_style_config SUITEB192
        Kconfig_style_config TLS openssl
        Kconfig_style_config FST
        if ! use bindist; then
@@ -226,6 +227,8 @@ src_configure() {
                Kconfig_style_config OWE
                Kconfig_style_config SAE
                Kconfig_style_config DPP
+               Kconfig_style_config SUITEB
+               Kconfig_style_config SUITEB192
        fi
 
        if use smartcard ; then
@@ -384,7 +387,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.
@@ -411,7 +414,7 @@ pkg_postinst() {
 
        if use bindist; then
                if ! use libressl; then
-                       ewarn "Using bindist use flags presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
+                       ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
                        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 487ffc5b611..e0e179eeae0 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p 
privsep ps3 qt5 readline selinux smartcard suiteb tdls uncommon-eap-types wimax 
wps kernel_linux kernel_FreeBSD"
+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"
 
 CDEPEND="dbus? ( sys-apps/dbus )
        kernel_linux? (
@@ -209,11 +209,6 @@ src_configure() {
                Kconfig_style_config WPA_CLI_EDIT
        fi
 
-       if use suiteb; then
-               Kconfig_style_config SUITEB
-       fi
-
-       Kconfig_style_config SUITEB192
        Kconfig_style_config TLS openssl
        Kconfig_style_config FST
        if ! use bindist; then
@@ -226,6 +221,8 @@ src_configure() {
                Kconfig_style_config OWE
                Kconfig_style_config SAE
                Kconfig_style_config DPP
+               Kconfig_style_config SUITEB
+               Kconfig_style_config SUITEB192
        fi
 
        if use smartcard ; then
@@ -411,7 +408,7 @@ pkg_postinst() {
 
        if use bindist; then
                if ! use libressl; then
-                       ewarn "Using bindist use flags presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
+                       ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
                        ewarn "This is incredibly undesirable"
                fi
        fi

Reply via email to