* update iwd to 3.2-1

This commit is contained in:
Alexander Baldeck 2024-12-10 10:15:48 +01:00
parent a09ab5095a
commit 211890ecd3
3 changed files with 9 additions and 30 deletions

View File

@ -1,6 +1,6 @@
pkgbase = iwd
pkgdesc = Internet Wireless Daemon
pkgver = 3.0
pkgver = 3.2
pkgrel = 1
url = https://git.kernel.org/cgit/network/wireless/iwd.git/
arch = x86_64
@ -19,14 +19,12 @@ pkgbase = iwd
depends = gcc-libs
optdepends = qrencode: for displaying QR code after DPP is started
options = !lto
source = https://www.kernel.org/pub/linux/network/wireless/iwd-3.0.tar.xz
source = https://www.kernel.org/pub/linux/network/wireless/iwd-3.0.tar.sign
source = https://www.kernel.org/pub/linux/network/wireless/iwd-3.2.tar.xz
source = https://www.kernel.org/pub/linux/network/wireless/iwd-3.2.tar.sign
source = 0001-use-network-group-for-unprivileged-access.diff
source = 0002-fix-scan-segfault.patch
validpgpkeys = E932D120BC2AEC444E558F0106CA9F5D1DCF2659
sha256sums = bd167ab368b6ba302b6c948a4f41f02d233a12e20d5094b1c0393325309f8a60
sha256sums = 21f5a8e29a41ff301045f36eed97a4e540262adfdc003db847fe0c7dce874e15
sha256sums = SKIP
sha256sums = d5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7
sha256sums = 4471026fb8816132e7f89327d2f0d72b63b6c8c64ffb1c449205dfe52bfec6ac
pkgname = iwd

View File

@ -1,13 +0,0 @@
diff --git a/src/scan.c b/src/scan.c
index debdeb1..e5360d1 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -2056,7 +2056,7 @@ static void get_survey_done(void *user_data)
sc->get_survey_cmd_id = 0;
- if (!results->sr->canceled)
+ if (results->sr && !results->sr->canceled)
get_results(results);
else
get_scan_done(user_data);

View File

@ -1,10 +1,10 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: AndyRTR <andyrtr at archlinux.org>
# Maintainer : Christian Rebischke <chris.rebischke@archlinux.org>
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: AndyRTR <andyrtr at archlinux.org>
pkgname=iwd
pkgver=3.0
pkgver=3.2
pkgrel=1
pkgdesc='Internet Wireless Daemon'
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
@ -14,13 +14,11 @@ depends=('glibc' 'readline' 'libreadline.so' 'ell' 'gcc-libs')
makedepends=('python-docutils' 'dbus' 'systemd')
optdepends=('qrencode: for displaying QR code after DPP is started')
source=(https://www.kernel.org/pub/linux/network/wireless/iwd-${pkgver}.tar{.xz,.sign}
0001-use-network-group-for-unprivileged-access.diff
0002-fix-scan-segfault.patch)
0001-use-network-group-for-unprivileged-access.diff)
# https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc
sha256sums=('bd167ab368b6ba302b6c948a4f41f02d233a12e20d5094b1c0393325309f8a60'
sha256sums=('21f5a8e29a41ff301045f36eed97a4e540262adfdc003db847fe0c7dce874e15'
'SKIP'
'd5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7'
'4471026fb8816132e7f89327d2f0d72b63b6c8c64ffb1c449205dfe52bfec6ac')
'd5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7')
validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659')
# https://lore.kernel.org/iwd/20240122104541.74f1a697@workstation64.local/T/#u
options=('!lto')
@ -32,10 +30,6 @@ prepare() {
# https://gitlab.archlinux.org/archlinux/packaging/packages/iwd/-/issues/2 + #3
patch -Np1 -i ../0001-use-network-group-for-unprivileged-access.diff
# fix segfault
# https://gitlab.archlinux.org/archlinux/packaging/packages/iwd/-/issues/5
# patch -Np1 -i ../0002-fix-scan-segfault.patch
# https://lore.kernel.org/iwd/20240122105312.66fb4dbf@workstation64.local/T/#u
# disable one expected test failure - requires a kernel module we cannot load
# from inside the chroot