1 |
commit: 92dac892940defc0627d8155910f4c13014b939c |
2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Mar 26 18:31:47 2021 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 2 19:29:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92dac892 |
7 |
|
8 |
net-wireless/wpa_supplicant: fix pkg-config, drop libressl |
9 |
|
10 |
Closes: https://bugs.gentoo.org/734790 |
11 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
12 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
13 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
14 |
|
15 |
.../wpa_supplicant/wpa_supplicant-2.9-r2.ebuild | 35 ++++++++-------------- |
16 |
.../wpa_supplicant/wpa_supplicant-9999.ebuild | 35 ++++++++-------------- |
17 |
2 files changed, 24 insertions(+), 46 deletions(-) |
18 |
|
19 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild |
20 |
index 3705130f557..95e04bf7986 100644 |
21 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild |
22 |
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild |
23 |
@@ -1,9 +1,9 @@ |
24 |
-# Copyright 1999-2020 Gentoo Authors |
25 |
+# Copyright 1999-2021 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
|
30 |
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop |
31 |
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs |
32 |
|
33 |
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" |
34 |
HOMEPAGE="https://w1.fi/wpa_supplicant/" |
35 |
@@ -18,7 +18,7 @@ else |
36 |
fi |
37 |
|
38 |
SLOT="0" |
39 |
-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" |
40 |
+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" |
41 |
|
42 |
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver |
43 |
# interface functions used for MACsec, so this combination cannot be used |
44 |
@@ -29,7 +29,9 @@ REQUIRED_USE=" |
45 |
broadcom-sta? ( !fils !mesh !mbo ) |
46 |
" |
47 |
|
48 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
49 |
+DEPEND=" |
50 |
+ >=dev-libs/openssl-1.0.2k:0=[bindist=] |
51 |
+ dbus? ( sys-apps/dbus ) |
52 |
kernel_linux? ( |
53 |
dev-libs/libnl:3 |
54 |
net-wireless/crda |
55 |
@@ -46,15 +48,11 @@ CDEPEND="dbus? ( sys-apps/dbus ) |
56 |
sys-libs/ncurses:0= |
57 |
sys-libs/readline:0= |
58 |
) |
59 |
- !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) |
60 |
- libressl? ( dev-libs/libressl:0= ) |
61 |
" |
62 |
-DEPEND="${CDEPEND} |
63 |
- virtual/pkgconfig |
64 |
-" |
65 |
-RDEPEND="${CDEPEND} |
66 |
+RDEPEND="${DEPEND} |
67 |
selinux? ( sec-policy/selinux-networkmanager ) |
68 |
" |
69 |
+BDEPEND="virtual/pkgconfig" |
70 |
|
71 |
DOC_CONTENTS=" |
72 |
If this is a clean installation of wpa_supplicant, you |
73 |
@@ -134,7 +132,7 @@ src_prepare() { |
74 |
|
75 |
src_configure() { |
76 |
# Toolchain setup |
77 |
- tc-export CC |
78 |
+ tc-export CC PKG_CONFIG |
79 |
|
80 |
cp defconfig .config || die |
81 |
|
82 |
@@ -235,7 +233,7 @@ src_configure() { |
83 |
|
84 |
Kconfig_style_config TLS openssl |
85 |
Kconfig_style_config FST |
86 |
- if ! use bindist || use libressl; then |
87 |
+ if ! use bindist ; then |
88 |
Kconfig_style_config EAP_PWD |
89 |
if use fils; then |
90 |
Kconfig_style_config FILS |
91 |
@@ -251,8 +249,6 @@ src_configure() { |
92 |
Kconfig_style_config SAE |
93 |
Kconfig_style_config DPP |
94 |
Kconfig_style_config SUITEB192 |
95 |
- fi |
96 |
- if ! use bindist && ! use libressl; then |
97 |
Kconfig_style_config SUITEB |
98 |
fi |
99 |
|
100 |
@@ -452,15 +448,8 @@ pkg_postinst() { |
101 |
fi |
102 |
|
103 |
if use bindist; then |
104 |
- if ! use libressl; then |
105 |
- ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." |
106 |
- ewarn "This is incredibly undesirable" |
107 |
- fi |
108 |
- fi |
109 |
- if use libressl; then |
110 |
- ewarn "Libressl doesn't support SUITEB (part of WPA3)" |
111 |
- ewarn "but it does support SUITEB192 (the upgraded strength version of the same)" |
112 |
- ewarn "You probably don't care. Patches welcome" |
113 |
+ ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." |
114 |
+ ewarn "This is incredibly undesirable" |
115 |
fi |
116 |
|
117 |
# Mea culpa, feel free to remove that after some time --mgorny. |
118 |
|
119 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild |
120 |
index c91b6d2f562..f4d4302d5ee 100644 |
121 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild |
122 |
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild |
123 |
@@ -1,9 +1,9 @@ |
124 |
-# Copyright 1999-2020 Gentoo Authors |
125 |
+# Copyright 1999-2021 Gentoo Authors |
126 |
# Distributed under the terms of the GNU General Public License v2 |
127 |
|
128 |
EAPI=7 |
129 |
|
130 |
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop |
131 |
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs |
132 |
|
133 |
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" |
134 |
HOMEPAGE="https://w1.fi/wpa_supplicant/" |
135 |
@@ -18,7 +18,7 @@ else |
136 |
fi |
137 |
|
138 |
SLOT="0" |
139 |
-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" |
140 |
+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" |
141 |
|
142 |
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver |
143 |
# interface functions used for MACsec, so this combination cannot be used |
144 |
@@ -29,7 +29,9 @@ REQUIRED_USE=" |
145 |
broadcom-sta? ( !fils !mesh !mbo ) |
146 |
" |
147 |
|
148 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
149 |
+DEPEND=" |
150 |
+ >=dev-libs/openssl-1.0.2k:0=[bindist=] |
151 |
+ dbus? ( sys-apps/dbus ) |
152 |
kernel_linux? ( |
153 |
dev-libs/libnl:3 |
154 |
net-wireless/crda |
155 |
@@ -46,15 +48,11 @@ CDEPEND="dbus? ( sys-apps/dbus ) |
156 |
sys-libs/ncurses:0= |
157 |
sys-libs/readline:0= |
158 |
) |
159 |
- !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) |
160 |
- libressl? ( dev-libs/libressl:0= ) |
161 |
" |
162 |
-DEPEND="${CDEPEND} |
163 |
- virtual/pkgconfig |
164 |
-" |
165 |
-RDEPEND="${CDEPEND} |
166 |
+RDEPEND="${DEPEND} |
167 |
selinux? ( sec-policy/selinux-networkmanager ) |
168 |
" |
169 |
+BDEPEND="virtual/pkgconfig" |
170 |
|
171 |
DOC_CONTENTS=" |
172 |
If this is a clean installation of wpa_supplicant, you |
173 |
@@ -131,7 +129,7 @@ src_prepare() { |
174 |
|
175 |
src_configure() { |
176 |
# Toolchain setup |
177 |
- tc-export CC |
178 |
+ tc-export CC PKG_CONFIG |
179 |
|
180 |
cp defconfig .config || die |
181 |
|
182 |
@@ -232,7 +230,7 @@ src_configure() { |
183 |
|
184 |
Kconfig_style_config TLS openssl |
185 |
Kconfig_style_config FST |
186 |
- if ! use bindist || use libressl; then |
187 |
+ if ! use bindist ; then |
188 |
Kconfig_style_config EAP_PWD |
189 |
if use fils; then |
190 |
Kconfig_style_config FILS |
191 |
@@ -248,8 +246,6 @@ src_configure() { |
192 |
Kconfig_style_config SAE |
193 |
Kconfig_style_config DPP |
194 |
Kconfig_style_config SUITEB192 |
195 |
- fi |
196 |
- if ! use bindist && ! use libressl; then |
197 |
Kconfig_style_config SUITEB |
198 |
fi |
199 |
|
200 |
@@ -449,15 +445,8 @@ pkg_postinst() { |
201 |
fi |
202 |
|
203 |
if use bindist; then |
204 |
- if ! use libressl; then |
205 |
- ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." |
206 |
- ewarn "This is incredibly undesirable" |
207 |
- fi |
208 |
- fi |
209 |
- if use libressl; then |
210 |
- ewarn "Libressl doesn't support SUITEB (part of WPA3)" |
211 |
- ewarn "but it does support SUITEB192 (the upgraded strength version of the same)" |
212 |
- ewarn "You probably don't care. Patches welcome" |
213 |
+ ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." |
214 |
+ ewarn "This is incredibly undesirable" |
215 |
fi |
216 |
|
217 |
# Mea culpa, feel free to remove that after some time --mgorny. |