git: cecc8a8d5624 - 2025Q2 - dns/dnsmasq-devel: update to v2.92test10 with one FreeBSD patch

The branch 2025Q2 has been updated by mandree:

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

commit cecc8a8d56247ede4c14ee97f1ecb29ab4d83060
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-05-24 19:46:08 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-05-24 19:50:47 +0000

    dns/dnsmasq-devel: update to v2.92test10 with one FreeBSD patch
    
    Changes since v2.92test9:
    
    This one has been submitted upstream to unbreak compilation:
    * e4bc90e 2025-05-24 | Unbreak compilation on non-Linux systems (FreeBSD) [Matthias Andree]
    
    These are part of the official v2.92test10:
    * 90b2485 2025-05-24 | Remove compiler warnings for obscure combinations of build options. (tag: v2.92test10) [Simon Kelley]
    * ebef27f 2025-05-24 | Add TFTP options windowsize (RFC 7440) and timeout (RFC 2349). [Simon Kelley]
    * 1861a88 2025-05-21 | Only define variable "a" if we HAVE_LINUX_NETWORK [Matthias Andree]
    * 96bdb42 2025-05-20 | Fix GCC's -Wunterminated-string-initialization warning in edns0.c. [Matthias Andree]
    * c7a909a 2025-05-21 | Add RRtypes HHIT and BRID to the table. [Simon Kelley]
    
    MFH:            2025Q2
    (cherry picked from commit eea38a526daa5a7fbeb3c74aa693f9c2a45b7bc9)
---
 dns/dnsmasq-devel/Makefile                  |  2 +-
 dns/dnsmasq-devel/distinfo                  |  6 ++---
 dns/dnsmasq-devel/files/patch-src_dnsmasq.c | 12 +++++++++
 dns/dnsmasq-devel/files/update.py           | 39 +++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index dad2c3104ac1..106ea9acc364 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dnsmasq
-DISTVERSION=	2.92test9 # remember to bump PORTEPOCH when going from test to rc!
+DISTVERSION=	2.92test10 # 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=	6
diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo
index 799961b58d2c..6df356566936 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747685166
-SHA256 (dnsmasq-2.92test9.tar.xz) = 12b535fe7a979774d5e77ae91b80bfa67a08d81b452367b8735fdf900046d1cf
-SIZE (dnsmasq-2.92test9.tar.xz) = 581868
+TIMESTAMP = 1748114943
+SHA256 (dnsmasq-2.92test10.tar.xz) = a668c317277f20e9a799062b03066a1b7ca5cd2daa59954b30a14ce44c6417b6
+SIZE (dnsmasq-2.92test10.tar.xz) = 582832
diff --git a/dns/dnsmasq-devel/files/patch-src_dnsmasq.c b/dns/dnsmasq-devel/files/patch-src_dnsmasq.c
new file mode 100644
index 000000000000..98c34221f71d
--- /dev/null
+++ b/dns/dnsmasq-devel/files/patch-src_dnsmasq.c
@@ -0,0 +1,12 @@
+--- src/dnsmasq.c.orig	2025-05-24 14:09:53 UTC
++++ src/dnsmasq.c
+@@ -81,7 +81,9 @@ int main (int argc, char **argv)
+   int tftp_prefix_missing = 0;
+ #endif
+ 
++#ifdef HAVE_LINUX_NETWORK
+   (void)netlink_warn;
++#endif
+   
+ #if defined(HAVE_IDN) || defined(HAVE_LIBIDN2) || defined(LOCALEDIR)
+   setlocale(LC_ALL, "");
diff --git a/dns/dnsmasq-devel/files/update.py b/dns/dnsmasq-devel/files/update.py
new file mode 100755
index 000000000000..5657cd9bc06d
--- /dev/null
+++ b/dns/dnsmasq-devel/files/update.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+"""update.py for dnsmasq-devel - (C) 2025 Matthias Andree, placed under MIT license
+To use, edit Makefile with the new version and possibly URLBASE below when switching to release-candidates,
+then run python update.py, which will download, check sigs, if GnuPG checks out, update makesum,
+upload tarball and sig to my public_distfiles/ because upstream has low bandwidth, and test build.
+
+If things work out, commit manually and push."""
+
+URLBASE = 'https://www.thekelleys.org.uk/dnsmasq/test-releases/'
+
+import os
+import shutil
+import subprocess
+import sys
+
+def trace(func):
+    def wrapper(*args, **kwargs):
+        print(f"> {func.__name__}({args}, {kwargs})", file=sys.stderr)
+        retval = func(*args, **kwargs)
+        print(f"< {func.__name__} -> {retval!r}", file=sys.stderr)
+        return retval
+    return wrapper
+
+subprocess.run = trace(subprocess.run)
+
+completed_distname = subprocess.run('make -V DISTNAME'.split(), capture_output=True, check=True, env={"LC_ALL": "C.UTF-8", "PATH": f'{os.environ["PATH"]}'}, encoding='UTF-8')
+name = completed_distname.stdout.splitlines()[0].strip()
+fnt = name + '.tar.xz'
+fns = fnt + '.asc'
+urt = URLBASE + fnt
+urs = URLBASE + fns
+subprocess.run(['fetch', urt, urs], check=True)
+subprocess.run(['gpg', '--verify', fns, fnt], check=True)
+subprocess.run(['rsync', '-avHP', '--chmod=0644', fnt, fns, 'freefall.freebsd.org:public_distfiles/'], check=True)
+shutil.move(fnt, '/usr/ports/distfiles/' + fnt)
+os.remove(fns)
+subprocess.run(['make', 'makesum'], check=True)
+subprocess.run(['make', 'clean'], check=True)
+subprocess.run(['make', 'check-plist', 'package'], check=True)