1 |
commit: 0760b9f7094e991d19ce4f5807142ff852876776 |
2 |
Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 7 00:22:58 2018 +0000 |
4 |
Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 7 01:25:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0760b9f7 |
7 |
|
8 |
net-wireless/hostapd: add backported bugfix |
9 |
|
10 |
Suggested-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
Bug: https://bugs.gentoo.org/660384 |
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
net-wireless/hostapd/Manifest | 1 + |
15 |
net-wireless/hostapd/hostapd-2.6-r6.ebuild | 259 +++++++++++++++++++++++++++++ |
16 |
2 files changed, 260 insertions(+) |
17 |
|
18 |
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest |
19 |
index 34faab85331..45eaaa812e7 100644 |
20 |
--- a/net-wireless/hostapd/Manifest |
21 |
+++ b/net-wireless/hostapd/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda |
24 |
DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981 SHA512 cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70 |
25 |
+DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e6618657777e77759d33e38c8a5647537c0098e772f032a368b82be709 SHA512 c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612 |
26 |
|
27 |
diff --git a/net-wireless/hostapd/hostapd-2.6-r6.ebuild b/net-wireless/hostapd/hostapd-2.6-r6.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..ffca9d29e16 |
30 |
--- /dev/null |
31 |
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild |
32 |
@@ -0,0 +1,259 @@ |
33 |
+# Copyright 1999-2018 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI="6" |
37 |
+ |
38 |
+inherit toolchain-funcs eutils systemd savedconfig |
39 |
+ |
40 |
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon" |
41 |
+HOMEPAGE="http://w1.fi" |
42 |
+EXTRAS_VER="2.6-r6" |
43 |
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras" |
44 |
+SRC_URI="http://w1.fi/releases/${P}.tar.gz |
45 |
+ https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz" |
46 |
+ |
47 |
+LICENSE="BSD" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" |
50 |
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda" |
51 |
+ |
52 |
+DEPEND=" |
53 |
+ libressl? ( dev-libs/libressl:0= ) |
54 |
+ !libressl? ( |
55 |
+ internal-tls? ( dev-libs/libtommath ) |
56 |
+ !internal-tls? ( dev-libs/openssl:0=[-bindist] ) |
57 |
+ ) |
58 |
+ kernel_linux? ( |
59 |
+ dev-libs/libnl:3 |
60 |
+ crda? ( net-wireless/crda ) |
61 |
+ ) |
62 |
+ netlink? ( net-libs/libnfnetlink ) |
63 |
+ sqlite? ( >=dev-db/sqlite-3 )" |
64 |
+ |
65 |
+RDEPEND="${DEPEND}" |
66 |
+ |
67 |
+S="${S}/${PN}" |
68 |
+ |
69 |
+pkg_pretend() { |
70 |
+ if use internal-tls; then |
71 |
+ if use libressl; then |
72 |
+ elog "libressl flag takes precedence over internal-tls" |
73 |
+ else |
74 |
+ ewarn "internal-tls implementation is experimental and provides fewer features" |
75 |
+ fi |
76 |
+ fi |
77 |
+} |
78 |
+ |
79 |
+src_prepare() { |
80 |
+ # Allow users to apply patches to src/drivers for example, |
81 |
+ # i.e. anything outside ${S}/${PN} |
82 |
+ pushd ../ >/dev/null || die |
83 |
+ |
84 |
+ # Add LibreSSL compatibility patch bug (#567262) |
85 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch" |
86 |
+ |
87 |
+ # https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt |
88 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch" |
89 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch" |
90 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch" |
91 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch" |
92 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch" |
93 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch" |
94 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch" |
95 |
+ |
96 |
+ eapply "${WORKDIR}/${EXTRAS_NAME}/nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch" |
97 |
+ |
98 |
+ default |
99 |
+ popd >/dev/null || die |
100 |
+ |
101 |
+ sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \ |
102 |
+ "${S}/hostapd.conf" || die |
103 |
+ |
104 |
+} |
105 |
+ |
106 |
+src_configure() { |
107 |
+ local CONFIG="${S}/.config" |
108 |
+ |
109 |
+ restore_config "${CONFIG}" |
110 |
+ if [[ -f "${CONFIG}" ]]; then |
111 |
+ default_src_configure |
112 |
+ return 0 |
113 |
+ fi |
114 |
+ |
115 |
+ # toolchain setup |
116 |
+ echo "CC = $(tc-getCC)" > ${CONFIG} |
117 |
+ |
118 |
+ # EAP authentication methods |
119 |
+ echo "CONFIG_EAP=y" >> ${CONFIG} |
120 |
+ echo "CONFIG_ERP=y" >> ${CONFIG} |
121 |
+ echo "CONFIG_EAP_MD5=y" >> ${CONFIG} |
122 |
+ |
123 |
+ if use internal-tls && !use libressl; then |
124 |
+ echo "CONFIG_TLS=internal" >> ${CONFIG} |
125 |
+ else |
126 |
+ # SSL authentication methods |
127 |
+ echo "CONFIG_EAP_FAST=y" >> ${CONFIG} |
128 |
+ echo "CONFIG_EAP_TLS=y" >> ${CONFIG} |
129 |
+ echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} |
130 |
+ echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} |
131 |
+ echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} |
132 |
+ echo "CONFIG_TLSV11=y" >> ${CONFIG} |
133 |
+ echo "CONFIG_TLSV12=y" >> ${CONFIG} |
134 |
+ echo "CONFIG_EAP_PWD=y" >> ${CONFIG} |
135 |
+ fi |
136 |
+ |
137 |
+ if use wps; then |
138 |
+ # Enable Wi-Fi Protected Setup |
139 |
+ echo "CONFIG_WPS=y" >> ${CONFIG} |
140 |
+ echo "CONFIG_WPS2=y" >> ${CONFIG} |
141 |
+ echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} |
142 |
+ echo "CONFIG_WPS_NFC=y" >> ${CONFIG} |
143 |
+ einfo "Enabling Wi-Fi Protected Setup support" |
144 |
+ fi |
145 |
+ |
146 |
+ echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} |
147 |
+ echo "CONFIG_EAP_TNC=y" >> ${CONFIG} |
148 |
+ echo "CONFIG_EAP_GTC=y" >> ${CONFIG} |
149 |
+ echo "CONFIG_EAP_SIM=y" >> ${CONFIG} |
150 |
+ echo "CONFIG_EAP_AKA=y" >> ${CONFIG} |
151 |
+ echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} |
152 |
+ echo "CONFIG_EAP_EKE=y" >> ${CONFIG} |
153 |
+ echo "CONFIG_EAP_PAX=y" >> ${CONFIG} |
154 |
+ echo "CONFIG_EAP_PSK=y" >> ${CONFIG} |
155 |
+ echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} |
156 |
+ echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} |
157 |
+ echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} |
158 |
+ |
159 |
+ einfo "Enabling drivers: " |
160 |
+ |
161 |
+ # drivers |
162 |
+ echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} |
163 |
+ einfo " HostAP driver enabled" |
164 |
+ echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} |
165 |
+ einfo " Wired driver enabled" |
166 |
+ echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} |
167 |
+ einfo " None driver enabled" |
168 |
+ |
169 |
+ einfo " nl80211 driver enabled" |
170 |
+ echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} |
171 |
+ |
172 |
+ # epoll |
173 |
+ echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} |
174 |
+ |
175 |
+ # misc |
176 |
+ echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} |
177 |
+ echo "CONFIG_PKCS12=y" >> ${CONFIG} |
178 |
+ echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} |
179 |
+ echo "CONFIG_IAPP=y" >> ${CONFIG} |
180 |
+ echo "CONFIG_IEEE80211R=y" >> ${CONFIG} |
181 |
+ echo "CONFIG_IEEE80211W=y" >> ${CONFIG} |
182 |
+ echo "CONFIG_IEEE80211N=y" >> ${CONFIG} |
183 |
+ echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} |
184 |
+ echo "CONFIG_PEERKEY=y" >> ${CONFIG} |
185 |
+ echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} |
186 |
+ echo "CONFIG_INTERWORKING=y" >> ${CONFIG} |
187 |
+ echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} |
188 |
+ echo "CONFIG_HS20=y" >> ${CONFIG} |
189 |
+ echo "CONFIG_WNM=y" >> ${CONFIG} |
190 |
+ echo "CONFIG_FST=y" >> ${CONFIG} |
191 |
+ echo "CONFIG_FST_TEST=y" >> ${CONFIG} |
192 |
+ echo "CONFIG_ACS=y" >> ${CONFIG} |
193 |
+ |
194 |
+ if use netlink; then |
195 |
+ # Netlink support |
196 |
+ echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} |
197 |
+ fi |
198 |
+ |
199 |
+ if use ipv6; then |
200 |
+ # IPv6 support |
201 |
+ echo "CONFIG_IPV6=y" >> ${CONFIG} |
202 |
+ fi |
203 |
+ |
204 |
+ if use sqlite; then |
205 |
+ # Sqlite support |
206 |
+ echo "CONFIG_SQLITE=y" >> ${CONFIG} |
207 |
+ fi |
208 |
+ |
209 |
+ # If we are using libnl 2.0 and above, enable support for it |
210 |
+ # Removed for now, since the 3.2 version is broken, and we don't |
211 |
+ # support it. |
212 |
+ if has_version ">=dev-libs/libnl-3.2"; then |
213 |
+ echo "CONFIG_LIBNL32=y" >> .config |
214 |
+ fi |
215 |
+ |
216 |
+ # TODO: Add support for BSD drivers |
217 |
+ |
218 |
+ default_src_configure |
219 |
+} |
220 |
+ |
221 |
+src_compile() { |
222 |
+ emake V=1 |
223 |
+ |
224 |
+ if use libressl || !use internal-tls; then |
225 |
+ emake V=1 nt_password_hash |
226 |
+ emake V=1 hlr_auc_gw |
227 |
+ fi |
228 |
+} |
229 |
+ |
230 |
+src_install() { |
231 |
+ insinto /etc/${PN} |
232 |
+ doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk} |
233 |
+ |
234 |
+ fperms -R 600 /etc/${PN} |
235 |
+ |
236 |
+ dosbin ${PN} |
237 |
+ dobin ${PN}_cli |
238 |
+ |
239 |
+ if use libressl || !use internal-tls; then |
240 |
+ dobin nt_password_hash hlr_auc_gw |
241 |
+ fi |
242 |
+ |
243 |
+ newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} |
244 |
+ newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} |
245 |
+ systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service |
246 |
+ |
247 |
+ doman ${PN}{.8,_cli.1} |
248 |
+ |
249 |
+ dodoc ChangeLog README |
250 |
+ use wps && dodoc README-WPS |
251 |
+ |
252 |
+ docinto examples |
253 |
+ dodoc wired.conf |
254 |
+ |
255 |
+ if use logwatch; then |
256 |
+ insinto /etc/log.d/conf/services/ |
257 |
+ doins logwatch/${PN}.conf |
258 |
+ |
259 |
+ exeinto /etc/log.d/scripts/services/ |
260 |
+ doexe logwatch/${PN} |
261 |
+ fi |
262 |
+ |
263 |
+ save_config .config |
264 |
+} |
265 |
+ |
266 |
+pkg_postinst() { |
267 |
+ einfo |
268 |
+ einfo "If you are running openRC you need to follow this instructions:" |
269 |
+ einfo "In order to use ${PN} you need to set up your wireless card" |
270 |
+ einfo "for master mode in /etc/conf.d/net and then start" |
271 |
+ einfo "/etc/init.d/${PN}." |
272 |
+ einfo |
273 |
+ einfo "Example configuration:" |
274 |
+ einfo |
275 |
+ einfo "config_wlan0=( \"192.168.1.1/24\" )" |
276 |
+ einfo "channel_wlan0=\"6\"" |
277 |
+ einfo "essid_wlan0=\"test\"" |
278 |
+ einfo "mode_wlan0=\"master\"" |
279 |
+ einfo |
280 |
+ #if [ -e "${KV_DIR}"/net/mac80211 ]; then |
281 |
+ # einfo "This package now compiles against the headers installed by" |
282 |
+ # einfo "the kernel source for the mac80211 driver. You should " |
283 |
+ # einfo "re-emerge ${PN} after upgrading your kernel source." |
284 |
+ #fi |
285 |
+ |
286 |
+ if use wps; then |
287 |
+ einfo "You have enabled Wi-Fi Protected Setup support, please" |
288 |
+ einfo "read the README-WPS file in /usr/share/doc/${P}" |
289 |
+ einfo "for info on how to use WPS" |
290 |
+ fi |
291 |
+} |