git: 7db750b4c241 - main - dns/dnsmasq-devel: update to v2.92test11

The branch main has been updated by mandree:

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

commit 7db750b4c241145c5eb3a9a00f2ae78afaac391b
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-06-03 17:22:25 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-06-03 17:23:41 +0000

    dns/dnsmasq-devel: update to v2.92test11
    
    Changes since v2.92test10:
    
    * c378d2c 2025-06-02 | Fix crash in filter_servers(). (tag: v2.92test11) [Simon Kelley]
    * 5846f74 2025-05-29 | Rewrite chunks of inotify.c to remove a memory leak. [Simon Kelley]
    * c9a4240 2025-05-24 | Unbreak compilation on non-Linux systems (FreeBSD) [Matthias Andree]
    
    (The latter was already in FreeBSD's port.)
    
    MFH:            2025Q2
---
 dns/dnsmasq-devel/Makefile                       |   2 +-
 dns/dnsmasq-devel/distinfo                       |   6 ++--
 dns/dnsmasq-devel/files/patch-src_dnsmasq.c      |  12 -------
 dns/dnsmasq-devel/files/simon-kelley-keyring.asc | Bin 0 -> 7158 bytes
 dns/dnsmasq-devel/files/update.py                |  38 +++++++++++++++--------
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile
index 106ea9acc364..2b9b7e12b85a 100644
--- a/dns/dnsmasq-devel/Makefile
+++ b/dns/dnsmasq-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dnsmasq
-DISTVERSION=	2.92test10 # remember to bump PORTEPOCH when going from test to rc!
+DISTVERSION=	2.92test11 # 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 6df356566936..79f9abc2cc24 100644
--- a/dns/dnsmasq-devel/distinfo
+++ b/dns/dnsmasq-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748114943
-SHA256 (dnsmasq-2.92test10.tar.xz) = a668c317277f20e9a799062b03066a1b7ca5cd2daa59954b30a14ce44c6417b6
-SIZE (dnsmasq-2.92test10.tar.xz) = 582832
+TIMESTAMP = 1748967968
+SHA256 (dnsmasq-2.92test11.tar.xz) = a4c0351b59578b6aa8d17b91eac136478a54965e5c3135b09f457231d3f9167a
+SIZE (dnsmasq-2.92test11.tar.xz) = 582764
diff --git a/dns/dnsmasq-devel/files/patch-src_dnsmasq.c b/dns/dnsmasq-devel/files/patch-src_dnsmasq.c
deleted file mode 100644
index 98c34221f71d..000000000000
--- a/dns/dnsmasq-devel/files/patch-src_dnsmasq.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/simon-kelley-keyring.asc b/dns/dnsmasq-devel/files/simon-kelley-keyring.asc
new file mode 100644
index 000000000000..5ffea306f73b
Binary files /dev/null and b/dns/dnsmasq-devel/files/simon-kelley-keyring.asc differ
diff --git a/dns/dnsmasq-devel/files/update.py b/dns/dnsmasq-devel/files/update.py
index df81cdd3880b..117c0e9c95a4 100755
--- a/dns/dnsmasq-devel/files/update.py
+++ b/dns/dnsmasq-devel/files/update.py
@@ -25,16 +25,28 @@ cleanenv={'LC_ALL': 'C.UTF-8',
           'PATH': os.environ["PATH"]}
 defargs={"check": "True", "env": cleanenv, "encoding": 'UTF-8'}
 
-distdir, master_site = map(str.strip, traced_run(['make', '-V', 'DISTDIR', '-V', 'MASTER_SITES:N*FreeBSD*'], capture_output=True, **defargs).stdout.splitlines())
-filename_tarball = traced_run('make -V DISTFILES'.split(), capture_output=True, **defargs).stdout.splitlines()[0].strip()
-filename_signature = filename_tarball + '.asc'
-uri_tarball = master_site + filename_tarball
-uri_signature = master_site + filename_signature
-traced_run(['fetch', uri_tarball, uri_signature], **defargs)
-traced_run(['gpg', '--verify', filename_signature, filename_tarball], **defargs)
-traced_run(['rsync', '-avHPW', '--chmod=0644', filename_tarball, filename_signature, 'freefall.freebsd.org:public_distfiles/'], **defargs)
-shutil.move(filename_tarball, '/usr/ports/distfiles/' + filename_tarball)
-os.remove(filename_signature)
-traced_run(['make', 'makesum', 'clean'], **defargs)
-traced_run(['make', 'check-plist', 'package'], **defargs)
-print("\nSUCCESS\n")
+try:
+    distdir, master_site, files_dir, dist_dir = map(str.strip, traced_run(['make', '-V', 'DISTDIR',
+                                                                           '-V', 'MASTER_SITES:N*FreeBSD*',
+                                                                           '-V', 'FILESDIR',
+                                                                           '-V', 'DISTDIR'],
+                                                                          capture_output=True, **defargs).stdout.splitlines())
+    filename_tarball = traced_run('make -V DISTFILES'.split(), capture_output=True, **defargs).stdout.splitlines()[0].strip()
+    filename_signature = filename_tarball + '.asc'
+    uri_tarball = master_site + filename_tarball
+    uri_signature = master_site + filename_signature
+    traced_run(['fetch', uri_tarball, uri_signature], **defargs)
+    traced_run(['gpg', '--no-options', '--with-colons', '--status-fd', '1',
+                                        '--no-default-keyring', '--keyring', files_dir + '/simon-kelley-keyring.asc',
+                                        '--verify', filename_signature, filename_tarball], **defargs)
+    traced_run(['rsync', '-avHPW', '--chmod=0644', filename_tarball, filename_signature, 'freefall.freebsd.org:public_distfiles/'], **defargs)
+    shutil.move(filename_tarball, dist_dir + '/' + filename_tarball)
+    traced_run(['make', 'makesum', 'clean'], **defargs)
+    os.remove(filename_signature)
+    traced_run(['make', 'check-plist', 'package'], **defargs)
+    print("\nSUCCESS\n")
+except Exception as cpe:
+    print("\nERROR\n")
+    print(repr(cpe))
+    print("\nERROR\n")
+    sys.exit(1)