git: 0f9874c5844e - 2025Q1 - dns/dnsmasq-devel: update to v2.91test7

The branch 2025Q1 has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0f9874c5844e7ed005de40e38a3ad19ce2b13fb8

commit 0f9874c5844e7ed005de40e38a3ad19ce2b13fb8
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-01-14 21:17:45 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-01-14 21:36:18 +0000

    dns/dnsmasq-devel: update to v2.91test7
    
    The local patch got merged upstream and was removed.
    This is the changelog since test6:
    
    * da58455 2025-01-13 | Tweak 7d915a0bb94260073ec7aa4dd00b787f3ea4b9e8 (tag: v2.91test7)
    * b915c9a 2025-01-13 | Attempt to keep running if a child process dies.
    * 424aaa0 2025-01-13 | Fix another 509afcd1d2f9edbd1e11c9abd0f335f02baa7fc4 SNAFU
    * c72c895 2025-01-12 | Improve "no upstream servers configured" when D-Bus is enabled [Andrew Sayers]
    * b715611 2025-01-12 | Fix SNAFU in 509afcd1d2f9edbd1e11c9abd0f335f02baa7fc4
    * 7d915a0 2025-01-12 | Don't do retries over UDP when we've sent the query by TCP.
    * 509afcd 2025-01-12 | Refactor poll() loop.
    * 51343bd 2025-01-12 | Treat replies with CD flag set the same for UDP and TCP code paths.
    * b58276a 2025-01-12 | Return EDE OTHER error when DNSSEC validation abandoned.
    * f162d34 2024-12-29 | cache: Fix potential NULL deref in arcane situations. [Matthias Andree]
    
    (cherry picked from commit 44de445d96ac7096fb803c1bba9019c23cc24990)
---
 dns/dnsmasq-devel/Makefile                |  2 +-
 dns/dnsmasq-devel/distinfo                |  6 +++---
 dns/dnsmasq-devel/files/patch-src_cache.c | 11 -----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 808f2ddf1b33..f363001805a9 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dnsmasq
-DISTVERSION=	2.91test6 # remember to bump PORTEPOCH when going from test to rc!
+DISTVERSION=	2.91test7 # remember to bump PORTEPOCH when going from test to rc!
 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
 PORTREVISION=	0
 PORTEPOCH=	5
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index 733a37b90308..dbf8ff6b92bd 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736349936
-SHA256 (dnsmasq-2.91test6.tar.xz) = 394becd1c0a3a8565b61db8dbe1afb3241295b984275e46905e0c7271642c235
-SIZE (dnsmasq-2.91test6.tar.xz) = 571768
+TIMESTAMP = 1736889174
+SHA256 (dnsmasq-2.91test7.tar.xz) = 5440f0f68a0b0cc4531c34e7ba825da018d57877d2e7d5ac1e28be0a140eebae
+SIZE (dnsmasq-2.91test7.tar.xz) = 572008
diff --git a/dns/dnsmasq-devel/files/patch-src_cache.c b/dns/dnsmasq-devel/files/patch-src_cache.c
deleted file mode 100644
index d91038ed1a25..000000000000
--- a/dns/dnsmasq-devel/files/patch-src_cache.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cache.c.orig	2025-01-07 23:08:35 UTC
-+++ src/cache.c
-@@ -479,7 +479,7 @@ static struct crec *cache_scan_free(char *name, union 
- 	  if ((crecp->flags & F_FORWARD) && hostname_isequal(cache_get_name(crecp), name))
- 	    {
- 	      int rrmatch = 0;
--	      if (crecp->flags & flags & F_RR)
-+	      if (addr && crecp->flags & flags & F_RR)
- 		{
- 		  unsigned short rrc = (crecp->flags & F_KEYTAG) ? crecp->addr.rrblock.rrtype : crecp->addr.rrdata.rrtype;
- 		  unsigned short rra = (flags & F_KEYTAG) ? addr->rrblock.rrtype : addr->rrdata.rrtype;