mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-05-07 19:04:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

testing/eiwd: upgrade to 3.6

Browse source 
upstream changed to https://github.com/ioraff/eiwd because original is
stale
remove fix-crash-in-the-RSSI-polling-fallback-workaround.patch, applied
upstream
This commit is contained in:
Milan P. Stanić 2025-04-18 15:26:27 +00:00
parent a891b3b64c
commit 0e514cba3e
2 changed files with 4 additions and 64 deletions

10
testing/eiwd/APKBUILD
View file

@ -2,10 +2,10 @@
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=eiwd
_realpkgname=iwd
pkgver=2.22
pkgver=3.6
pkgrel=0
pkgdesc="Internet Wireless Daemon without dbus"
url="https://github.com/illiliti/eiwd"
url="https://github.com/ioraff/eiwd"
arch="all"
license="LGPL-2.1-or-later"
depends="!iwd"
@ -14,9 +14,8 @@ options="!check" # doesn't work because of eapol issue
makedepends="linux-headers readline-dev"
checkdepends="coreutils"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://github.com/illiliti/eiwd/releases/download/$pkgver-1/iwd-$pkgver.tar.xz
source="https://github.com/ioraff/eiwd/releases/download/$pkgver-1/iwd-$pkgver.tar.xz
0001-resolving-service-none.patch
fix-crash-in-the-RSSI-polling-fallback-workaround.patch
eiwd.initd
main.conf
@ -53,9 +52,8 @@ package() {
}
sha512sums="
455ee65debe9ab2a2f9267e57d20aa8d4121771fa7e408a37acd6002c47fe14ab45c125edd5a1d1482df01e40153a9dafd4b0e7d721b4f3cab1c42d9d4a1e714 iwd-2.22.tar.xz
ca2bf6f4b5e591f01c0616db10a8aada665e8c7d0bc303a9f0a0a6225372b48b0b23a886dfefe4d29b3580f98e94c53e26e749b6359a30e5a8818e431fd987c5 iwd-3.6.tar.xz
aff4cd6bf4ae72aa64f9f5485bd310633f5219eb71532a8c0fa9a05abaaf50f7636a70a63e533370cd12a702854340e18b27b0537b26ead846fa9c351ec03b42 0001-resolving-service-none.patch
5760182ef1b0a7f1e34643dd63d57513ebfc6764a57b9fb20884e3d4e3efe0514adf78df52ae080014f6f1cd9c2467f396c7723cdc9914eb5591cd6ca3b3a2b2 fix-crash-in-the-RSSI-polling-fallback-workaround.patch
b78d19f5a3ef5f12d33b4fab11ed348b1b2fe309310c33fe278d302cadf065dba72c13214bd760576ecb47f6681d012adcb4997e17a75778d41e3c4fd6a0eb01 eiwd.initd
33517c2c72c43440ed2e68e53bb937d7d557efdf19a6f7fa9cceb87be4b64499f8b9bd6f981f5e413dc3d724eb13ec08b50a129dd81cf64872c362fc5e1d1321 main.conf
06d0258e9e4d13a5cd7cb47cc30c122e2ea950c84b18352fef4982bef41961295316de396b7e6d0a33b949436da40d08fdd76230c7c228d8bdd0e33751cad26c iwd_passphrase

58
testing/eiwd/fix-crash-in-the-RSSI-polling-fallback-workaround.patch
View file

@ -1,58 +0,0 @@
From b0a011d8f4aff5c24736eb1213e667aaad113c6a Mon Sep 17 00:00:00 2001
From: James Prestwood <prestwoj@gmail.com>
Date: Thu, 3 Oct 2024 05:58:17 -0700
Subject: netdev: fix crash in the RSSI polling fallback workaround
Prior to adding the polling fallback this code path was only used for
signal level list notifications and netdev_rssi_polling_update() was
structured as such, where if the RSSI list feature existed there was
nothing to be done as the kernel handled the notifications.
For certain mediatek cards this is broken, hence why the fallback was
added. But netdev_rssi_polling_update() was never changed to take
this into account which bypassed the timer cleanup on disconnections
resulting in a crash when the timer fired after IWD was disconnected:
iwd: ++++++++ backtrace ++++++++
iwd: #0 0x7b5459642520 in /lib/x86_64-linux-gnu/libc.so.6
iwd: #1 0x7b54597aedf4 in /lib/x86_64-linux-gnu/libc.so.6
iwd: #2 0x49f82d in l_netlink_message_append() at ome/jprestwood/iwd/ell/netlink.c:825
iwd: #3 0x4a0c12 in l_genl_msg_append_attr() at ome/jprestwood/iwd/ell/genl.c:1522
iwd: #4 0x405c61 in netdev_rssi_poll() at ome/jprestwood/iwd/src/netdev.c:764
iwd: #5 0x49cce4 in timeout_callback() at ome/jprestwood/iwd/ell/timeout.c:70
iwd: #6 0x49c2ed in l_main_iterate() at ome/jprestwood/iwd/ell/main.c:455 (discriminator 2)
iwd: #7 0x49c3bc in l_main_run() at ome/jprestwood/iwd/ell/main.c:504
iwd: #8 0x49c5f0 in l_main_run_with_signal() at ome/jprestwood/iwd/ell/main.c:632
iwd: #9 0x4049ed in main() at ome/jprestwood/iwd/src/main.c:614
iwd: #10 0x7b5459629d90 in /lib/x86_64-linux-gnu/libc.so.6
iwd: #11 0x7b5459629e40 in /lib/x86_64-linux-gnu/libc.so.6
iwd: +++++++++++++++++++++++++++
To fix this we need to add checks for the cqm_poll_fallback flag in
netdev_rssi_polling_update().
---
src/netdev.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/netdev.c b/src/netdev.c
index d298977a1..8379a5983 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -769,11 +769,12 @@ static void netdev_rssi_poll(struct l_timeout *timeout, void *user_data)
/* To be called whenever operational or rssi_levels_num are updated */
static void netdev_rssi_polling_update(struct netdev *netdev)
{
- if (wiphy_has_ext_feature(netdev->wiphy,
+ if (!netdev->cqm_poll_fallback && wiphy_has_ext_feature(netdev->wiphy,
NL80211_EXT_FEATURE_CQM_RSSI_LIST))
return;
- if (netdev->operational && netdev->rssi_levels_num > 0) {
+ if (netdev->operational && (netdev->rssi_levels_num > 0 ||
+ netdev->cqm_poll_fallback)) {
if (netdev->rssi_poll_timeout)
return;
--
cgit 1.2.3-korg