commit: 5e80780d1f9a202dafd258e2e48b422dca6c9129 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Apr 11 21:42:48 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Apr 12 02:05:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5e80780d
net-wireless/wpa_supplicant: Merge ::gentoo changes Signed-off-by: orbea <orbea <AT> riseup.net> net-wireless/wpa_supplicant/files/wpa_cli.sh | 2 +- net-wireless/wpa_supplicant/metadata.xml | 5 ++++- .../wpa_supplicant/wpa_supplicant-2.10-r1.ebuild | 20 +++++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/net-wireless/wpa_supplicant/files/wpa_cli.sh b/net-wireless/wpa_supplicant/files/wpa_cli.sh index 4c3a505..c581bc1 100644 --- a/net-wireless/wpa_supplicant/files/wpa_cli.sh +++ b/net-wireless/wpa_supplicant/files/wpa_cli.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2011 Gentoo Foundation # Written by Roy Marples <[email protected]> # Distributed under the terms of the GNU General Public License v2 # Alternatively, this file may be distributed under the terms of the BSD License diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml index 743ca1d..ecb638b 100644 --- a/net-wireless/wpa_supplicant/metadata.xml +++ b/net-wireless/wpa_supplicant/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> <email>[email protected]</email> @@ -8,6 +8,7 @@ <use> <flag name="ap">Add support for access point mode</flag> <flag name="broadcom-sta">Flag to help users disable features not supported by broadcom-sta driver</flag> + <flag name="crda">Use <pkg>net-wireless/crda</pkg> for regulatory domain loading instead of in-kernel (4.15+) support</flag> <flag name="eap-sim">Add support for EAP-SIM authentication algorithm</flag> <flag name="eapol-test">Build and install eapol_test binary</flag> <flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag> @@ -20,7 +21,9 @@ <flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag> <flag name="privsep">Enable wpa_priv privledge separation binary</flag> <flag name="tdls">Add support for Tunneled Direct Link Setup (802.11z)</flag> + <flag name="tkip">Add support for WPA TKIP (deprecated due to security flaws in 2009)</flag> <flag name="uncommon-eap-types">Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE</flag> + <flag name="wep">Add support for Wired Equivalent Privacy (deprecated due to security flaws in 2004)</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="smartcard">Add support for smartcards</flag> diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild index f2829f0..4a319f1 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild @@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://w1.fi/hostap.git"; else - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" SRC_URI="https://w1.fi/releases/${P}.tar.gz"; fi @@ -77,13 +77,13 @@ Kconfig_style_config() { #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" + 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" + sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" fi } @@ -480,6 +480,20 @@ pkg_postinst() { 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 + if ! use wep; then + einfo "WARNING: You are building with WEP support disabled, which is recommended since" + einfo "this protocol is deprecated and insecure. If you still need to connect to" + einfo "WEP-enabled networks, you may turn this flag back on. With this flag off," + einfo "WEP-enabled networks will not even show up as available." + einfo "If your network is missing you may wish to USE=wep" + fi + if ! use tkip; then + ewarn "WARNING: You are building with TKIP support disabled, which is recommended since" + ewarn "this protocol is deprecated and insecure. If you still need to connect to" + ewarn "TKIP-enabled networks, you may turn this flag back on. With this flag off," + ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up" + ewarn "as available. If your network is missing you may wish to USE=tkip" + fi # Mea culpa, feel free to remove that after some time --mgorny. local fn
