Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Robert Buchholz (rbu)" <rbu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/wpa_supplicant: ChangeLog wpa_supplicant-0.6.1.ebuild wpa_supplicant-0.6.0.ebuild
Date: Tue, 08 Jan 2008 01:42:30
Message-Id: E1JC3Tw-0003ig-S7@stork.gentoo.org
1 rbu 08/01/08 01:42:20
2
3 Modified: ChangeLog
4 Added: wpa_supplicant-0.6.1.ebuild
5 Removed: wpa_supplicant-0.6.0.ebuild
6 Log:
7 Version bump by security for remote DoS vulnerability (CVE-2007-6025) in 0.6.0 (bug #199828)
8 (Portage version: 2.1.4_rc10)
9
10 Revision Changes Path
11 1.102 net-wireless/wpa_supplicant/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?rev=1.102&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?rev=1.102&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog?r1=1.101&r2=1.102
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v
20 retrieving revision 1.101
21 retrieving revision 1.102
22 diff -u -r1.101 -r1.102
23 --- ChangeLog 25 Dec 2007 16:32:54 -0000 1.101
24 +++ ChangeLog 8 Jan 2008 01:42:20 -0000 1.102
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-wireless/wpa_supplicant
27 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.101 2007/12/25 16:32:54 phreak Exp $
29 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.102 2008/01/08 01:42:20 rbu Exp $
31 +
32 +*wpa_supplicant-0.6.1 (08 Jan 2008)
33 +
34 + 08 Jan 2008; Robert Buchholz <rbu@g.o>
35 + -wpa_supplicant-0.6.0.ebuild, +wpa_supplicant-0.6.1.ebuild:
36 + Version bump by security for remote DoS vulnerability (CVE-2007-6025) in
37 + 0.6.0 (bug #199828)
38
39 25 Dec 2007; Christian Heim <phreak@g.o> metadata.xml:
40 Removing uberlord from metadata.xml as per #199318.
41
42
43
44 1.1 net-wireless/wpa_supplicant/wpa_supplicant-0.6.1.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: wpa_supplicant-0.6.1.ebuild
50 ===================================================================
51 # Copyright 1999-2008 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-0.6.1.ebuild,v 1.1 2008/01/08 01:42:20 rbu Exp $
54
55 inherit eutils toolchain-funcs
56
57 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
58 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
59 SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
60 LICENSE="|| ( GPL-2 BSD )"
61
62 SLOT="0"
63 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
64 IUSE="dbus gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
65
66 RDEPEND="dbus? ( sys-apps/dbus )
67 kernel_linux? (
68 gsm? ( sys-apps/pcsc-lite )
69 madwifi? ( ||
70 ( >net-wireless/madwifi-ng-tools-0.9.3
71 <net-wireless/madwifi-ng-0.9.3-r4
72 net-wireless/madwifi-old )
73 )
74 )
75 !kernel_linux? ( net-libs/libpcap )
76 qt4? ( =x11-libs/qt-4* )
77 !qt4? ( qt3? ( =x11-libs/qt-3* ) )
78 readline? ( sys-libs/ncurses sys-libs/readline )
79 ssl? ( dev-libs/openssl )
80 gnutls? ( net-libs/gnutls )
81 !ssl? ( !gnutls? ( dev-libs/libtommath ) )"
82
83 S="${WORKDIR}/${P}/${PN}"
84
85 pkg_setup() {
86 if use qt3 && use qt4; then
87 einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\""
88 fi
89
90 if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then
91 if ! built_with_use x11-libs/qt qt3support ; then
92 eerror ">=qt4.2.2 requires qt3support"
93 die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag"
94 fi
95 fi
96 }
97
98 src_unpack() {
99 unpack ${A}
100 cd "${S}"
101
102 # net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
103 sed -i \
104 -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
105 ../src/l2_packet/l2_packet_freebsd.c || die
106
107 # toolchain setup
108 echo "CC = $(tc-getCC)" > .config
109
110 # basic setup
111 echo "CONFIG_CTRL_IFACE=y" >> .config
112 echo "CONFIG_BACKEND=file" >> .config
113
114 # basic authentication methods
115 # NOTE: we don't set GPSK or SAKE as they conflict
116 # with the below options
117 echo "CONFIG_EAP_GTC=y" >> .config
118 echo "CONFIG_EAP_MD5=y" >> .config
119 echo "CONFIG_EAP_OTP=y" >> .config
120 echo "CONFIG_EAP_PAX=y" >> .config
121 echo "CONFIG_EAP_PSK=y" >> .config
122 echo "CONFIG_EAP_TLV=y" >> .config
123 echo "CONFIG_IEEE8021X_EAPOL=y" >> .config
124 echo "CONFIG_PKCS12=y" >> .config
125 echo "CONFIG_PEERKEY=y" >> .config
126 echo "CONFIG_EAP_LEAP=y" >> .config
127 echo "CONFIG_EAP_MSCHAPV2=y" >> .config
128 echo "CONFIG_EAP_PEAP=y" >> .config
129 echo "CONFIG_EAP_TLS=y" >> .config
130 echo "CONFIG_EAP_TTLS=y" >> .config
131
132 if use dbus ; then
133 echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config
134 fi
135
136 if use gsm ; then
137 # smart card authentication
138 echo "CONFIG_EAP_SIM=y" >> .config
139 echo "CONFIG_EAP_AKA=y" >> .config
140 echo "CONFIG_PCSC=y" >> .config
141 fi
142
143 if use readline ; then
144 # readline/history support for wpa_cli
145 echo "CONFIG_READLINE=y" >> .config
146 fi
147
148 # SSL authentication methods
149 if use gnutls ; then
150 echo "CONFIG_TLS=gnutls" >> .config
151 echo "CONFIG_GNUTLS_EXTRA=y" >> .config
152 elif use ssl ; then
153 echo "CONFIG_TLS=openssl" >> .config
154 echo "CONFIG_SMARTCARD=y" >> .config
155 else
156 echo "CONFIG_TLS=internal" >> .config
157 fi
158
159 if use kernel_linux ; then
160 # Linux specific drivers
161 echo "CONFIG_DRIVER_ATMEL=y" >> .config
162 #echo "CONFIG_DRIVER_BROADCOM=y" >> .config
163 #echo "CONFIG_DRIVER_HERMES=y" >> .config
164 echo "CONFIG_DRIVER_HOSTAP=y" >> .config
165 echo "CONFIG_DRIVER_IPW=y" >> .config
166 echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config
167 echo "CONFIG_DRIVER_PRISM54=y" >> .config
168 echo "CONFIG_DRIVER_WEXT=y" >> .config
169 echo "CONFIG_DRIVER_WIRED=y" >> .config
170
171 if use madwifi ; then
172 # Add include path for madwifi-driver headers
173 echo "CFLAGS += -I/usr/include/madwifi" >> .config
174 echo "CONFIG_DRIVER_MADWIFI=y" >> .config
175 fi
176 elif use kernel_FreeBSD ; then
177 # FreeBSD specific driver
178 echo "CONFIG_DRIVER_BSD=y" >> .config
179 fi
180
181 # people seem to take the example configuration file too literally
182 # bug #102361
183 sed -i \
184 -e "s:^\(opensc_engine_path\):#\1:" \
185 -e "s:^\(pkcs11_engine_path\):#\1:" \
186 -e "s:^\(pkcs11_module_path\):#\1:" \
187 wpa_supplicant.conf || die
188
189 # Change configuration to match Gentoo locations, #143750
190 sed -i \
191 -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
192 -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
193 wpa_supplicant.conf || die
194 }
195
196 src_compile() {
197 emake || die "emake failed"
198
199 if use qt4 ; then
200 qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro
201 cd "${S}"/wpa_gui-qt4
202 emake || die "emake wpa_gui-qt4 failed"
203 elif use qt3 ; then
204 [[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings
205 "${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro
206 cd "${S}"/wpa_gui
207 emake || die "emake wpa_gui failed"
208 fi
209 }
210
211 src_install() {
212 dosbin wpa_supplicant
213 dobin wpa_cli wpa_passphrase
214
215 # baselayout-1 compat
216 dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant
217 dosym /usr/bin/wpa_cli /bin/wpa_cli
218
219 exeinto /etc/wpa_supplicant/
220 newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh
221 insinto /etc/wpa_supplicant/
222 newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf
223
224 dodoc ChangeLog ../COPYING eap_testing.txt README todo.txt
225 newdoc wpa_supplicant.conf wpa_supplicant.conf
226
227 doman doc/docbook/*.8
228 doman doc/docbook/*.5
229
230 if use qt4 ; then
231 into /usr
232 dobin wpa_gui-qt4/wpa_gui
233 elif use qt3 ; then
234 into /usr
235 dobin wpa_gui/wpa_gui
236 fi
237
238 if use qt3 || use qt4; then
239 make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI"
240 fi
241
242 if use dbus ; then
243 insinto /etc/dbus-1/system.d
244 newins dbus-wpa_supplicant.conf wpa_supplicant.conf
245 fi
246 }
247
248 pkg_postinst() {
249 einfo "A default configuration file has been installed to"
250 einfo "/etc/wpa_supplicant/wpa_supplicant.conf"
251 einfo
252 einfo "An example configuration file is available as"
253 einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz"
254
255 if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then
256 echo
257 ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf"
258 ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf"
259 fi
260
261 if use madwifi; then
262 echo
263 einfo "This package compiles against the headers installed by"
264 einfo "madwifi-old, madwifi-ng or madwifi-ng-tools."
265 einfo "You should remerge ${PN} after upgrading these packages."
266 fi
267 }
268
269
270
271 --
272 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups