From 01a84689c26ad3a213f089c410c436bc45914dd8 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 4 Feb 2015 20:56:57 +0000 Subject: [PATCH] Exclude wpa_supplicant.service when USE=-dbus, bug 538600. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- net-wireless/wpa_supplicant/ChangeLog | 9 +- net-wireless/wpa_supplicant/Manifest | 21 +- .../wpa_supplicant-2.3-r2.ebuild | 373 ++++++++++++++++++ 3 files changed, 386 insertions(+), 17 deletions(-) create mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index fb02e47c735b..eb1f1db536e0 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/wpa_supplicant -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.221 2014/11/02 09:40:03 swift Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.222 2015/02/04 20:56:56 floppym Exp $ + +*wpa_supplicant-2.3-r2 (04 Feb 2015) + + 04 Feb 2015; Mike Gilbert +wpa_supplicant-2.3-r2.ebuild: + Exclude wpa_supplicant.service when USE=-dbus, bug 538600. 02 Nov 2014; Sven Vermeulen wpa_supplicant-2.2-r1.ebuild, wpa_supplicant-2.3-r1.ebuild, wpa_supplicant-2.3.ebuild: diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 7b94b5ec1ff0..b0a3ebe88e79 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -25,23 +25,14 @@ DIST wpa_supplicant-2.3.tar.gz 2398722 SHA256 eaaa5bf3055270e521b2dff64f2d203ec8 EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90 EBUILD wpa_supplicant-2.2-r1.ebuild 9108 SHA256 28470d9f74923db209101dff9fea5923791c851262405a91fe6fff98dcd7a9ab SHA512 632ab08649648bc886e3a0cf78125abac02513f55afc2faa7a9a6b267bf8dfc08cedb15475c52041f4cd37a64ae3e406b8a0e2e6192c47812c49e3eda54c9ba6 WHIRLPOOL fdba2e96ef5c9e2c628db6200d139230df881dc7c659cb46b039cfdc1769afdd472a66bb7f7f6bc91182f2d3897d3f19dc81a37b2b6b11e476847672326bb032 EBUILD wpa_supplicant-2.3-r1.ebuild 9844 SHA256 3f59bd4f1999211954edc5d2f2ed803cc98ae502ed7f59b9c77a93f40635b84e SHA512 abb676a4acb5b7a03a25641a607a6c7b326c9992b056dc4b8d8585365f81b11f35fd0eefec87553160b806fc3067ad67157da8f993ec58206589d2ae987d906b WHIRLPOOL bf8312815462e9d2e91c70a7b028c64198593d3573f3e7b3a380fb0dd92b0e7dbce83e14d705be1d5ee5b1fc4fd253f3bf67d0384e782ca92fa504b0cec681d9 +EBUILD wpa_supplicant-2.3-r2.ebuild 10058 SHA256 1441f55fb7a69ef711982780fa8853659f819fa700c5e535f65484d61d45eedd SHA512 a96c3fcd1e5ef1fb189fde27179dcd0fa05fe443fcf53e36974bf9e8277bcef889bf4ae61c677fd651ba736b5f0f5c8f5e85f5f419a4defda9f36e64197373a8 WHIRLPOOL 8b1763f21904ef57fe71e13087317006b1258bfae628264b61c063563bd49db655994557b74b76d6b8df4cc41afb1863b4d1b3eba56c8b81222cad2f1604b7c6 EBUILD wpa_supplicant-2.3.ebuild 9022 SHA256 3b1b05c944840be6b10520f2f34989fb3af48f1e4ce982a4a405199b4bf25c60 SHA512 764809717e60b78ee7964c0b7b597da23fa23447305e69d7e2e7be41263b10d249bfe215a28f007986c11f7feec56dc49e98a6a5fb6fbd344e800ed2a02d4d08 WHIRLPOOL 1913152d6dd112152f2159b887ebbecc4e4980e96919fc04a491832e7191cf1c6f40e17ff172284be4d979ddff60f41090482cad8a7979e1d15f47834aa2a17c -MISC ChangeLog 45839 SHA256 0981ad71cb61096cf501968f91c358d03546671971d32d0a0cd27aa11a7aeba7 SHA512 51857a0724b7abd45330e1a8f4bd09accb8cd3aa7b282b97ca2c59d3f762e66986962bdbd0db71c090682f8f28fae2e841dd44cd732d9467867c34cf2413e79c WHIRLPOOL 590b78fc7cba6e4ade88c80e5eb895f0243d4dbf50292277d41392250e6430a08063460370e716698d786e1f779f99d95ef1f51f8310c89e97a599509997691e +MISC ChangeLog 46021 SHA256 6a36fa975c48bfc2d5b600b5ff800b790ef26d941b71e049d6641d5490b40f8a SHA512 df2bd6ead77f2411143a36b326f012e62a70325cd22ea5656f628fe5991b3d4457fe4a1bf63c4e968015bd74d7ae1746b4af24df8d70b65246c3172fb879dc6d WHIRLPOOL 4a2cf363f14b3a35fba27d6286acbe499f7f650d1d6e7a5e6fff2f8ce1bca2f5620ba161faf5e343de403c7e7886e4a13d4bc02ea176f2c72ed9aeb9910143c0 MISC metadata.xml 1253 SHA256 a4e9c1eca186fd6158512a3cb8cb42f519c48d3b2c43f5af5c56afd51a356c10 SHA512 f534ef753089dbcc2b634ead459d6f47d6e1a1682591c01a3b99d5fdaaa0602bac48e80b41afdf04517d8ac43ec0ff93cc082eed0f209d937cc2199884365be1 WHIRLPOOL fd163dc937c19face2e496e22efbd1ad0b97b963eb14b2998e32c7e06c374c799bf8dc6a3f5f75d6d15d31b4d65a1cb4a4242ed7f47c92cc6c462532ac68dd7a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQIcBAEBCAAGBQJUVfv0AAoJEC7dUkA7aK9HXswP/3V0AsDYsEnxRjFSt60dWd2n -aBNQ+rdSsCQvbG+owLjAe+PrQH1wj7YLZ1xP9557bC3NiC8Frzbdj7bzuMQEtm7f -9cYKikjYc1VX0to+DrTeY01PwW98DS5QabkeGVG+Pra6iLTt2E7/1SGjU+dF6cf8 -XFSFZPfksBBjr6ZzTJ68a0u7Jah3rBATA/W5AqAwrTKM9pEDCzdblcJQ7AcIoH4H -EqCasN2H4svA5lYrFk6gMgYxRvTXjhAH5PIXOvzasllRNMoPvtIhHdG+4Fg3ayWs -SYNTiHIiLRzXkhq0X5nnvFiAMYnXzZOy+LhFcWEWH9pvRegw1cBzzqjVpjYTPDF1 -xPTOODjnEdMoffDxAU3uoPga58x1+HDtWu23UaA+LbtanTkPRI9LpBQUD7xXotPn -7vVxNPFbVf4DL5+rAd+JXViaVsv31lyM7STwH9oUgtE/s6Nvxe73O8um0Xjg8KSx -gGCDcGglm+9PNwYS8lpt0XYxzaHTFJW9eMibYU5oHdha5qSCxzFvDUsqnit985oX -NQMK+zHux2m1mBEhi75/0wPhn8UPeqkRiRXCbiXvAl+ICTVnp3t675IZSUkCgptI -MkXb6xUNlXM7uEpfBQu/nO9vjs0HNidRVHUlWZ4ifQhOV2dWaN33vwOgLQ3FiSs2 -XyhNfDoEPuNNLAaavZvS -=2geE +iF4EAREIAAYFAlTSh5kACgkQC77qH+pIQ6QTLAD8DXx/pnHVuDC2Cd9kMTl5V6Qh +OVxJ7inPQ1kEAX+aAosA/2ug1J8sD/ewTboY2twxV84nOmbKPMdEmrAQImXEh8qB +=XPuv -----END PGP SIGNATURE----- diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild new file mode 100644 index 000000000000..e0728848597c --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.3-r2.ebuild @@ -0,0 +1,373 @@ +# 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.1 2015/02/04 20:56:56 floppym Exp $ + +EAPI=5 + +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 +hs2.0 p2p ps3 qt4 readline selinux smartcard ssl tdls uncommon-eap-types 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}" + +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 \):#include \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 + + 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 + + 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. + Kconfig_style_config DEBUG_FILE + + 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 +} + +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/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 ; 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 +} -- 2.26.2