Gentoo Archives: gentoo-commits

From: "Bjarke Istrup Pedersen (gurligebis)" <gurligebis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/hostapd: hostapd-2.0-r1.ebuild ChangeLog hostapd-2.2-r1.ebuild hostapd-2.2.ebuild
Date: Fri, 29 Aug 2014 19:28:47
Message-Id: 20140829192844.4B8E44314@oystercatcher.gentoo.org
1 gurligebis 14/08/29 19:28:44
2
3 Modified: hostapd-2.0-r1.ebuild ChangeLog
4 Added: hostapd-2.2-r1.ebuild
5 Removed: hostapd-2.2.ebuild
6 Log:
7 Adding 802.11ac support, removing references to madwifi-old, fixing bug #521130
8
9 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 15AE484C)
10
11 Revision Changes Path
12 1.6 net-wireless/hostapd/hostapd-2.0-r1.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-2.0-r1.ebuild?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-2.0-r1.ebuild?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-2.0-r1.ebuild?r1=1.5&r2=1.6
17
18 Index: hostapd-2.0-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.0-r1.ebuild,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- hostapd-2.0-r1.ebuild 1 May 2014 01:21:20 -0000 1.5
25 +++ hostapd-2.0-r1.ebuild 29 Aug 2014 19:28:44 -0000 1.6
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.0-r1.ebuild,v 1.5 2014/05/01 01:21:20 vapier Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.0-r1.ebuild,v 1.6 2014/08/29 19:28:44 gurligebis Exp $
31
32 EAPI="4"
33
34 @@ -21,8 +21,8 @@
35 crda? ( net-wireless/crda )
36 )
37 madwifi? ( ||
38 - ( >net-wireless/madwifi-ng-tools-0.9.3
39 - net-wireless/madwifi-old ) )"
40 + ( >net-wireless/madwifi-ng-tools-0.9.3 ) )"
41 +
42 RDEPEND="${DEPEND}"
43
44 S="${S}/${PN}"
45
46
47
48 1.150 net-wireless/hostapd/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?rev=1.150&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?rev=1.150&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/ChangeLog?r1=1.149&r2=1.150
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v
57 retrieving revision 1.149
58 retrieving revision 1.150
59 diff -u -r1.149 -r1.150
60 --- ChangeLog 6 Jun 2014 16:23:18 -0000 1.149
61 +++ ChangeLog 29 Aug 2014 19:28:44 -0000 1.150
62 @@ -1,6 +1,13 @@
63 # ChangeLog for net-wireless/hostapd
64 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.149 2014/06/06 16:23:18 gurligebis Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/ChangeLog,v 1.150 2014/08/29 19:28:44 gurligebis Exp $
67 +
68 +*hostapd-2.2-r1 (29 Aug 2014)
69 +
70 + 29 Aug 2014; <gurligebis@g.o> hostapd-2.0-r1.ebuild,
71 + -hostapd-2.2.ebuild, +hostapd-2.2-r1.ebuild:
72 + Adding 802.11ac support, removing references to madwifi-old, fixing bug
73 + #521130
74
75 *hostapd-2.2 (06 Jun 2014)
76
77
78
79
80 1.1 net-wireless/hostapd/hostapd-2.2-r1.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-2.2-r1.ebuild?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/hostapd/hostapd-2.2-r1.ebuild?rev=1.1&content-type=text/plain
84
85 Index: hostapd-2.2-r1.ebuild
86 ===================================================================
87 # Copyright 1999-2014 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 # $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/hostapd-2.2-r1.ebuild,v 1.1 2014/08/29 19:28:44 gurligebis Exp $
90
91 EAPI="4"
92
93 inherit toolchain-funcs eutils systemd
94
95 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
96 HOMEPAGE="http://hostap.epitest.fi"
97 SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
98
99 LICENSE="|| ( GPL-2 BSD )"
100 SLOT="0"
101 KEYWORDS="~amd64 ~mips ~ppc ~x86"
102 IUSE="ipv6 logwatch madwifi +ssl +wps +crda"
103
104 DEPEND="ssl? ( dev-libs/openssl )
105 kernel_linux? (
106 dev-libs/libnl:3
107 crda? ( net-wireless/crda )
108 )
109 madwifi? ( ||
110 ( >net-wireless/madwifi-ng-tools-0.9.3 ) )"
111
112 RDEPEND="${DEPEND}"
113
114 S="${S}/${PN}"
115
116 src_prepare() {
117 sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
118 "${S}/hostapd.conf" || die
119 }
120
121 src_configure() {
122 local CONFIG="${S}/.config"
123
124 # toolchain setup
125 echo "CC = $(tc-getCC)" > ${CONFIG}
126
127 # EAP authentication methods
128 echo "CONFIG_EAP=y" >> ${CONFIG}
129 echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
130
131 if use ssl; then
132 # SSL authentication methods
133 echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
134 echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
135 echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
136 echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
137 fi
138
139 if use wps; then
140 # Enable Wi-Fi Protected Setup
141 echo "CONFIG_WPS=y" >> ${CONFIG}
142 echo "CONFIG_WPS2=y" >> ${CONFIG}
143 echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
144 einfo "Enabling Wi-Fi Protected Setup support"
145 fi
146
147 echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
148 echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
149 echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
150 echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
151 echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
152 echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
153 echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
154 echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
155 echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
156 echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
157
158 einfo "Enabling drivers: "
159
160 # drivers
161 echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
162 einfo " HostAP driver enabled"
163 echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
164 einfo " Wired driver enabled"
165 echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
166 einfo " Prism54 driver enabled"
167 echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
168 einfo " None driver enabled"
169
170 if use madwifi; then
171 # Add include path for madwifi-driver headers
172 einfo " Madwifi driver enabled"
173 echo "CFLAGS += -I/usr/include/madwifi" >> ${CONFIG}
174 echo "CONFIG_DRIVER_MADWIFI=y" >> ${CONFIG}
175 else
176 einfo " Madwifi driver disabled"
177 fi
178
179 einfo " nl80211 driver enabled"
180 echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
181
182 # misc
183 echo "CONFIG_PKCS12=y" >> ${CONFIG}
184 echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
185 echo "CONFIG_IAPP=y" >> ${CONFIG}
186 echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
187 echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
188 echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
189 echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
190 echo "CONFIG_PEERKEY=y" >> ${CONFIG}
191 echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
192 echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
193 echo "CONFIG_ACS=y" >> ${CONFIG}
194
195 if use ipv6; then
196 # IPv6 support
197 echo "CONFIG_IPV6=y" >> ${CONFIG}
198 fi
199
200 # If we are using libnl 2.0 and above, enable support for it
201 # Removed for now, since the 3.2 version is broken, and we don't
202 # support it.
203 if has_version ">=dev-libs/libnl-3.2"; then
204 echo "CONFIG_LIBNL32=y" >> .config
205 fi
206
207 # TODO: Add support for BSD drivers
208
209 default_src_configure
210 }
211
212 src_compile() {
213 emake V=1
214
215 if use ssl; then
216 emake V=1 nt_password_hash
217 emake V=1 hlr_auc_gw
218 fi
219 }
220
221 src_install() {
222 insinto /etc/${PN}
223 doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
224
225 fperms -R 600 /etc/${PN}
226
227 dosbin ${PN}
228 dobin ${PN}_cli
229
230 use ssl && dobin nt_password_hash hlr_auc_gw
231
232 newinitd "${FILESDIR}"/${PN}-init.d ${PN}
233 newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
234 systemd_dounit "${FILESDIR}"/${PN}.service
235
236 doman ${PN}{.8,_cli.1}
237
238 dodoc ChangeLog README
239 use wps && dodoc README-WPS
240
241 docinto examples
242 dodoc wired.conf
243
244 if use logwatch; then
245 insinto /etc/log.d/conf/services/
246 doins logwatch/${PN}.conf
247
248 exeinto /etc/log.d/scripts/services/
249 doexe logwatch/${PN}
250 fi
251 }
252
253 pkg_postinst() {
254 einfo
255 einfo "If you are running openRC you need to follow this instructions:"
256 einfo "In order to use ${PN} you need to set up your wireless card"
257 einfo "for master mode in /etc/conf.d/net and then start"
258 einfo "/etc/init.d/${PN}."
259 einfo
260 einfo "Example configuration:"
261 einfo
262 einfo "config_wlan0=( \"192.168.1.1/24\" )"
263 einfo "channel_wlan0=\"6\""
264 einfo "essid_wlan0=\"test\""
265 einfo "mode_wlan0=\"master\""
266 einfo
267 if use madwifi; then
268 einfo "This package compiles against the headers installed by"
269 einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
270 einfo "You should remerge ${PN} after upgrading these packages."
271 einfo
272 einfo "Since you are using the madwifi-ng driver, you should disable or"
273 einfo "comment out wme_enabled from ${PN}.conf, since it will"
274 einfo "cause problems otherwise (see bug #260377"
275 fi
276 #if [ -e "${KV_DIR}"/net/mac80211 ]; then
277 # einfo "This package now compiles against the headers installed by"
278 # einfo "the kernel source for the mac80211 driver. You should "
279 # einfo "re-emerge ${PN} after upgrading your kernel source."
280 #fi
281
282 if use wps; then
283 einfo "You have enabled Wi-Fi Protected Setup support, please"
284 einfo "read the README-WPS file in /usr/share/doc/${P}"
285 einfo "for info on how to use WPS"
286 fi
287 }