Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 182486 Details for
Bug 246117
net-wireless/wpa_supplicant-0.6.9 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
diff 0.6.4 -> 0.6.8
wpa_supplicant.ebuild.patch (text/plain), 8.53 KB, created by
Davide Pesavento
on 2009-02-18 22:27:04 UTC
(
hide
)
Description:
diff 0.6.4 -> 0.6.8
Filename:
MIME Type:
Creator:
Davide Pesavento
Created:
2009-02-18 22:27:04 UTC
Size:
8.53 KB
patch
obsolete
>--- /usr/portage/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild 2009-02-01 22:37:18.000000000 +0100 >+++ wpa_supplicant-0.6.8.ebuild 2009-02-18 23:00:54.000000000 +0100 >@@ -2,9 +2,9 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.6.4.ebuild,v 1.4 2009/02/01 21:23:45 maekke Exp $ > >-EAPI="1" >+EAPI="2" > >-inherit eutils toolchain-funcs >+inherit eutils toolchain-funcs qt3 qt4 > > DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" > HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" >@@ -12,56 +12,59 @@ > LICENSE="|| ( GPL-2 BSD )" > > SLOT="0" >-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" >-IUSE="dbus debug gnutls gsm madwifi qt3 qt4 readline ssl kernel_linux >- kernel_FreeBSD ps3" >+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" >+IUSE="dbus debug gnutls gsm madwifi ps3 qt3 qt4 readline ssl kernel_linux kernel_FreeBSD" > >-RDEPEND="dbus? ( sys-apps/dbus ) >+DEPEND="dbus? ( sys-apps/dbus ) > kernel_linux? ( > gsm? ( sys-apps/pcsc-lite ) >- madwifi? ( || >+ madwifi? ( || > ( >net-wireless/madwifi-ng-tools-0.9.3 > net-wireless/madwifi-old ) > ) > ) > !kernel_linux? ( net-libs/libpcap ) >- qt4? ( >- || ( ( x11-libs/qt-core:4 >- x11-libs/qt-gui:4 ) >- <x11-libs/qt-4.4:4 >- ) >- ) >- !qt4? ( qt3? ( =x11-libs/qt-3* ) ) >+ qt4? ( x11-libs/qt-gui:4 ) >+ !qt4? ( qt3? ( x11-libs/qt:3 ) ) > readline? ( sys-libs/ncurses sys-libs/readline ) >- ssl? ( dev-libs/openssl ) > gnutls? ( net-libs/gnutls ) >- !ssl? ( !gnutls? ( dev-libs/libtommath ) )" >+ !gnutls? ( ssl? ( dev-libs/openssl ) ) >+ !gnutls? ( !ssl? ( dev-libs/libtommath ) )" >+RDEPEND="${DEPEND}" > > S="${WORKDIR}/${P}/${PN}" > > pkg_setup() { >- if use qt3 && use qt4; then >- einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" >+ if use gnutls && use ssl ; then >+ einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"gnutls\"" > fi > >- if use qt4 && has_version ">=x11-libs/qt-4.2.2" ; then >- if ! built_with_use x11-libs/qt qt3support ; then >- eerror ">=qt4.2.2 requires qt3support" >- die "rebuild >=x11-libs/qt-4.2.2 with the qt3support USE flag" >- fi >+ if use qt3 && use qt4 ; then >+ einfo "You have both 'qt3' and 'qt4' USE flags enabled: defaulting to USE=\"qt4\"" > fi > } > >-src_unpack() { >- unpack ${A} >- >- cd "${S}" >- >- # net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD >+src_prepare() { >+ # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD > sed -i \ > -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ > ../src/l2_packet/l2_packet_freebsd.c || die > >+ # People seem to take the example configuration file too literally (bug #102361) >+ sed -i \ >+ -e "s:^\(opensc_engine_path\):#\1:" \ >+ -e "s:^\(pkcs11_engine_path\):#\1:" \ >+ -e "s:^\(pkcs11_module_path\):#\1:" \ >+ wpa_supplicant.conf || die >+ >+ # Change configuration to match Gentoo locations (bug #143750) >+ sed -i \ >+ -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ >+ -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ >+ wpa_supplicant.conf || die >+} >+ >+src_configure() { > # toolchain setup > echo "CC = $(tc-getCC)" > .config > >@@ -97,9 +100,10 @@ > > if use gsm ; then > # smart card authentication >- echo "CONFIG_EAP_SIM=y" >> .config >- echo "CONFIG_EAP_AKA=y" >> .config >- echo "CONFIG_PCSC=y" >> .config >+ echo "CONFIG_EAP_SIM=y" >> .config >+ echo "CONFIG_EAP_AKA=y" >> .config >+ echo "CONFIG_EAP_AKA_PRIME=y" >> .config >+ echo "CONFIG_PCSC=y" >> .config > fi > > if use readline ; then >@@ -109,13 +113,13 @@ > > # SSL authentication methods > if use gnutls ; then >- echo "CONFIG_TLS=gnutls" >> .config >+ echo "CONFIG_TLS=gnutls" >> .config > echo "CONFIG_GNUTLS_EXTRA=y" >> .config > elif use ssl ; then >- echo "CONFIG_TLS=openssl" >> .config >- echo "CONFIG_SMARTCARD=y" >> .config >+ echo "CONFIG_TLS=openssl" >> .config >+ echo "CONFIG_SMARTCARD=y" >> .config > else >- echo "CONFIG_TLS=internal" >> .config >+ echo "CONFIG_TLS=internal" >> .config > fi > > if use kernel_linux ; then >@@ -126,89 +130,83 @@ > echo "CONFIG_DRIVER_HOSTAP=y" >> .config > echo "CONFIG_DRIVER_IPW=y" >> .config > echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config >- echo "CONFIG_DRIVER_PRISM54=y" >> .config >+ echo "CONFIG_DRIVER_NL80211=y" >> .config >+ #echo "CONFIG_DRIVER_PRISM54=y" >> .config >+ echo "CONFIG_DRIVER_RALINK=y" >> .config > echo "CONFIG_DRIVER_WEXT=y" >> .config > echo "CONFIG_DRIVER_WIRED=y" >> .config > > if use madwifi ; then > # Add include path for madwifi-driver headers > echo "CFLAGS += -I/usr/include/madwifi" >> .config >- echo "CONFIG_DRIVER_MADWIFI=y" >> .config >+ echo "CONFIG_DRIVER_MADWIFI=y" >> .config > fi >+ > if use ps3 ; then > echo "CONFIG_DRIVER_PS3=y" >> .config > fi >+ > elif use kernel_FreeBSD ; then > # FreeBSD specific driver > echo "CONFIG_DRIVER_BSD=y" >> .config > fi > >- # people seem to take the example configuration file too literally >- # bug #102361 >- sed -i \ >- -e "s:^\(opensc_engine_path\):#\1:" \ >- -e "s:^\(pkcs11_engine_path\):#\1:" \ >- -e "s:^\(pkcs11_module_path\):#\1:" \ >- wpa_supplicant.conf || die >+ # Wi-Fi Protected Setup (WPS) >+ echo "CONFIG_WPS=y" >> .config > >- # Change configuration to match Gentoo locations, #143750 >- sed -i \ >- -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ >- -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ >- wpa_supplicant.conf || die >+ # Enable mitigation against certain attacks against TKIP >+ echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config > } > > src_compile() { > emake || die "emake failed" > > if use qt4 ; then >- qmake -o "${S}"/wpa_gui-qt4/Makefile "${S}"/wpa_gui-qt4/wpa_gui.pro > cd "${S}"/wpa_gui-qt4 >- emake || die "emake wpa_gui-qt4 failed" >+ eqmake4 wpa_gui.pro >+ emake || die "Qt4 wpa_gui compilation failed" > elif use qt3 ; then >- [[ -d "${QTDIR}"/etc/settings ]] && addwrite "${QTDIR}"/etc/settings >- "${QTDIR}"/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro > cd "${S}"/wpa_gui >- emake || die "emake wpa_gui failed" >+ eqmake3 wpa_gui.pro >+ emake || die "Qt3 wpa_gui compilation failed" > fi > } > > src_install() { >- dosbin wpa_supplicant >- dobin wpa_cli wpa_passphrase >+ dosbin wpa_supplicant || die >+ dobin wpa_cli wpa_passphrase || die > > # baselayout-1 compat >- dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant >- dosym /usr/bin/wpa_cli /bin/wpa_cli >+ dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die >+ dosym /usr/bin/wpa_cli /bin/wpa_cli || die > > exeinto /etc/wpa_supplicant/ > newexe "${FILESDIR}"/wpa_cli.sh wpa_cli.sh > insinto /etc/wpa_supplicant/ > newins "${FILESDIR}"/wpa_supplicant.conf wpa_supplicant.conf > >- dodoc ChangeLog eap_testing.txt README todo.txt >- newdoc wpa_supplicant.conf wpa_supplicant.conf >+ dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ >+ wpa_supplicant.conf || die "dodoc failed" > >- doman doc/docbook/*.8 >- doman doc/docbook/*.5 >+ doman doc/docbook/*.{5,8} || die "doman failed" > > if use qt4 ; then > into /usr >- dobin wpa_gui-qt4/wpa_gui >+ dobin wpa_gui-qt4/wpa_gui || die > elif use qt3 ; then > into /usr >- dobin wpa_gui/wpa_gui >+ dobin wpa_gui/wpa_gui || die > fi > >- if use qt3 || use qt4; then >- make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI" >+ if use qt3 || use qt4 ; then >+ make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" > fi > > if use dbus ; then > insinto /etc/dbus-1/system.d >- newins dbus-wpa_supplicant.conf wpa_supplicant.conf >+ newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die > insinto /usr/share/dbus-1/system-services >- newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' >+ newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' || die > keepdir /var/run/wpa_supplicant > fi > } >@@ -217,8 +215,8 @@ > einfo "A default configuration file has been installed to" > einfo "/etc/wpa_supplicant/wpa_supplicant.conf" > einfo >- einfo "An example configuration file is available as" >- einfo "/usr/share/doc/${PF}/wpa_supplicant.conf.gz" >+ einfo "An example configuration file is available in" >+ einfo "/usr/share/doc/${PF}/" > > if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then > echo >@@ -226,10 +224,10 @@ > ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf" > fi > >- if use madwifi; then >+ if use madwifi ; then > echo > einfo "This package compiles against the headers installed by" > einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." >- einfo "You should remerge ${PN} after upgrading these packages." >+ einfo "You should re-emerge ${PN} after upgrading these packages." > fi > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 246117
:
179822
|
179824
|
182485
|
182486
|
186123
|
186125