git: bbad368748bf - main - dns/dnsmasq: update to v2.91

From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Thu, 20 Mar 2025 21:51:05 UTC
The branch main has been updated by mandree:

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

commit bbad368748bff5f9222f9cbdf464099a005a2cf1
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-03-20 21:49:15 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-03-20 21:49:15 +0000

    dns/dnsmasq: update to v2.91
    
    Changelog:      https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.91
---
 dns/dnsmasq/Makefile               |  7 +++----
 dns/dnsmasq/distinfo               |  6 +++---
 dns/dnsmasq/files/patch-CHANGELOG  | 10 ----------
 dns/dnsmasq/files/patch-src_dhcp.c | 12 ------------
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index 0400d96cbd2b..96ca52b022e8 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dnsmasq
-DISTVERSION=	2.90
+DISTVERSION=	2.91
 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps:
-PORTREVISION=	6
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
@@ -26,8 +26,7 @@ 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-gnu-variable-sized-type-not-at-end
+		-Wno-unused-value -Wno-unused-variable
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 CONFLICTS_INSTALL=	dnsmasq-devel
diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo
index db929741d6a4..747553a94907 100644
--- a/dns/dnsmasq/distinfo
+++ b/dns/dnsmasq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707863813
-SHA256 (dnsmasq-2.90.tar.xz) = 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4
-SIZE (dnsmasq-2.90.tar.xz) = 570672
+TIMESTAMP = 1742506571
+SHA256 (dnsmasq-2.91.tar.xz) = f622682848b33677adb2b6ad08264618a2ae0a01da486a93fd8cd91186b3d153
+SIZE (dnsmasq-2.91.tar.xz) = 576820
diff --git a/dns/dnsmasq/files/patch-CHANGELOG b/dns/dnsmasq/files/patch-CHANGELOG
deleted file mode 100644
index 3332566802fa..000000000000
--- a/dns/dnsmasq/files/patch-CHANGELOG
+++ /dev/null
@@ -1,10 +0,0 @@
---- CHANGELOG.orig	2024-02-13 13:49:15 UTC
-+++ CHANGELOG
-@@ -1,3 +1,7 @@
-+post version 2.90
-+	Fix broken dhcp-relay on *BSD. Thanks to Harold for finding
-+	this problem.
-+
- version 2.90
- 	Fix reversion in --rev-server introduced in 2.88 which
- 	caused breakage if the prefix length is not exactly divisible
diff --git a/dns/dnsmasq/files/patch-src_dhcp.c b/dns/dnsmasq/files/patch-src_dhcp.c
deleted file mode 100644
index 24f31c859c3c..000000000000
--- a/dns/dnsmasq/files/patch-src_dhcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/dhcp.c.orig	2024-02-13 13:49:15 UTC
-+++ src/dhcp.c
-@@ -1121,6 +1121,9 @@ static int relay_upstream4(int iface_index, struct dhc
- 	to.sa.sa_family = AF_INET;
- 	to.in.sin_addr = relay->server.addr4;
- 	to.in.sin_port = htons(relay->port);
-+#ifdef HAVE_SOCKADDR_SA_LEN
-+	to.in.sin_len = sizeof(struct sockaddr_in);
-+#endif
- 	
- 	/* Broadcasting to server. */
- 	if (relay->server.addr4.s_addr == 0)