mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
net-wireless/wpa_supplicant: add upstream patch for CTRL-EVENT-SIGNAL-CHANGE log spam
Backport upstream commit c330b5820eefa8e703dbce7278c2a62d9c69166a to send CTRL-EVENT-SIGNAL-CHANGE message to control interfaces only, reducing excessive syslog spam seen on systems with mt79xx wifi. Bug: https://bugs.gentoo.org/971605 Signed-off-by: Svetlana Akaeva <erikazoku@caramail.com> Part-of: https://github.com/gentoo/gentoo/pull/46010 Closes: https://github.com/gentoo/gentoo/pull/46010 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Svetlana Akaeva
committed by
Sam James
Sam James
parent
63a24aca12
commit
c5afbcdb15
@@ -0,0 +1,50 @@
|
||||
Bug: https://bugs.gentoo.org/971605
|
||||
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2309148
|
||||
|
||||
From c330b5820eefa8e703dbce7278c2a62d9c69166a Mon Sep 17 00:00:00 2001
|
||||
From: Kan-Ru Chen <kanru@kanru.info>
|
||||
Date: Mon, 23 Dec 2024 08:42:33 +0900
|
||||
Subject: Send CTRL-EVENT-SIGNAL-CHANGE message to control interfaces only
|
||||
|
||||
The default logging level for the CTRL-EVENT-SIGNAL-CHANGE message
|
||||
may be repeated many times and fill the log file or journal.
|
||||
|
||||
For example https://bugzilla.redhat.com/show_bug.cgi?id=2309148 and
|
||||
the first few results from searching CTRL-EVENT-SIGNAL-CHANGE on the
|
||||
web contain various complaints and workarounds.
|
||||
|
||||
Change the logging method to wpa_msg_ctrl to avoid sending frequent
|
||||
messages to the syslog but still allow the message to be consumed by
|
||||
control interface monitors.
|
||||
|
||||
Signed-off-by: Kan-Ru Chen <kanru@kanru.info>
|
||||
---
|
||||
wpa_supplicant/events.c | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
|
||||
index 5a1bc6d58..00109a0cd 100644
|
||||
--- a/wpa_supplicant/events.c
|
||||
+++ b/wpa_supplicant/events.c
|
||||
@@ -6766,12 +6766,12 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
|
||||
data->eapol_rx.encrypted);
|
||||
break;
|
||||
case EVENT_SIGNAL_CHANGE:
|
||||
- wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SIGNAL_CHANGE
|
||||
- "above=%d signal=%d noise=%d txrate=%lu",
|
||||
- data->signal_change.above_threshold,
|
||||
- data->signal_change.data.signal,
|
||||
- data->signal_change.current_noise,
|
||||
- data->signal_change.data.current_tx_rate);
|
||||
+ wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SIGNAL_CHANGE
|
||||
+ "above=%d signal=%d noise=%d txrate=%lu",
|
||||
+ data->signal_change.above_threshold,
|
||||
+ data->signal_change.data.signal,
|
||||
+ data->signal_change.current_noise,
|
||||
+ data->signal_change.data.current_tx_rate);
|
||||
wpa_bss_update_level(wpa_s->current_bss,
|
||||
data->signal_change.data.signal);
|
||||
bgscan_notify_signal_change(
|
||||
--
|
||||
cgit v1.2.3
|
||||
|
||||
455
net-wireless/wpa_supplicant/wpa_supplicant-2.11-r5.ebuild
Normal file
455
net-wireless/wpa_supplicant/wpa_supplicant-2.11-r5.ebuild
Normal file
@@ -0,0 +1,455 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit desktop linux-info qmake-utils readme.gentoo-r1 systemd toolchain-funcs
|
||||
|
||||
DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
|
||||
HOMEPAGE="https://w1.fi/wpa_supplicant/"
|
||||
LICENSE="|| ( GPL-2 BSD )"
|
||||
|
||||
if [ "${PV}" = "9999" ]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://w1.fi/hostap.git"
|
||||
else
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
SRC_URI="https://w1.fi/releases/${P}.tar.gz"
|
||||
fi
|
||||
|
||||
SLOT="0"
|
||||
IUSE="+ap broadcom-sta dbus eap-sim eapol-test +fils gui macsec +mbo +mesh p2p privsep readline selinux smartcard tkip uncommon-eap-types wep wps"
|
||||
|
||||
# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
|
||||
# interface functions used for MACsec, so this combination cannot be used
|
||||
# at least for now. bug #684442
|
||||
REQUIRED_USE="
|
||||
macsec? ( !privsep )
|
||||
mesh? ( ap )
|
||||
p2p? ( ap wps )
|
||||
privsep? ( !macsec )
|
||||
broadcom-sta? ( !fils !mesh !mbo )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/openssl-1.0.2k:=
|
||||
dbus? ( sys-apps/dbus )
|
||||
kernel_linux? (
|
||||
>=dev-libs/libnl-3.2:3
|
||||
eap-sim? ( sys-apps/pcsc-lite )
|
||||
)
|
||||
!kernel_linux? ( net-libs/libpcap )
|
||||
gui? (
|
||||
dev-qt/qtbase:6[gui,widgets]
|
||||
dev-qt/qtsvg:6
|
||||
)
|
||||
readline? (
|
||||
sys-libs/ncurses:0=
|
||||
sys-libs/readline:0=
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
selinux? ( sec-policy/selinux-networkmanager )
|
||||
kernel_linux? (
|
||||
net-wireless/wireless-regdb
|
||||
)
|
||||
"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
DOC_CONTENTS="
|
||||
If this is a clean installation of wpa_supplicant, you
|
||||
have to create a configuration file named
|
||||
/etc/wpa_supplicant/wpa_supplicant.conf
|
||||
An example configuration file is available for reference in
|
||||
/usr/share/doc/${PF}/
|
||||
"
|
||||
|
||||
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)
|
||||
if ! sed -i "/^$CONFIG_PARAM\>/s/=.*/=$setting/" .config; then
|
||||
echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
|
||||
fi
|
||||
if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
|
||||
echo "$CONFIG_PARAM=$setting" >>.config
|
||||
fi
|
||||
else
|
||||
#ensure item commented out
|
||||
if ! sed -i "/^$CONFIG_PARAM\>/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config; then
|
||||
echo "Kconfig_style_config error commenting $CONFIG_PARAM"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# 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
|
||||
|
||||
# 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
|
||||
|
||||
# systemd entries to D-Bus service files (bug #372877)
|
||||
echo 'SystemdService=wpa_supplicant.service' \
|
||||
| tee -a dbus/*.service >/dev/null || die
|
||||
|
||||
cd "${WORKDIR}/${P}" || die
|
||||
|
||||
# bug (320097)
|
||||
eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
|
||||
|
||||
# bug (912315)
|
||||
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
|
||||
|
||||
# bug (948052)
|
||||
eapply "${FILESDIR}/${PN}-2.10-use-qt6.patch"
|
||||
|
||||
# bug (937452)
|
||||
eapply "${FILESDIR}/${PN}-2.11-Revert-Mark-authorization-completed-on-driver-indica.patch"
|
||||
|
||||
# bug (956555)
|
||||
eapply "${FILESDIR}/${PN}-2.11-broadcom-wl-scanning.patch"
|
||||
|
||||
# bug (971605)
|
||||
eapply "${FILESDIR}/${PN}-2.11-Send-CTRL-EVENT-SIGNAL-CHANGE-message-to-control-interfaces-only.patch"
|
||||
|
||||
# bug (640492)
|
||||
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Toolchain setup
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
cp defconfig .config || die
|
||||
|
||||
# Basic setup
|
||||
Kconfig_style_config CTRL_IFACE
|
||||
Kconfig_style_config MATCH_IFACE
|
||||
Kconfig_style_config BACKEND file
|
||||
Kconfig_style_config IBSS_RSN
|
||||
Kconfig_style_config IEEE80211W
|
||||
Kconfig_style_config IEEE80211R
|
||||
Kconfig_style_config HT_OVERRIDES
|
||||
Kconfig_style_config VHT_OVERRIDES
|
||||
Kconfig_style_config OCV
|
||||
Kconfig_style_config TLSV11
|
||||
Kconfig_style_config TLSV12
|
||||
Kconfig_style_config GETRANDOM
|
||||
|
||||
# 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_TEAP
|
||||
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
|
||||
else
|
||||
Kconfig_style_config CTRL_IFACE_DBUS n
|
||||
Kconfig_style_config CTRL_IFACE_DBUS_NEW n
|
||||
Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
|
||||
fi
|
||||
|
||||
if use eapol-test ; then
|
||||
Kconfig_style_config EAPOL_TEST
|
||||
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 mbo ; then
|
||||
Kconfig_style_config MBO
|
||||
else
|
||||
Kconfig_style_config MBO n
|
||||
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 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
|
||||
|
||||
Kconfig_style_config TLS openssl
|
||||
Kconfig_style_config FST
|
||||
|
||||
Kconfig_style_config EAP_PWD
|
||||
if use fils; then
|
||||
Kconfig_style_config FILS
|
||||
Kconfig_style_config FILS_SK_PFS
|
||||
fi
|
||||
if use mesh; then
|
||||
Kconfig_style_config MESH
|
||||
else
|
||||
Kconfig_style_config MESH n
|
||||
fi
|
||||
# WPA3
|
||||
Kconfig_style_config OWE
|
||||
Kconfig_style_config SAE
|
||||
Kconfig_style_config DPP
|
||||
Kconfig_style_config DPP2
|
||||
Kconfig_style_config SUITEB192
|
||||
Kconfig_style_config SUITEB
|
||||
|
||||
if use wep ; then
|
||||
Kconfig_style_config WEP
|
||||
else
|
||||
Kconfig_style_config WEP n
|
||||
fi
|
||||
|
||||
# Watch out, reversed logic
|
||||
if use tkip ; then
|
||||
Kconfig_style_config NO_TKIP n
|
||||
else
|
||||
Kconfig_style_config NO_TKIP
|
||||
fi
|
||||
|
||||
if use smartcard ; then
|
||||
Kconfig_style_config SMARTCARD
|
||||
else
|
||||
Kconfig_style_config SMARTCARD n
|
||||
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 macsec ; then
|
||||
#requires something, no idea what
|
||||
#Kconfig_style_config DRIVER_MACSEC_QCA
|
||||
Kconfig_style_config DRIVER_MACSEC_LINUX
|
||||
Kconfig_style_config MACSEC
|
||||
else
|
||||
# bug #831369 and bug #684442
|
||||
Kconfig_style_config DRIVER_MACSEC_LINUX n
|
||||
Kconfig_style_config MACSEC n
|
||||
fi
|
||||
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
|
||||
else
|
||||
Kconfig_style_config WPS n
|
||||
Kconfig_style_config WPS2 n
|
||||
Kconfig_style_config WPS_UFD n
|
||||
Kconfig_style_config WPS_ER n
|
||||
Kconfig_style_config WPS_UPNP n
|
||||
Kconfig_style_config WPS_NFC n
|
||||
fi
|
||||
|
||||
# Wi-Fi Direct (WiDi)
|
||||
if use p2p ; then
|
||||
Kconfig_style_config P2P
|
||||
Kconfig_style_config WIFI_DISPLAY
|
||||
else
|
||||
Kconfig_style_config P2P n
|
||||
Kconfig_style_config WIFI_DISPLAY n
|
||||
fi
|
||||
|
||||
# Access Point Mode
|
||||
if use ap ; then
|
||||
Kconfig_style_config AP
|
||||
else
|
||||
Kconfig_style_config AP n
|
||||
fi
|
||||
|
||||
# Enable essentials for AP/P2P
|
||||
if use ap || use p2p ; then
|
||||
# Enabling HT support (802.11n)
|
||||
Kconfig_style_config IEEE80211N
|
||||
|
||||
# Enabling VHT support (802.11ac)
|
||||
Kconfig_style_config IEEE80211AC
|
||||
fi
|
||||
|
||||
# Enable mitigation against certain attacks against TKIP
|
||||
Kconfig_style_config DELAYED_MIC_ERROR_REPORT
|
||||
|
||||
if use privsep ; then
|
||||
Kconfig_style_config PRIVSEP
|
||||
fi
|
||||
|
||||
if use kernel_linux ; then
|
||||
Kconfig_style_config LIBNL32
|
||||
fi
|
||||
|
||||
if use gui ; then
|
||||
pushd "${S}"/wpa_gui-qt4 > /dev/null || die
|
||||
eqmake6 wpa_gui.pro
|
||||
popd > /dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "Building wpa_supplicant"
|
||||
emake V=1 BINDIR=/usr/sbin
|
||||
|
||||
if use gui ; then
|
||||
einfo "Building wpa_gui"
|
||||
emake -C "${S}"/wpa_gui-qt4
|
||||
fi
|
||||
|
||||
if use eapol-test ; then
|
||||
emake eapol_test
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dosbin wpa_supplicant
|
||||
use privsep && dosbin wpa_priv
|
||||
dobin wpa_cli wpa_passphrase
|
||||
|
||||
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
|
||||
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
|
||||
|
||||
exeinto /etc/wpa_supplicant/
|
||||
newexe "${FILESDIR}/wpa_cli-r1.sh" wpa_cli.sh
|
||||
|
||||
readme.gentoo_create_doc
|
||||
dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
|
||||
wpa_supplicant.conf
|
||||
|
||||
newdoc .config build-config
|
||||
|
||||
if [ "${PV}" != "9999" ]; then
|
||||
doman doc/docbook/*.{5,8}
|
||||
fi
|
||||
|
||||
if use gui ; then
|
||||
into /usr
|
||||
dobin wpa_gui-qt4/wpa_gui
|
||||
doicon wpa_gui-qt4/icons/wpa_gui.svg
|
||||
domenu wpa_gui-qt4/wpa_gui.desktop
|
||||
else
|
||||
rm "${ED}"/usr/share/man/man8/wpa_gui.8
|
||||
fi
|
||||
|
||||
if use dbus ; then
|
||||
pushd "${S}"/dbus > /dev/null || die
|
||||
insinto /etc/dbus-1/system.d
|
||||
newins dbus-wpa_supplicant.conf wpa_supplicant.conf
|
||||
insinto /usr/share/dbus-1/system-services
|
||||
doins fi.w1.wpa_supplicant1.service
|
||||
popd > /dev/null || die
|
||||
|
||||
# This unit relies on dbus support, bug 538600.
|
||||
systemd_dounit systemd/wpa_supplicant.service
|
||||
fi
|
||||
|
||||
if use eapol-test ; then
|
||||
dobin eapol_test
|
||||
fi
|
||||
|
||||
systemd_dounit "systemd/wpa_supplicant@.service"
|
||||
systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
|
||||
systemd_dounit "systemd/wpa_supplicant-wired@.service"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if [[ -e "${EROOT}"/etc/wpa_supplicant.conf ]] ; then
|
||||
echo
|
||||
ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf"
|
||||
ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf"
|
||||
fi
|
||||
if ! use wep; then
|
||||
einfo "WARNING: You are building with WEP support disabled, which is recommended since"
|
||||
einfo "this protocol is deprecated and insecure. If you still need to connect to"
|
||||
einfo "WEP-enabled networks, you may turn this flag back on. With this flag off,"
|
||||
einfo "WEP-enabled networks will not even show up as available."
|
||||
einfo "If your network is missing you may wish to USE=wep"
|
||||
fi
|
||||
if ! use tkip; then
|
||||
ewarn "WARNING: You are building with TKIP support disabled, which is recommended since"
|
||||
ewarn "this protocol is deprecated and insecure. If you still need to connect to"
|
||||
ewarn "TKIP-enabled networks, you may turn this flag back on. With this flag off,"
|
||||
ewarn "TKIP-enabled networks, including mixed mode TKIP/AES-CCMP will not even show up"
|
||||
ewarn "as available. If your network is missing you may wish to USE=tkip"
|
||||
fi
|
||||
|
||||
# Mea culpa, feel free to remove that after some time --mgorny.
|
||||
local fn
|
||||
for fn in wpa_supplicant{,@wlan0}.service; do
|
||||
if [[ -e "${EROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
|
||||
then
|
||||
ebegin "Moving ${fn} to multi-user.target"
|
||||
mv "${EROOT}"/etc/systemd/system/network.target.wants/${fn} \
|
||||
"${EROOT}"/etc/systemd/system/multi-user.target.wants/ || die
|
||||
eend ${?} \
|
||||
"Please try to re-enable ${fn}"
|
||||
fi
|
||||
done
|
||||
|
||||
systemd_reenable wpa_supplicant.service
|
||||
}
|
||||
Reference in New Issue
Block a user