diff options
author | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2015-03-21 13:32:11 +0000 |
---|---|---|
committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2015-03-21 13:32:11 +0000 |
commit | 440ff0e599c26e24db57bb0438d2126eab989526 (patch) | |
tree | 158e93d78085c578f3c9cc3dd1a237fb88bac6a4 /net-wireless/wpa_supplicant | |
parent | Use ecvs_clean; fix linking with as-needed, #533688 (diff) | |
download | gentoo-2-440ff0e599c26e24db57bb0438d2126eab989526.tar.gz gentoo-2-440ff0e599c26e24db57bb0438d2126eab989526.tar.bz2 gentoo-2-440ff0e599c26e24db57bb0438d2126eab989526.zip |
Bumping to 2.4 and removing old version
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 15AE484C)
Diffstat (limited to 'net-wireless/wpa_supplicant')
-rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 16 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-dbus-path-fix.patch (renamed from net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-dbus-path-fix.patch) | 0 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch (renamed from net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch) | 0 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch (renamed from net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch) | 0 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch (renamed from net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-generate-libeap-peer.patch) | 0 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild | 325 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild (renamed from net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild) | 2 |
7 files changed, 16 insertions, 327 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index e8d1e56f61ef..0e2768350068 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.228 2015/03/03 09:45:18 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.229 2015/03/21 13:32:11 gurligebis Exp $ + +*wpa_supplicant-2.4 (21 Mar 2015) + + 21 Mar 2015; <gurligebis@gentoo.org> -wpa_supplicant-2.3.ebuild, + -wpa_supplicant-2.3-r2.ebuild, +wpa_supplicant-2.4.ebuild, + -files/wpa_supplicant-2.3-dbus-path-fix.patch, + -files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch, + -files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch, + -files/wpa_supplicant-2.3-generate-libeap-peer.patch, + +files/wpa_supplicant-2.4-dbus-path-fix.patch, + +files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch, + +files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch, + +files/wpa_supplicant-2.4-generate-libeap-peer.patch: + Bumping to 2.4 and removing old version 03 Mar 2015; Yixun Lan <dlan@gentoo.org> wpa_supplicant-2.3-r2.ebuild: add arm64 support, tested on A53 board diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-dbus-path-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-dbus-path-fix.patch index 976d71b0ec39..976d71b0ec39 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-dbus-path-fix.patch +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-dbus-path-fix.patch diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch index bbff73e13d42..bbff73e13d42 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-do-not-call-dbus-functions-with-NULL-path.patch +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch index def43a2ae314..def43a2ae314 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-fix-undefined-reference-to-random_get_bytes.patch +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch index 391338b302cd..391338b302cd 100644 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.3-generate-libeap-peer.patch +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild deleted file mode 100644 index 2fa2b86d4d59..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild +++ /dev/null @@ -1,325 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.3.ebuild,v 1.3 2014/11/02 09:40:03 swift Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs qt4-r2 systemd multilib - -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="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="ap dbus gnutls eap-sim fasteap p2p ps3 qt4 readline selinux smartcard ssl wimax wps kernel_linux kernel_FreeBSD" -REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl )" - -CDEPEND="dbus? ( sys-apps/dbus ) - kernel_linux? ( - eap-sim? ( sys-apps/pcsc-lite ) - dev-libs/libnl:3 - net-wireless/crda - ) - !kernel_linux? ( net-libs/libpcap ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - ) - readline? ( - sys-libs/ncurses - sys-libs/readline - ) - ssl? ( dev-libs/openssl ) - !ssl? ( gnutls? ( net-libs/gnutls ) ) - !ssl? ( !gnutls? ( dev-libs/libtommath ) ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-networkmanager ) -" - -S="${WORKDIR}/${P}/${PN}" - -pkg_setup() { - if use gnutls && use ssl ; then - elog "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" - fi -} - -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 - - if use dbus; then - epatch "${FILESDIR}/${P}-dbus-path-fix.patch" - fi - - # systemd entries to D-Bus service files (bug #372877) - echo 'SystemdService=wpa_supplicant.service' \ - | tee -a dbus/*.service >/dev/null || die - - cd "${WORKDIR}/${P}" - - if use wimax; then - # generate-libeap-peer.patch comes before - # fix-undefined-reference-to-random_get_bytes.patch - epatch "${FILESDIR}/${P}-generate-libeap-peer.patch" - epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.patch" - - # multilib-strict fix (bug #373685) - sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile - fi - - # bug (320097) - epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" - - # TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX, - # SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED. - # bug (374089) - #epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch" -} - -src_configure() { - # Toolchain setup - tc-export CC - - # Basic setup - echo "CONFIG_CTRL_IFACE=y" >> .config - echo "CONFIG_BACKEND=file" >> .config - echo "CONFIG_IBSS_RSN=y" >> .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_EAP_EXE=y" >> .config - echo "CONFIG_IEEE8021X_EAPOL=y" >> .config - echo "CONFIG_PKCS12=y" >> .config - echo "CONFIG_PEERKEY=y" >> .config - 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 - - # Enabling background scanning. - echo "CONFIG_BGSCAN_SIMPLE=y" >> .config - echo "CONFIG_BGSCAN_LEARN=y" >> .config - - if use dbus ; then - echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config - echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config - echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config - fi - - # Enable support for writing debug info to a log file. - echo "CONFIG_DEBUG_FILE=y" >> .config - - if use eap-sim ; then - # Smart card authentication - 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 fasteap ; then - echo "CONFIG_EAP_FAST=y" >> .config - fi - - if use readline ; then - # readline/history support for wpa_cli - echo "CONFIG_READLINE=y" >> .config - fi - - # SSL authentication methods - if use ssl ; then - echo "CONFIG_TLS=openssl" >> .config - elif use gnutls ; then - echo "CONFIG_TLS=gnutls" >> .config - echo "CONFIG_GNUTLS_EXTRA=y" >> .config - else - echo "CONFIG_TLS=internal" >> .config - fi - - if use smartcard ; then - echo "CONFIG_SMARTCARD=y" >> .config - fi - - if use kernel_linux ; then - # Linux specific drivers - echo "CONFIG_DRIVER_ATMEL=y" >> .config - echo "CONFIG_DRIVER_HOSTAP=y" >> .config - echo "CONFIG_DRIVER_IPW=y" >> .config - echo "CONFIG_DRIVER_NL80211=y" >> .config - echo "CONFIG_DRIVER_RALINK=y" >> .config - echo "CONFIG_DRIVER_WEXT=y" >> .config - echo "CONFIG_DRIVER_WIRED=y" >> .config - - 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 - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - echo "CONFIG_WPS=y" >> .config - echo "CONFIG_WPS2=y" >> .config - # USB Flash Drive - echo "CONFIG_WPS_UFD=y" >> .config - # External Registrar - echo "CONFIG_WPS_ER=y" >> .config - # Universal Plug'n'Play - echo "CONFIG_WPS_UPNP=y" >> .config - # Near Field Communication - echo "CONFIG_WPS_NFC=y" >> .config - fi - - # Wi-Fi Direct (WiDi) - if use p2p ; then - echo "CONFIG_P2P=y" >> .config - fi - - # Access Point Mode - if use ap ; then - echo "CONFIG_AP=y" >> .config - fi - - # Enable mitigation against certain attacks against TKIP - echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config - - # If we are using libnl 2.0 and above, enable support for it - # Bug 382159 - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - if has_version ">=dev-libs/libnl-3.2"; then - echo "CONFIG_LIBNL32=y" >> .config - fi - - if use qt4 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null - eqmake4 wpa_gui.pro - popd > /dev/null - fi -} - -src_compile() { - einfo "Building wpa_supplicant" - emake V=1 BINDIR=/usr/sbin - - if use wimax; then - emake -C ../src/eap_peer clean - emake -C ../src/eap_peer - fi - - if use qt4 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null - einfo "Building wpa_gui" - emake - popd > /dev/null - fi -} - -src_install() { - dosbin wpa_supplicant - dobin wpa_cli wpa_passphrase - - # baselayout-1 compat - if has_version "<sys-apps/baselayout-2.0.0"; then - dodir /sbin - dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant - dodir /bin - dosym /usr/bin/wpa_cli /bin/wpa_cli - fi - - if has_version ">=sys-apps/openrc-0.5.0"; then - newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant - newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant - fi - - exeinto /etc/wpa_supplicant/ - newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh - - dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ - wpa_supplicant.conf - - doman doc/docbook/*.{5,8} - - if use qt4 ; then - into /usr - dobin wpa_gui-qt4/wpa_gui - doicon wpa_gui-qt4/icons/wpa_gui.svg - make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" - fi - - use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install - - if use dbus ; then - pushd "${S}"/dbus > /dev/null - insinto /etc/dbus-1/system.d - newins dbus-wpa_supplicant.conf wpa_supplicant.conf - insinto /usr/share/dbus-1/system-services - doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service - popd > /dev/null - fi - - # systemd stuff - systemd_dounit systemd/*.service -} - -pkg_postinst() { - elog "If this is a clean installation of wpa_supplicant, you" - elog "have to create a configuration file named" - elog "/etc/wpa_supplicant/wpa_supplicant.conf" - elog - elog "An example configuration file is available for reference in" - elog "/usr/share/doc/${PF}/" - - 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 - - # Mea culpa, feel free to remove that after some time --mgorny. - local fn - for fn in wpa_supplicant{,@wlan0}.service; do - if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]] - then - ebegin "Moving ${fn} to multi-user.target" - mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \ - "${ROOT}"/etc/systemd/system/multi-user.target.wants/ - eend ${?} \ - "Please try to re-enable ${fn}" - fi - done -} diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild index a65aab8a67c0..b78a32f0798d 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild,v 1.6 2015/03/03 09:45:18 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-2.4.ebuild,v 1.1 2015/03/21 13:32:11 gurligebis Exp $ EAPI=5 |