From a9720fb9382a7219bf46cab6810b3649ec2af040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Mon, 5 Apr 2021 22:08:45 -0300 Subject: [PATCH] iwd: update to 1.13. Fix iwd.config(5) patch to act on .rst file, not the pre-generated .5 file - the build system re-generates it and overrode our change. --- srcpkgs/iwd/patches/resolvconf-default.patch | 37 ++++++++++++-------- srcpkgs/iwd/template | 4 +-- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/srcpkgs/iwd/patches/resolvconf-default.patch b/srcpkgs/iwd/patches/resolvconf-default.patch index 257615e7b92a..79731282a844 100644 --- a/srcpkgs/iwd/patches/resolvconf-default.patch +++ b/srcpkgs/iwd/patches/resolvconf-default.patch @@ -1,6 +1,6 @@ ---- src/resolve.c 2020-09-05 09:43:41.000000000 +0200 -+++ - 2020-10-27 20:27:39.193991880 +0100 -@@ -554,7 +554,7 @@ +--- src/resolve.c ++++ src/resolve.c +@@ -604,7 +604,7 @@ static int resolve_init(void) l_warn("[General].dns_resolve_method is deprecated, " "use [Network].NameResolvingService"); else /* Default to systemd-resolved service. */ @@ -9,14 +9,23 @@ } for (i = 0; resolve_method_ops_list[i].name; i++) { ---- src/iwd.config.5 2020-09-05 09:47:11.000000000 +0200 -+++ - 2020-11-01 22:37:16.517573954 +0100 -@@ -198,7 +198,7 @@ - \fBEnableNetworkConfiguration\fP and provides the choice of system - resolver integration. - .sp --If not specified, \fBsystemd\fP is used as default. -+If not specified, \fBresolvconf\fP is used as default. - T} - _ - T{ +--- src/iwd.config.rst ++++ src/iwd.config.rst +@@ -194,7 +194,7 @@ The group ``[Network]`` contains network configuration related settings. + by default. This setting can also be overriden on a per-network basis. + + * - NameResolvingService +- - Values: resolvconf, **systemd** ++ - Values: **resolvconf**, systemd + + Configures a DNS resolution method used by the system. + +@@ -202,7 +202,7 @@ The group ``[Network]`` contains network configuration related settings. + ``EnableNetworkConfiguration`` and provides the choice of system + resolver integration. + +- If not specified, ``systemd`` is used as default. ++ If not specified, ``resolvconf`` is used as default. + + * - RoutePriorityOffset + - Values: uint32 value (default: **300**) diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index 3274f358eedc..32a44f3a0555 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,6 +1,6 @@ # Template file for 'iwd' pkgname=iwd -version=1.12 +version=1.13 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog" distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz" -checksum=4238c394d35ee6e99291009424d5530183aa5367c6f4f5349a95a56c5c94a211 +checksum=b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a make_dirs="/var/lib/iwd 0600 root root /var/lib/ead 0600 root root /etc/iwd 755 root root"