Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / iwd
Commits: ed8da468 by Andreas Radke at 2024-09-02T07:20:44+02:00 upgpkg: 2.20-2; add fix for scan segfault - https://gitlab.archlinux.org/archlinux/packaging/packages/iwd/-/issues/5 - - - - - 3 changed files: - .SRCINFO - + 0002-fix-scan-segfault.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = iwd pkgdesc = Internet Wireless Daemon pkgver = 2.20 - pkgrel = 1 + pkgrel = 2 url = https://git.kernel.org/cgit/network/wireless/iwd.git/ arch = x86_64 license = LGPL-2.1-or-later @@ -18,9 +18,11 @@ pkgbase = iwd source = https://www.kernel.org/pub/linux/network/wireless/iwd-2.20.tar.xz source = https://www.kernel.org/pub/linux/network/wireless/iwd-2.20.tar.sign source = 0001-use-network-group-for-unprivileged-access.diff + source = 0002-fix-scan-segfault.patch validpgpkeys = E932D120BC2AEC444E558F0106CA9F5D1DCF2659 sha256sums = 86827b97cb5b19ddecce36568c59378da2fae8cf37a0e2b9eacd1269f24c6f8e sha256sums = SKIP sha256sums = d5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7 + sha256sums = 4471026fb8816132e7f89327d2f0d72b63b6c8c64ffb1c449205dfe52bfec6ac pkgname = iwd ===================================== 0002-fix-scan-segfault.patch ===================================== @@ -0,0 +1,13 @@ +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); ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgname=iwd pkgver=2.20 -pkgrel=1 +pkgrel=2 pkgdesc='Internet Wireless Daemon' arch=('x86_64') url='https://git.kernel.org/cgit/network/wireless/iwd.git/' @@ -13,11 +13,13 @@ 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) + 0001-use-network-group-for-unprivileged-access.diff + 0002-fix-scan-segfault.patch) # https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc sha256sums=('86827b97cb5b19ddecce36568c59378da2fae8cf37a0e2b9eacd1269f24c6f8e' 'SKIP' - 'd5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7') + 'd5fb4fb864b7a0632117aa2039df535ab5c1d024ae618a1f09e34dfab8ee0cc7' + '4471026fb8816132e7f89327d2f0d72b63b6c8c64ffb1c449205dfe52bfec6ac') validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # https://lore.kernel.org/iwd/20240122104541.74f1a697@workstation64.local/T/#u options=('!lto') @@ -29,6 +31,10 @@ 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 View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/iwd/-/commit/ed8da468973c66c52734b1e785d562d43fc3e630 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/iwd/-/commit/ed8da468973c66c52734b1e785d562d43fc3e630 You're receiving this email because of your account on gitlab.archlinux.org.
