1 |
commit: 48285d29fe270e8dc2c3e780076989adf4f6f1e6 |
2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 25 20:08:31 2019 +0000 |
4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 25 20:08:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48285d29 |
7 |
|
8 |
net-wireless/wpa_supplicant: cleanup old/vuln |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
11 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
12 |
|
13 |
net-wireless/wpa_supplicant/Manifest | 1 - |
14 |
.../wpa_supplicant/wpa_supplicant-2.8-r1.ebuild | 449 --------------------- |
15 |
2 files changed, 450 deletions(-) |
16 |
|
17 |
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest |
18 |
index 637bcc2c825..07c650017d7 100644 |
19 |
--- a/net-wireless/wpa_supplicant/Manifest |
20 |
+++ b/net-wireless/wpa_supplicant/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 260b4830949a3e051ef4f33f279b3b225ab9fd95100e4b270d29af457cf07601421fac636d9f1d8927271d7c76aecb0b7c93ddab35203e31a0fd84c3e327d951 SHA512 b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b |
23 |
DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8 |
24 |
|
25 |
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild |
26 |
deleted file mode 100644 |
27 |
index 2b773d19178..00000000000 |
28 |
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,449 +0,0 @@ |
31 |
-# Copyright 1999-2019 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 |
37 |
- |
38 |
-DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" |
39 |
-HOMEPAGE="https://w1.fi/wpa_supplicant/" |
40 |
-LICENSE="|| ( GPL-2 BSD )" |
41 |
- |
42 |
-if [ "${PV}" = "9999" ]; then |
43 |
- inherit git-r3 |
44 |
- EGIT_REPO_URI="https://w1.fi/hostap.git" |
45 |
-else |
46 |
- KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" |
47 |
- SRC_URI="https://w1.fi/releases/${P}.tar.gz" |
48 |
-fi |
49 |
- |
50 |
-SLOT="0" |
51 |
-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" |
52 |
- |
53 |
-CDEPEND="dbus? ( sys-apps/dbus ) |
54 |
- kernel_linux? ( |
55 |
- dev-libs/libnl:3 |
56 |
- net-wireless/crda |
57 |
- eap-sim? ( sys-apps/pcsc-lite ) |
58 |
- ) |
59 |
- !kernel_linux? ( net-libs/libpcap ) |
60 |
- qt5? ( |
61 |
- dev-qt/qtcore:5 |
62 |
- dev-qt/qtgui:5 |
63 |
- dev-qt/qtsvg:5 |
64 |
- dev-qt/qtwidgets:5 |
65 |
- ) |
66 |
- readline? ( |
67 |
- sys-libs/ncurses:0= |
68 |
- sys-libs/readline:0= |
69 |
- ) |
70 |
- !libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] ) |
71 |
- libressl? ( dev-libs/libressl:0= ) |
72 |
-" |
73 |
-DEPEND="${CDEPEND} |
74 |
- virtual/pkgconfig |
75 |
-" |
76 |
-RDEPEND="${CDEPEND} |
77 |
- selinux? ( sec-policy/selinux-networkmanager ) |
78 |
-" |
79 |
- |
80 |
-DOC_CONTENTS=" |
81 |
- If this is a clean installation of wpa_supplicant, you |
82 |
- have to create a configuration file named |
83 |
- ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf |
84 |
- An example configuration file is available for reference in |
85 |
- ${EROOT%/}/usr/share/doc/${PF}/ |
86 |
-" |
87 |
- |
88 |
-S="${WORKDIR}/${P}/${PN}" |
89 |
- |
90 |
-Kconfig_style_config() { |
91 |
- #param 1 is CONFIG_* item |
92 |
- #param 2 is what to set it = to, defaulting in y |
93 |
- CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" |
94 |
- setting="${2:-y}" |
95 |
- |
96 |
- if [ ! $setting = n ]; then |
97 |
- #first remove any leading "# " if $2 is not n |
98 |
- sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" |
99 |
- #set item = $setting (defaulting to y) |
100 |
- sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" |
101 |
- if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then |
102 |
- echo "$CONFIG_PARAM=$setting" >>.config |
103 |
- fi |
104 |
- else |
105 |
- #ensure item commented out |
106 |
- sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" |
107 |
- fi |
108 |
-} |
109 |
- |
110 |
-src_prepare() { |
111 |
- default |
112 |
- |
113 |
- # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD |
114 |
- sed -i \ |
115 |
- -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ |
116 |
- ../src/l2_packet/l2_packet_freebsd.c || die |
117 |
- |
118 |
- # People seem to take the example configuration file too literally (bug #102361) |
119 |
- sed -i \ |
120 |
- -e "s:^\(opensc_engine_path\):#\1:" \ |
121 |
- -e "s:^\(pkcs11_engine_path\):#\1:" \ |
122 |
- -e "s:^\(pkcs11_module_path\):#\1:" \ |
123 |
- wpa_supplicant.conf || die |
124 |
- |
125 |
- # Change configuration to match Gentoo locations (bug #143750) |
126 |
- sed -i \ |
127 |
- -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ |
128 |
- -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ |
129 |
- wpa_supplicant.conf || die |
130 |
- |
131 |
- # systemd entries to D-Bus service files (bug #372877) |
132 |
- echo 'SystemdService=wpa_supplicant.service' \ |
133 |
- | tee -a dbus/*.service >/dev/null || die |
134 |
- |
135 |
- cd "${WORKDIR}/${P}" || die |
136 |
- |
137 |
- if use wimax; then |
138 |
- # generate-libeap-peer.patch comes before |
139 |
- # fix-undefined-reference-to-random_get_bytes.patch |
140 |
- eapply "${FILESDIR}/${P}-generate-libeap-peer.patch" |
141 |
- |
142 |
- # multilib-strict fix (bug #373685) |
143 |
- sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die |
144 |
- fi |
145 |
- |
146 |
- # bug (320097) |
147 |
- eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch" |
148 |
- |
149 |
- # bug (640492) |
150 |
- sed -i 's#-Werror ##' wpa_supplicant/Makefile || die |
151 |
-} |
152 |
- |
153 |
-src_configure() { |
154 |
- # Toolchain setup |
155 |
- tc-export CC |
156 |
- |
157 |
- cp defconfig .config || die |
158 |
- |
159 |
- # Basic setup |
160 |
- Kconfig_style_config CTRL_IFACE |
161 |
- Kconfig_style_config MATCH_IFACE |
162 |
- Kconfig_style_config BACKEND file |
163 |
- Kconfig_style_config IBSS_RSN |
164 |
- Kconfig_style_config IEEE80211W |
165 |
- Kconfig_style_config IEEE80211R |
166 |
- Kconfig_style_config HT_OVERRIDES |
167 |
- Kconfig_style_config VHT_OVERRIDES |
168 |
- Kconfig_style_config OCV |
169 |
- Kconfig_style_config TLSV11 |
170 |
- Kconfig_style_config TLSV12 |
171 |
- Kconfig_style_config GETRANDOM |
172 |
- Kconfig_style_config MBO |
173 |
- |
174 |
- # Basic authentication methods |
175 |
- # NOTE: we don't set GPSK or SAKE as they conflict |
176 |
- # with the below options |
177 |
- Kconfig_style_config EAP_GTC |
178 |
- Kconfig_style_config EAP_MD5 |
179 |
- Kconfig_style_config EAP_OTP |
180 |
- Kconfig_style_config EAP_PAX |
181 |
- Kconfig_style_config EAP_PSK |
182 |
- Kconfig_style_config IEEE8021X_EAPOL |
183 |
- Kconfig_style_config PKCS12 |
184 |
- Kconfig_style_config PEERKEY |
185 |
- Kconfig_style_config EAP_LEAP |
186 |
- Kconfig_style_config EAP_MSCHAPV2 |
187 |
- Kconfig_style_config EAP_PEAP |
188 |
- Kconfig_style_config EAP_TLS |
189 |
- Kconfig_style_config EAP_TTLS |
190 |
- |
191 |
- # Enabling background scanning. |
192 |
- Kconfig_style_config BGSCAN_SIMPLE |
193 |
- Kconfig_style_config BGSCAN_LEARN |
194 |
- |
195 |
- if use dbus ; then |
196 |
- Kconfig_style_config CTRL_IFACE_DBUS |
197 |
- Kconfig_style_config CTRL_IFACE_DBUS_NEW |
198 |
- Kconfig_style_config CTRL_IFACE_DBUS_INTRO |
199 |
- else |
200 |
- Kconfig_style_config CTRL_IFACE_DBUS n |
201 |
- Kconfig_style_config CTRL_IFACE_DBUS_NEW n |
202 |
- Kconfig_style_config CTRL_IFACE_DBUS_INTRO n |
203 |
- fi |
204 |
- |
205 |
- if use eapol_test ; then |
206 |
- Kconfig_style_config EAPOL_TEST |
207 |
- fi |
208 |
- |
209 |
- # Enable support for writing debug info to a log file and syslog. |
210 |
- Kconfig_style_config DEBUG_FILE |
211 |
- Kconfig_style_config DEBUG_SYSLOG |
212 |
- |
213 |
- if use hs2-0 ; then |
214 |
- Kconfig_style_config INTERWORKING |
215 |
- Kconfig_style_config HS20 |
216 |
- fi |
217 |
- |
218 |
- if use uncommon-eap-types; then |
219 |
- Kconfig_style_config EAP_GPSK |
220 |
- Kconfig_style_config EAP_SAKE |
221 |
- Kconfig_style_config EAP_GPSK_SHA256 |
222 |
- Kconfig_style_config EAP_IKEV2 |
223 |
- Kconfig_style_config EAP_EKE |
224 |
- fi |
225 |
- |
226 |
- if use eap-sim ; then |
227 |
- # Smart card authentication |
228 |
- Kconfig_style_config EAP_SIM |
229 |
- Kconfig_style_config EAP_AKA |
230 |
- Kconfig_style_config EAP_AKA_PRIME |
231 |
- Kconfig_style_config PCSC |
232 |
- fi |
233 |
- |
234 |
- if use fasteap ; then |
235 |
- Kconfig_style_config EAP_FAST |
236 |
- fi |
237 |
- |
238 |
- if use readline ; then |
239 |
- # readline/history support for wpa_cli |
240 |
- Kconfig_style_config READLINE |
241 |
- else |
242 |
- #internal line edit mode for wpa_cli |
243 |
- Kconfig_style_config WPA_CLI_EDIT |
244 |
- fi |
245 |
- |
246 |
- Kconfig_style_config TLS openssl |
247 |
- Kconfig_style_config FST |
248 |
- if ! use bindist || use libressl; then |
249 |
- Kconfig_style_config EAP_PWD |
250 |
- if use fils; then |
251 |
- Kconfig_style_config FILS |
252 |
- Kconfig_style_config FILS_SK_PFS |
253 |
- fi |
254 |
- # Enabling mesh networks. |
255 |
- Kconfig_style_config MESH |
256 |
- #WPA3 |
257 |
- Kconfig_style_config OWE |
258 |
- Kconfig_style_config SAE |
259 |
- Kconfig_style_config DPP |
260 |
- Kconfig_style_config SUITEB192 |
261 |
- fi |
262 |
- if ! use bindist && ! use libressl; then |
263 |
- Kconfig_style_config SUITEB |
264 |
- fi |
265 |
- |
266 |
- if use smartcard ; then |
267 |
- Kconfig_style_config SMARTCARD |
268 |
- else |
269 |
- Kconfig_style_config SMARTCARD n |
270 |
- fi |
271 |
- |
272 |
- if use tdls ; then |
273 |
- Kconfig_style_config TDLS |
274 |
- fi |
275 |
- |
276 |
- if use kernel_linux ; then |
277 |
- # Linux specific drivers |
278 |
- Kconfig_style_config DRIVER_ATMEL |
279 |
- Kconfig_style_config DRIVER_HOSTAP |
280 |
- Kconfig_style_config DRIVER_IPW |
281 |
- Kconfig_style_config DRIVER_NL80211 |
282 |
- Kconfig_style_config DRIVER_RALINK |
283 |
- Kconfig_style_config DRIVER_WEXT |
284 |
- Kconfig_style_config DRIVER_WIRED |
285 |
- |
286 |
- if use macsec ; then |
287 |
- #requires something, no idea what |
288 |
- #Kconfig_style_config DRIVER_MACSEC_QCA |
289 |
- Kconfig_style_config DRIVER_MACSEC_LINUX |
290 |
- Kconfig_style_config MACSEC |
291 |
- fi |
292 |
- |
293 |
- if use ps3 ; then |
294 |
- Kconfig_style_config DRIVER_PS3 |
295 |
- fi |
296 |
- |
297 |
- elif use kernel_FreeBSD ; then |
298 |
- # FreeBSD specific driver |
299 |
- Kconfig_style_config DRIVER_BSD |
300 |
- fi |
301 |
- |
302 |
- # Wi-Fi Protected Setup (WPS) |
303 |
- if use wps ; then |
304 |
- Kconfig_style_config WPS |
305 |
- Kconfig_style_config WPS2 |
306 |
- # USB Flash Drive |
307 |
- Kconfig_style_config WPS_UFD |
308 |
- # External Registrar |
309 |
- Kconfig_style_config WPS_ER |
310 |
- # Universal Plug'n'Play |
311 |
- Kconfig_style_config WPS_UPNP |
312 |
- # Near Field Communication |
313 |
- Kconfig_style_config WPS_NFC |
314 |
- else |
315 |
- Kconfig_style_config WPS n |
316 |
- fi |
317 |
- |
318 |
- # Wi-Fi Direct (WiDi) |
319 |
- if use p2p ; then |
320 |
- Kconfig_style_config P2P |
321 |
- Kconfig_style_config WIFI_DISPLAY |
322 |
- fi |
323 |
- |
324 |
- # Access Point Mode |
325 |
- if use ap ; then |
326 |
- Kconfig_style_config AP |
327 |
- else |
328 |
- Kconfig_style_config AP n |
329 |
- fi |
330 |
- |
331 |
- # Enable essentials for AP/P2P |
332 |
- if use ap || use p2p ; then |
333 |
- # Enabling HT support (802.11n) |
334 |
- Kconfig_style_config IEEE80211N |
335 |
- |
336 |
- # Enabling VHT support (802.11ac) |
337 |
- Kconfig_style_config IEEE80211AC |
338 |
- fi |
339 |
- |
340 |
- # Enable mitigation against certain attacks against TKIP |
341 |
- Kconfig_style_config DELAYED_MIC_ERROR_REPORT |
342 |
- |
343 |
- if use privsep ; then |
344 |
- Kconfig_style_config PRIVSEP |
345 |
- fi |
346 |
- |
347 |
- # If we are using libnl 2.0 and above, enable support for it |
348 |
- # Bug 382159 |
349 |
- # Removed for now, since the 3.2 version is broken, and we don't |
350 |
- # support it. |
351 |
- if has_version ">=dev-libs/libnl-3.2"; then |
352 |
- Kconfig_style_config LIBNL32 |
353 |
- fi |
354 |
- |
355 |
- if use qt5 ; then |
356 |
- pushd "${S}"/wpa_gui-qt4 > /dev/null || die |
357 |
- eqmake5 wpa_gui.pro |
358 |
- popd > /dev/null || die |
359 |
- fi |
360 |
-} |
361 |
- |
362 |
-src_compile() { |
363 |
- einfo "Building wpa_supplicant" |
364 |
- emake V=1 BINDIR=/usr/sbin |
365 |
- |
366 |
- if use wimax; then |
367 |
- emake -C ../src/eap_peer clean |
368 |
- emake -C ../src/eap_peer |
369 |
- fi |
370 |
- |
371 |
- if use qt5; then |
372 |
- einfo "Building wpa_gui" |
373 |
- emake -C "${S}"/wpa_gui-qt4 |
374 |
- fi |
375 |
- |
376 |
- if use eapol_test ; then |
377 |
- emake eapol_test |
378 |
- fi |
379 |
-} |
380 |
- |
381 |
-src_install() { |
382 |
- dosbin wpa_supplicant |
383 |
- use privsep && dosbin wpa_priv |
384 |
- dobin wpa_cli wpa_passphrase |
385 |
- |
386 |
- # baselayout-1 compat |
387 |
- if has_version "<sys-apps/baselayout-2.0.0"; then |
388 |
- dodir /sbin |
389 |
- dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant |
390 |
- dodir /bin |
391 |
- dosym ../usr/bin/wpa_cli /bin/wpa_cli |
392 |
- fi |
393 |
- |
394 |
- if has_version ">=sys-apps/openrc-0.5.0"; then |
395 |
- newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant |
396 |
- newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant |
397 |
- fi |
398 |
- |
399 |
- exeinto /etc/wpa_supplicant/ |
400 |
- newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh |
401 |
- |
402 |
- readme.gentoo_create_doc |
403 |
- dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ |
404 |
- wpa_supplicant.conf |
405 |
- |
406 |
- newdoc .config build-config |
407 |
- |
408 |
- if [ "${PV}" != "9999" ]; then |
409 |
- doman doc/docbook/*.{5,8} |
410 |
- fi |
411 |
- |
412 |
- if use qt5 ; then |
413 |
- into /usr |
414 |
- dobin wpa_gui-qt4/wpa_gui |
415 |
- doicon wpa_gui-qt4/icons/wpa_gui.svg |
416 |
- make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" |
417 |
- else |
418 |
- rm "${ED}"/usr/share/man/man8/wpa_gui.8 |
419 |
- fi |
420 |
- |
421 |
- use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install |
422 |
- |
423 |
- if use dbus ; then |
424 |
- pushd "${S}"/dbus > /dev/null || die |
425 |
- insinto /etc/dbus-1/system.d |
426 |
- newins dbus-wpa_supplicant.conf wpa_supplicant.conf |
427 |
- insinto /usr/share/dbus-1/system-services |
428 |
- doins fi.w1.wpa_supplicant1.service |
429 |
- popd > /dev/null || die |
430 |
- |
431 |
- # This unit relies on dbus support, bug 538600. |
432 |
- systemd_dounit systemd/wpa_supplicant.service |
433 |
- fi |
434 |
- |
435 |
- if use eapol_test ; then |
436 |
- dobin eapol_test |
437 |
- fi |
438 |
- |
439 |
- systemd_dounit "systemd/wpa_supplicant@.service" |
440 |
- systemd_dounit "systemd/wpa_supplicant-nl80211@.service" |
441 |
- systemd_dounit "systemd/wpa_supplicant-wired@.service" |
442 |
-} |
443 |
- |
444 |
-pkg_postinst() { |
445 |
- readme.gentoo_print_elog |
446 |
- |
447 |
- if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then |
448 |
- echo |
449 |
- ewarn "WARNING: your old configuration file ${EROOT%/}/etc/wpa_supplicant.conf" |
450 |
- ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf" |
451 |
- fi |
452 |
- |
453 |
- if use bindist; then |
454 |
- if ! use libressl; then |
455 |
- ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)." |
456 |
- ewarn "This is incredibly undesirable" |
457 |
- fi |
458 |
- fi |
459 |
- if use libressl; then |
460 |
- ewarn "Libressl doesn't support SUITEB (part of WPA3)" |
461 |
- ewarn "but it does support SUITEB192 (the upgraded strength version of the same)" |
462 |
- ewarn "You probably don't care. Patches welcome" |
463 |
- fi |
464 |
- |
465 |
- # Mea culpa, feel free to remove that after some time --mgorny. |
466 |
- local fn |
467 |
- for fn in wpa_supplicant{,@wlan0}.service; do |
468 |
- if [[ -e "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]] |
469 |
- then |
470 |
- ebegin "Moving ${fn} to multi-user.target" |
471 |
- mv "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \ |
472 |
- "${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die |
473 |
- eend ${?} \ |
474 |
- "Please try to re-enable ${fn}" |
475 |
- fi |
476 |
- done |
477 |
- |
478 |
- systemd_reenable wpa_supplicant.service |
479 |
-} |