Gentoo Archives: gentoo-commits

From: Andrey Utkin <andrey_utkin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/hostapd/
Date: Wed, 13 Jun 2018 14:45:51
Message-Id: 1528901137.65d1259988a2f59c664eeb168760e14b65dc9bed.andrey_utkin@gentoo
1 commit: 65d1259988a2f59c664eeb168760e14b65dc9bed
2 Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 13 14:44:50 2018 +0000
4 Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 13 14:45:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d12599
7
8 net-wireless/hostapd: 2.6-r{2,3}: drop obsolete
9
10 Dropping ebuild revisions which are not latest nor stable.
11
12 Package-Manager: Portage-2.3.40, Repoman-2.3.9
13
14 net-wireless/hostapd/hostapd-2.6-r2.ebuild | 232 ----------------------------
15 net-wireless/hostapd/hostapd-2.6-r3.ebuild | 238 -----------------------------
16 2 files changed, 470 deletions(-)
17
18 diff --git a/net-wireless/hostapd/hostapd-2.6-r2.ebuild b/net-wireless/hostapd/hostapd-2.6-r2.ebuild
19 deleted file mode 100644
20 index 250e07cfbe7..00000000000
21 --- a/net-wireless/hostapd/hostapd-2.6-r2.ebuild
22 +++ /dev/null
23 @@ -1,232 +0,0 @@
24 -# Copyright 1999-2018 Gentoo Foundation
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI="6"
28 -
29 -inherit toolchain-funcs eutils systemd savedconfig
30 -
31 -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
32 -HOMEPAGE="http://hostap.epitest.fi"
33 -SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
34 -
35 -LICENSE="BSD"
36 -SLOT="0"
37 -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
38 -IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
39 -
40 -DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
41 - kernel_linux? (
42 - dev-libs/libnl:3
43 - crda? ( net-wireless/crda )
44 - )
45 - netlink? ( net-libs/libnfnetlink )
46 - sqlite? ( >=dev-db/sqlite-3 )"
47 -
48 -RDEPEND="${DEPEND}"
49 -
50 -S="${S}/${PN}"
51 -
52 -src_prepare() {
53 - # Allow users to apply patches to src/drivers for example,
54 - # i.e. anything outside ${S}/${PN}
55 - pushd ../ >/dev/null || die
56 - # https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
57 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
58 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
59 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
60 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
61 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
62 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
63 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
64 - default
65 - popd >/dev/null || die
66 -
67 - sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
68 - "${S}/hostapd.conf" || die
69 -
70 -}
71 -
72 -src_configure() {
73 - local CONFIG="${S}/.config"
74 -
75 - restore_config "${CONFIG}"
76 - if [[ -f "${CONFIG}" ]]; then
77 - default_src_configure
78 - return 0
79 - fi
80 -
81 - # toolchain setup
82 - echo "CC = $(tc-getCC)" > ${CONFIG}
83 -
84 - # EAP authentication methods
85 - echo "CONFIG_EAP=y" >> ${CONFIG}
86 - echo "CONFIG_ERP=y" >> ${CONFIG}
87 - echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
88 -
89 - if use ssl; then
90 - # SSL authentication methods
91 - echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
92 - echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
93 - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
94 - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
95 - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
96 - echo "CONFIG_TLSV11=y" >> ${CONFIG}
97 - echo "CONFIG_TLSV12=y" >> ${CONFIG}
98 - fi
99 -
100 - if use wps; then
101 - # Enable Wi-Fi Protected Setup
102 - echo "CONFIG_WPS=y" >> ${CONFIG}
103 - echo "CONFIG_WPS2=y" >> ${CONFIG}
104 - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
105 - echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
106 - einfo "Enabling Wi-Fi Protected Setup support"
107 - fi
108 -
109 - echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
110 - echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
111 - echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
112 - echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
113 - echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
114 - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
115 - echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
116 - echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
117 - echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
118 - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
119 - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
120 - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
121 - echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
122 -
123 - einfo "Enabling drivers: "
124 -
125 - # drivers
126 - echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
127 - einfo " HostAP driver enabled"
128 - echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
129 - einfo " Wired driver enabled"
130 - echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
131 - einfo " Prism54 driver enabled"
132 - echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
133 - einfo " None driver enabled"
134 -
135 - einfo " nl80211 driver enabled"
136 - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
137 -
138 - # epoll
139 - echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
140 -
141 - # misc
142 - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
143 - echo "CONFIG_PKCS12=y" >> ${CONFIG}
144 - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
145 - echo "CONFIG_IAPP=y" >> ${CONFIG}
146 - echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
147 - echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
148 - echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
149 - echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
150 - echo "CONFIG_PEERKEY=y" >> ${CONFIG}
151 - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
152 - echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
153 - echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
154 - echo "CONFIG_HS20=y" >> ${CONFIG}
155 - echo "CONFIG_WNM=y" >> ${CONFIG}
156 - echo "CONFIG_FST=y" >> ${CONFIG}
157 - echo "CONFIG_FST_TEST=y" >> ${CONFIG}
158 - echo "CONFIG_ACS=y" >> ${CONFIG}
159 -
160 - if use netlink; then
161 - # Netlink support
162 - echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
163 - fi
164 -
165 - if use ipv6; then
166 - # IPv6 support
167 - echo "CONFIG_IPV6=y" >> ${CONFIG}
168 - fi
169 -
170 - if use sqlite; then
171 - # Sqlite support
172 - echo "CONFIG_SQLITE=y" >> ${CONFIG}
173 - fi
174 -
175 - # If we are using libnl 2.0 and above, enable support for it
176 - # Removed for now, since the 3.2 version is broken, and we don't
177 - # support it.
178 - if has_version ">=dev-libs/libnl-3.2"; then
179 - echo "CONFIG_LIBNL32=y" >> .config
180 - fi
181 -
182 - # TODO: Add support for BSD drivers
183 -
184 - default_src_configure
185 -}
186 -
187 -src_compile() {
188 - emake V=1
189 -
190 - if use ssl; then
191 - emake V=1 nt_password_hash
192 - emake V=1 hlr_auc_gw
193 - fi
194 -}
195 -
196 -src_install() {
197 - insinto /etc/${PN}
198 - doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
199 -
200 - fperms -R 600 /etc/${PN}
201 -
202 - dosbin ${PN}
203 - dobin ${PN}_cli
204 -
205 - use ssl && dobin nt_password_hash hlr_auc_gw
206 -
207 - newinitd "${FILESDIR}"/${PN}-init.d ${PN}
208 - newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
209 - systemd_dounit "${FILESDIR}"/${PN}.service
210 -
211 - doman ${PN}{.8,_cli.1}
212 -
213 - dodoc ChangeLog README
214 - use wps && dodoc README-WPS
215 -
216 - docinto examples
217 - dodoc wired.conf
218 -
219 - if use logwatch; then
220 - insinto /etc/log.d/conf/services/
221 - doins logwatch/${PN}.conf
222 -
223 - exeinto /etc/log.d/scripts/services/
224 - doexe logwatch/${PN}
225 - fi
226 -
227 - save_config .config
228 -}
229 -
230 -pkg_postinst() {
231 - einfo
232 - einfo "If you are running openRC you need to follow this instructions:"
233 - einfo "In order to use ${PN} you need to set up your wireless card"
234 - einfo "for master mode in /etc/conf.d/net and then start"
235 - einfo "/etc/init.d/${PN}."
236 - einfo
237 - einfo "Example configuration:"
238 - einfo
239 - einfo "config_wlan0=( \"192.168.1.1/24\" )"
240 - einfo "channel_wlan0=\"6\""
241 - einfo "essid_wlan0=\"test\""
242 - einfo "mode_wlan0=\"master\""
243 - einfo
244 - #if [ -e "${KV_DIR}"/net/mac80211 ]; then
245 - # einfo "This package now compiles against the headers installed by"
246 - # einfo "the kernel source for the mac80211 driver. You should "
247 - # einfo "re-emerge ${PN} after upgrading your kernel source."
248 - #fi
249 -
250 - if use wps; then
251 - einfo "You have enabled Wi-Fi Protected Setup support, please"
252 - einfo "read the README-WPS file in /usr/share/doc/${P}"
253 - einfo "for info on how to use WPS"
254 - fi
255 -}
256
257 diff --git a/net-wireless/hostapd/hostapd-2.6-r3.ebuild b/net-wireless/hostapd/hostapd-2.6-r3.ebuild
258 deleted file mode 100644
259 index feebb2eda45..00000000000
260 --- a/net-wireless/hostapd/hostapd-2.6-r3.ebuild
261 +++ /dev/null
262 @@ -1,238 +0,0 @@
263 -# Copyright 1999-2018 Gentoo Foundation
264 -# Distributed under the terms of the GNU General Public License v2
265 -
266 -EAPI="6"
267 -
268 -inherit toolchain-funcs eutils systemd savedconfig
269 -
270 -DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
271 -HOMEPAGE="http://hostap.epitest.fi"
272 -SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
273 -
274 -LICENSE="BSD"
275 -SLOT="0"
276 -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
277 -IUSE="ipv6 libressl logwatch netlink sqlite +ssl +wps +crda"
278 -
279 -DEPEND="
280 - ssl? (
281 - !libressl? ( dev-libs/openssl:0=[-bindist] )
282 - libressl? ( dev-libs/libressl:0= )
283 - )
284 - kernel_linux? (
285 - dev-libs/libnl:3
286 - crda? ( net-wireless/crda )
287 - )
288 - netlink? ( net-libs/libnfnetlink )
289 - sqlite? ( >=dev-db/sqlite-3 )"
290 -
291 -RDEPEND="${DEPEND}"
292 -
293 -S="${S}/${PN}"
294 -
295 -src_prepare() {
296 - # Allow users to apply patches to src/drivers for example,
297 - # i.e. anything outside ${S}/${PN}
298 - pushd ../ >/dev/null || die
299 -
300 - # Add LibreSSL compatibility patch bug (#567262)
301 - eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
302 -
303 - # https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
304 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
305 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
306 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
307 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
308 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
309 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
310 - eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
311 - default
312 - popd >/dev/null || die
313 -
314 - sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
315 - "${S}/hostapd.conf" || die
316 -
317 -}
318 -
319 -src_configure() {
320 - local CONFIG="${S}/.config"
321 -
322 - restore_config "${CONFIG}"
323 - if [[ -f "${CONFIG}" ]]; then
324 - default_src_configure
325 - return 0
326 - fi
327 -
328 - # toolchain setup
329 - echo "CC = $(tc-getCC)" > ${CONFIG}
330 -
331 - # EAP authentication methods
332 - echo "CONFIG_EAP=y" >> ${CONFIG}
333 - echo "CONFIG_ERP=y" >> ${CONFIG}
334 - echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
335 -
336 - if use ssl; then
337 - # SSL authentication methods
338 - echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
339 - echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
340 - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
341 - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
342 - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
343 - echo "CONFIG_TLSV11=y" >> ${CONFIG}
344 - echo "CONFIG_TLSV12=y" >> ${CONFIG}
345 - fi
346 -
347 - if use wps; then
348 - # Enable Wi-Fi Protected Setup
349 - echo "CONFIG_WPS=y" >> ${CONFIG}
350 - echo "CONFIG_WPS2=y" >> ${CONFIG}
351 - echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
352 - echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
353 - einfo "Enabling Wi-Fi Protected Setup support"
354 - fi
355 -
356 - echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
357 - echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
358 - echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
359 - echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
360 - echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
361 - echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
362 - echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
363 - echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
364 - echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
365 - echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
366 - echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
367 - echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
368 - echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
369 -
370 - einfo "Enabling drivers: "
371 -
372 - # drivers
373 - echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
374 - einfo " HostAP driver enabled"
375 - echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
376 - einfo " Wired driver enabled"
377 - echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
378 - einfo " None driver enabled"
379 -
380 - einfo " nl80211 driver enabled"
381 - echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
382 -
383 - # epoll
384 - echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
385 -
386 - # misc
387 - echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
388 - echo "CONFIG_PKCS12=y" >> ${CONFIG}
389 - echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
390 - echo "CONFIG_IAPP=y" >> ${CONFIG}
391 - echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
392 - echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
393 - echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
394 - echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
395 - echo "CONFIG_PEERKEY=y" >> ${CONFIG}
396 - echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
397 - echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
398 - echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
399 - echo "CONFIG_HS20=y" >> ${CONFIG}
400 - echo "CONFIG_WNM=y" >> ${CONFIG}
401 - echo "CONFIG_FST=y" >> ${CONFIG}
402 - echo "CONFIG_FST_TEST=y" >> ${CONFIG}
403 - echo "CONFIG_ACS=y" >> ${CONFIG}
404 -
405 - if use netlink; then
406 - # Netlink support
407 - echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
408 - fi
409 -
410 - if use ipv6; then
411 - # IPv6 support
412 - echo "CONFIG_IPV6=y" >> ${CONFIG}
413 - fi
414 -
415 - if use sqlite; then
416 - # Sqlite support
417 - echo "CONFIG_SQLITE=y" >> ${CONFIG}
418 - fi
419 -
420 - # If we are using libnl 2.0 and above, enable support for it
421 - # Removed for now, since the 3.2 version is broken, and we don't
422 - # support it.
423 - if has_version ">=dev-libs/libnl-3.2"; then
424 - echo "CONFIG_LIBNL32=y" >> .config
425 - fi
426 -
427 - # TODO: Add support for BSD drivers
428 -
429 - default_src_configure
430 -}
431 -
432 -src_compile() {
433 - emake V=1
434 -
435 - if use ssl; then
436 - emake V=1 nt_password_hash
437 - emake V=1 hlr_auc_gw
438 - fi
439 -}
440 -
441 -src_install() {
442 - insinto /etc/${PN}
443 - doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
444 -
445 - fperms -R 600 /etc/${PN}
446 -
447 - dosbin ${PN}
448 - dobin ${PN}_cli
449 -
450 - use ssl && dobin nt_password_hash hlr_auc_gw
451 -
452 - newinitd "${FILESDIR}"/${PN}-init.d ${PN}
453 - newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
454 - systemd_dounit "${FILESDIR}"/${PN}.service
455 -
456 - doman ${PN}{.8,_cli.1}
457 -
458 - dodoc ChangeLog README
459 - use wps && dodoc README-WPS
460 -
461 - docinto examples
462 - dodoc wired.conf
463 -
464 - if use logwatch; then
465 - insinto /etc/log.d/conf/services/
466 - doins logwatch/${PN}.conf
467 -
468 - exeinto /etc/log.d/scripts/services/
469 - doexe logwatch/${PN}
470 - fi
471 -
472 - save_config .config
473 -}
474 -
475 -pkg_postinst() {
476 - einfo
477 - einfo "If you are running openRC you need to follow this instructions:"
478 - einfo "In order to use ${PN} you need to set up your wireless card"
479 - einfo "for master mode in /etc/conf.d/net and then start"
480 - einfo "/etc/init.d/${PN}."
481 - einfo
482 - einfo "Example configuration:"
483 - einfo
484 - einfo "config_wlan0=( \"192.168.1.1/24\" )"
485 - einfo "channel_wlan0=\"6\""
486 - einfo "essid_wlan0=\"test\""
487 - einfo "mode_wlan0=\"master\""
488 - einfo
489 - #if [ -e "${KV_DIR}"/net/mac80211 ]; then
490 - # einfo "This package now compiles against the headers installed by"
491 - # einfo "the kernel source for the mac80211 driver. You should "
492 - # einfo "re-emerge ${PN} after upgrading your kernel source."
493 - #fi
494 -
495 - if use wps; then
496 - einfo "You have enabled Wi-Fi Protected Setup support, please"
497 - einfo "read the README-WPS file in /usr/share/doc/${P}"
498 - einfo "for info on how to use WPS"
499 - fi
500 -}