Date: Sunday, October 30, 2022 @ 07:40:12 Author: eworm Revision: 459563
upgpkg: dnsmasq 2.87-2: fix loss of DNS servers on config reload Added: dnsmasq/trunk/fix-loss-of-DNS-servers-on-config-reload.patch Modified: dnsmasq/trunk/PKGBUILD ------------------------------------------------+ PKGBUILD | 10 +++++++- fix-loss-of-DNS-servers-on-config-reload.patch | 27 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-30 07:23:14 UTC (rev 459562) +++ PKGBUILD 2022-10-30 07:40:12 UTC (rev 459563) @@ -5,7 +5,7 @@ pkgname=dnsmasq pkgver=2.87 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server' url='http://www.thekelleys.org.uk/dnsmasq/doc.html' arch=('x86_64') @@ -15,15 +15,23 @@ backup=('etc/dnsmasq.conf') validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <[email protected]> source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc} + 'fix-loss-of-DNS-servers-on-config-reload.patch' 'dnsmasq-sysusers.conf' 'dnsmasq.service') sha256sums=('0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a' 'SKIP' + 'af922de43b4bef2de8c4191d6c155ef9fb5a48629ce14e183627d51b502bec12' '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab' '297dbae8cfa3d353284820dd87cc65c37d1ef289cac3a5c3ede079413d31eeec') _build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK' +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 < ../fix-loss-of-DNS-servers-on-config-reload.patch +} + build() { cd "$pkgname-$pkgver" Added: fix-loss-of-DNS-servers-on-config-reload.patch =================================================================== --- fix-loss-of-DNS-servers-on-config-reload.patch (rev 0) +++ fix-loss-of-DNS-servers-on-config-reload.patch 2022-10-30 07:40:12 UTC (rev 459563) @@ -0,0 +1,27 @@ +From 930428fb970f4991e5c2933fd5a5d2504c18a551 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <[email protected]> +Date: Mon, 17 Oct 2022 21:15:43 +0100 +Subject: Fix loss of DNS servers on config reload. + +A bug, introduced in 2.87, which could result in DNS +servers being removed from the configuration when reloading +server configuration from DBus, or re-reading /etc/resolv.conf +Only servers from the same source should be replaced, but some +servers from other sources (ie hard coded or another dynamic source) +could mysteriously disappear. +--- +diff --git a/src/domain-match.c b/src/domain-match.c +index f7db0fe..76a1109 100644 +--- a/src/domain-match.c ++++ b/src/domain-match.c +@@ -683,7 +683,9 @@ int add_update_server(int flags, + serv->next = NULL; + } + break; +- } ++ } ++ else ++ up = &serv->next; + } + + if (serv)
