Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 734790
Collapse All | Expand All

(-)a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild (-23 / +12 lines)
Lines 1-9 Link Here
1
# Copyright 1999-2020 Gentoo Authors
1
# Copyright 1999-2021 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
3
4
EAPI=7
4
EAPI=7
5
5
6
inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
6
inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
7
7
8
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
8
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
9
HOMEPAGE="https://w1.fi/wpa_supplicant/"
9
HOMEPAGE="https://w1.fi/wpa_supplicant/"
Lines 18-24 else Link Here
18
fi
18
fi
19
19
20
SLOT="0"
20
SLOT="0"
21
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"
21
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"
22
22
23
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
23
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
24
# interface functions used for MACsec, so this combination cannot be used
24
# interface functions used for MACsec, so this combination cannot be used
Lines 29-35 REQUIRED_USE=" Link Here
29
	broadcom-sta? ( !fils !mesh !mbo )
29
	broadcom-sta? ( !fils !mesh !mbo )
30
"
30
"
31
31
32
CDEPEND="dbus? ( sys-apps/dbus )
32
DEPEND="
33
	>=dev-libs/openssl-1.0.2k:0=[bindist=]
34
	dbus? ( sys-apps/dbus )
33
	kernel_linux? (
35
	kernel_linux? (
34
		dev-libs/libnl:3
36
		dev-libs/libnl:3
35
		net-wireless/crda
37
		net-wireless/crda
Lines 46-60 CDEPEND="dbus? ( sys-apps/dbus ) Link Here
46
		sys-libs/ncurses:0=
48
		sys-libs/ncurses:0=
47
		sys-libs/readline:0=
49
		sys-libs/readline:0=
48
	)
50
	)
49
	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
50
	libressl? ( dev-libs/libressl:0= )
51
"
51
"
52
DEPEND="${CDEPEND}
52
RDEPEND="${DEPEND}
53
	virtual/pkgconfig
54
"
55
RDEPEND="${CDEPEND}
56
	selinux? ( sec-policy/selinux-networkmanager )
53
	selinux? ( sec-policy/selinux-networkmanager )
57
"
54
"
55
BDEPEND="virtual/pkgconfig"
58
56
59
DOC_CONTENTS="
57
DOC_CONTENTS="
60
	If this is a clean installation of wpa_supplicant, you
58
	If this is a clean installation of wpa_supplicant, you
Lines 134-140 src_prepare() { Link Here
134
132
135
src_configure() {
133
src_configure() {
136
	# Toolchain setup
134
	# Toolchain setup
137
	tc-export CC
135
	tc-export CC PKG_CONFIG
138
136
139
	cp defconfig .config || die
137
	cp defconfig .config || die
140
138
Lines 235-241 src_configure() { Link Here
235
233
236
	Kconfig_style_config TLS openssl
234
	Kconfig_style_config TLS openssl
237
	Kconfig_style_config FST
235
	Kconfig_style_config FST
238
	if ! use bindist || use libressl; then
236
	if ! use bindist ; then
239
		Kconfig_style_config EAP_PWD
237
		Kconfig_style_config EAP_PWD
240
		if use fils; then
238
		if use fils; then
241
			Kconfig_style_config FILS
239
			Kconfig_style_config FILS
Lines 251-258 src_configure() { Link Here
251
		Kconfig_style_config SAE
249
		Kconfig_style_config SAE
252
		Kconfig_style_config DPP
250
		Kconfig_style_config DPP
253
		Kconfig_style_config SUITEB192
251
		Kconfig_style_config SUITEB192
254
	fi
255
	if ! use bindist && ! use libressl; then
256
		Kconfig_style_config SUITEB
252
		Kconfig_style_config SUITEB
257
	fi
253
	fi
258
254
Lines 452-466 pkg_postinst() { Link Here
452
	fi
448
	fi
453
449
454
	if use bindist; then
450
	if use bindist; then
455
		if ! use libressl; then
451
		ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
456
			ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
452
		ewarn "This is incredibly undesirable"
457
			ewarn "This is incredibly undesirable"
458
		fi
459
	fi
460
	if use libressl; then
461
		ewarn "Libressl doesn't support SUITEB (part of WPA3)"
462
		ewarn "but it does support SUITEB192 (the upgraded strength version of the same)"
463
		ewarn "You probably don't care.  Patches welcome"
464
	fi
453
	fi
465
454
466
	# Mea culpa, feel free to remove that after some time --mgorny.
455
	# Mea culpa, feel free to remove that after some time --mgorny.
(-)a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild (-24 / +12 lines)
Lines 1-9 Link Here
1
# Copyright 1999-2020 Gentoo Authors
1
# Copyright 1999-2021 Gentoo Authors
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
3
4
EAPI=7
4
EAPI=7
5
5
6
inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
6
inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
7
7
8
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
8
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
9
HOMEPAGE="https://w1.fi/wpa_supplicant/"
9
HOMEPAGE="https://w1.fi/wpa_supplicant/"
Lines 18-24 else Link Here
18
fi
18
fi
19
19
20
SLOT="0"
20
SLOT="0"
21
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"
21
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"
22
22
23
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
23
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
24
# interface functions used for MACsec, so this combination cannot be used
24
# interface functions used for MACsec, so this combination cannot be used
Lines 29-35 REQUIRED_USE=" Link Here
29
	broadcom-sta? ( !fils !mesh !mbo )
29
	broadcom-sta? ( !fils !mesh !mbo )
30
"
30
"
31
31
32
CDEPEND="dbus? ( sys-apps/dbus )
32
DEPEND="
33
	>=dev-libs/openssl-1.0.2k:0=[bindist=]
34
	dbus? ( sys-apps/dbus )
33
	kernel_linux? (
35
	kernel_linux? (
34
		dev-libs/libnl:3
36
		dev-libs/libnl:3
35
		net-wireless/crda
37
		net-wireless/crda
Lines 46-60 CDEPEND="dbus? ( sys-apps/dbus ) Link Here
46
		sys-libs/ncurses:0=
48
		sys-libs/ncurses:0=
47
		sys-libs/readline:0=
49
		sys-libs/readline:0=
48
	)
50
	)
49
	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
50
	libressl? ( dev-libs/libressl:0= )
51
"
51
"
52
DEPEND="${CDEPEND}
52
RDEPEND="${DEPEND}
53
	virtual/pkgconfig
54
"
55
RDEPEND="${CDEPEND}
56
	selinux? ( sec-policy/selinux-networkmanager )
53
	selinux? ( sec-policy/selinux-networkmanager )
57
"
54
"
55
BDEPEND="virtual/pkgconfig"
58
56
59
DOC_CONTENTS="
57
DOC_CONTENTS="
60
	If this is a clean installation of wpa_supplicant, you
58
	If this is a clean installation of wpa_supplicant, you
Lines 131-137 src_prepare() { Link Here
131
129
132
src_configure() {
130
src_configure() {
133
	# Toolchain setup
131
	# Toolchain setup
134
	tc-export CC
132
	tc-export CC PKG_CONFIG
135
133
136
	cp defconfig .config || die
134
	cp defconfig .config || die
137
135
Lines 232-238 src_configure() { Link Here
232
230
233
	Kconfig_style_config TLS openssl
231
	Kconfig_style_config TLS openssl
234
	Kconfig_style_config FST
232
	Kconfig_style_config FST
235
	if ! use bindist || use libressl; then
233
	if ! use bindist ; then
236
		Kconfig_style_config EAP_PWD
234
		Kconfig_style_config EAP_PWD
237
		if use fils; then
235
		if use fils; then
238
			Kconfig_style_config FILS
236
			Kconfig_style_config FILS
Lines 248-255 src_configure() { Link Here
248
		Kconfig_style_config SAE
246
		Kconfig_style_config SAE
249
		Kconfig_style_config DPP
247
		Kconfig_style_config DPP
250
		Kconfig_style_config SUITEB192
248
		Kconfig_style_config SUITEB192
251
	fi
252
	if ! use bindist && ! use libressl; then
253
		Kconfig_style_config SUITEB
249
		Kconfig_style_config SUITEB
254
	fi
250
	fi
255
251
Lines 449-463 pkg_postinst() { Link Here
449
	fi
445
	fi
450
446
451
	if use bindist; then
447
	if use bindist; then
452
		if ! use libressl; then
448
		ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
453
			ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
449
		ewarn "This is incredibly undesirable"
454
			ewarn "This is incredibly undesirable"
455
		fi
456
	fi
457
	if use libressl; then
458
		ewarn "Libressl doesn't support SUITEB (part of WPA3)"
459
		ewarn "but it does support SUITEB192 (the upgraded strength version of the same)"
460
		ewarn "You probably don't care.  Patches welcome"
461
	fi
450
	fi
462
451
463
	# Mea culpa, feel free to remove that after some time --mgorny.
452
	# Mea culpa, feel free to remove that after some time --mgorny.
464
- 

Return to bug 734790