[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2024-03-09 Thread Sam James
commit: 4c8375e12db9421a1155f034705b68fdbe8f928e
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  9 21:23:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  9 21:23:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8375e1

net-wireless/wpa_supplicant: always install OpenRC init script, cleanup cruft

I haven't dug into the historical reasons for the has_version here, my guess
is it relied on some newer OpenRC feature rather than intentionally omitting
for systemd machines (where the small file policy applies in both directions).

Always install them accordingly.

Also, cleanup an ancient  gentoo.org>

 ...t-2.10-r3.ebuild => wpa_supplicant-2.10-r4.ebuild} | 16 +++-
 .../wpa_supplicant/wpa_supplicant-.ebuild | 19 +--
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
similarity index 96%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
index b4b8610aa549..5778596a4275 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -389,18 +389,8 @@ src_install() {
use privsep && dosbin wpa_priv
dobin wpa_cli wpa_passphrase
 
-   # baselayout-1 compat
-   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
+   newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+   newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
 
exeinto /etc/wpa_supplicant/
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 8c93c31c2554..5778596a4275 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~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
 
@@ -124,6 +124,7 @@ src_prepare() {
 
# bug (912315)
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
+   eapply 
"${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
@@ -388,18 +389,8 @@ src_install() {
use privsep && dosbin wpa_priv
dobin wpa_cli wpa_passphrase
 
-   # baselayout-1 compat
-   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
+   newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+   newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
 
exeinto /etc/wpa_supplicant/
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2024-03-09 Thread Sam James
commit: 804d4d18a8999594e931c3f7d350a9535eed7033
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  9 21:22:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  9 21:22:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d4d18

net-wireless/wpa_supplicant: drop 2.10-r1, 2.10-r2

Signed-off-by: Sam James  gentoo.org>

 .../wpa_supplicant/wpa_supplicant-2.10-r1.ebuild   | 501 -
 .../wpa_supplicant/wpa_supplicant-2.10-r2.ebuild   | 483 
 2 files changed, 984 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
deleted file mode 100644
index 867bb37f63ac..
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ /dev/null
@@ -1,501 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="https://w1.fi/wpa_supplicant/;
-LICENSE="|| ( GPL-2 BSD )"
-
-if [ "${PV}" = "" ]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
-   SRC_URI="https://w1.fi/releases/${P}.tar.gz;
-fi
-
-SLOT="0"
-IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo 
+mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
-
-# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
-# interface functions used for MACsec, so this combination cannot be used
-# at least for now. bug #684442
-REQUIRED_USE="
-   macsec? ( !privsep )
-   privsep? ( !macsec )
-   broadcom-sta? ( !fils !mesh !mbo )
-"
-
-DEPEND="
-   >=dev-libs/openssl-1.0.2k:=
-   dbus? ( sys-apps/dbus )
-   kernel_linux? (
-   >=dev-libs/libnl-3.2:3
-   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=
-   )
-"
-RDEPEND="${DEPEND}
-   selinux? ( sec-policy/selinux-networkmanager )
-   kernel_linux? (
-   net-wireless/wireless-regdb
-   )
-"
-BDEPEND="virtual/pkgconfig"
-
-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_pretend() {
-   CONFIG_CHECK=""
-
-   check_extra_config
-
-   if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-   [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* 
]]
-   then
-   ewarn "REGULATORY DOMAIN PROBLEM:"
-   ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be 
able to load regulatory.db from"
-   ewarn " /lib/firmware, resulting in broken regulatory domain 
support.  Please set CONFIG_CFG80211=m"
-   ewarn " or add regulatory.db and regulatory.db.p7s to 
CONFIG_EXTRA_FIRMWARE."
-   fi
-}
-
-src_prepare() {
-   default
-
-   # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-   sed -i \
-   -e "s:\(#include \):#include \n\1:" \
-   ../src/l2_packet/l2_packet_freebsd.c || die
-
-   # People seem to take the example 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2024-01-21 Thread David Seifert
commit: 91d807c5ca433ee38fb3d2f6ae704afc07cc3af8
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 21 09:42:06 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 21 09:42:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d807c5

net-wireless/wpa_supplicant: remove USE=crda

Signed-off-by: David Seifert  gentoo.org>

 net-wireless/wpa_supplicant/metadata.xml   |  1 -
 .../wpa_supplicant/wpa_supplicant-2.10-r1.ebuild   | 26 --
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index ecb638b513dc..489b2ea119fd 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -8,7 +8,6 @@

Add support for access point mode
Flag to help users disable features 
not supported by broadcom-sta driver
-   Use net-wireless/crda for 
regulatory domain loading instead of in-kernel (4.15+) support
Add support for EAP-SIM authentication 
algorithm
Build and install eapol_test 
binary
Add support for FAST-EAP authentication 
algorithm

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 dbd441303c31..867bb37f63ac 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
+IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo 
+mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -52,7 +52,6 @@ RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-networkmanager )
kernel_linux? (
net-wireless/wireless-regdb
-   crda? ( net-wireless/crda )
)
 "
 BDEPEND="virtual/pkgconfig"
@@ -90,22 +89,15 @@ Kconfig_style_config() {
 pkg_pretend() {
CONFIG_CHECK=""
 
-   if use crda ; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-   WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: 
please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-   fi
-
check_extra_config
 
-   if ! use crda ; then
-   if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-   [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != 
*regulatory.db* ]]
-   then
-   ewarn "REGULATORY DOMAIN PROBLEM:"
-   ewarn "With CONFIG_CFG80211=y (built-in), the driver 
won't be able to load regulatory.db from"
-   ewarn " /lib/firmware, resulting in broken regulatory 
domain support.  Please set CONFIG_CFG80211=m"
-   ewarn " or add regulatory.db and regulatory.db.p7s to 
CONFIG_EXTRA_FIRMWARE."
-   fi
+   if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+   [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* 
]]
+   then
+   ewarn "REGULATORY DOMAIN PROBLEM:"
+   ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be 
able to load regulatory.db from"
+   ewarn " /lib/firmware, resulting in broken regulatory domain 
support.  Please set CONFIG_CFG80211=m"
+   ewarn " or add regulatory.db and regulatory.db.p7s to 
CONFIG_EXTRA_FIRMWARE."
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-09-22 Thread Sam James
commit: 3a6a56d97fe922ce09365a93a4ca01e3eefa65f4
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 22 17:30:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 22 17:30:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6a56d9

net-wireless/wpa_supplicant: Stabilize 2.10-r3 arm64, #914385

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
index 4e15082c5146..66d2b2c226df 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-09-19 Thread Sam James
commit: f1bb9334e7ebbb394a81872d675766fab80f3e74
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 19 09:47:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 19 09:47:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bb9334

net-wireless/wpa_supplicant: Stabilize 2.10-r3 ppc64, #914385

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
index ead7910ec7c6..4e15082c5146 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-09-19 Thread Sam James
commit: 36360450b62dd3bd29016ad412912fe1b805e1d8
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 19 09:37:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 19 09:37:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36360450

net-wireless/wpa_supplicant: Stabilize 2.10-r3 arm, #914385

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
index 0be6f1eb8e2e..6fa279139914 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-09-19 Thread Sam James
commit: a852a52152789131be50f4f25c49a6bb158ef0fc
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 19 09:37:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 19 09:37:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a852a521

net-wireless/wpa_supplicant: Stabilize 2.10-r3 x86, #914385

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
index 6fa279139914..ead7910ec7c6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~loong ~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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-09-19 Thread Sam James
commit: 2521e8befe473b0b7ca9adec77766f0773fd60ba
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 19 09:30:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 19 09:30:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2521e8be

net-wireless/wpa_supplicant: Stabilize 2.10-r3 amd64, #914385

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
index d04e2429d769..0be6f1eb8e2e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/, net-wireless/wpa_supplicant/

2023-08-26 Thread Pacho Ramos
commit: 862d4997853b3de3fb3507c997a254ae24d84576
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Aug 26 09:29:18 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Aug 26 09:29:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862d4997

net-wireless/wpa_supplicant: Fix openssl3 TLS/EAP regression

Apply Debian/Fedora patches to fix regression with openssl3 causing some wifi
connections (i.e. Eduroam) to fail.

Closes: https://bugs.gentoo.org/912315
Signed-off-by: Pacho Ramos  gentoo.org>

 ...p-security-level-to-0-with-OpenSSL-3.0-wh.patch | 57 ++
 ...upplicant-2.10-allow-legacy-renegotiation.patch | 30 
 ...t-.ebuild => wpa_supplicant-2.10-r3.ebuild} |  4 ++
 .../wpa_supplicant/wpa_supplicant-.ebuild  |  3 ++
 4 files changed, 94 insertions(+)

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch
 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch
new file mode 100644
index ..18f879c9f39f
--- /dev/null
+++ 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch
@@ -0,0 +1,57 @@
+From: Jouni Malinen 
+Date: Sun, 22 May 2022 17:01:35 +0300
+Subject: OpenSSL: Drop security level to 0 with OpenSSL 3.0 when using TLS 
1.0/1.1
+
+Commit 9afb68b03976 ("OpenSSL: Allow systemwide secpolicy overrides for
+TLS version") with commit 58bbcfa31b18 ("OpenSSL: Update security level
+drop for TLS 1.0/1.1 with OpenSSL 3.0") allow this workaround to be
+enabled with an explicit network configuration parameter. However, the
+default settings are still allowing TLS 1.0 and 1.1 to be negotiated
+just to see them fail immediately when using OpenSSL 3.0. This is not
+exactly helpful especially when the OpenSSL error message for this
+particular case is "internal error" which does not really say anything
+about the reason for the error.
+
+It is is a bit inconvenient to update the security policy for this
+particular issue based on the negotiated TLS version since that happens
+in the middle of processing for the first message from the server.
+However, this can be done by using the debug callback for printing out
+the received TLS messages during processing.
+
+Drop the OpenSSL security level to 0 if that is the only option to
+continue the TLS negotiation, i.e., when TLS 1.0/1.1 are still allowed
+in wpa_supplicant default configuration and OpenSSL 3.0 with the
+constraint on MD5-SHA1 use.
+
+Signed-off-by: Jouni Malinen 
+
+Bug-Debian: https://bugs.debian.org/1011121
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1958267
+Origin: upstream, commit:bc99366f9b960150aa2e369048bbc2218c1d414e
+---
+ src/crypto/tls_openssl.c | 9 +
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 6602ac64f591..78621d926dab 100644
+--- a/src/crypto/tls_openssl.c
 b/src/crypto/tls_openssl.c
+@@ -1557,6 +1557,15 @@ static void tls_msg_cb(int write_p, int version, int 
content_type,
+   struct tls_connection *conn = arg;
+   const u8 *pos = buf;
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x3000L
++  if ((SSL_version(ssl) == TLS1_VERSION ||
++   SSL_version(ssl) == TLS1_1_VERSION) &&
++  SSL_get_security_level(ssl) > 0) {
++  wpa_printf(MSG_DEBUG,
++ "OpenSSL: Drop security level to 0 to allow TLS 
1.0/1.1 use of MD5-SHA1 signature algorithm");
++  SSL_set_security_level(ssl, 0);
++  }
++#endif /* OpenSSL version >= 3.0 */
+   if (write_p == 2) {
+   wpa_printf(MSG_DEBUG,
+  "OpenSSL: session ver=0x%x content_type=%d",
+-- 
+2.39.0
+

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch
 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch
new file mode 100644
index ..574973fe6fe5
--- /dev/null
+++ 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.10-allow-legacy-renegotiation.patch
@@ -0,0 +1,30 @@
+From: James Ralston 
+Date: Sun, 1 May 2022 16:15:23 -0700
+Subject: Allow legacy renegotiation to fix PEAP issues with some servers
+
+Upstream: http://lists.infradead.org/pipermail/hostap/2022-May/040511.html
+---
+ src/crypto/tls_openssl.c | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 273e5cb..ad3aa1a 100644
+--- a/src/crypto/tls_openssl.c
 b/src/crypto/tls_openssl.c
+@@ -1056,6 +1056,16 @@ void * tls_init(const struct tls_config *conf)
+   SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv2);
+   SSL_CTX_set_options(ssl, SSL_OP_NO_SSLv3);
+ 
++  /* Many enterprise PEAP server implementations (e.g. used in large
++   corporations and universities) do not support RFC5746 secure
++   renegotiation, and 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-08-19 Thread Rick Farina
commit: ee29aaf84ffee4f7b7d05ed995ff07ed7ba05dd1
Author: Rick Farina  gentoo  org>
AuthorDate: Sat Aug 19 17:55:28 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sat Aug 19 17:55:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee29aaf8

net-wireless/wpa_supplicant: remove no-op sed

Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild | 7 ---
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild| 7 ---
 2 files changed, 14 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
index 710e7c4ad2c2..656297bfa793 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
@@ -98,13 +98,6 @@ src_prepare() {
-e "s:\(#include \):#include \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):" \

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 710e7c4ad2c2..656297bfa793 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -98,13 +98,6 @@ src_prepare() {
-e "s:\(#include \):#include \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):" \



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2023-08-19 Thread Rick Farina
commit: eb05f1c34454ccbad4bca7032537917d05f894ac
Author: Rick Farina  gentoo  org>
AuthorDate: Sat Aug 19 16:57:45 2023 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sat Aug 19 17:29:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb05f1c3

net-wireless/wpa_supplicant: make crda optional

net-wireless/wireless-regdb now handles crda if requested and other
packages do not need that handling.
Closes: https://bugs.gentoo.org/829958
Signed-off-by: Rick Farina  gentoo.org>

 ...t-.ebuild => wpa_supplicant-2.10-r2.ebuild} | 35 +-
 .../wpa_supplicant/wpa_supplicant-.ebuild  | 35 +-
 2 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
similarity index 90%
copy from net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
copy to net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
index aee70bb7bc41..710e7c4ad2c2 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
+IUSE="ap broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo 
+mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -52,7 +52,6 @@ RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-networkmanager )
kernel_linux? (
net-wireless/wireless-regdb
-   crda? ( net-wireless/crda )
)
 "
 BDEPEND="virtual/pkgconfig"
@@ -77,36 +76,18 @@ 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"
+   if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" 
.config; then
+   echo "Kconfig_style_config error setting 
$CONFIG_PARAM=$setting"
+   fi
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_pretend() {
-   CONFIG_CHECK=""
-
-   if use crda ; then
-   CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-   WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: 
please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-   fi
-
-   check_extra_config
-
-   if ! use crda ; then
-   if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-   [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != 
*regulatory.db* ]]
-   then
-   ewarn "REGULATORY DOMAIN PROBLEM:"
-   ewarn "With CONFIG_CFG80211=y (built-in), the driver 
won't be able to load regulatory.db from"
-   ewarn " /lib/firmware, resulting in broken regulatory 
domain support.  Please set CONFIG_CFG80211=m"
-   ewarn " or add regulatory.db and regulatory.db.p7s to 
CONFIG_EXTRA_FIRMWARE."
+   if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# 
$CONFIG_PARAM/" .config; then
+   echo "Kconfig_style_config error commenting 
$CONFIG_PARAM"
+   fi
fi
-   fi
 }
 
 src_prepare() {

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index aee70bb7bc41..710e7c4ad2c2 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-09-02 Thread Rick Farina
commit: 2c655522c1c063f95e1e0ae12fe5e90933d7064e
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Sep  2 17:40:57 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Sep  2 17:41:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c655522

net-wireless/wpa_supplicant: improve Kconfig_style_config()

As-is, this macro can have imprecise results. Specifically,
'Kconfig_style_config TLS openssl' is converting lines like
'CONFIG_TLSV11=y' into 'CONFIG_TLSV11=openssl'.

If we match to the end-of-word '\>', this doesn't happen.

Closes: https://github.com/gentoo/gentoo/pull/16307
Author: Brian Norris  chromium.org>
Signed-off-by: Brian Norris  chromium.org>
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild | 4 ++--
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 cb80b33748c2..dbd441303c31 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
@@ -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
 }
 

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 276c74b2dc41..aee70bb7bc41 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -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
 }
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-08-26 Thread Rick Farina
commit: de359f9d291ad818476330e855828c0fb79ba482
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Aug 26 16:30:12 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Aug 26 16:32:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de359f9d

net-wireless/wpa_supplicant: add deprecated ewarns

Per discussion in #gentoo-dev, hopefully ease tkip/wep users to finding
the new use flags by adding einfo/ewarn for when wep/tkip use flags are
disabled.  In the 5 months it has been disabled there have been a few
complaints, but not nearly enough to lower the security of all users by
defaulting broken encryption/authentication to on.
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild | 14 ++
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild| 14 ++
 2 files changed, 28 insertions(+)

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 b7a623182f1f..cb80b33748c2 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
@@ -477,6 +477,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

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index abd50f99a8df..276c74b2dc41 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -477,6 +477,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



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-08-25 Thread Rick Farina
commit: 18b900c358d16aa0ba191c3a878b6aa00da25d1d
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Aug 25 21:34:15 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Aug 25 21:34:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b900c3

net-wireless/wpa_supplicant: update metadata

Deprecated could be for many reasons, by request, clarify it was due to
security flaws so people know why it is off by default and should not be
used.
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index e6c399334732..ecb638b513dc 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -21,9 +21,9 @@
Add support for ps3 hypervisor driven gelic 
wifi
Enable wpa_priv privledge separation 
binary
Add support for Tunneled Direct Link Setup 
(802.11z)
-   Add support for WPA TKIP (deprecated 
2009)
+   Add support for WPA TKIP (deprecated due to 
security flaws in 2009)
Add support for GPSK, SAKE, 
GPSK_SHA256, IKEV2 and EKE
-   Add support for Wired Equivalent Privacy 
(deprecated 2004)
+   Add support for Wired Equivalent Privacy 
(deprecated due to security flaws in 2004)
Add support for Wi-Fi Protected Setup
Add support for Wimax EAP-PEER 
authentication algorithm
Add support for smartcards



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-05-05 Thread WANG Xuerui
commit: c196d8ac8e7a62efb292f5e5683a4987c2bffce1
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May  5 23:39:40 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May  5 23:44:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c196d8ac

net-wireless/wpa_supplicant: keyword 2.10-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0430cf11a777..b7a623182f1f 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}" = "" ]; 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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-05-05 Thread WANG Xuerui
commit: 005db2ecfd02f3b58a184144f860c4f8a434318c
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May  5 23:39:41 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May  5 23:44:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005db2ec

net-wireless/wpa_supplicant: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index d0aba4022747..abd50f99a8df 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/2017-1/, net-wireless/wpa_supplicant/files/, ...

2022-03-16 Thread Rick Farina
commit: 83775f6e5802bb8bb1a78d86b2144bc0b7d31ab2
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Mar 17 02:15:25 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Mar 17 02:15:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83775f6e

net-wireless/wpa_supplicant: drop unused patches

Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |   1 -
 ...-Avoid-key-reinstallation-in-FT-handshake.patch | 174 --
 ...nstallation-of-an-already-in-use-group-ke.patch | 250 -
 ...ection-of-GTK-IGTK-reinstallation-of-WNM-.patch | 184 ---
 ...04-Prevent-installation-of-an-all-zero-TK.patch |  79 ---
 ...Fix-PTK-rekeying-to-generate-a-new-ANonce.patch |  64 --
 ...6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch | 132 ---
 ...WNM-Sleep-Mode-Response-without-pending-r.patch |  43 
 ...llow-multiple-Reassociation-Response-fram.patch |  82 ---
 ...y-ignore-management-frame-from-unexpected.patch |  73 --
 .../wpa_supplicant/wpa_supplicant-2.10-r1.ebuild   |   1 -
 .../wpa_supplicant/wpa_supplicant-.ebuild  |   1 -
 12 files changed, 1084 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index f3bd37dd4029..0e445ba324c5 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,2 +1 @@
 DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 
7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752
 SHA512 
021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
-DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 
284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274
 SHA512 
80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5

diff --git 
a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
 
b/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
deleted file mode 100644
index 727684865dbd..
--- 
a/net-wireless/wpa_supplicant/files/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef 
-Date: Fri, 14 Jul 2017 15:15:35 +0200
-Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake
-
-Do not reinstall TK to the driver during Reassociation Response frame
-processing if the first attempt of setting the TK succeeded. This avoids
-issues related to clearing the TX/RX PN that could result in reusing
-same PN values for transmitted frames (e.g., due to CCM nonce reuse and
-also hitting replay protection on the receiver) and accepting replayed
-frames on RX side.
-
-This issue was introduced by the commit
-0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in
-authenticator') which allowed wpa_ft_install_ptk() to be called multiple
-times with the same PTK. While the second configuration attempt is
-needed with some drivers, it must be done only if the first attempt
-failed.
-
-Signed-off-by: Mathy Vanhoef 

- src/ap/ieee802_11.c  | 16 +---
- src/ap/wpa_auth.c| 11 +++
- src/ap/wpa_auth.h|  3 ++-
- src/ap/wpa_auth_ft.c | 10 ++
- src/ap/wpa_auth_i.h  |  1 +
- 5 files changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index 4e04169..333035f 100644
 a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd,
- {
-   struct ieee80211_ht_capabilities ht_cap;
-   struct ieee80211_vht_capabilities vht_cap;
-+  int set = 1;
- 
-   /*
-* Remove the STA entry to ensure the STA PS state gets cleared and
-@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd,
-* FT-over-the-DS, where a station re-associates back to the same AP but
-* skips the authentication flow, or if working with a driver that
-* does not support full AP client state.
-+   *
-+   * Skip this if the STA has already completed FT reassociation and the
-+   * TK has been configured since the TX/RX PN must not be reset to 0 for
-+   * the same key.
-*/
--  if (!sta->added_unassoc)
-+  if (!sta->added_unassoc &&
-+  (!(sta->flags & WLAN_STA_AUTHORIZED) ||
-+   !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) {
-   hostapd_drv_sta_remove(hapd, sta->addr);
-+  wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
-+   

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-16 Thread Rick Farina
commit: 5784e26cc42f4cdf3db96a5545316fe82c84d373
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Mar 17 01:55:40 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Mar 17 02:15:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5784e26c

net-wireless/wpa_supplicant: fix wep regression

Introduce a use flag for wep.  Previous bump accidently left wep hard
disabled.  That's a very sane default, but we need a way to turn it back
on for anyone who needs it.
Fixes: 744939bdfc1a0a6296c709d4382d3676abdb2b66
Additionally add a use flag for TKIP which was introduced in 2.10.
While 2.10 leaves TKIP enabled by default, it's been deprecated since
2009 and support has been removed from many other operating systems such
as Windows.  Disabled is a better default.
Enable DPP2, support was added in 2.10 and there is no downside

Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/metadata.xml |  2 ++
 ...plicant-2.10.ebuild => wpa_supplicant-2.10-r1.ebuild} | 16 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index 749b235bf0e5..e6c399334732 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -21,7 +21,9 @@
Add support for ps3 hypervisor driven gelic 
wifi
Enable wpa_priv privledge separation 
binary
Add support for Tunneled Direct Link Setup 
(802.11z)
+   Add support for WPA TKIP (deprecated 
2009)
Add support for GPSK, SAKE, 
GPSK_SHA256, IKEV2 and EKE
+   Add support for Wired Equivalent Privacy 
(deprecated 2004)
Add support for Wi-Fi Protected Setup
Add support for Wimax EAP-PEER 
authentication algorithm
Add support for smartcards

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
similarity index 97%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
index 8b641fcc5aa7..38b59c995133 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10-r1.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -271,9 +271,23 @@ src_configure() {
Kconfig_style_config OWE
Kconfig_style_config SAE
Kconfig_style_config DPP
+   Kconfig_style_config DPP2
Kconfig_style_config SUITEB192
Kconfig_style_config SUITEB
 
+   if use wep ; then
+   Kconfig_style_config WEP
+   else
+   Kconfig_style_config WEP n
+   fi
+
+   # Watch out, reversed logic
+   if use tkip ; then
+   Kconfig_style_config NO_TKIP n
+   else
+   Kconfig_style_config NO_TKIP
+   fi
+
if use smartcard ; then
Kconfig_style_config SMARTCARD
else



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-16 Thread Rick Farina
commit: 093594dc110993c6f0b2cefe5935d56977e4ee37
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Mar 17 02:01:30 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Mar 17 02:15:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093594dc

net-wireless/wpa_supplicant: drop 2.9-r4, 2.9-r5, 2.9-r8

Signed-off-by: Rick Farina  gentoo.org>
Bug: https://bugs.gentoo.org/831332

 net-wireless/wpa_supplicant/Manifest   |   1 -
 .../wpa_supplicant/wpa_supplicant-2.9-r4.ebuild| 465 ---
 .../wpa_supplicant/wpa_supplicant-2.9-r5.ebuild| 471 
 .../wpa_supplicant/wpa_supplicant-2.9-r8.ebuild| 490 -
 4 files changed, 1427 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 99b29aeba98d..f3bd37dd4029 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,3 +1,2 @@
 DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 
7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752
 SHA512 
021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
 DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 
284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274
 SHA512 
80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5
-DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
deleted file mode 100644
index 1f17da11e7e4..
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
-
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
-HOMEPAGE="https://w1.fi/wpa_supplicant/;
-LICENSE="|| ( GPL-2 BSD )"
-
-if [ "${PV}" = "" ]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-   SRC_URI="https://w1.fi/releases/${P}.tar.gz;
-fi
-
-SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
-
-# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
-# interface functions used for MACsec, so this combination cannot be used
-# at least for now.
-REQUIRED_USE="
-   macsec? ( !privsep )
-   privsep? ( !macsec )
-   broadcom-sta? ( !fils !mesh !mbo )
-"
-
-DEPEND="
-   >=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
-   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=
-   )
-"
-RDEPEND="${DEPEND}
-   selinux? ( sec-policy/selinux-networkmanager )
-"
-BDEPEND="virtual/pkgconfig"
-
-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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-16 Thread Rick Farina
commit: 019971ba4a2a2a45fe45aabe2ed090fe8eddd1b8
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Mar 17 02:10:05 2022 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Mar 17 02:15:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019971ba

net-wireless/wpa_supplicant: sync live ebuild

Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 91171ec95ad1..e0e12b24f103 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls tkip 
uncommon-eap-types wep wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -271,9 +271,23 @@ src_configure() {
Kconfig_style_config OWE
Kconfig_style_config SAE
Kconfig_style_config DPP
+   Kconfig_style_config DPP2
Kconfig_style_config SUITEB192
Kconfig_style_config SUITEB
 
+   if use wep ; then
+   Kconfig_style_config WEP
+   else
+   Kconfig_style_config WEP n
+   fi
+
+   # Watch out, reversed logic
+   if use tkip ; then
+   Kconfig_style_config NO_TKIP n
+   else
+   Kconfig_style_config NO_TKIP
+   fi
+
if use smartcard ; then
Kconfig_style_config SMARTCARD
else



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-12 Thread Arthur Zamarin
commit: 66f8aafc8d3542a07af138ffd045bdd1ce396c59
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 15:48:07 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 15:48:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f8aafc

net-wireless/wpa_supplicant: Stabilize 2.10 ppc64, #834461

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index 93a6b9c6af7a..8b641fcc5aa7 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ppc ppc64 ~riscv ~sparc 
x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-12 Thread Arthur Zamarin
commit: 5cb9acd6e379fc379183b6cfbb93b062dd55e341
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 10:37:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 10:37:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb9acd6

net-wireless/wpa_supplicant: Stabilize 2.10 arm, #834461

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index 9c8b65a7bc1e..93a6b9c6af7a 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-06 Thread Agostino Sarubbo
commit: a94103203468a9a587ddc904a2a0e1f111de0151
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  6 08:54:04 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  6 08:54:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9410320

net-wireless/wpa_supplicant: x86 stable wrt bug #834461

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index b444606183a6..9c8b65a7bc1e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-06 Thread Agostino Sarubbo
commit: 511352a0f73b21a40ec193b377f5c87add4ea48e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  6 08:50:47 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  6 08:50:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511352a0

net-wireless/wpa_supplicant: ppc stable wrt bug #834461

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index 23821217aff1..b444606183a6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ppc ~ppc64 ~riscv ~sparc 
~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-06 Thread Agostino Sarubbo
commit: 3f5ae279e06ac0984547820e83905101917114f1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  6 08:49:54 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  6 08:49:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5ae279

net-wireless/wpa_supplicant: amd64 stable wrt bug #834461

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index fe5ecf7d1d62..23821217aff1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-06 Thread Sam James
commit: e4ff1a8c2a81f1076ef6d3252bb84366869d1e0b
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  6 08:05:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  6 08:05:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ff1a8c

net-wireless/wpa_supplicant: Stabilize 2.10 arm64, #834461

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index 91171ec95ad1..fe5ecf7d1d62 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-03-01 Thread Sam James
commit: 49c884d31f99241bb978d04afffdeff46364597d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  2 03:26:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  2 03:26:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c884d3

net-wireless/wpa_supplicant: fix build with USE=privsep

Closes: https://bugs.gentoo.org/831369
Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild | 6 +-
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index 3066970717f3..91171ec95ad1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -23,7 +23,7 @@ IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap 
+fils +hs2-0 macsec
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
-# at least for now.
+# at least for now. bug #684442
 REQUIRED_USE="
macsec? ( !privsep )
privsep? ( !macsec )
@@ -299,6 +299,10 @@ src_configure() {
#Kconfig_style_config DRIVER_MACSEC_QCA
Kconfig_style_config DRIVER_MACSEC_LINUX
Kconfig_style_config MACSEC
+   else
+   # bug #831369 and bug #684442
+   Kconfig_style_config DRIVER_MACSEC_LINUX n
+   Kconfig_style_config MACSEC n
fi
 
if use ps3 ; then

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 3066970717f3..91171ec95ad1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -23,7 +23,7 @@ IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap 
+fils +hs2-0 macsec
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
-# at least for now.
+# at least for now. bug #684442
 REQUIRED_USE="
macsec? ( !privsep )
privsep? ( !macsec )
@@ -299,6 +299,10 @@ src_configure() {
#Kconfig_style_config DRIVER_MACSEC_QCA
Kconfig_style_config DRIVER_MACSEC_LINUX
Kconfig_style_config MACSEC
+   else
+   # bug #831369 and bug #684442
+   Kconfig_style_config DRIVER_MACSEC_LINUX n
+   Kconfig_style_config MACSEC n
fi
 
if use ps3 ; then



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-01-16 Thread Sam James
commit: 744939bdfc1a0a6296c709d4382d3676abdb2b66
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 17 02:14:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 17 02:20:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=744939bd

net-wireless/wpa_supplicant: add 2.10 (security bump)

Bug: https://bugs.gentoo.org/831332
Closes: https://bugs.gentoo.org/829180
Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |  1 +
 .../{wpa_supplicant-.ebuild => wpa_supplicant-2.10.ebuild} | 10 +++---
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 10 +++---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 587047b0ad3a..99b29aeba98d 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,2 +1,3 @@
+DIST wpa_supplicant-2.10.tar.gz 3511622 BLAKE2B 
7f6045e5dcf24f7ccf1ea75c99541f9d68fadaea858a6ca11a95c997de14e33b3aa89138e748664579b5a4ea493d247cf6613da3c5fae49a4dbb5cd58dace752
 SHA512 
021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1
 DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 
284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274
 SHA512 
80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
similarity index 98%
copy from net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
copy to net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
index 2e075c4c2b2b..3066970717f3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
@@ -34,7 +34,7 @@ DEPEND="
>=dev-libs/openssl-1.0.2k:=
dbus? ( sys-apps/dbus )
kernel_linux? (
-   dev-libs/libnl:3
+   >=dev-libs/libnl-3.2:3
eap-sim? ( sys-apps/pcsc-lite )
)
!kernel_linux? ( net-libs/libpcap )
@@ -359,11 +359,7 @@ src_configure() {
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
+   if use kernel_linux ; then
Kconfig_style_config LIBNL32
fi
 

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 2e075c4c2b2b..3066970717f3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
@@ -34,7 +34,7 @@ DEPEND="
>=dev-libs/openssl-1.0.2k:=
dbus? ( sys-apps/dbus )
kernel_linux? (
-   dev-libs/libnl:3
+   >=dev-libs/libnl-3.2:3
eap-sim? ( sys-apps/pcsc-lite )
)
!kernel_linux? ( net-libs/libpcap )
@@ -359,11 +359,7 @@ src_configure() {
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
+   if use kernel_linux ; then
Kconfig_style_config LIBNL32
fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-01-04 Thread David Seifert
commit: 091ffa53326315f1aacb998e83be79743d7944ad
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jan  4 10:29:52 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jan  4 10:29:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=091ffa53

net-wireless/wpa_supplicant: remove implicit kernel_linux

Signed-off-by: David Seifert  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
index acd12f1b94f3..1f17da11e7e4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 53849b5c9a31..3be08e10a41d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
index a18a9f31ed0c..1b4727fa9173 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 11eb78d15724..2e075c4c2b2b 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2022-01-03 Thread Sam James
commit: a74327582ef96b9dbc569ad5079702b3ee8a33ea
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan  3 16:06:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  4 03:28:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7432758

net-wireless/wpa_supplicant: remove kernel_FreeBSD

Signed-off-by: David Seifert  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild | 8 ++--
 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 8 ++--
 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild | 8 ++--
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild   | 8 ++--
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
index f3b138d121f2..acd12f1b94f3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -282,10 +282,6 @@ src_configure() {
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)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 62785e101ba2..53849b5c9a31 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -288,10 +288,6 @@ src_configure() {
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)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
index 8c0150f8694d..a18a9f31ed0c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -312,10 +312,6 @@ src_configure() {
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)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-12-15 Thread Sam James
commit: c59dd064bc6192fb91018c63764a2c7120c1c9a1
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 16 00:08:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 16 00:08:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59dd064

net-wireless/wpa_supplicant: Stabilize 2.9-r8 ALLARCHES, #828045

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
index 6c1e2d23ae78..8c0150f8694d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; 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 ~mips ppc ppc64 ~riscv ~sparc 
x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-12-02 Thread Sam James
commit: d07f49b07110bd211a32aea3d9656372a31379c0
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 04:38:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  3 04:38:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07f49b0

net-wireless/wpa_supplicant: fix bindist removal

I'd gone back and tried to sync live and ended up with a monstrosity.

Bug: https://bugs.gentoo.org/762850
Signed-off-by: Sam James  gentoo.org>

 ...a_supplicant-2.9-r7.ebuild => wpa_supplicant-2.9-r8.ebuild} |  2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 10 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
similarity index 99%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
index 2935a7227ab1..6c1e2d23ae78 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-   >=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
+   >=dev-libs/openssl-1.0.2k:=
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 2935a7227ab1..132825beb46c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-   >=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
+   >=dev-libs/openssl-1.0.2k:=
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3
@@ -151,14 +151,6 @@ src_prepare() {
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-
-   ## Security patches
-   # CVE-2019-16275 (bug #696030)
-   eapply 
"${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-   # 2020-2, 2021-1 security advisories (bug #768759)
-   eapply 
"${WORKDIR}"/wpa_supplicant-2.9-r3-patches/security-{2020-2,2021-1}/*.patch
-   # CVE-2021-30004 (bug #780138)
-   eapply 
"${WORKDIR}"/wpa_supplicant-2.9-r3-patches/misc/CVE-2021-30004.patch
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-12-02 Thread Sam James
commit: f448b05c0c596479972d0fed25847fabd277f26b
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 04:06:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  3 04:26:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f448b05c

net-wireless/wpa_supplicant: drop OpenSSL bindist kludge

Not needed anymore now that (stable) OpenSSL now lacks USE=bindist;
see news item for more information.

Originally added in fed37693d6442a4ec65e121c80ad2f52b6d93335, the
changes were/are just to allow building wpa_supplicant against
openssl[bindist] rather than anything shipped within wpa_supplicant
that might have patent issues, etc.

Bug: https://bugs.gentoo.org/762850
Signed-off-by: Sam James  gentoo.org>

 ...-2.9-r6.ebuild => wpa_supplicant-2.9-r7.ebuild} | 40 --
 .../wpa_supplicant/wpa_supplicant-.ebuild  | 49 --
 2 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
similarity index 94%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
index 5e770398c338..2935a7227ab1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r7.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils 
+hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -264,24 +264,23 @@ src_configure() {
 
Kconfig_style_config TLS openssl
Kconfig_style_config FST
-   if ! use bindist ; then
-   Kconfig_style_config EAP_PWD
-   if use fils; then
-   Kconfig_style_config FILS
-   Kconfig_style_config FILS_SK_PFS
-   fi
-   if use mesh; then
-   Kconfig_style_config MESH
-   else
-   Kconfig_style_config MESH n
-   fi
-   #WPA3
-   Kconfig_style_config OWE
-   Kconfig_style_config SAE
-   Kconfig_style_config DPP
-   Kconfig_style_config SUITEB192
-   Kconfig_style_config SUITEB
+
+   Kconfig_style_config EAP_PWD
+   if use fils; then
+   Kconfig_style_config FILS
+   Kconfig_style_config FILS_SK_PFS
fi
+   if use mesh; then
+   Kconfig_style_config MESH
+   else
+   Kconfig_style_config MESH n
+   fi
+   # WPA3
+   Kconfig_style_config OWE
+   Kconfig_style_config SAE
+   Kconfig_style_config DPP
+   Kconfig_style_config SUITEB192
+   Kconfig_style_config SUITEB
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
@@ -478,11 +477,6 @@ pkg_postinst() {
ewarn "needs to be moved to 
${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf"
fi
 
-   if use bindist; then
-   ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
-   ewarn "This is incredibly undesirable"
-   fi
-
# Mea culpa, feel free to remove that after some time --mgorny.
local fn
for fn in wpa_supplicant{,@wlan0}.service; do

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 0420a22e8dc9..2935a7227ab1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -15,10 +15,11 @@ if [ "${PV}" = "" ]; then
 else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi
 
 SLOT="0"
-IUSE="ap bindist +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils 
+hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-11-21 Thread Sam James
commit: 7011f0660e18847f3b09d610372e6212fc3f7feb
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 21 13:38:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 21 13:38:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7011f066

net-wireless/wpa_supplicant: fix DEPEND for new optional CRDA

Bug: https://bugs.gentoo.org/462032
Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild | 1 -
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
index d2ef0b6caa03..5e770398c338 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
@@ -35,7 +35,6 @@ DEPEND="
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3
-   net-wireless/crda
eap-sim? ( sys-apps/pcsc-lite )
)
!kernel_linux? ( net-libs/libpcap )

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 92aa484c96d9..0420a22e8dc9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -34,7 +34,6 @@ DEPEND="
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3
-   net-wireless/crda
eap-sim? ( sys-apps/pcsc-lite )
)
!kernel_linux? ( net-libs/libpcap )



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-11-21 Thread Sam James
commit: cae2078be29fb03d6126d6639126d86b56004965
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 21 12:32:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 21 12:32:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae2078b

net-wireless/wpa_supplicant: add CRDA description

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index 0209c6198dc8..749b235bf0e5 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -8,6 +8,7 @@

Add support for access point mode
Flag to help users disable features 
not supported by broadcom-sta driver
+   Use net-wireless/crda for 
regulatory domain loading instead of in-kernel (4.15+) support
Add support for EAP-SIM authentication 
algorithm
Build and install eapol_test 
binary
Add support for FAST-EAP authentication 
algorithm



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-11-21 Thread Sam James
commit: 86f2873941b8049bfd376569e7871c74782257f4
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 21 12:25:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 21 12:30:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f28739

net-wireless/wpa_supplicant: make crda optional

Since the bug was originally filed, the situation
has changed and upstream now _discourage_ CRDA usage.

Let's make it optional to avoid pulling in m2crypto
on smaller devices.

Keeping it on by default (for now?) to avoid
breaking existing setups.

Closes: https://bugs.gentoo.org/462032
Thanks-to: Michael Weiser  weiser.dinsnail.net>
Signed-off-by: Sam James  gentoo.org>

 ...nt-.ebuild => wpa_supplicant-2.9-r6.ebuild} | 41 --
 .../wpa_supplicant/wpa_supplicant-.ebuild  | 32 +++--
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
similarity index 87%
copy from net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
copy to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
index 97cde554f0db..d2ef0b6caa03 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
+inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/;
@@ -13,12 +13,13 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist +crda broadcom-sta dbus eap-sim eapol-test fasteap +fils 
+hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -51,6 +52,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-networkmanager )
+   kernel_linux? (
+   net-wireless/wireless-regdb
+   crda? ( net-wireless/crda )
+   )
 "
 BDEPEND="virtual/pkgconfig"
 
@@ -84,6 +89,28 @@ Kconfig_style_config() {
fi
 }
 
+pkg_pretend() {
+   CONFIG_CHECK=""
+
+   if use crda ; then
+   CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+   WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: 
please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+   fi
+
+   check_extra_config
+
+   if ! use crda ; then
+   if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+   [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != 
*regulatory.db* ]]
+   then
+   ewarn "REGULATORY DOMAIN PROBLEM:"
+   ewarn "With CONFIG_CFG80211=y (built-in), the driver 
won't be able to load regulatory.db from"
+   ewarn " /lib/firmware, resulting in broken regulatory 
domain support.  Please set CONFIG_CFG80211=m"
+   ewarn " or add regulatory.db and regulatory.db.p7s to 
CONFIG_EXTRA_FIRMWARE."
+   fi
+   fi
+}
+
 src_prepare() {
default
 
@@ -125,6 +152,14 @@ src_prepare() {
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+
+   ## Security patches
+   # CVE-2019-16275 (bug #696030)
+   eapply 
"${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+   # 2020-2, 2021-1 security advisories (bug #768759)
+   eapply 
"${WORKDIR}"/wpa_supplicant-2.9-r3-patches/security-{2020-2,2021-1}/*.patch
+   # CVE-2021-30004 (bug #780138)
+   eapply 
"${WORKDIR}"/wpa_supplicant-2.9-r3-patches/misc/CVE-2021-30004.patch
 }
 
 src_configure() {

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 97cde554f0db..92aa484c96d9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop qmake-utils 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-07-24 Thread Marek Szuba
commit: 2ad21b7d79b179bcf914ceede9f4ef7bf362ef0b
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 24 11:18:59 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 24 23:02:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad21b7d

net-wireless/wpa_supplicant: keyword 2.9-r5 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 57801c056f9..62785e101ba 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-23 Thread Sam James
commit: dd03ae13526d9a6374c437466a357ce8463b0ca1
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 23 14:23:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 23 14:23:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd03ae13

net-wireless/wpa_supplicant: Stabilize 2.9-r5 arm64, #768759

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index a95fd9b837d..57801c056f9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-22 Thread Sam James
commit: 2c6823a0b69803c060d2804aed35281b9bc6b8fa
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 22 19:37:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 22 19:37:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6823a0

net-wireless/wpa_supplicant: Stabilize 2.9-r5 arm, #768759

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 476854d29ef..a95fd9b837d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-21 Thread Agostino Sarubbo
commit: 719da79f6944f212c3729b48aeafe1d388fa2384
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 21 06:18:52 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 21 06:18:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719da79f

net-wireless/wpa_supplicant: ppc64 stable wrt bug #768759

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 81805ffebe7..476854d29ef 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-21 Thread Agostino Sarubbo
commit: 340536d1bfdf089a97b5571f913ac3904e867f5e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 21 06:18:11 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 21 06:18:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340536d1

net-wireless/wpa_supplicant: ppc stable wrt bug #768759

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index e7289d21872..81805ffebe7 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-19 Thread Sam James
commit: 80b6a36cd4021aaf282a14a3a0daa7c9e5240b17
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 19 23:51:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 19 23:51:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b6a36c

net-wireless/wpa_supplicant: Stabilize 2.9-r5 x86, #768759

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
index 927131b4597..e7289d21872 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-17 Thread Thomas Deutschmann
commit: 99e1e98f29e5d21a2baf079455f611f25096
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 22:07:03 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 22:18:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e1e98f

net-wireless/wpa_supplicant: rev bump for commit f9b8bde6b

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../{wpa_supplicant-2.9-r2.ebuild => wpa_supplicant-2.9-r4.ebuild}| 0
 .../{wpa_supplicant-2.9-r3.ebuild => wpa_supplicant-2.9-r5.ebuild}| 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild
similarity index 100%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r4.ebuild

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild
similarity index 100%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r5.ebuild



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-17 Thread Thomas Deutschmann
commit: f9b8bde6ba878cf68cc50bd8bb972b938eeba53b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 17 20:20:32 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 17 20:32:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b8bde6

net-wireless/wpa_supplicant: Fix MissingUseDepDefault for 
dev-libs/openssl[bindist]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 95e04bf7986..f3b138d121f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-   >=dev-libs/openssl-1.0.2k:0=[bindist=]
+   >=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
index 5e5bcd094c6..927131b4597 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-   >=dev-libs/openssl-1.0.2k:0=[bindist=]
+   >=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index f4d4302d5ee..97cde554f0d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-   >=dev-libs/openssl-1.0.2k:0=[bindist=]
+   >=dev-libs/openssl-1.0.2k:0=[bindist(-)=]
dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-17 Thread Sam James
commit: 33ebdddb2371e36b2445abea8fa11925d640a215
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 17 20:18:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 17 20:23:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ebdddb

net-wireless/wpa_supplicant: Stabilize 2.9-r3 amd64, #768759

Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
index 84b17a27672..5e5bcd094c6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
 fi



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-06-07 Thread Sam James
commit: a67f782dde9b277d96bdc762475a4ff551268061
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  8 05:39:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  8 05:41:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67f782d

net-wireless/wpa_supplicant: add security patches

Patches for:
* Upstream advisories 2020-2, 2021-1
* CVE-2021-30004

Bug: https://bugs.gentoo.org/768759
Bug: https://bugs.gentoo.org/780138
Signed-off-by: Sam James  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |   1 +
 .../wpa_supplicant/wpa_supplicant-2.9-r3.ebuild| 475 +
 2 files changed, 476 insertions(+)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 07c650017d7..587047b0ad3 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1 +1,2 @@
+DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 
284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274
 SHA512 
80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
new file mode 100644
index 000..84b17a27672
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
@@ -0,0 +1,475 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="https://w1.fi/wpa_supplicant/;
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "" ]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   SRC_URI="https://w1.fi/releases/${P}.tar.gz;
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2;
+fi
+
+SLOT="0"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+
+# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
+# interface functions used for MACsec, so this combination cannot be used
+# at least for now.
+REQUIRED_USE="
+   macsec? ( !privsep )
+   privsep? ( !macsec )
+   broadcom-sta? ( !fils !mesh !mbo )
+"
+
+DEPEND="
+   >=dev-libs/openssl-1.0.2k:0=[bindist=]
+   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=
+   )
+"
+RDEPEND="${DEPEND}
+   selinux? ( sec-policy/selinux-networkmanager )
+"
+BDEPEND="virtual/pkgconfig"
+
+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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2021-04-02 Thread Rick Farina
commit: 92dac892940defc0627d8155910f4c13014b939c
Author: David Michael  gmail  com>
AuthorDate: Fri Mar 26 18:31:47 2021 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Apr  2 19:29:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92dac892

net-wireless/wpa_supplicant: fix pkg-config, drop libressl

Closes: https://bugs.gentoo.org/734790
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Rick Farina  gentoo.org>

 .../wpa_supplicant/wpa_supplicant-2.9-r2.ebuild| 35 --
 .../wpa_supplicant/wpa_supplicant-.ebuild  | 35 --
 2 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 3705130f557..95e04bf7986 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/;
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -29,7 +29,9 @@ REQUIRED_USE="
broadcom-sta? ( !fils !mesh !mbo )
 "
 
-CDEPEND="dbus? ( sys-apps/dbus )
+DEPEND="
+   >=dev-libs/openssl-1.0.2k:0=[bindist=]
+   dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3
net-wireless/crda
@@ -46,15 +48,11 @@ 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= )
 "
-DEPEND="${CDEPEND}
-   virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-networkmanager )
 "
+BDEPEND="virtual/pkgconfig"
 
 DOC_CONTENTS="
If this is a clean installation of wpa_supplicant, you
@@ -134,7 +132,7 @@ src_prepare() {
 
 src_configure() {
# Toolchain setup
-   tc-export CC
+   tc-export CC PKG_CONFIG
 
cp defconfig .config || die
 
@@ -235,7 +233,7 @@ src_configure() {
 
Kconfig_style_config TLS openssl
Kconfig_style_config FST
-   if ! use bindist || use libressl; then
+   if ! use bindist ; then
Kconfig_style_config EAP_PWD
if use fils; then
Kconfig_style_config FILS
@@ -251,8 +249,6 @@ src_configure() {
Kconfig_style_config SAE
Kconfig_style_config DPP
Kconfig_style_config SUITEB192
-   fi
-   if ! use bindist && ! use libressl; then
Kconfig_style_config SUITEB
fi
 
@@ -452,15 +448,8 @@ pkg_postinst() {
fi
 
if use bindist; then
-   if ! use libressl; then
-   ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
-   ewarn "This is incredibly undesirable"
-   fi
-   fi
-   if use libressl; then
-   ewarn "Libressl doesn't support SUITEB (part of WPA3)"
-   ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
-   ewarn "You probably don't care.  Patches welcome"
+   ewarn "Using bindist use flag presently breaks WPA3 
(specifically SAE, OWE, DPP, and FILS)."
+   ewarn "This is incredibly undesirable"
fi
 
# Mea culpa, feel free to remove that after some time --mgorny.

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index c91b6d2f562..f4d4302d5ee 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils qmake-utils systemd 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2020-02-18 Thread Rick Farina
commit: 57c83db7084fe3737637adef13cc8ee8996dd15d
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Feb 18 14:49:24 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Feb 18 14:49:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c83db7

net-wireless/wpa_supplicant: please pkgcheck

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild | 16 
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild   | 16 
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 13942c996c1..3705130f557 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -59,9 +59,9 @@ RDEPEND="${CDEPEND}
 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
+   ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf
An example configuration file is available for reference in
-   ${EROOT%/}/usr/share/doc/${PF}/
+   ${EROOT}/usr/share/doc/${PF}/
 "
 
 S="${WORKDIR}/${P}/${PN}"
@@ -445,10 +445,10 @@ src_install() {
 pkg_postinst() {
readme.gentoo_print_elog
 
-   if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
+   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"
+   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 bindist; then
@@ -466,11 +466,11 @@ pkg_postinst() {
# 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} ]]
+   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
+   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

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 67a54e06ba6..c91b6d2f562 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -59,9 +59,9 @@ RDEPEND="${CDEPEND}
 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
+   ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf
An example configuration file is available for reference in
-   ${EROOT%/}/usr/share/doc/${PF}/
+   ${EROOT}/usr/share/doc/${PF}/
 "
 
 S="${WORKDIR}/${P}/${PN}"
@@ -442,10 +442,10 @@ src_install() {
 pkg_postinst() {
readme.gentoo_print_elog
 
-   if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
+   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"
+   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 bindist; then
@@ -463,11 +463,11 @@ pkg_postinst() {
# 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} ]]
+   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} \
-   

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2020-02-17 Thread Rick Farina
commit: 06ea529e68be364586486973a33278ecbfe9bcf9
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Feb 18 01:38:55 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Feb 18 01:38:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ea529e

net-wireless/wpa_supplicant: fix libressl live

per testing it seems suiteb is still broken with libressl even in
wpa_supplicant git

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 3cb7b352a50..67a54e06ba6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -247,9 +247,11 @@ 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 bindist && ! use libressl; then
+   Kconfig_style_config SUITEB
+   fi
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
@@ -452,6 +454,11 @@ pkg_postinst() {
ewarn "This is incredibly undesirable"
fi
fi
+   if use libressl; then
+   ewarn "Libressl doesn't support SUITEB (part of WPA3)"
+   ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
+   ewarn "You probably don't care.  Patches welcome"
+   fi
 
# Mea culpa, feel free to remove that after some time --mgorny.
local fn



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2020-02-14 Thread Rick Farina
commit: 8429f2180ffd3520486695c342040498512f1f03
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Feb 14 21:07:31 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Feb 14 21:08:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8429f218

net-wireless/wpa_supplicant: fix libressl

closes bug #709528

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 0c3b8ae72bc..542eb63de1d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -250,9 +250,11 @@ 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 bindist && ! use libressl; then
+   Kconfig_style_config SUITEB
+   fi
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
@@ -455,6 +457,12 @@ pkg_postinst() {
ewarn "This is incredibly undesirable"
fi
fi
+   if use libressl; then
+   ewarn "Libressl doesn't support SUITEB (part of WPA3)"
+   ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
+   ewarn "You probably don't care.  Patches welcome"
+   fi
+
 
# Mea culpa, feel free to remove that after some time --mgorny.
local fn



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2020-02-14 Thread Rick Farina
commit: 8b1e2ed0c0ddc42494379ef6aadb6c893bd28efa
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Feb 14 21:08:02 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Feb 14 21:08:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1e2ed0

net-wireless/wpa_supplicant: whitespace

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 542eb63de1d..13942c996c1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -463,7 +463,6 @@ pkg_postinst() {
ewarn "You probably don't care.  Patches welcome"
fi
 
-
# Mea culpa, feel free to remove that after some time --mgorny.
local fn
for fn in wpa_supplicant{,@wlan0}.service; do



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2020-02-13 Thread Rick Farina
commit: a460ecf5f4c7aa8b59149d553774ff95284b9c30
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Feb 13 18:55:45 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Feb 13 18:55:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a460ecf5

net-wireless/wpa_supplicant: fix bug #692846

also disable more things properly when the use flag isn't set
also harmonize release and live ebuilds
also fix multiple QA warnings

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/metadata.xml   |  5 ++-
 ...-2.9-r1.ebuild => wpa_supplicant-2.9-r2.ebuild} | 48 ++
 .../wpa_supplicant/wpa_supplicant-.ebuild  | 32 ++-
 3 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index a52a722509e..743ca1d2c5b 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -7,12 +7,15 @@


Add support for access point mode
+   Flag to help users disable features 
not supported by broadcom-sta driver
Add support for EAP-SIM authentication 
algorithm
-   Build and install eapol_test 
binary
+   Build and install eapol_test 
binary
Add support for FAST-EAP authentication 
algorithm
Add support for Fast Initial Link Setup 
(802.11ai)
Add support for 802.11u and Passpoint for 
HotSpot 2.0
Add support for wired macsec
+   Add support Multiband Operation
+   Add support for mesh mode
Add support for Wi-Fi Direct mode
Add support for ps3 hypervisor driven gelic 
wifi
Enable wpa_priv privledge separation 
binary

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
similarity index 93%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 8cfb6d7ecd1..0c3b8ae72bc 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/;
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec 
p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax 
wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 
libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -26,6 +26,7 @@ IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 
libressl macsec p2
 REQUIRED_USE="
macsec? ( !privsep )
privsep? ( !macsec )
+   broadcom-sta? ( !fils !mesh !mbo )
 "
 
 CDEPEND="dbus? ( sys-apps/dbus )
@@ -150,7 +151,6 @@ src_configure() {
Kconfig_style_config TLSV11
Kconfig_style_config TLSV12
Kconfig_style_config GETRANDOM
-   Kconfig_style_config MBO
 
# Basic authentication methods
# NOTE: we don't set GPSK or SAKE as they conflict
@@ -160,6 +160,8 @@ src_configure() {
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
@@ -184,7 +186,7 @@ src_configure() {
Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
fi
 
-   if use eapol_test ; then
+   if use eapol-test ; then
Kconfig_style_config EAPOL_TEST
fi
 
@@ -197,6 +199,12 @@ src_configure() {
Kconfig_style_config HS20
fi
 
+   if use mbo ; then
+   Kconfig_style_config MBO
+   else
+   Kconfig_style_config MBO n
+   fi
+
if use uncommon-eap-types; then
Kconfig_style_config EAP_GPSK
Kconfig_style_config EAP_SAKE
@@ -233,16 +241,17 @@ src_configure() {
Kconfig_style_config FILS

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2020-01-10 Thread Rick Farina
commit: 7f312872277aa9dbcd755cb5667bdca492e52f6b
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Jan 10 20:44:47 2020 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Jan 10 20:44:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f312872

net-wireless/wpa_supplicant: sync some changes to live

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Rick Farina  gentoo.org>

 .../wpa_supplicant/wpa_supplicant-.ebuild  | 22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index a439dde4108..f73f675d9fd 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,14 @@ fi
 SLOT="0"
 IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec 
p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax 
wps kernel_linux kernel_FreeBSD"
 
+# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
+# interface functions used for MACsec, so this combination cannot be used
+# at least for now.
+REQUIRED_USE="
+   macsec? ( !privsep )
+   privsep? ( !macsec )
+"
+
 CDEPEND="dbus? ( sys-apps/dbus )
kernel_linux? (
dev-libs/libnl:3
@@ -157,6 +165,7 @@ src_configure() {
Kconfig_style_config EAP_LEAP
Kconfig_style_config EAP_MSCHAPV2
Kconfig_style_config EAP_PEAP
+   Kconfig_style_config EAP_TEAP
Kconfig_style_config EAP_TLS
Kconfig_style_config EAP_TTLS
 
@@ -235,6 +244,8 @@ src_configure() {
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
+   else
+   Kconfig_style_config SMARTCARD n
fi
 
if use tdls ; then
@@ -279,6 +290,13 @@ src_configure() {
Kconfig_style_config WPS_UPNP
# Near Field Communication
Kconfig_style_config WPS_NFC
+   else
+   Kconfig_style_config WPS n
+   Kconfig_style_config WPS2 n
+   Kconfig_style_config WPS_UFD n
+   Kconfig_style_config WPS_ER n
+   Kconfig_style_config WPS_UPNP n
+   Kconfig_style_config WPS_NFC n
fi
 
# Wi-Fi Direct (WiDi)
@@ -290,6 +308,8 @@ src_configure() {
# Access Point Mode
if use ap ; then
Kconfig_style_config AP
+   else
+   Kconfig_style_config AP n
fi
 
# Enable essentials for AP/P2P



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/

2019-11-29 Thread Aaron Bauman
commit: 2b82a229fbd08184cfd3595e7c39b5f0c79a740d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Nov 28 17:19:13 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Nov 29 22:07:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b82a229

net-wireless/wpa_supplicant: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13784
Signed-off-by: Aaron Bauman  gentoo.org>

 ...-unauthenticated-encrypted-EAPOL-Key-data.patch |  44 -
 ...wpa_supplicant-2.6-libressl-compatibility.patch | 106 -
 .../files/wpa_supplicant-2.6-openssl-1.1.patch |  48 --
 ...pa_supplicant-2.7-fix-undefined-remove-ie.patch |  38 
 .../files/wpa_supplicant-2.7-libressl.patch|  46 -
 5 files changed, 282 deletions(-)

diff --git 
a/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
 
b/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
deleted file mode 100644
index a62b52c6b9a..000
--- 
a/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef 
-Date: Sun, 15 Jul 2018 01:25:53 +0200
-Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data
-
-Ignore unauthenticated encrypted EAPOL-Key data in supplicant
-processing. When using WPA2, these are frames that have the Encrypted
-flag set, but not the MIC flag.
-
-When using WPA2, EAPOL-Key frames that had the Encrypted flag set but
-not the MIC flag, had their data field decrypted without first verifying
-the MIC. In case the data field was encrypted using RC4 (i.e., when
-negotiating TKIP as the pairwise cipher), this meant that
-unauthenticated but decrypted data would then be processed. An adversary
-could abuse this as a decryption oracle to recover sensitive information
-in the data field of EAPOL-Key messages (e.g., the group key).
-(CVE-2018-14526)
-
-Signed-off-by: Mathy Vanhoef 

- src/rsn_supp/wpa.c | 11 +++
- 1 file changed, 11 insertions(+)
-
-diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 
wpa_supplicant-2.6/src/rsn_supp/wpa.c
 wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.0 
+0300
-+++ wpa_supplicant-2.6/src/rsn_supp/wpa.c  2018-08-08 16:55:11.506831029 
+0300
-@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c
- 
-   if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) &&
-   (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
-+  /*
-+   * Only decrypt the Key Data field if the frame's authenticity
-+   * was verified. When using AES-SIV (FILS), the MIC flag is not
-+   * set, so this check should only be performed if mic_len != 0
-+   * which is the case in this code branch.
-+   */
-+  if (!(key_info & WPA_KEY_INFO_MIC)) {
-+  wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-+  "WPA: Ignore EAPOL-Key with encrypted but 
unauthenticated data");
-+  goto out;
-+  }
-   if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data,
-   _data_len))
-   goto out;

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl-compatibility.patch
 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl-compatibility.patch
deleted file mode 100644
index 025da58028d..000
--- 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl-compatibility.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
-index 19e0e2be8..6585c0245 100644
 a/src/crypto/crypto_openssl.c
-+++ b/src/crypto/crypto_openssl.c
-@@ -33,7 +33,9 @@
- #include "aes_wrap.h"
- #include "crypto.h"
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || \
-+  (defined(LIBRESSL_VERSION_NUMBER) && \
-+   LIBRESSL_VERSION_NUMBER < 0x2070L)
- /* Compatibility wrappers for older versions. */
- 
- static HMAC_CTX * HMAC_CTX_new(void)
-@@ -79,7 +81,9 @@ static void EVP_MD_CTX_free(EVP_MD_CTX *ctx)
- 
- static BIGNUM * get_group5_prime(void)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L && \
-+  !(defined(LIBRESSL_VERSION_NUMBER) && \
-+  LIBRESSL_VERSION_NUMBER < 0x2070L)
-   return BN_get_rfc3526_prime_1536(NULL);
- #elif !defined(OPENSSL_IS_BORINGSSL)
-   return get_rfc3526_prime_1536(NULL);
-@@ -611,7 +615,9 @@ void 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-25 Thread Rick Farina
commit: 48285d29fe270e8dc2c3e780076989adf4f6f1e6
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Nov 25 20:08:31 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Nov 25 20:08:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48285d29

net-wireless/wpa_supplicant: cleanup old/vuln

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |   1 -
 .../wpa_supplicant/wpa_supplicant-2.8-r1.ebuild| 449 -
 2 files changed, 450 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 637bcc2c825..07c650017d7 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,2 +1 @@
-DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 
260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951
 SHA512 
b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
deleted file mode 100644
index 2b773d19178..000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/;
-LICENSE="|| ( GPL-2 BSD )"
-
-if [ "${PV}" = "" ]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://w1.fi/hostap.git;
-else
-   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-   SRC_URI="https://w1.fi/releases/${P}.tar.gz;
-fi
-
-SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +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? (
-   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=
-   )
-   !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-   libressl? ( dev-libs/libressl:0= )
-"
-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
-}
-
-src_prepare() {
-   default
-
-   # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
-   sed -i \
-   -e "s:\(#include \):#include \n\1:" \
-   ../src/l2_packet/l2_packet_freebsd.c || die
-
-   # People seem to take the example configuration file too literally (bug 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-25 Thread Aaron Bauman
commit: d1c533c514a69db3016b0375f76df30c8c99a917
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Nov 25 18:03:04 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Nov 25 18:03:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c533c5

net-wireless/wpa_supplicant: arm64 stable (bug #696030)

Signed-off-by: Aaron Bauman  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
index cc058f1a1dd..8cfb6d7ecd1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-25 Thread Rick Farina
commit: 91835ebfb082547cbe6ec2cc35358c2b54f298ac
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Nov 25 16:23:58 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Nov 25 16:23:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91835ebf

net-wireless/wpa_supplicant: remove most old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |   2 -
 net-wireless/wpa_supplicant/metadata.xml   |   1 -
 .../wpa_supplicant/wpa_supplicant-2.6-r10.ebuild   | 463 -
 .../wpa_supplicant/wpa_supplicant-2.7-r1.ebuild| 458 
 .../wpa_supplicant/wpa_supplicant-2.7-r3.ebuild| 442 
 .../wpa_supplicant/wpa_supplicant-2.9.ebuild   | 458 
 6 files changed, 1824 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 54e1a007a51..637bcc2c825 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,4 +1,2 @@
-DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 
99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac
 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
-DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B 
bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa
 SHA512 
8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 
260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951
 SHA512 
b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index a2085baaa25..a52a722509e 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -16,7 +16,6 @@
Add support for Wi-Fi Direct mode
Add support for ps3 hypervisor driven gelic 
wifi
Enable wpa_priv privledge separation 
binary
-   Enable enable NSA Suite B encryption
Add support for Tunneled Direct Link Setup 
(802.11z)
Add support for GPSK, SAKE, 
GPSK_SHA256, IKEV2 and EKE
Add support for Wi-Fi Protected Setup

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
deleted file mode 100644
index 5c5b91c36f5..000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-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? (
-   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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-22 Thread Mikle Kolyada
commit: 0f19bfc726ed94e900ca23c52370dafe339ceb70
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov 22 09:39:23 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov 22 09:39:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f19bfc7

net-wireless/wpa_supplicant: arm stable wrt bug #696030

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
index 3ce34b1851a..cc058f1a1dd 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-12 Thread Agostino Sarubbo
commit: ace2e8d37c5ae2697e8ce8c677138af34597
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 18:07:38 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 18:07:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace2e8d3

net-wireless/wpa_supplicant: ppc stable wrt bug #696030

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
index 9fc0630292d..3ce34b1851a 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-12 Thread Agostino Sarubbo
commit: aa85975e1d533f4300f9accd53cbc2537a5030e8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 12 10:37:49 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 12 10:37:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa85975e

net-wireless/wpa_supplicant: ppc64 stable wrt bug #696030

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
index 6f8c8a43ccb..9fc0630292d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/, net-wireless/wpa_supplicant/

2019-11-04 Thread Rick Farina
commit: 38457d7ed121534eadb492deb0e9048f41d13a94
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Nov  4 16:31:53 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Nov  4 16:31:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38457d7e

net-wireless/wpa_supplicant: fix bug #696030

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Rick Farina  gentoo.org>

 ...y-ignore-management-frame-from-unexpected.patch |  73 
 .../wpa_supplicant/wpa_supplicant-2.9-r1.ebuild| 461 +
 2 files changed, 534 insertions(+)

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
new file mode 100644
index 000..d764a9db016
--- /dev/null
+++ 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
@@ -0,0 +1,73 @@
+From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Thu, 29 Aug 2019 11:52:04 +0300
+Subject: [PATCH] AP: Silently ignore management frame from unexpected source
+ address
+
+Do not process any received Management frames with unexpected/invalid SA
+so that we do not add any state for unexpected STA addresses or end up
+sending out frames to unexpected destination. This prevents unexpected
+sequences where an unprotected frame might end up causing the AP to send
+out a response to another device and that other device processing the
+unexpected response.
+
+In particular, this prevents some potential denial of service cases
+where the unexpected response frame from the AP might result in a
+connected station dropping its association.
+
+Signed-off-by: Jouni Malinen 
+---
+ src/ap/drv_callbacks.c | 13 +
+ src/ap/ieee802_11.c| 12 
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 31587685fe3b..34ca379edc3d 100644
+--- a/src/ap/drv_callbacks.c
 b/src/ap/drv_callbacks.c
+@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const 
u8 *addr,
+  "hostapd_notif_assoc: Skip event with no address");
+   return -1;
+   }
++
++  if (is_multicast_ether_addr(addr) ||
++  is_zero_ether_addr(addr) ||
++  os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
++  /* Do not process any frames with unexpected/invalid SA so that
++   * we do not add any state for unexpected STA addresses or end
++   * up sending out frames to unexpected destination. */
++  wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
++ " in received indication - ignore this indication 
silently",
++ __func__, MAC2STR(addr));
++  return 0;
++  }
++
+   random_add_randomness(addr, ETH_ALEN);
+ 
+   hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index c85a28db44b7..e7065372e158 100644
+--- a/src/ap/ieee802_11.c
 b/src/ap/ieee802_11.c
+@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 
*buf, size_t len,
+   fc = le_to_host16(mgmt->frame_control);
+   stype = WLAN_FC_GET_STYPE(fc);
+ 
++  if (is_multicast_ether_addr(mgmt->sa) ||
++  is_zero_ether_addr(mgmt->sa) ||
++  os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
++  /* Do not process any frames with unexpected/invalid SA so that
++   * we do not add any state for unexpected STA addresses or end
++   * up sending out frames to unexpected destination. */
++  wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
++ " in received frame - ignore this frame silently",
++ MAC2STR(mgmt->sa));
++  return 0;
++  }
++
+   if (stype == WLAN_FC_STYPE_BEACON) {
+   handle_beacon(hapd, mgmt, len, fi);
+   return 1;
+-- 
+2.20.1
+

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
new file mode 100644
index 000..6b9f21781fc
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/;
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "" ]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+else
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-11-04 Thread Rick Farina
commit: 0505f8a1256245476e001553035ad43ada03df67
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Nov  4 16:32:49 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Nov  4 16:32:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0505f8a1

net-wireless/wpa_supplicant: stable bug #696030

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
index 6b9f21781fc..6f8c8a43ccb 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/, net-wireless/aircrack-ng/, net-wireless/lorcon/

2019-10-11 Thread Michał Górny
commit: 6ea119c9bc2fd23213ea0d758a43f815a7cef29c
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:37:23 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:37:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea119c9

net-wireless: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny  gentoo.org>

 net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild | 2 +-
 net-wireless/aircrack-ng/aircrack-ng-.ebuild  | 2 +-
 net-wireless/lorcon/lorcon-0.0_p20150109.ebuild   | 2 +-
 net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild| 2 +-
 net-wireless/lorcon/lorcon-.ebuild| 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild  | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild  | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild  | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild | 2 +-
 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild| 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild 
b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index 09e5e6b6a66..c03f3658dc9 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]] ; then
 else
MY_PV=${PV/_/-}
SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz;
-   KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+   KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-wireless/aircrack-ng/aircrack-ng-.ebuild 
b/net-wireless/aircrack-ng/aircrack-ng-.ebuild
index cdc4a06e100..a2e14c08c24 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "" ]] ; then
 else
MY_PV=${PV/_/-}
SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz;
-   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+   KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild 
b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index 702bd34a3a2..715e6dd1a8c 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]] ; then
KEYWORDS=""
 else
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz;
-   KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+   KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild 
b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
index 3d4ff55cdf8..d9ac3ecfbee 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
@@ -21,7 +21,7 @@ else
GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"

SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-wireless/lorcon/lorcon-.ebuild 
b/net-wireless/lorcon/lorcon-.ebuild
index 3d4ff55cdf8..d9ac3ecfbee 100644
--- a/net-wireless/lorcon/lorcon-.ebuild
+++ b/net-wireless/lorcon/lorcon-.ebuild
@@ -21,7 +21,7 @@ else
GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"

SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index a51880a17dd..5c5b91c36f5 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 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 )"
 

diff --git 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-09-01 Thread Mikle Kolyada
commit: 3e6d1bb53e40a88510a2015341cccd18a9bda918
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep  1 18:05:03 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep  1 18:05:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6d1bb5

net-wireless/wpa_supplicant: arm stable wrt bug #685860

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 9e7aa2c6b99..1c68d46a2a6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 
~x86-fbsd"
+   KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 
~x86-fbsd"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-08-18 Thread Agostino Sarubbo
commit: 70243c31af361fb07b0b34cd9315faccde5d6f56
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Aug 18 21:49:23 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Aug 18 21:49:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70243c31

net-wireless/wpa_supplicant: amd64 stable wrt bug #685860

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 7dd2d7f6744..9e7aa2c6b99 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 
~x86-fbsd"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 
~x86-fbsd"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-08-17 Thread Sergei Trofimovich
commit: 1add32c95d14d2688ae449e4ad87e9c6290c4c6c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 17 20:34:10 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 17 20:40:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1add32c9

net-wireless/wpa_supplicant: stable 2.8-r1 for ppc64, bug #685860

Package-Manager: Portage-2.3.71, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index c01b805b61c..7dd2d7f6744 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 
~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 
~x86-fbsd"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-08-17 Thread Sergei Trofimovich
commit: 4e5cf9680daed26ade2e6e6826daf6985220a2d3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 17 20:24:11 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 17 20:24:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5cf968

net-wireless/wpa_supplicant: stable 2.8-r1 for ppc, bug #685860

Package-Manager: Portage-2.3.71, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index f6f4b2f513e..c01b805b61c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 
~x86-fbsd"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-08-16 Thread Thomas Deutschmann
commit: 43eaf097d365067fb15a36757311af1fc533b88b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 16 22:38:17 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 16 22:38:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43eaf097

net-wireless/wpa_supplicant: x86 stable (bug #685860)

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index d85da58597f..f6f4b2f513e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~x86-fbsd"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-08-16 Thread Aaron Bauman
commit: f6ae37738d9b8ded7b4b57ed9af73bbdec72
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Aug 16 18:47:42 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Aug 16 18:47:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ae3773

net-wireless/wpa_supplicant: arm64 stable (bug #685860)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.71, Repoman-2.3.17
RepoMan-Options: --include-arches="arm64"

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 2b150cc4bec..d85da58597f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git;
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
SRC_URI="https://w1.fi/releases/${P}.tar.gz;
 fi
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-08-16 Thread Rick Farina
commit: 39a43a7c4c0256848f5b5934eab38bb73699506b
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Thu Aug 15 12:22:29 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Aug 16 15:53:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a43a7c

net-wireless/wpa_supplicant: bump to version 2.9

Also allowing privsep only without macsec.
According to upstream, it's not a valid combination, when you do enable
macsec and privsep together.

Upstream says:
CONFIG_PRIVSEP=y does not have sufficient support for the new driver
interface functions used for MACsec, so this combination cannot be used
at least for now.

Instead of creating a new desktop file, the shipped one is used.

Closes: https://bugs.gentoo.org/615872
Closes: https://bugs.gentoo.org/684442
Closes: https://bugs.gentoo.org/692062
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |   1 +
 .../wpa_supplicant/wpa_supplicant-2.9.ebuild   | 458 +
 2 files changed, 459 insertions(+)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 5bfd97437ba..54e1a007a51 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,3 +1,4 @@
 DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 
99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac
 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B 
bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa
 SHA512 
8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 
260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951
 SHA512 
b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b
+DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B 
f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807
 SHA512 
37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
new file mode 100644
index 000..2d3f2e93d50
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/;
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "" ]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://w1.fi/hostap.git;
+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 +fils +hs2-0 libressl macsec 
p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax 
wps kernel_linux kernel_FreeBSD"
+
+# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
+# interface functions used for MACsec, so this combination cannot be used
+# at least for now.
+REQUIRED_USE="
+   macsec? ( !privsep )
+   privsep? ( !macsec )
+"
+
+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=
+   )
+   !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+   libressl? ( dev-libs/libressl:0= )
+"
+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}/
+"
+

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-06-10 Thread Rick Farina
commit: a244d4bce6ddaf22ae1d4706cfb5afaacb18db8d
Author: Brian Norris  chromium  org>
AuthorDate: Tue Jun 11 00:27:34 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Jun 11 01:18:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a244d4bc

net-wireless/wpa_supplicant: drop nonexistent EAP_TLV, EAP_EXE

These aren't CONFIG_* options in this project and either never have been
or haven't for a long time.

Signed-off-by: Brian Norris  chromium.org>
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index b1b3a219ec3..2b150cc4bec 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -149,8 +149,6 @@ src_configure() {
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



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-06-10 Thread Rick Farina
commit: 5b6759c261091a763379979a40fc9cedae86bf92
Author: Brian Norris  chromium  org>
AuthorDate: Tue Jun 11 00:18:40 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Jun 11 01:18:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6759c2

net-wireless/wpa_supplicant: support USE="-smartcard -ap -wps"

These are enabled in the defconfig and need to be forced off here.

Bug: https://bugs.gentoo.org/687838
Signed-off-by: Brian Norris  chromium.org>
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 52bb7374068..b1b3a219ec3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -237,6 +237,8 @@ src_configure() {
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
+   else
+   Kconfig_style_config SMARTCARD n
fi
 
if use tdls ; then
@@ -281,6 +283,8 @@ src_configure() {
Kconfig_style_config WPS_UPNP
# Near Field Communication
Kconfig_style_config WPS_NFC
+   else
+   Kconfig_style_config WPS n
fi
 
# Wi-Fi Direct (WiDi)
@@ -292,6 +296,8 @@ src_configure() {
# Access Point Mode
if use ap ; then
Kconfig_style_config AP
+   else
+   Kconfig_style_config AP n
fi
 
# Enable essentials for AP/P2P



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-06-07 Thread Rick Farina
commit: 69dab4bc68150a1f3dd1020cd2f1b2e3b99f9b02
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Jun  7 19:53:27 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Jun  7 19:53:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69dab4bc

net-wireless/wpa_supplicant: update live ebuild

per last commit

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index d5ae9e59fef..98c75f3618e 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -168,6 +168,10 @@ src_configure() {
Kconfig_style_config CTRL_IFACE_DBUS
Kconfig_style_config CTRL_IFACE_DBUS_NEW
Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+   else
+   Kconfig_style_config CTRL_IFACE_DBUS n
+   Kconfig_style_config CTRL_IFACE_DBUS_NEW n
+   Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
fi
 
if use eapol_test ; then



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-06-07 Thread Rick Farina
commit: 5b965ec21241ff2624cbb9cb0185a00b450518da
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Jun  7 19:54:04 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Jun  7 19:54:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b965ec2

net-wireless/wpa_supplicant: revbump for dbus fix

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Rick Farina  gentoo.org>

 .../{wpa_supplicant-2.8.ebuild => wpa_supplicant-2.8-r1.ebuild}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
similarity index 100%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-06-07 Thread Rick Farina
commit: 810264fb09681b49562278b9f10ad2e935232e74
Author: Gábor Oszkár Dénes  protonmail  com>
AuthorDate: Fri Jun  7 06:26:23 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Jun  7 19:48:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810264fb

net-wireless/wpa_supplicant: Fix mandatory dbus

The default configuration requires dbus.
It is disabled when the dbus flag is not set.

Closes: https://bugs.gentoo.org/684284
Signed-off-by: Gábor Oszkár Dénes  protonmail.com>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
index 69128d52bd2..52bb7374068 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
@@ -168,6 +168,10 @@ src_configure() {
Kconfig_style_config CTRL_IFACE_DBUS
Kconfig_style_config CTRL_IFACE_DBUS_NEW
Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+   else
+   Kconfig_style_config CTRL_IFACE_DBUS n
+   Kconfig_style_config CTRL_IFACE_DBUS_NEW n
+   Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
fi
 
if use eapol_test ; then



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-05-23 Thread Aaron Bauman
commit: 5b5f5d39225a2ad406cd61459248d34e06a7a368
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu May 23 06:27:41 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 23 06:39:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b5f5d39

net-wireless/wpa_supplicant: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index aee917dd595..a51880a17dd 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 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 )"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-05-18 Thread Rick Farina
commit: 781c50e298a216b1a9bff0006411f6f0b9d50e06
Author: Rick Farina  gentoo  org>
AuthorDate: Sun May 19 00:55:01 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Sun May 19 00:59:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781c50e2

Revert "net-wireless/wpa_supplicant: libressl suiteb works"

This reverts commit df704718f10468578ce9b1de71c02d1edc11963f.

bug #684290

Signed-off-by: Rick Farina  gentoo.org>

 .../{wpa_supplicant-2.8-r1.ebuild => wpa_supplicant-2.8.ebuild}  | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
similarity index 97%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
index d5ae9e59fef..69128d52bd2 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
@@ -225,9 +225,11 @@ 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 bindist && ! use libressl; then
+   Kconfig_style_config SUITEB
+   fi
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
@@ -416,6 +418,11 @@ pkg_postinst() {
ewarn "This is incredibly undesirable"
fi
fi
+   if use libressl; then
+   ewarn "Libressl doesn't support SUITEB (part of WPA3)"
+   ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
+   ewarn "You probably don't care.  Patches welcome"
+   fi
 
# Mea culpa, feel free to remove that after some time --mgorny.
local fn



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-04-23 Thread Rick Farina
commit: df704718f10468578ce9b1de71c02d1edc11963f
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Apr 24 03:15:36 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Apr 24 03:15:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df704718

net-wireless/wpa_supplicant: libressl suiteb works

thanks for the testing b-man

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 .../{wpa_supplicant-2.8.ebuild => wpa_supplicant-2.8-r1.ebuild}  | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
similarity index 97%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 69128d52bd2..d5ae9e59fef 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -225,10 +225,8 @@ src_configure() {
Kconfig_style_config OWE
Kconfig_style_config SAE
Kconfig_style_config DPP
-   Kconfig_style_config SUITEB192
-   fi
-   if ! use bindist && ! use libressl; then
Kconfig_style_config SUITEB
+   Kconfig_style_config SUITEB192
fi
 
if use smartcard ; then
@@ -418,11 +416,6 @@ pkg_postinst() {
ewarn "This is incredibly undesirable"
fi
fi
-   if use libressl; then
-   ewarn "Libressl doesn't support SUITEB (part of WPA3)"
-   ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
-   ewarn "You probably don't care.  Patches welcome"
-   fi
 
# Mea culpa, feel free to remove that after some time --mgorny.
local fn



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-04-23 Thread Rick Farina
commit: 1ca007c22b7e0fd67b90aa52d8788e4dbee51d86
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Apr 24 02:39:36 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Apr 24 02:39:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca007c2

net-wireless/wpa_supplicant: bump

some minor changes trying to enable things which make sense

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/Manifest|  1 +
 net-wireless/wpa_supplicant/metadata.xml|  1 +
 ...licant-.ebuild => wpa_supplicant-2.8.ebuild} | 21 -
 .../wpa_supplicant/wpa_supplicant-.ebuild   | 12 
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index 6c70e97a288..5bfd97437ba 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,2 +1,3 @@
 DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 
99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac
 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B 
bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa
 SHA512 
8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
+DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 
260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951
 SHA512 
b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index 4d369c2c386..a2085baaa25 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -10,6 +10,7 @@
Add support for EAP-SIM authentication 
algorithm
Build and install eapol_test 
binary
Add support for FAST-EAP authentication 
algorithm
+   Add support for Fast Initial Link Setup 
(802.11ai)
Add support for 802.11u and Passpoint for 
HotSpot 2.0
Add support for wired macsec
Add support for Wi-Fi Direct mode

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
similarity index 94%
copy from net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
copy to net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
index e0e179eeae0..69128d52bd2 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8.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 tdls uncommon-eap-types wimax wps 
kernel_linux kernel_FreeBSD"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +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? (
@@ -138,6 +138,8 @@ src_configure() {
Kconfig_style_config OCV
Kconfig_style_config TLSV11
Kconfig_style_config TLSV12
+   Kconfig_style_config GETRANDOM
+   Kconfig_style_config MBO
 
# Basic authentication methods
# NOTE: we don't set GPSK or SAKE as they conflict
@@ -211,19 +213,23 @@ src_configure() {
 
Kconfig_style_config TLS openssl
Kconfig_style_config FST
-   if ! use bindist; then
+   if ! use bindist || use libressl; then
Kconfig_style_config EAP_PWD
-   Kconfig_style_config FILS
-   Kconfig_style_config FILS_SK_PFS
+   if use fils; then
+   Kconfig_style_config FILS
+   Kconfig_style_config FILS_SK_PFS
+   fi
# Enabling mesh networks.
Kconfig_style_config MESH
#WPA3
Kconfig_style_config OWE
Kconfig_style_config SAE
Kconfig_style_config DPP
-   Kconfig_style_config SUITEB
Kconfig_style_config SUITEB192
fi
+   if ! use bindist && ! use libressl; then
+   Kconfig_style_config SUITEB
+   fi
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
@@ -412,6 +418,11 @@ pkg_postinst() {
ewarn "This is incredibly undesirable"
fi
 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-03-25 Thread Rick Farina
commit: 013f21b40ef90710a03ee28cbf43a6fc600c7b17
Author: Rick Farina  gentoo  org>
AuthorDate: Mon Mar 25 19:25:40 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Mar 25 19:25:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013f21b4

net-wireless/wpa_supplicant: fix bug# 678784

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

 ..._supplicant-2.7-r2.ebuild => wpa_supplicant-2.7-r3.ebuild} | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
similarity index 97%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
index 39d282d..a20d8e0dce3 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r3.ebuild
@@ -217,7 +217,7 @@ src_configure() {
 
Kconfig_style_config TLS openssl
Kconfig_style_config FST
-   if ! use bindist; then
+   if ! use bindist || use libressl; then
Kconfig_style_config EAP_PWD
Kconfig_style_config FILS
Kconfig_style_config FILS_SK_PFS
@@ -227,9 +227,11 @@ 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 bindist && ! use libressl; then
+   Kconfig_style_config SUITEB
+   fi
 
if use smartcard ; then
Kconfig_style_config SMARTCARD
@@ -417,6 +419,11 @@ pkg_postinst() {
ewarn "This is incredibly undesirable"
fi
fi
+   if use libressl; then
+   ewarn "Libressl doesn't support SUITEB (part of WPA3)"
+   ewarn "but it does support SUITEB192 (the upgraded strength 
version of the same)"
+   ewarn "You probably don't care.  Patches welcome"
+   fi
 
# Mea culpa, feel free to remove that after some time --mgorny.
local fn



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-03-22 Thread Rick Farina
commit: f830911f2ae4e86dbc0b73d78dc52878634cb5ac
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Mar 22 19:50:41 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Mar 22 19:55:21 2019 +
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  gentoo.org>

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

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
similarity index 95%
copy from net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
copy to net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
index 487ffc5b611..02ae5e792d5 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.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-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 487ffc5b611..e0e179eeae0 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.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
+ 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-03-22 Thread Rick Farina
commit: fbc6592d99312e8cbbea70c0fdb46ae74b7c11c1
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Mar 22 19:54:51 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Mar 22 19:55:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc6592d

net-wireless/wpa_supplicant: remove macsec linux

the driver isn't functional in this release

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

 net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
index 02ae5e792d5..39d282d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
@@ -252,7 +252,6 @@ src_configure() {
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
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-03-22 Thread Rick Farina
commit: f0eb78b0281f714dc7506eba410cd1ebaf1e7ad0
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Mar 22 19:33:22 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Mar 22 19:39:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0eb78b0

net-wireless/wpa_supplicant: update live

this is the LAST ebuild that will support gnutls or internal tls
implementations.  they don't work for any of the new wpa3 stuff, they
aren't equivilent and never were.

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

 net-wireless/wpa_supplicant/metadata.xml   |  1 +
 .../wpa_supplicant/wpa_supplicant-.ebuild  | 31 ++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/net-wireless/wpa_supplicant/metadata.xml 
b/net-wireless/wpa_supplicant/metadata.xml
index 885b7c3d6bb..4d369c2c386 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -11,6 +11,7 @@
Build and install eapol_test 
binary
Add support for FAST-EAP authentication 
algorithm
Add support for 802.11u and Passpoint for 
HotSpot 2.0
+   Add support for wired macsec
Add support for Wi-Fi Direct mode
Add support for ps3 hypervisor driven gelic 
wifi
Enable wpa_priv privledge separation 
binary

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 72b9d2aa46d..8a81bc1b5d4 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-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"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl macsec 
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 )
@@ -90,7 +90,7 @@ Kconfig_style_config() {
 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\""
+   elog "You have both 'gnutls' and 'libressl' USE flags 
enabled: defaulting to USE=\"libressl\""
fi
else
elog "You have 'ssl' USE flag disabled: defaulting to internal 
TLS implementation"
@@ -153,6 +153,11 @@ 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
@@ -177,6 +182,13 @@ src_configure() {
Kconfig_style_config BGSCAN_SIMPLE
Kconfig_style_config BGSCAN_LEARN
 
+   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 dbus ; then
Kconfig_style_config CTRL_IFACE_DBUS
Kconfig_style_config CTRL_IFACE_DBUS_NEW
@@ -233,25 +245,34 @@ src_configure() {
if use gnutls ; then
Kconfig_style_config TLS gnutls
Kconfig_style_config GNUTLS_EXTRA
+   Kconfig_style_config EAP_PWD n
+   Kconfig_style_config SAE n
+   Kconfig_style_config DPP n
else
#this fails for gnutls
Kconfig_style_config SUITEB192
Kconfig_style_config TLS openssl
+   Kconfig_style_config FST
if ! use bindist; then
  #this fails for gnutls
  Kconfig_style_config EAP_PWD
+ Kconfig_style_config FILS
+ Kconfig_style_config FILS_SK_PFS
  # 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
+ 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-03-22 Thread Rick Farina
commit: ef2b4ea4fa229f9b1c92b34ee9dba111a927a7ea
Author: Rick Farina  gentoo  org>
AuthorDate: Fri Mar 22 19:38:50 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Fri Mar 22 19:39:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2b4ea4

net-wireless/wpa_supplicant: simplify ebuild

remove broken gnutls and internal tls implementations.  they were never
equivilent to openssl and users don't need broken implementations

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

 .../wpa_supplicant/wpa_supplicant-.ebuild  | 90 ++
 1 file changed, 25 insertions(+), 65 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 8a81bc1b5d4..487ffc5b611 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -18,8 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl macsec 
p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls 
uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
+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"
 
 CDEPEND="dbus? ( sys-apps/dbus )
kernel_linux? (
@@ -38,17 +37,8 @@ CDEPEND="dbus? ( sys-apps/dbus )
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 )
+   !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+   libressl? ( dev-libs/libressl:0= )
 "
 DEPEND="${CDEPEND}
virtual/pkgconfig
@@ -87,16 +77,6 @@ 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=\"libressl\""
-   fi
-   else
-   elog "You have 'ssl' USE flag disabled: defaulting to internal 
TLS implementation"
-   fi
-}
-
 src_prepare() {
default
 
@@ -182,13 +162,6 @@ src_configure() {
Kconfig_style_config BGSCAN_SIMPLE
Kconfig_style_config BGSCAN_LEARN
 
-   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 dbus ; then
Kconfig_style_config CTRL_IFACE_DBUS
Kconfig_style_config CTRL_IFACE_DBUS_NEW
@@ -240,39 +213,19 @@ src_configure() {
Kconfig_style_config SUITEB
fi
 
-   # SSL authentication methods
-   if use ssl ; then
-   if use gnutls ; then
-   Kconfig_style_config TLS gnutls
-   Kconfig_style_config GNUTLS_EXTRA
-   Kconfig_style_config EAP_PWD n
-   Kconfig_style_config SAE n
-   Kconfig_style_config DPP n
-   else
-   #this fails for gnutls
-   Kconfig_style_config SUITEB192
-   Kconfig_style_config TLS openssl
-   Kconfig_style_config FST
-   if ! use bindist; then
- #this fails for gnutls
- Kconfig_style_config EAP_PWD
- Kconfig_style_config FILS
- Kconfig_style_config FILS_SK_PFS
- # 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
- Kconfig_style_config DPP
-   fi
-
-   fi
-   else
-   Kconfig_style_config TLS internal
-   Kconfig_style_config EAP_PWD n
-   Kconfig_style_config SAE n
-   Kconfig_style_config DPP n
+   Kconfig_style_config SUITEB192
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2019-03-21 Thread Rick Farina
commit: 49a75e1dc0934274554a0aca6a92eaecbcf88ce5
Author: Rick Farina  gentoo  org>
AuthorDate: Thu Mar 21 23:06:22 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Thu Mar 21 23:06:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a75e1d

net-wireless/wpa_supplicant: cleanup old

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

 .../wpa_supplicant/wpa_supplicant-2.6-r6.ebuild| 436 
 .../wpa_supplicant/wpa_supplicant-2.7-r1.ebuild|   1 -
 .../wpa_supplicant/wpa_supplicant-2.7.ebuild   | 456 -
 .../wpa_supplicant/wpa_supplicant-.ebuild  |   3 +-
 4 files changed, 1 insertion(+), 895 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
deleted file mode 100644
index df073740892..000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# 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 \):#include \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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/, net-wireless/wpa_supplicant/

2019-01-13 Thread Rick Farina
commit: ad158c5c451d3fe5878fba086e38e064654c1087
Author: Stefan Strogin  gmail  com>
AuthorDate: Sun Jan 13 19:24:24 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Jan 14 01:42:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad158c5c

net-wireless/wpa_supplicant: add LibreSSL fix from upstream

Close: https://bugs.gentoo.org/672632
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: Rick Farina  gentoo.org>

 .../files/wpa_supplicant-2.7-libressl.patch|  46 +++
 .../wpa_supplicant/wpa_supplicant-2.7-r1.ebuild| 459 +
 2 files changed, 505 insertions(+)

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-libressl.patch 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-libressl.patch
new file mode 100644
index 000..45a1cf3701f
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-libressl.patch
@@ -0,0 +1,46 @@
+From 2643a056bb7d0737f63f42a11c308b2804d9ebe5 Mon Sep 17 00:00:00 2001
+From: Andrey Utkin 
+Date: Tue, 11 Dec 2018 17:41:10 +
+Subject: [PATCH] Fix build with LibreSSL
+
+When using LibreSSL instead of OpenSSL, linkage of hostapd executable
+fails with the following error when using some LibreSSL versions
+
+../src/crypto/tls_openssl.o: In function `tls_verify_cb':
+tls_openssl.c:(.text+0x1273): undefined reference to 
`ASN1_STRING_get0_data'
+../src/crypto/tls_openssl.o: In function `tls_connection_peer_serial_num':
+tls_openssl.c:(.text+0x3023): undefined reference to 
`ASN1_STRING_get0_data'
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:1278: hostapd] Error 1
+
+ASN1_STRING_get0_data is present in recent OpenSSL, but absent in some
+versions of LibreSSL (confirmed for version 2.6.5), so fallback needs to
+be defined in this case, just like for old OpenSSL.
+
+This patch was inspired by similar patches to other projects, such as
+spice-gtk, pjsip.
+
+Link: https://bugs.gentoo.org/672834
+Signed-off-by: Andrey Utkin 
+---
+ src/crypto/tls_openssl.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 608818310..cb70e2c47 100644
+--- a/src/crypto/tls_openssl.c
 b/src/crypto/tls_openssl.c
+@@ -104,7 +104,9 @@ static size_t SSL_SESSION_get_master_key(const SSL_SESSION 
*session,
+ 
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010L
++#if OPENSSL_VERSION_NUMBER < 0x1010L || \
++  (defined(LIBRESSL_VERSION_NUMBER) && \
++   LIBRESSL_VERSION_NUMBER < 0x2070L)
+ #ifdef CONFIG_SUITEB
+ static int RSA_bits(const RSA *r)
+ {
+-- 
+2.20.1
+

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
new file mode 100644
index 000..16e14e933dd
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/;
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "" ]; 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 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? (
+   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
+   

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/

2019-01-13 Thread Rick Farina
commit: 60c211a01666babeebbbee2eea595da93173ec4c
Author: Stefan Strogin  gmail  com>
AuthorDate: Sun Jan 13 19:28:13 2019 +
Commit: Rick Farina  gentoo  org>
CommitDate: Mon Jan 14 01:42:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c211a0

net-wireless/wpa_supplicant: remove unused patch

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: Rick Farina  gentoo.org>

 .../files/wpa_supplicant-2.6-libressl.patch| 81 --
 1 file changed, 81 deletions(-)

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch
deleted file mode 100644
index 0394ab545b1..000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d53b107120af86a0c711bac950bfc2fa728cb4e6 Mon Sep 17 00:00:00 2001
-From: Julian Ospald 
-Date: Fri, 7 Oct 2016 17:45:46 +0200
-Subject: [PATCH] Fix LibreSSL compatibility
-Upstream: pending, 
http://lists.infradead.org/pipermail/hostap/2016-October/036458.html
-
-This basically just follows
-587b0457e0238b7b1800d46f5cdd5e1d2b06732f
-with the same pattern, which was missed here.
-
-Signed-off-by: Julian Ospald 

- src/crypto/crypto_openssl.c | 4 ++--
- src/crypto/tls_openssl.c| 8 
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
-index 19e0e2b..b3d1b07 100644
 a/src/crypto/crypto_openssl.c
-+++ b/src/crypto/crypto_openssl.c
-@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
- 
- void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   DH *dh;
-   struct wpabuf *pubkey = NULL, *privkey = NULL;
-   size_t publen, privlen;
-@@ -712,7 +712,7 @@ err:
- 
- void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
- {
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   DH *dh;
- 
-   dh = DH_new();
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 23ac64b..a7d4880 100644
 a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -919,7 +919,7 @@ void * tls_init(const struct tls_config *conf)
-   }
- #endif /* OPENSSL_FIPS */
- #endif /* CONFIG_FIPS */
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   SSL_load_error_strings();
-   SSL_library_init();
- #ifndef OPENSSL_NO_SHA256
-@@ -1043,7 +1043,7 @@ void tls_deinit(void *ssl_ctx)
- 
-   tls_openssl_ref_count--;
-   if (tls_openssl_ref_count == 0) {
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_ENGINE
-   ENGINE_cleanup();
- #endif /* OPENSSL_NO_ENGINE */
-@@ -2334,7 +2334,7 @@ static int tls_connection_client_cert(struct 
tls_connection *conn,
-   return 0;
- 
- #ifdef PKCS12_FUNCS
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-   /*
-* Clear previously set extra chain certificates, if any, from PKCS#12
-* processing in tls_parse_pkcs12() to allow OpenSSL to build a new
-@@ -3976,7 +3976,7 @@ int tls_connection_set_params(void *tls_ctx, struct 
tls_connection *conn,
-   engine_id = "pkcs11";
- 
- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
--#if OPENSSL_VERSION_NUMBER < 0x1010L
-+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
-   if (params->flags & TLS_CONN_EAP_FAST) {
-   wpa_printf(MSG_DEBUG,
-  "OpenSSL: Use TLSv1_method() for EAP-FAST");
--- 
-2.10.1
-



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-08 Thread Mikle Kolyada
commit: eda2ef097d3a40b12910d7728ed257a4ce7c589f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Dec  8 12:11:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Dec  8 12:11:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda2ef09

net-wireless/wpa_supplicant: arm stable wrt bug #663172

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index c8e1affd5a6..aee917dd595 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 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 )"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-07 Thread Matt Turner
commit: 4e99a2d6bbbd9fda1ef37728622f35603a994c05
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec  7 23:19:22 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec  7 23:19:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e99a2d6

net-wireless/wpa_supplicant-2.6-r10: ppc64 stable, bug 663172

Signed-off-by: Matt Turner  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index d35dcba17e6..c8e1affd5a6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 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 )"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-07 Thread Matt Turner
commit: 90ce79d94e22cdf5f308af33c44599e0252d8a7c
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec  7 23:19:14 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec  7 23:19:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ce79d9

net-wireless/wpa_supplicant-2.6-r10: ppc stable, bug 663172

Signed-off-by: Matt Turner  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index c033f1f00a6..d35dcba17e6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 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 )"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-07 Thread Mikle Kolyada
commit: 4e4e572218f6c9b5bf6a7b5bc8cbf1dc06b38d3e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Dec  7 12:30:48 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec  7 12:31:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4e5722

net-wireless/wpa_supplicant: amd64 stable wrt bug #663172

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index 16f9113ba43..c033f1f00a6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~x86-fbsd"
 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 )"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-06 Thread Thomas Deutschmann
commit: 3f5ee0c20880fdbee0d595ba09db465f5018b729
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  7 02:24:17 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  7 02:40:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5ee0c2

net-wireless/wpa_supplicant: x86 stable (bug #663172)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index 36a7ffe69b6..16f9113ba43 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~x86-fbsd"
 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 )"
 



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/files/, net-wireless/wpa_supplicant/

2018-12-05 Thread Rick Farina
commit: e0288112138a70a8acc3ae0196772fd7ccb677ce
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Dec  5 22:08:06 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Dec  5 22:08:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0288112

net-wireless/wpa_supplicant: bump bug #672568

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/Manifest   |   1 +
 ...pa_supplicant-2.7-fix-undefined-remove-ie.patch |  38 ++
 .../wpa_supplicant/wpa_supplicant-2.7.ebuild   | 456 +
 3 files changed, 495 insertions(+)

diff --git a/net-wireless/wpa_supplicant/Manifest 
b/net-wireless/wpa_supplicant/Manifest
index b73800a9506..6c70e97a288 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1 +1,2 @@
 DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 
99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac
 SHA512 
46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
+DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B 
bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa
 SHA512 
8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch
 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch
new file mode 100644
index 000..97a8cc7f3e1
--- /dev/null
+++ 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-fix-undefined-remove-ie.patch
@@ -0,0 +1,38 @@
+From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen 
+Date: Mon, 3 Dec 2018 12:00:26 +0200
+Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y
+
+remove_ie() was defined within an ifdef CONFIG_FILS block while it is
+now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition
+there.
+
+Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol")
+Signed-off-by: Jouni Malinen 
+---
+ wpa_supplicant/sme.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
+index 39c8069..f77f751 100644
+--- a/wpa_supplicant/sme.c
 b/wpa_supplicant/sme.c
+@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union 
wpa_event_data *data)
+ }
+ 
+ 
+-#ifdef CONFIG_FILS
+ #ifdef CONFIG_IEEE80211R
+ static void remove_ie(u8 *buf, size_t *len, u8 eid)
+ {
+@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid)
+   }
+ }
+ #endif /* CONFIG_IEEE80211R */
+-#endif /* CONFIG_FILS */
+ 
+ 
+ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
+-- 
+cgit v0.12
+

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild
new file mode 100644
index 000..12a69aa090d
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/;
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "" ]; 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 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? (
+   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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-05 Thread Rick Farina
commit: a802978c479168afde267bcd775c936150ce9ed7
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Dec  5 21:59:58 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Dec  5 22:08:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a802978c

net-wireless/wpa_supplicant: minor fixes for live ebuild

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 net-wireless/wpa_supplicant/wpa_supplicant-.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
index 5c5676770af..df34e7baa75 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -135,10 +135,7 @@ src_prepare() {
fi
 
# bug (320097)
-   #eapply 
"${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
-
-   # bug (596332 & 651314)
-   #eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
+   eapply 
"${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
 
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
@@ -387,7 +384,9 @@ src_install() {
 
newdoc .config build-config
 
-   #doman doc/docbook/*.{5,8}
+   if [ "${PV}" != "" ]; then
+   doman doc/docbook/*.{5,8}
+   fi
 
if use qt5 ; then
into /usr



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-05 Thread Rick Farina
commit: 97f1a00c864815da233ca14bca2cfcb94ca1bf18
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Dec  5 20:47:04 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Dec  5 20:47:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f1a00c

net-wireless/wpa_supplicant: cleanup old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 .../wpa_supplicant/wpa_supplicant-2.6-r3.ebuild| 401 ---
 .../wpa_supplicant/wpa_supplicant-2.6-r5.ebuild| 436 -
 2 files changed, 837 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
deleted file mode 100644
index 94efb65ea57..000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2017 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 gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline 
selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux 
kernel_FreeBSD"
-REQUIRED_USE="fasteap? ( !ssl ) 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:0= )
-   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"
-   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 \):#include \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
-
-   # 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/, net-wireless/wpa_supplicant/files/

2018-12-05 Thread Rick Farina
commit: 102ca740a0e42464d91b474119a03c8b26cdefaa
Author: Rick Farina  gentoo  org>
AuthorDate: Wed Dec  5 20:39:42 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Wed Dec  5 20:39:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102ca740

net-wireless/wpa_supplicant: fix bug #663172

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 ...-unauthenticated-encrypted-EAPOL-Key-data.patch | 44 ++
 ...2.6-r9.ebuild => wpa_supplicant-2.6-r10.ebuild} |  3 ++
 2 files changed, 47 insertions(+)

diff --git 
a/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
 
b/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
new file mode 100644
index 000..a62b52c6b9a
--- /dev/null
+++ 
b/net-wireless/wpa_supplicant/files/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
@@ -0,0 +1,44 @@
+From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001
+From: Mathy Vanhoef 
+Date: Sun, 15 Jul 2018 01:25:53 +0200
+Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data
+
+Ignore unauthenticated encrypted EAPOL-Key data in supplicant
+processing. When using WPA2, these are frames that have the Encrypted
+flag set, but not the MIC flag.
+
+When using WPA2, EAPOL-Key frames that had the Encrypted flag set but
+not the MIC flag, had their data field decrypted without first verifying
+the MIC. In case the data field was encrypted using RC4 (i.e., when
+negotiating TKIP as the pairwise cipher), this meant that
+unauthenticated but decrypted data would then be processed. An adversary
+could abuse this as a decryption oracle to recover sensitive information
+in the data field of EAPOL-Key messages (e.g., the group key).
+(CVE-2018-14526)
+
+Signed-off-by: Mathy Vanhoef 
+---
+ src/rsn_supp/wpa.c | 11 +++
+ 1 file changed, 11 insertions(+)
+
+diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 
wpa_supplicant-2.6/src/rsn_supp/wpa.c
+--- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.0 
+0300
 wpa_supplicant-2.6/src/rsn_supp/wpa.c  2018-08-08 16:55:11.506831029 
+0300
+@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c
+ 
+   if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) &&
+   (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
++  /*
++   * Only decrypt the Key Data field if the frame's authenticity
++   * was verified. When using AES-SIV (FILS), the MIC flag is not
++   * set, so this check should only be performed if mic_len != 0
++   * which is the case in this code branch.
++   */
++  if (!(key_info & WPA_KEY_INFO_MIC)) {
++  wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
++  "WPA: Ignore EAPOL-Key with encrypted but 
unauthenticated data");
++  goto out;
++  }
+   if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data,
+   _data_len))
+   goto out;

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
similarity index 98%
rename from net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild
rename to net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
index 19e3fbfe5a0..36a7ffe69b6 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r10.ebuild
@@ -146,6 +146,9 @@ src_prepare() {
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"
 
+   # https://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt
+   eapply 
"${FILESDIR}/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch"
+
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
 }



[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/, net-wireless/wpa_supplicant/files/

2018-12-03 Thread Rick Farina
commit: 696f3772a422e25bd62e69d497717985d1fe295d
Author: Craig Andrews  gentoo  org>
AuthorDate: Mon Dec  3 20:21:11 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Dec  4 01:39:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f3772

net-wireless/wpa_supplicant: Fix EAP-TLS with OpenSSL 1.1

Closes: https://bugs.gentoo.org/671006
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Craig Andrews  gentoo.org>
Signed-off-by: Rick Farina  gentoo.org>

 .../files/wpa_supplicant-2.6-openssl-1.1.patch |  48 +++
 .../wpa_supplicant/wpa_supplicant-2.6-r9.ebuild| 460 +
 2 files changed, 508 insertions(+)

diff --git 
a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-openssl-1.1.patch 
b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-openssl-1.1.patch
new file mode 100644
index 000..1e2335f34c0
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-openssl-1.1.patch
@@ -0,0 +1,48 @@
+From f665c93e1d28fbab3d9127a8c3985cc32940824f Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani 
+Date: Sun, 9 Jul 2017 11:14:10 +0200
+Subject: OpenSSL: Fix private key password handling with OpenSSL >= 1.1.0f
+
+Since OpenSSL version 1.1.0f, SSL_use_PrivateKey_file() uses the
+callback from the SSL object instead of the one from the CTX, so let's
+set the callback on both SSL and CTX. Note that
+SSL_set_default_passwd_cb*() is available only in 1.1.0.
+
+Signed-off-by: Beniamino Galvani 
+---
+ src/crypto/tls_openssl.c | 12 
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index fd94eaf..c790b53 100644
+--- a/src/crypto/tls_openssl.c
 b/src/crypto/tls_openssl.c
+@@ -2796,6 +2796,15 @@ static int tls_connection_private_key(struct tls_data 
*data,
+   } else
+   passwd = NULL;
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  /*
++   * In OpenSSL >= 1.1.0f SSL_use_PrivateKey_file() uses the callback
++   * from the SSL object. See OpenSSL commit d61461a75253.
++   */
++  SSL_set_default_passwd_cb(conn->ssl, tls_passwd_cb);
++  SSL_set_default_passwd_cb_userdata(conn->ssl, passwd);
++#endif /* >= 1.1.0f && !LibreSSL */
++  /* Keep these for OpenSSL < 1.1.0f */
+   SSL_CTX_set_default_passwd_cb(ssl_ctx, tls_passwd_cb);
+   SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, passwd);
+ 
+@@ -2886,6 +2895,9 @@ static int tls_connection_private_key(struct tls_data 
*data,
+   return -1;
+   }
+   ERR_clear_error();
++#if OPENSSL_VERSION_NUMBER >= 0x1010L && !defined(LIBRESSL_VERSION_NUMBER)
++  SSL_set_default_passwd_cb(conn->ssl, NULL);
++#endif /* >= 1.1.0f && !LibreSSL */
+   SSL_CTX_set_default_passwd_cb(ssl_ctx, NULL);
+   os_free(passwd);
+ 
+-- 
+cgit v0.12
+

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild
new file mode 100644
index 000..19e3fbfe5a0
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r9.ebuild
@@ -0,0 +1,460 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 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? (
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-12-03 Thread Rick Farina
commit: 4e24312881ca8d4fb913f6cc7f41413e309ee3c9
Author: Rick Farina  gentoo  org>
AuthorDate: Tue Dec  4 01:39:52 2018 +
Commit: Rick Farina  gentoo  org>
CommitDate: Tue Dec  4 01:39:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e243128

net-wireless/wpa_supplicant: drop old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Rick Farina  gentoo.org>

 .../wpa_supplicant/wpa_supplicant-2.6-r8.ebuild| 457 -
 1 file changed, 457 deletions(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild
deleted file mode 100644
index 15d823b942f..000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# 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 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? (
-   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 \):#include \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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-08-05 Thread Richard Farina
commit: f68a920c048a4f792997a28e5cb9e2cbcf055420
Author: Zero_Chaos  gentoo  org>
AuthorDate: Sun Aug  5 16:03:45 2018 +
Commit: Richard Farina  gentoo  org>
CommitDate: Sun Aug  5 16:04:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68a920c

net-wireless/wpa_supplicant: rough live ebuild

you are welcome to test and report bugs, but you will likely get told
you get to keep the pieces

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 .../wpa_supplicant/wpa_supplicant-.ebuild  | 454 +
 1 file changed, 454 insertions(+)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
new file mode 100644
index 000..5c5676770af
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-.ebuild
@@ -0,0 +1,454 @@
+# 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/;
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "" ]; 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 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? (
+   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 \):#include \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 

[gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/

2018-06-09 Thread Sergei Trofimovich
commit: 0e3895714ff8067905ed6408a3eba988d8ccd8fa
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun  9 19:19:50 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun  9 19:21:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e389571

net-wireless/wpa_supplicant: stable 2.6-r6 for ppc, bug #653518

Tested-by: ernsteiswuerfel
Bug: https://bugs.gentoo.org/653518
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild 
b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
index 57de56f9e9f..df073740892 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
@@ -11,7 +11,7 @@ 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"
+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 )"
 



  1   2   >