git: ccd2f3531f9a - main - dns/dnsmasq: update pkg-message and fix a few compiler warnings

The branch main has been updated by mandree:

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

commit ccd2f3531f9ad5662e4d3047123f0156e525ebbd
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-02-22 12:56:00 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-02-22 12:56:00 +0000

    dns/dnsmasq: update pkg-message and fix a few compiler warnings
    
    ...which v2.91 will also fix.
---
 dns/dnsmasq/Makefile               |  5 +++--
 dns/dnsmasq/files/patch-src_dbus.c | 21 +++++++++++++++++++++
 dns/dnsmasq/files/pkg-message.in   |  6 ++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 82c465cf42c6..1e64e36f3a3e 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dnsmasq
 DISTVERSION=	2.90
 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
@@ -26,7 +26,8 @@ MAKE_ARGS=	CC="${CC}" \
 		PREFIX="${PREFIX}" \
 		RPM_OPT_FLAGS="${CPPFLAGS}"
 CFLAGS+=	-Wall -Wno-unused-function -Wno-unused-parameter \
-		-Wno-unused-value -Wno-unused-variable
+		-Wno-unused-value -Wno-unused-variable \
+		-Wno-gnu-variable-sized-type-not-at-end
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 CONFLICTS_INSTALL=	dnsmasq-devel
diff --git a/dns/dnsmasq/files/patch-src_dbus.c b/dns/dnsmasq/files/patch-src_dbus.c
new file mode 100644
index 000000000000..0955676b4cd4
--- /dev/null
+++ b/dns/dnsmasq/files/patch-src_dbus.c
@@ -0,0 +1,21 @@
+--- src/dbus.c.orig	2025-02-21 14:41:34 UTC
++++ src/dbus.c
+@@ -745,7 +745,6 @@ static DBusMessage *dbus_get_server_metrics(DBusMessag
+     if (!(serv->flags & SERV_MARK))
+       {
+ 	unsigned int port;
+-	unsigned int queries = 0, failed_queries = 0, nxdomain_replies = 0, retrys = 0;
+ 	unsigned int sigma_latency = 0, count_latency = 0;
+ 	
+ 	struct server *serv1;
+@@ -754,10 +753,6 @@ static DBusMessage *dbus_get_server_metrics(DBusMessag
+ 	  if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr))
+ 	    {
+ 	      serv1->flags |= SERV_MARK;
+-	      queries += serv1->queries;
+-	      failed_queries += serv1->failed_queries;
+-	      nxdomain_replies += serv1->nxdomain_replies;
+-	      retrys += serv1->retrys;
+ 	      sigma_latency += serv1->query_latency;
+ 	      count_latency++;
+ 	    }
diff --git a/dns/dnsmasq/files/pkg-message.in b/dns/dnsmasq/files/pkg-message.in
index ea0fda8b3e92..3585d591a921 100644
--- a/dns/dnsmasq/files/pkg-message.in
+++ b/dns/dnsmasq/files/pkg-message.in
@@ -7,6 +7,12 @@ set dnsmasq_enable="YES" in /etc/rc.conf[.local]
 Further options and actions are documented inside
 %%PREFIX%%/etc/rc.d/dnsmasq
 
+
+NOTE: when using dnssec, inaccurate system clocks
+can cause DNS resolution to fail
+because DNSSEC signatures may then not validate.
+
+
 SECURITY RECOMMENDATION
 ~~~~~~~~~~~~~~~~~~~~~~~
 It is recommended to enable the wpad-related options