1 |
gurligebis 13/05/19 07:41:08 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wpa_supplicant-2.0-r2.ebuild |
5 |
Removed: wpa_supplicant-2.0-r1.ebuild |
6 |
Log: |
7 |
Adding patch to fix missing symbox in libeap, fixing bug #470038 |
8 |
|
9 |
(Portage version: 2.2.0_alpha175/cvs/Linux i686, signed Manifest commit with key 15AE484C) |
10 |
|
11 |
Revision Changes Path |
12 |
1.199 net-wireless/wpa_supplicant/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?rev=1.199&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?rev=1.199&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?r1=1.198&r2=1.199 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v |
21 |
retrieving revision 1.198 |
22 |
retrieving revision 1.199 |
23 |
diff -u -r1.198 -r1.199 |
24 |
--- ChangeLog 28 Apr 2013 16:02:30 -0000 1.198 |
25 |
+++ ChangeLog 19 May 2013 07:41:08 -0000 1.199 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for net-wireless/wpa_supplicant |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.198 2013/04/28 16:02:30 gurligebis Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.199 2013/05/19 07:41:08 gurligebis Exp $ |
31 |
+ |
32 |
+*wpa_supplicant-2.0-r2 (19 May 2013) |
33 |
+ |
34 |
+ 19 May 2013; <gurligebis@g.o> -wpa_supplicant-2.0-r1.ebuild, |
35 |
+ +wpa_supplicant-2.0-r2.ebuild, |
36 |
+ +files/wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch: |
37 |
+ Adding patch to fix missing symbox in libeap, fixing bug #470038 |
38 |
|
39 |
*wpa_supplicant-2.0-r1 (28 Apr 2013) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: wpa_supplicant-2.0-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.0-r2.ebuild,v 1.1 2013/05/19 07:41:08 gurligebis Exp $ |
54 |
|
55 |
EAPI=4 |
56 |
|
57 |
inherit eutils toolchain-funcs qt4-r2 systemd multilib |
58 |
|
59 |
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" |
60 |
HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" |
61 |
SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" |
62 |
LICENSE="|| ( GPL-2 BSD )" |
63 |
|
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
66 |
IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD" |
67 |
REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )" |
68 |
|
69 |
RDEPEND="dbus? ( sys-apps/dbus ) |
70 |
kernel_linux? ( |
71 |
eap-sim? ( sys-apps/pcsc-lite ) |
72 |
dev-libs/libnl:3 |
73 |
net-wireless/crda |
74 |
) |
75 |
!kernel_linux? ( net-libs/libpcap ) |
76 |
qt4? ( |
77 |
dev-qt/qtgui:4 |
78 |
dev-qt/qtsvg:4 |
79 |
) |
80 |
readline? ( |
81 |
sys-libs/ncurses |
82 |
sys-libs/readline |
83 |
) |
84 |
ssl? ( dev-libs/openssl ) |
85 |
!ssl? ( gnutls? ( net-libs/gnutls ) ) |
86 |
!ssl? ( !gnutls? ( dev-libs/libtommath ) ) |
87 |
selinux? ( sec-policy/selinux-networkmanager )" |
88 |
DEPEND="${RDEPEND} |
89 |
virtual/pkgconfig" |
90 |
|
91 |
S="${WORKDIR}/${P}/${PN}" |
92 |
|
93 |
pkg_setup() { |
94 |
if use gnutls && use ssl ; then |
95 |
elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" |
96 |
fi |
97 |
} |
98 |
|
99 |
src_prepare() { |
100 |
# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD |
101 |
sed -i \ |
102 |
-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ |
103 |
../src/l2_packet/l2_packet_freebsd.c || die |
104 |
|
105 |
# People seem to take the example configuration file too literally (bug #102361) |
106 |
sed -i \ |
107 |
-e "s:^\(opensc_engine_path\):#\1:" \ |
108 |
-e "s:^\(pkcs11_engine_path\):#\1:" \ |
109 |
-e "s:^\(pkcs11_module_path\):#\1:" \ |
110 |
wpa_supplicant.conf || die |
111 |
|
112 |
# Change configuration to match Gentoo locations (bug #143750) |
113 |
sed -i \ |
114 |
-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ |
115 |
-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ |
116 |
wpa_supplicant.conf || die |
117 |
|
118 |
if use dbus; then |
119 |
epatch "${FILESDIR}/${P}-dbus-path-fix.patch" |
120 |
fi |
121 |
|
122 |
# systemd entries to D-Bus service files (bug #372877) |
123 |
echo 'SystemdService=wpa_supplicant.service' \ |
124 |
| tee -a dbus/*.service >/dev/null || die |
125 |
|
126 |
cd "${WORKDIR}/${P}" |
127 |
|
128 |
if use wimax; then |
129 |
# generate-libeap-peer.patch comes before |
130 |
# fix-undefined-reference-to-random_get_bytes.patch |
131 |
epatch "${FILESDIR}/${P}-generate-libeap-peer.patch" |
132 |
epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.patch" |
133 |
|
134 |
# multilib-strict fix (bug #373685) |
135 |
sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile |
136 |
fi |
137 |
|
138 |
# bug (320097) |
139 |
epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" |
140 |
|
141 |
# TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX, |
142 |
# SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED. |
143 |
# bug (374089) |
144 |
#epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch" |
145 |
} |
146 |
|
147 |
src_configure() { |
148 |
# Toolchain setup |
149 |
tc-export CC |
150 |
|
151 |
# Basic setup |
152 |
echo "CONFIG_CTRL_IFACE=y" >> .config |
153 |
echo "CONFIG_BACKEND=file" >> .config |
154 |
|
155 |
# Basic authentication methods |
156 |
# NOTE: we don't set GPSK or SAKE as they conflict |
157 |
# with the below options |
158 |
echo "CONFIG_EAP_GTC=y" >> .config |
159 |
echo "CONFIG_EAP_MD5=y" >> .config |
160 |
echo "CONFIG_EAP_OTP=y" >> .config |
161 |
echo "CONFIG_EAP_PAX=y" >> .config |
162 |
echo "CONFIG_EAP_PSK=y" >> .config |
163 |
echo "CONFIG_EAP_TLV=y" >> .config |
164 |
echo "CONFIG_IEEE8021X_EAPOL=y" >> .config |
165 |
echo "CONFIG_PKCS12=y" >> .config |
166 |
echo "CONFIG_PEERKEY=y" >> .config |
167 |
echo "CONFIG_EAP_LEAP=y" >> .config |
168 |
echo "CONFIG_EAP_MSCHAPV2=y" >> .config |
169 |
echo "CONFIG_EAP_PEAP=y" >> .config |
170 |
echo "CONFIG_EAP_TLS=y" >> .config |
171 |
echo "CONFIG_EAP_TTLS=y" >> .config |
172 |
|
173 |
if use dbus ; then |
174 |
echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config |
175 |
echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config |
176 |
echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config |
177 |
fi |
178 |
|
179 |
# Enable support for writing debug info to a log file. |
180 |
echo "CONFIG_DEBUG_FILE=y" >> .config |
181 |
|
182 |
if use eap-sim ; then |
183 |
# Smart card authentication |
184 |
echo "CONFIG_EAP_SIM=y" >> .config |
185 |
echo "CONFIG_EAP_AKA=y" >> .config |
186 |
echo "CONFIG_EAP_AKA_PRIME=y" >> .config |
187 |
echo "CONFIG_PCSC=y" >> .config |
188 |
fi |
189 |
|
190 |
if use fasteap ; then |
191 |
echo "CONFIG_EAP_FAST=y" >> .config |
192 |
fi |
193 |
|
194 |
if use readline ; then |
195 |
# readline/history support for wpa_cli |
196 |
echo "CONFIG_READLINE=y" >> .config |
197 |
fi |
198 |
|
199 |
# SSL authentication methods |
200 |
if use ssl ; then |
201 |
echo "CONFIG_TLS=openssl" >> .config |
202 |
elif use gnutls ; then |
203 |
echo "CONFIG_TLS=gnutls" >> .config |
204 |
echo "CONFIG_GNUTLS_EXTRA=y" >> .config |
205 |
else |
206 |
echo "CONFIG_TLS=internal" >> .config |
207 |
fi |
208 |
|
209 |
if use smartcard ; then |
210 |
echo "CONFIG_SMARTCARD=y" >> .config |
211 |
fi |
212 |
|
213 |
if use kernel_linux ; then |
214 |
# Linux specific drivers |
215 |
echo "CONFIG_DRIVER_ATMEL=y" >> .config |
216 |
#echo "CONFIG_DRIVER_BROADCOM=y" >> .config |
217 |
#echo "CONFIG_DRIVER_HERMES=y" >> .config |
218 |
echo "CONFIG_DRIVER_HOSTAP=y" >> .config |
219 |
echo "CONFIG_DRIVER_IPW=y" >> .config |
220 |
echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config |
221 |
echo "CONFIG_DRIVER_NL80211=y" >> .config |
222 |
#echo "CONFIG_DRIVER_PRISM54=y" >> .config |
223 |
echo "CONFIG_DRIVER_RALINK=y" >> .config |
224 |
echo "CONFIG_DRIVER_WEXT=y" >> .config |
225 |
echo "CONFIG_DRIVER_WIRED=y" >> .config |
226 |
|
227 |
if use ps3 ; then |
228 |
echo "CONFIG_DRIVER_PS3=y" >> .config |
229 |
fi |
230 |
|
231 |
elif use kernel_FreeBSD ; then |
232 |
# FreeBSD specific driver |
233 |
echo "CONFIG_DRIVER_BSD=y" >> .config |
234 |
fi |
235 |
|
236 |
# Wi-Fi Protected Setup (WPS) |
237 |
if use wps ; then |
238 |
echo "CONFIG_WPS=y" >> .config |
239 |
echo "CONFIG_WPS2=y" >> .config |
240 |
# USB Flash Drive |
241 |
echo "CONFIG_WPS_UFD=y" >> .config |
242 |
# External Registrar |
243 |
echo "CONFIG_WPS_ER=y" >> .config |
244 |
# Universal Plug'n'Play |
245 |
echo "CONFIG_WPS_UPNP=y" >> .config |
246 |
# Near Field Communication |
247 |
echo "CONFIG_WPS_NFC=y" >> .config |
248 |
fi |
249 |
|
250 |
# Wi-Fi Direct (WiDi) |
251 |
if use p2p ; then |
252 |
echo "CONFIG_P2P=y" >> .config |
253 |
fi |
254 |
|
255 |
# Access Point Mode |
256 |
if use ap ; then |
257 |
echo "CONFIG_AP=y" >> .config |
258 |
fi |
259 |
|
260 |
# Enable mitigation against certain attacks against TKIP |
261 |
echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config |
262 |
|
263 |
# If we are using libnl 2.0 and above, enable support for it |
264 |
# Bug 382159 |
265 |
# Removed for now, since the 3.2 version is broken, and we don't |
266 |
# support it. |
267 |
if has_version ">=dev-libs/libnl-3.2"; then |
268 |
echo "CONFIG_LIBNL32=y" >> .config |
269 |
fi |
270 |
|
271 |
if use qt4 ; then |
272 |
pushd "${S}"/wpa_gui-qt4 > /dev/null |
273 |
eqmake4 wpa_gui.pro |
274 |
popd > /dev/null |
275 |
fi |
276 |
} |
277 |
|
278 |
src_compile() { |
279 |
einfo "Building wpa_supplicant" |
280 |
emake V=1 |
281 |
|
282 |
if use wimax; then |
283 |
emake -C ../src/eap_peer clean |
284 |
emake -C ../src/eap_peer |
285 |
fi |
286 |
|
287 |
if use qt4 ; then |
288 |
pushd "${S}"/wpa_gui-qt4 > /dev/null |
289 |
einfo "Building wpa_gui" |
290 |
emake |
291 |
popd > /dev/null |
292 |
fi |
293 |
} |
294 |
|
295 |
src_install() { |
296 |
dosbin wpa_supplicant |
297 |
dobin wpa_cli wpa_passphrase |
298 |
|
299 |
# baselayout-1 compat |
300 |
if has_version "<sys-apps/baselayout-2.0.0"; then |
301 |
dodir /sbin |
302 |
dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant |
303 |
dodir /bin |
304 |
dosym /usr/bin/wpa_cli /bin/wpa_cli |
305 |
fi |
306 |
|
307 |
if has_version ">=sys-apps/openrc-0.5.0"; then |
308 |
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant |
309 |
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant |
310 |
fi |
311 |
|
312 |
exeinto /etc/wpa_supplicant/ |
313 |
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh |
314 |
|
315 |
dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ |
316 |
wpa_supplicant.conf |
317 |
|
318 |
doman doc/docbook/*.{5,8} |
319 |
|
320 |
if use qt4 ; then |
321 |
into /usr |
322 |
dobin wpa_gui-qt4/wpa_gui |
323 |
doicon wpa_gui-qt4/icons/wpa_gui.svg |
324 |
make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" |
325 |
fi |
326 |
|
327 |
use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install |
328 |
|
329 |
if use dbus ; then |
330 |
pushd "${S}"/dbus > /dev/null |
331 |
insinto /etc/dbus-1/system.d |
332 |
newins dbus-wpa_supplicant.conf wpa_supplicant.conf |
333 |
insinto /usr/share/dbus-1/system-services |
334 |
doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service |
335 |
keepdir /var/run/wpa_supplicant |
336 |
popd > /dev/null |
337 |
fi |
338 |
|
339 |
# systemd stuff |
340 |
systemd_dounit "${FILESDIR}"/wpa_supplicant.service |
341 |
systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service' |
342 |
} |
343 |
|
344 |
pkg_postinst() { |
345 |
elog "If this is a clean installation of wpa_supplicant, you" |
346 |
elog "have to create a configuration file named" |
347 |
elog "/etc/wpa_supplicant/wpa_supplicant.conf" |
348 |
elog |
349 |
elog "An example configuration file is available for reference in" |
350 |
elog "/usr/share/doc/${PF}/" |
351 |
|
352 |
if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then |
353 |
echo |
354 |
ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf" |
355 |
ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf" |
356 |
fi |
357 |
|
358 |
# Mea culpa, feel free to remove that after some time --mgorny. |
359 |
local fn |
360 |
for fn in wpa_supplicant{,@wlan0}.service; do |
361 |
if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]] |
362 |
then |
363 |
ebegin "Moving ${fn} to multi-user.target" |
364 |
mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \ |
365 |
"${ROOT}"/etc/systemd/system/multi-user.target.wants/ |
366 |
eend ${?} \ |
367 |
"Please try to re-enable ${fn}" |
368 |
fi |
369 |
done |
370 |
} |