From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/
Date: Thu, 26 Oct 2017 20:54:33 +0000 (UTC) [thread overview]
Message-ID: <1509051263.8ccb0e61f002487f4ca2c095ecd81bfaf7c67314.zerochaos@gentoo> (raw)
commit: 8ccb0e61f002487f4ca2c095ecd81bfaf7c67314
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 20:54:23 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 20:54:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ccb0e61
net-wireless/wpa_supplicant: remove vulnerable for bug #634436
Package-Manager: Portage-2.3.12, Repoman-2.3.4
.../wpa_supplicant/wpa_supplicant-2.6.ebuild | 399 ---------------------
1 file changed, 399 deletions(-)
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 e9c1c8a53ef..00000000000
--- 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
-}
next reply other threads:[~2017-10-26 20:54 UTC|newest]
Thread overview: 147+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 20:54 Richard Farina [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-01 11:51 [gentoo-commits] repo/gentoo:master commit in: net-wireless/wpa_supplicant/ Sam James
2024-10-04 17:37 Andreas Sturmlechner
2024-09-28 13:56 Arthur Zamarin
2024-09-28 10:51 Arthur Zamarin
2024-09-26 10:36 Jakov Smolić
2024-09-26 10:36 Jakov Smolić
2024-09-26 10:36 Jakov Smolić
2024-09-26 8:26 Arthur Zamarin
2024-08-08 16:04 Mike Gilbert
2024-05-08 1:26 Mike Gilbert
2024-03-09 21:24 Sam James
2024-03-09 21:24 Sam James
2024-01-21 9:42 David Seifert
2023-09-22 17:31 Sam James
2023-09-19 9:47 Sam James
2023-09-19 9:37 Sam James
2023-09-19 9:37 Sam James
2023-09-19 9:30 Sam James
2023-08-19 17:55 Rick Farina
2023-08-19 17:29 Rick Farina
2022-09-02 17:41 Rick Farina
2022-08-26 16:32 Rick Farina
2022-08-25 21:34 Rick Farina
2022-05-05 23:48 WANG Xuerui
2022-05-05 23:48 WANG Xuerui
2022-03-17 2:15 Rick Farina
2022-03-17 2:15 Rick Farina
2022-03-17 2:15 Rick Farina
2022-03-12 15:48 Arthur Zamarin
2022-03-12 10:37 Arthur Zamarin
2022-03-06 8:54 Agostino Sarubbo
2022-03-06 8:51 Agostino Sarubbo
2022-03-06 8:50 Agostino Sarubbo
2022-03-06 8:05 Sam James
2022-03-02 3:26 Sam James
2022-01-17 2:20 Sam James
2022-01-04 10:30 David Seifert
2022-01-04 3:29 Sam James
2021-12-16 0:09 Sam James
2021-12-03 4:39 Sam James
2021-12-03 4:26 Sam James
2021-11-21 13:38 Sam James
2021-11-21 12:32 Sam James
2021-11-21 12:31 Sam James
2021-07-24 23:02 Marek Szuba
2021-06-23 14:23 Sam James
2021-06-22 19:45 Sam James
2021-06-21 6:19 Agostino Sarubbo
2021-06-21 6:18 Agostino Sarubbo
2021-06-19 23:51 Sam James
2021-06-17 22:18 Thomas Deutschmann
2021-06-17 20:32 Thomas Deutschmann
2021-06-17 20:23 Sam James
2021-06-08 5:41 Sam James
2021-04-02 19:29 Rick Farina
2020-02-18 14:49 Rick Farina
2020-02-18 1:42 Rick Farina
2020-02-14 21:08 Rick Farina
2020-02-14 21:08 Rick Farina
2020-02-13 18:55 Rick Farina
2020-01-10 20:44 Rick Farina
2019-11-25 20:08 Rick Farina
2019-11-25 18:03 Aaron Bauman
2019-11-25 16:24 Rick Farina
2019-11-22 9:39 Mikle Kolyada
2019-11-12 18:07 Agostino Sarubbo
2019-11-12 10:38 Agostino Sarubbo
2019-11-04 16:35 Rick Farina
2019-09-01 18:05 Mikle Kolyada
2019-08-18 21:51 Agostino Sarubbo
2019-08-17 20:41 Sergei Trofimovich
2019-08-17 20:33 Sergei Trofimovich
2019-08-16 22:38 Thomas Deutschmann
2019-08-16 18:47 Aaron Bauman
2019-08-16 15:56 Rick Farina
2019-06-11 1:18 Rick Farina
2019-06-11 1:18 Rick Farina
2019-06-07 19:54 Rick Farina
2019-06-07 19:54 Rick Farina
2019-06-07 19:48 Rick Farina
2019-05-23 6:39 Aaron Bauman
2019-05-19 0:59 Rick Farina
2019-04-24 3:15 Rick Farina
2019-04-24 2:39 Rick Farina
2019-03-25 19:26 Rick Farina
2019-03-22 19:55 Rick Farina
2019-03-22 19:55 Rick Farina
2019-03-22 19:39 Rick Farina
2019-03-22 19:39 Rick Farina
2019-03-21 23:06 Rick Farina
2018-12-08 12:11 Mikle Kolyada
2018-12-07 23:27 Matt Turner
2018-12-07 23:27 Matt Turner
2018-12-07 12:31 Mikle Kolyada
2018-12-07 2:41 Thomas Deutschmann
2018-12-05 22:08 Rick Farina
2018-12-05 20:47 Rick Farina
2018-12-04 1:40 Rick Farina
2018-08-05 16:04 Richard Farina
2018-06-09 19:22 Sergei Trofimovich
2018-05-20 14:42 Sergei Trofimovich
2018-05-18 20:07 Richard Farina
2018-05-17 2:50 Richard Farina
2018-04-23 21:46 Mikle Kolyada
2018-04-23 16:31 Richard Farina
2018-04-22 1:35 Thomas Deutschmann
2018-04-19 19:29 Aaron Bauman
2018-04-16 20:37 Richard Farina
2018-04-16 20:37 Richard Farina
2018-03-13 11:59 Pacho Ramos
2018-01-06 19:51 Lars Wendler
2017-12-17 1:45 Craig Andrews
2017-12-08 17:11 Richard Farina
2017-12-08 17:11 Richard Farina
2017-12-03 10:39 Pacho Ramos
2017-10-28 21:06 Andreas Sturmlechner
2017-10-24 17:38 Markus Meier
2017-10-21 10:46 Sergei Trofimovich
2017-10-16 14:46 Richard Farina
2017-10-16 14:07 Richard Farina
2017-09-03 1:46 Mike Gilbert
2017-08-01 15:47 Richard Farina
2017-06-20 5:17 Agostino Sarubbo
2017-06-19 17:03 Agostino Sarubbo
2017-04-10 16:00 Patrice Clement
2017-02-02 7:32 Aaron Bauman
2016-12-04 0:54 Patrice Clement
2016-12-04 0:54 Patrice Clement
2016-10-18 19:48 Markus Meier
2016-10-07 9:01 Agostino Sarubbo
2016-10-07 8:59 Agostino Sarubbo
2016-10-06 5:20 Jeroen Roovers
2016-09-19 13:17 Lars Wendler
2016-08-14 19:29 Markus Meier
2016-03-17 10:50 Agostino Sarubbo
2016-03-16 11:51 Agostino Sarubbo
2016-03-15 21:13 Bjarke Istrup Pedersen
2016-03-15 16:39 Agostino Sarubbo
2016-03-15 11:08 Agostino Sarubbo
2016-02-14 10:11 Agostino Sarubbo
2016-02-13 15:33 Agostino Sarubbo
2016-02-10 20:47 Markus Meier
2015-12-22 15:30 Richard Farina
2015-12-22 15:15 Richard Farina
2015-11-14 13:30 Bjarke Istrup Pedersen
2015-10-07 20:10 Jason Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1509051263.8ccb0e61f002487f4ca2c095ecd81bfaf7c67314.zerochaos@gentoo \
--to=zerochaos@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox