From d5947e0b6146add7fc13effd73a955b62664a43d Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Sep 09 2021 08:03:17 +0000
Subject: Update to 2.86 (#2002475)


---

diff --git a/.gitignore b/.gitignore
index 29cbea9..958a268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ dnsmasq-2.52.tar.lzma
 /dnsmasq-2.85rc2.tar.xz.asc
 /dnsmasq-2.85.tar.xz
 /dnsmasq-2.85.tar.xz.asc
+/dnsmasq-2.86.tar.xz
+/dnsmasq-2.86.tar.xz.asc
diff --git a/dnsmasq-2.77-underflow.patch b/dnsmasq-2.77-underflow.patch
index 2a04039..dfddf4c 100644
--- a/dnsmasq-2.77-underflow.patch
+++ b/dnsmasq-2.77-underflow.patch
@@ -1,4 +1,4 @@
-From 684bede049a006a0a47ce88f017ada9f73bf4430 Mon Sep 17 00:00:00 2001
+From 77c7cabbeab1fbe1f7296f33762771f208586e59 Mon Sep 17 00:00:00 2001
 From: Doran Moppert <dmoppert@redhat.com>
 Date: Tue, 26 Sep 2017 14:48:20 +0930
 Subject: [PATCH] google patch hand-applied
@@ -10,7 +10,7 @@ Subject: [PATCH] google patch hand-applied
  3 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/src/edns0.c b/src/edns0.c
-index d75d3cc..7d8cf7f 100644
+index 7bd26b8..7f96414 100644
 --- a/src/edns0.c
 +++ b/src/edns0.c
 @@ -212,11 +212,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
@@ -31,10 +31,10 @@ index d75d3cc..7d8cf7f 100644
  	  free(buff);
  	  p += rdlen;
 diff --git a/src/forward.c b/src/forward.c
-index ed9c8f6..77059ed 100644
+index 3d638e4..e254e35 100644
 --- a/src/forward.c
 +++ b/src/forward.c
-@@ -1542,6 +1542,10 @@ void receive_query(struct listener *listen, time_t now)
+@@ -1558,6 +1558,10 @@ void receive_query(struct listener *listen, time_t now)
  	udp_size = PACKETSZ; /* Sanity check - can't reduce below default. RFC 6891 6.2.3 */
      }
  
@@ -42,14 +42,14 @@ index ed9c8f6..77059ed 100644
 +  // do not underflow
 +  if (udp_size < n) udp_size = n;
 +
+ #ifdef HAVE_CONNTRACK
  #ifdef HAVE_AUTH
-   if (auth_dns)
-     {
+   if (!auth_dns || local_auth)
 diff --git a/src/rfc1035.c b/src/rfc1035.c
-index f1edc45..15041cc 100644
+index 6fc4f26..66fa00c 100644
 --- a/src/rfc1035.c
 +++ b/src/rfc1035.c
-@@ -1326,6 +1326,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+@@ -1396,6 +1396,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
    size_t len;
    int rd_bit = (header->hb3 & HB3_RD);
  
@@ -60,5 +60,5 @@ index f1edc45..15041cc 100644
    if (ntohs(header->ancount) != 0 ||
        ntohs(header->nscount) != 0 ||
 -- 
-2.21.1
+2.31.1
 
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 3af1202..0f87341 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -19,8 +19,8 @@
 %bcond_with sourcegit
 
 Name:           dnsmasq
-Version:        2.85
-Release:        6%{?extraversion:.%{extraversion}}%{?dist}
+Version:        2.86
+Release:        1%{?extraversion:.%{extraversion}}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 License:        GPLv2 or GPLv3
@@ -200,6 +200,10 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Thu Sep 09 2021 Petr Menšík <pemensik@redhat.com> - 2.86-1
+- Update to 2.86 (#2002475)
+- Apply coverity detected issues patches
+
 * Wed Aug 04 2021 Petr Menšík <pemensik@redhat.com> - 2.85-6
 - Do not require systemd
 
diff --git a/sources b/sources
index 37adc99..02ff1d0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dnsmasq-2.85.tar.xz) = 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09
-SHA512 (dnsmasq-2.85.tar.xz.asc) = 4ec4d51b80f5437cf56003e343646e2362b9451823ec3812bfbf496b57071c878b09052c9bd6e5491c91a2ece7010b841a8766d378ebc68b9dc71d18af1b2d31
+SHA512 (dnsmasq-2.86.tar.xz) = 487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf
+SHA512 (dnsmasq-2.86.tar.xz.asc) = 852023cd5bf48e5e603288398989c63b3c4724d9d1d8abb0eb0ffcbe526d99f93371e244c706bf249387f337465433d439017fc23cfbdbae030900c2989605e6