diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /net-wireless/wpa_supplicant | |
parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) |
gentoo resync : 29.10.2017
Diffstat (limited to 'net-wireless/wpa_supplicant')
-rw-r--r-- | net-wireless/wpa_supplicant/Manifest | 3 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild | 4 | ||||
-rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild | 399 |
3 files changed, 3 insertions, 403 deletions
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index dbf6e3965d2f..7c4fa431c3cc 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -23,8 +23,7 @@ AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038 AUX wpa_supplicant-init.d 1250 SHA256 98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7 SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403 WHIRLPOOL 01a81c7527561845148102863a6c80c1a0decab56320611a7dc96d7fd0772a75767a5bfcff5fd93a40842e52b517fd417ac21e8233f68e173add847608321a6b AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548 DIST wpa_supplicant-2.6.tar.gz 2753524 SHA256 b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 SHA512 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 WHIRLPOOL 63f91b9f72fee65df5412e90f5a4b38f327f47b44724164aa27a6933a68c68672a129d7c01e658c7fed1f7018fe9e4b743f3c6cef2f69fd75c3f5b9a1cb67c1b -EBUILD wpa_supplicant-2.6-r3.ebuild 11021 SHA256 7d8a05495ac8254c52af1a7db3f28e3d17d37570aec1ad94dbd9d4868fe878d5 SHA512 e2f99b2b7df5b0203f77e472109739afa5acc0a065d769a7c9874f9f13dada6514292e9613c5220d97d2e849d6ba434fddce5a62db661481052a9227b75606d9 WHIRLPOOL 0141e1cab568c0375e0e970416a497c1126acb5940f1a3096a40b30db93a5194e4ee8598a81701478840e2e5c81dddfbfbb3782c255e0b87e76da2e8b408b736 -EBUILD wpa_supplicant-2.6.ebuild 10387 SHA256 88bcb24afd034a61d838a5ea30a4cdedaf40a46140aaf7c1bad5699c4492ec1f SHA512 f5b2bea3e358363ec89d56efacfcbdf7de6adefc1c8869e80407db300bfa9630db11b0c549cdff0ecd0ca67cc655955f2ca1d468991ddddaaa082274c37cf638 WHIRLPOOL 32a4058cf743743e9545f10bbaad05ca474cd33bb977b470e4d651136f086d1d1a0a998191c743fd5e29fcfeb1b9f4626ee02dd613233489a9642ce7e9bdd1cb +EBUILD wpa_supplicant-2.6-r3.ebuild 11009 SHA256 4153d626390b54c8aa80118a251ff9574a3b14e0bcafeac360e6fc42005214db SHA512 4c4e0bb9ab8b226e16640daf7751362db531c247f379257b12a0ea341ac1122964dd6e99ee22351f8ca5425c98541e113dab96843aa98c63d0f9b88252afd753 WHIRLPOOL 4a2a6ca59f24b335cd930f156bb7ee6801295c31fc483b29dfba3a47efba06cb82f2019efd07055265d3fb51f1ff9b5a1b73c87ed2941c3287fedd972a343f66 MISC ChangeLog 11682 SHA256 efbca267d21a112d16d2c31ec937decb8835cb2daf8d49888a65512c5d290561 SHA512 5468ebc87b83245f4f950bf3bf08a027a746e5872b932a65690b5996997028dcfc627e0048f7dafaf427ed944b9afde51adbe194dc5a1ee468e7a6ae1e4f3630 WHIRLPOOL 2da07e6d6d160319f0ecacd2aee323792ae9d05257377521a955f624f1c988cb7ae2fc90659dba6ae8244edd006ba85af7356ee16202ed6b31b556785beb8f41 MISC ChangeLog-2015 51458 SHA256 b9aa43f72daf3df019ae96e8f49a0825f910d19149712e6e6a30a4fc56dd7476 SHA512 84963b76764be27e85bbf40a74c714702fea51406d6de813624e95408018c66ecf36ef50298fe150278a9ca930c5d21946766d3c0aa624627dd29340abc95eae WHIRLPOOL 10bbade886984c1668850770ddb14a92cd990236f150eb7aa9bfdf421035fb7a864a9551f5ba8a5785da2f53d7bd463488905f3ec3479b498ff6b50b298cd887 MISC metadata.xml 1298 SHA256 fb99224e36989c66fe85f2e8222521a0a88e1cac6f6a963b6170261e5b720a19 SHA512 166af06f1caf533381cdde208f98863d2e38a7de1ab89a0ec3b7e9e1ffa3e173540564fafd2e032df79197f596e7ad227f8eb6c2c748b2fc1368999f09588044 WHIRLPOOL d6a9ec37350c417dece67ba992b5aaa914e3f9ed11c4b2d5e9cb88ad4db664db84f4e5572e619be1be3e5a96628ff4305a6f87e6f6b52816f96b91de32253eb8 diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild index 0c7ca6fbc325..756782604758 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r3.ebuild @@ -6,12 +6,12 @@ EAPI=6 inherit eutils qmake-utils systemd toolchain-funcs DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" -HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +HOMEPAGE="https://w1.fi/wpa_supplicant/" SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" LICENSE="|| ( GPL-2 BSD )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" REQUIRED_USE="fasteap? ( !ssl ) smartcard? ( ssl )" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild deleted file mode 100644 index e9c1c8a53ef5..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6.ebuild +++ /dev/null @@ -1,399 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs qt4-r2 qmake-utils 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 ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd" -IUSE="ap dbus gnutls eap-sim fasteap +hs2-0 libressl p2p ps3 qt4 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD" -REQUIRED_USE="fasteap? ( !gnutls !ssl ) smartcard? ( ssl ) ?? ( qt4 qt5 )" - -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 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - ) - readline? ( - sys-libs/ncurses:0= - sys-libs/readline:0= - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - ) - !ssl? ( - gnutls? ( - net-libs/gnutls - dev-libs/libgcrypt:* - ) - !gnutls? ( dev-libs/libtommath ) - ) -" -DEPEND="${CDEPEND} - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-networkmanager ) -" - -S="${WORKDIR}/${P}/${PN}" - -Kconfig_style_config() { - #param 1 is CONFIG_* item - #param 2 is what to set it = to, defaulting in y - CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1" - setting="${2:-y}" - - if [ ! $setting = n ]; then - #first remove any leading "# " if $2 is not n - sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM" - #set item = $setting (defaulting to y) - sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting" - else - #ensure item commented out - sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM" - fi -} - -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" - - # 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" - - # bug (596332) - epatch "${FILESDIR}/${P}-libressl.patch" -} - -src_configure() { - # Toolchain setup - tc-export CC - - cp defconfig .config - - # Basic setup - Kconfig_style_config CTRL_IFACE - Kconfig_style_config BACKEND file - Kconfig_style_config IBSS_RSN - Kconfig_style_config IEEE80211W - Kconfig_style_config IEEE80211R - - # Basic authentication methods - # NOTE: we don't set GPSK or SAKE as they conflict - # with the below options - Kconfig_style_config EAP_GTC - Kconfig_style_config EAP_MD5 - Kconfig_style_config EAP_OTP - Kconfig_style_config EAP_PAX - Kconfig_style_config EAP_PSK - Kconfig_style_config EAP_TLV - Kconfig_style_config EAP_EXE - Kconfig_style_config IEEE8021X_EAPOL - Kconfig_style_config PKCS12 - Kconfig_style_config PEERKEY - Kconfig_style_config EAP_LEAP - Kconfig_style_config EAP_MSCHAPV2 - Kconfig_style_config EAP_PEAP - Kconfig_style_config EAP_TLS - Kconfig_style_config EAP_TTLS - - # Enabling background scanning. - Kconfig_style_config BGSCAN_SIMPLE - Kconfig_style_config BGSCAN_LEARN - - # Enabling mesh networks. - Kconfig_style_config MESH - - if use dbus ; then - Kconfig_style_config CTRL_IFACE_DBUS - Kconfig_style_config CTRL_IFACE_DBUS_NEW - Kconfig_style_config CTRL_IFACE_DBUS_INTRO - fi - - # Enable support for writing debug info to a log file and syslog. - Kconfig_style_config DEBUG_FILE - Kconfig_style_config DEBUG_SYSLOG - - if use hs2-0 ; then - Kconfig_style_config INTERWORKING - Kconfig_style_config HS20 - fi - - if use uncommon-eap-types; then - Kconfig_style_config EAP_GPSK - Kconfig_style_config EAP_SAKE - Kconfig_style_config EAP_GPSK_SHA256 - Kconfig_style_config EAP_IKEV2 - Kconfig_style_config EAP_EKE - fi - - if use eap-sim ; then - # Smart card authentication - Kconfig_style_config EAP_SIM - Kconfig_style_config EAP_AKA - Kconfig_style_config EAP_AKA_PRIME - Kconfig_style_config PCSC - fi - - if use fasteap ; then - Kconfig_style_config EAP_FAST - fi - - if use readline ; then - # readline/history support for wpa_cli - Kconfig_style_config READLINE - else - #internal line edit mode for wpa_cli - Kconfig_style_config WPA_CLI_EDIT - fi - - # SSL authentication methods - if use ssl ; then - Kconfig_style_config TLS openssl - elif use gnutls ; then - Kconfig_style_config TLS gnutls - Kconfig_style_config GNUTLS_EXTRA - else - Kconfig_style_config TLS internal - fi - - if use smartcard ; then - Kconfig_style_config SMARTCARD - fi - - if use tdls ; then - Kconfig_style_config TDLS - fi - - if use kernel_linux ; then - # Linux specific drivers - Kconfig_style_config DRIVER_ATMEL - Kconfig_style_config DRIVER_HOSTAP - Kconfig_style_config DRIVER_IPW - Kconfig_style_config DRIVER_NL80211 - Kconfig_style_config DRIVER_RALINK - Kconfig_style_config DRIVER_WEXT - Kconfig_style_config DRIVER_WIRED - - if use ps3 ; then - Kconfig_style_config DRIVER_PS3 - fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - Kconfig_style_config DRIVER_BSD - fi - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - Kconfig_style_config WPS - Kconfig_style_config WPS2 - # USB Flash Drive - Kconfig_style_config WPS_UFD - # External Registrar - Kconfig_style_config WPS_ER - # Universal Plug'n'Play - Kconfig_style_config WPS_UPNP - # Near Field Communication - Kconfig_style_config WPS_NFC - fi - - # Wi-Fi Direct (WiDi) - if use p2p ; then - Kconfig_style_config P2P - Kconfig_style_config WIFI_DISPLAY - fi - - # Access Point Mode - if use ap ; then - Kconfig_style_config AP - fi - - # Enable mitigation against certain attacks against TKIP - Kconfig_style_config DELAYED_MIC_ERROR_REPORT - - # 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 - Kconfig_style_config LIBNL32 - fi - - if use qt4 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null - eqmake4 wpa_gui.pro - popd > /dev/null - fi - if use qt5 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null - eqmake5 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 || use qt5; 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 - - newdoc .config build-config - - doman doc/docbook/*.{5,8} - - if use qt4 || use qt5 ; 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 - - # This unit relies on dbus support, bug 538600. - systemd_dounit systemd/wpa_supplicant.service - fi - - systemd_dounit "systemd/wpa_supplicant@.service" - systemd_dounit "systemd/wpa_supplicant-nl80211@.service" - systemd_dounit "systemd/wpa_supplicant-wired@.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 - - systemd_reenable wpa_supplicant.service -} |