From: Roy Marples Date: Mon, 15 Jan 2007 14:34:19 +0000 (+0000) Subject: Version bump, #162172 thanks to Brandon Low. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dae098713fec64a7063c4aad35ff84a6c0f74604;p=gentoo.git Version bump, #162172 thanks to Brandon Low. Add dbus config file, #161590 thanks to Stian Skjelstad. Package-Manager: portage-2.1.2 --- diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 4d28a74fed7b..073876453ea6 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/wpa_supplicant -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.88 2006/12/13 18:26:50 uberlord Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.89 2007/01/15 14:34:19 uberlord Exp $ + +*wpa_supplicant-0.5.7 (15 Jan 2007) + + 15 Jan 2007; Roy Marples + +wpa_supplicant-0.5.7.ebuild: + Version bump, #162172 thanks to Brandon Low. + Add dbus config file, #161590 thanks to Stian Skjelstad. 13 Dec 2006; Roy Marples wpa_supplicant-0.5.6.ebuild: diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 8df525cb660f..673af8ac5fd7 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -30,6 +30,7 @@ DIST wpa_supplicant-0.4.9.tar.gz 483279 RMD160 627ddb6c12f15e08448606f24b3082b50 DIST wpa_supplicant-0.5.4.tar.gz 630779 RMD160 34074a4d1ebab4d455eb021a18ef9012943b1fd9 SHA1 53a03be9c39c783cb83f5e32f7aab493ef8b529e SHA256 6c14c9c6c68acc40aa1c860d4fde58424c57b48ea90700da189e6cf5c1dd6bd7 DIST wpa_supplicant-0.5.5.tar.gz 661097 RMD160 eda95756c49fb140063c14e0b9950b7045f47972 SHA1 b0992a71e759432fa3536bc4013885f0fe65aba1 SHA256 d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543 DIST wpa_supplicant-0.5.6.tar.gz 710441 RMD160 a00dfdf4874a09b6ee89d7a691f0e48e75325133 SHA1 8fa8f940b96340220fb51f8bf2baeef07edcca8d SHA256 892c6972b0940aa5d96d5a49ea924eb0f0504210213ba1134993e69dc395363f +DIST wpa_supplicant-0.5.7.tar.gz 713251 RMD160 dffc3b5cbead92757840f71ccdd4548348698b28 SHA1 43f769d46fdca47b024e777331fb00577595c0ef SHA256 cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57 EBUILD wpa_supplicant-0.4.9.ebuild 4890 RMD160 1822d2cd3ac39345f5d78d8b2c4826f6c56945c5 SHA1 3360894abc7e63b691b84d509dfbc1e5052cf0b6 SHA256 4d998e3bea3ad6326af6dbe93cbc032f6c46c2306fe42d0e5e0d32f7f671afa1 MD5 8d9c18fe9b4a757e2634583a8fd0205a wpa_supplicant-0.4.9.ebuild 4890 RMD160 1822d2cd3ac39345f5d78d8b2c4826f6c56945c5 wpa_supplicant-0.4.9.ebuild 4890 @@ -46,10 +47,14 @@ EBUILD wpa_supplicant-0.5.6.ebuild 5988 RMD160 9dd48ebe430ef850bb614252b2c420a40 MD5 3cda46bea6f45c76cb9e0797bd2c2cb5 wpa_supplicant-0.5.6.ebuild 5988 RMD160 9dd48ebe430ef850bb614252b2c420a408aaf713 wpa_supplicant-0.5.6.ebuild 5988 SHA256 f7743d2ee46159a263c4fa31ea8b5a492dad380b8ca491f60a55dafa0bd446e3 wpa_supplicant-0.5.6.ebuild 5988 -MISC ChangeLog 19990 RMD160 b76b2f48de280269e1051430e61b8f53ae491385 SHA1 e0050ca58c6c3a0e43ce7137490f2b8b315d2270 SHA256 b381e3e50cd53be43595f16350148d61847ef672527c248212c056058c0067da -MD5 dee827491654865c240b9d64347e71eb ChangeLog 19990 -RMD160 b76b2f48de280269e1051430e61b8f53ae491385 ChangeLog 19990 -SHA256 b381e3e50cd53be43595f16350148d61847ef672527c248212c056058c0067da ChangeLog 19990 +EBUILD wpa_supplicant-0.5.7.ebuild 5994 RMD160 1cf71c33f2ab9cabdebdede09020c5f1cf5ee07c SHA1 000ee5f89a04be2841c108a62833718a9d920c3e SHA256 1c8be2a454185510124f9e951dfee254369beb5cdbca82a05e7ab92fe3151417 +MD5 37f6c59e5c6375ec1f49a502ad0f3678 wpa_supplicant-0.5.7.ebuild 5994 +RMD160 1cf71c33f2ab9cabdebdede09020c5f1cf5ee07c wpa_supplicant-0.5.7.ebuild 5994 +SHA256 1c8be2a454185510124f9e951dfee254369beb5cdbca82a05e7ab92fe3151417 wpa_supplicant-0.5.7.ebuild 5994 +MISC ChangeLog 20215 RMD160 7ad4a7d197a30c72bc746d0da66c4ae41804d977 SHA1 53b9cedcdc0b9c0ec5b9bc4006056c5f9c5c9728 SHA256 52d73519432becba05d97a256d1ef3e8b4bac8f9460849c8fd9dd88aa81abca5 +MD5 5f1b60c0d0a166859e43104a7a1a7e6a ChangeLog 20215 +RMD160 7ad4a7d197a30c72bc746d0da66c4ae41804d977 ChangeLog 20215 +SHA256 52d73519432becba05d97a256d1ef3e8b4bac8f9460849c8fd9dd88aa81abca5 ChangeLog 20215 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250 @@ -66,3 +71,6 @@ SHA256 65a0548f39630b87564a5192c8f9a8812ce4d69b204dd6eaada607e77ad112b2 files/di MD5 b5ccb88b2fa4e9a8ed6ef6f0a2d13698 files/digest-wpa_supplicant-0.5.6 262 RMD160 99cebda2ff98f9bd98e44e6e521461a0bb6100f0 files/digest-wpa_supplicant-0.5.6 262 SHA256 beb9ceed89120a41c72fa2e31f5ed2112788104c20bd2b912ff342a95a85e738 files/digest-wpa_supplicant-0.5.6 262 +MD5 0055b09a5fd466d3a2e0eaec0840aeb8 files/digest-wpa_supplicant-0.5.7 262 +RMD160 489b9acb7b415af48073065511b74dcefe0032a0 files/digest-wpa_supplicant-0.5.7 262 +SHA256 15436ca18db0528215a8625bd421e9436f061c4250606497d1878252efa281ca files/digest-wpa_supplicant-0.5.7 262 diff --git a/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.7 b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.7 new file mode 100644 index 000000000000..f364daa44921 --- /dev/null +++ b/net-wireless/wpa_supplicant/files/digest-wpa_supplicant-0.5.7 @@ -0,0 +1,3 @@ +MD5 bd2436392ad3c6d2513da701a12f2d27 wpa_supplicant-0.5.7.tar.gz 713251 +RMD160 dffc3b5cbead92757840f71ccdd4548348698b28 wpa_supplicant-0.5.7.tar.gz 713251 +SHA256 cf688be96ba5f3227876b3412150e84a3cee60ddd0207b6d940d1fbbaf136b57 wpa_supplicant-0.5.7.tar.gz 713251 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild new file mode 100644 index 000000000000..d3ddf55a58b8 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.7.ebuild,v 1.1 2007/01/15 14:34:19 uberlord Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" +LICENSE="|| ( GPL-2 BSD )" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD" + +RDEPEND="dbus? ( sys-apps/dbus ) + kernel_linux? ( + gsm? ( sys-apps/pcsc-lite ) + madwifi? ( + || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) + ) + ) + !kernel_linux? ( net-libs/libpcap ) + qt4? ( =x11-libs/qt-4* ) + !qt4? ( qt3? ( =x11-libs/qt-3* ) ) + readline? ( sys-libs/ncurses sys-libs/readline ) + ssl? ( dev-libs/openssl )" + +pkg_setup() { + if use kernel_linux ; then + ewarn + ewarn "${PN} requires kernel support for Packet Socket (CONFIG_PACKET)." + ewarn + fi + + if use qt3 && use qt4; then + einfo "You have USE=\"qt3 qt4\" selected, defaulting to USE=\"qt4\"" + 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 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD + sed -i \ + -e "s:\(#include \):#include \n\1:" \ + l2_packet_freebsd.c || die + + # toolchain setup + echo "CC = $(tc-getCC)" > .config + + # basic setup + echo "CONFIG_CTRL_IFACE=y" >> .config + echo "CONFIG_BACKEND=file" >> .config + + # basic authentication methods + # NOTE: we don't set GPSK or SAKE as they conflict + # with the below options + echo "CONFIG_EAP_GTC=y" >> .config + echo "CONFIG_EAP_MD5=y" >> .config + echo "CONFIG_EAP_OTP=y" >> .config + echo "CONFIG_EAP_PAX=y" >> .config + echo "CONFIG_EAP_PSK=y" >> .config + echo "CONFIG_EAP_TLV=y" >> .config + echo "CONFIG_IEEE8021X_EAPOL=y" >> .config + echo "CONFIG_PKCS12=y" >> .config + echo "CONFIG_PEERKEY=y" >> .config + + if use dbus ; then + echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config + fi + + if use gsm ; then + # smart card authentication + echo "CONFIG_EAP_SIM=y" >> .config + echo "CONFIG_EAP_AKA=y" >> .config + echo "CONFIG_PCSC=y" >> .config + fi + + if use readline ; then + # readline/history support for wpa_cli + echo "CONFIG_READLINE=y" >> .config + fi + + if use ssl ; then + # SSL authentication methods + echo "CONFIG_EAP_LEAP=y" >> .config + echo "CONFIG_EAP_MSCHAPV2=y" >> .config + echo "CONFIG_EAP_PEAP=y" >> .config + echo "CONFIG_EAP_TLS=y" >> .config + echo "CONFIG_EAP_TTLS=y" >> .config + echo "CONFIG_SMARTCARD=y" >> .config + fi + + if use kernel_linux ; then + # Linux specific drivers + echo "CONFIG_DRIVER_ATMEL=y" >> .config + #echo "CONFIG_DRIVER_BROADCOM=y" >> .config + #echo "CONFIG_DRIVER_HERMES=y" >> .config + 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_WEXT=y" >> .config + echo "CONFIG_DRIVER_WIRED=y" >> .config + + if use madwifi ; then + # Add include path for madwifi-driver headers + echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> .config + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + fi + fi + + if 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 + + # 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 +} + +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" + elif use qt3 ; then + [[ -d ${QTDIR}/etc/settings ]] && addwrite "${QTDIR}"/etc/settings + /usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro + cd "${S}"/wpa_gui + emake || die "emake wpa_gui failed" + fi +} + +src_install() { + into / + dosbin wpa_supplicant + dobin wpa_cli wpa_passphrase + + 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 COPYING eap_testing.txt README todo.txt + newdoc wpa_supplicant.conf wpa_supplicant.conf + + doman doc/docbook/*.8 + doman doc/docbook/*.5 + + if use qt4 ; then + into /usr + dobin wpa_gui-qt4/wpa_gui + elif use qt3 ; then + into /usr + dobin wpa_gui/wpa_gui + fi + + if use qt3 || use qt4; then + make_desktop_entry wpa_gui "WPA_Supplicant Administration GUI" + fi + + if use dbus ; then + insinto /etc/dbus-1/system.d + newins dbus-wpa_supplicant.conf wpa_supplicant.conf + fi +} + +pkg_postinst() { + 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" + + if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then + echo + ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf" + ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf" + fi + + if use madwifi; then + echo + einfo "This package now compiles against the headers installed by" + einfo "the madwifi driver. You should reemerge ${PN} after" + einfo "upgrading your madwifi driver." + fi +}