patches/openwrt: dnsmasq: update to version 2.86

patches/openwrt/to-upstream/0049-dnsmasq-Update-to-version-2.86.patch

+From 6b8b5ae029fdb278967ebbffe177c88f7d7c899b Mon Sep 17 00:00:00 2001
+From: Etan Kissling <etan.kissling@gmail.com>
+Date: Thu, 9 Sep 2021 05:42:33 +0000
+Subject: [PATCH] dnsmasq: Update to version 2.86
+
+Summary of upstream CHANGELOG:
+* Handle DHCPREBIND requests in the DHCPv6 server code.
+* Fix bug which caused dnsmasq to lose track of processes forked.
+* Major rewrite of the DNS server and domain handling code.
+* Revise resource handling for number of concurrent DNS queries.
+* Improve efficiency of DNSSEC.
+* Connection track mark based DNS query filtering.
+* Allow smaller than 64 prefix lengths in synth-domain.
+* Make domains generated by --synth-domain appear in replies
+  when in authoritative mode.
+* Ensure CAP_NET_ADMIN capability is available when
+  conntrack is configured.
+* When --dhcp-hostsfile --dhcp-optsfile and --addn-hosts are
+  given a directory as argument, define the order in which
+  files within that directory are read.
+* Support some wildcard matching of input tags to --tag-if.
+
+Signed-off-by: Etan Kissling <etan.kissling@gmail.com>
+(cherry picked from commit d2d0044ebf01b71f63cde609e09f6ac68cdfeccb)
+---
+ package/network/services/dnsmasq/Makefile                   | 4 ++--
+ .../patches/100-remove-old-runtime-kernel-support.patch     | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
+index 90a81b5f65..c5a8930ea7 100644
+--- a/package/network/services/dnsmasq/Makefile
++++ b/package/network/services/dnsmasq/Makefile
+@@ -8,13 +8,13 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=dnsmasq
+-PKG_UPSTREAM_VERSION:=2.85
++PKG_UPSTREAM_VERSION:=2.86
+ PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
+ PKG_RELEASE:=$(AUTORELEASE)
+ 
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
+ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+-PKG_HASH:=ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa
++PKG_HASH:=28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08
+ 
+ PKG_LICENSE:=GPL-2.0
+ PKG_LICENSE_FILES:=COPYING
+diff --git a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
+index b601bce1a9..4f8fe4ecbe 100644
+--- a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
++++ b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
+@@ -26,7 +26,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+  
+ --- a/src/dnsmasq.h
+ +++ b/src/dnsmasq.h
+-@@ -1144,7 +1144,7 @@ extern struct daemon {
++@@ -1201,7 +1201,7 @@ extern struct daemon {
+    int inotifyfd;
+  #endif
+  #if defined(HAVE_LINUX_NETWORK)
+@@ -35,7 +35,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+  #elif defined(HAVE_BSD_NETWORK)
+    int dhcp_raw_fd, dhcp_icmp_fd, routefd;
+  #endif
+-@@ -1326,9 +1326,6 @@ int read_write(int fd, unsigned char *pa
++@@ -1388,9 +1388,6 @@ int read_write(int fd, unsigned char *pa
+  void close_fds(long max_fd, int spare1, int spare2, int spare3);
+  int wildcard_match(const char* wildcard, const char* match);
+  int wildcard_matchn(const char* wildcard, const char* match, int num);
+@@ -140,7 +140,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+       my_syslog(LOG_ERR, _("failed to update ipset %s: %s"), setname, strerror(errno));
+ --- a/src/util.c
+ +++ b/src/util.c
+-@@ -786,22 +786,3 @@ int wildcard_matchn(const char* wildcard
++@@ -796,22 +796,3 @@ int wildcard_matchn(const char* wildcard
+  
+    return (!num) || (*wildcard == *match);
+  }
+-- 
+2.34.1
+