git: 27475717cab4 - 2025Q2 - dns/dnsmasq-devel: update to v2.92test11
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 03 Jun 2025 17:39:36 UTC
The branch 2025Q2 has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=27475717cab4becc7b421d2fbeb8cc8c24a84c4c
commit 27475717cab4becc7b421d2fbeb8cc8c24a84c4c
Author: Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-05-28 08:41:24 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-06-03 17:35:39 +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
(cherry picked from commit 076249c799105fe08a1a2a090be5104e897ae3b4)
(which was dns/dnsmasq-devel: Revise files/update.py script.)
(cherry picked from commit 7db750b4c241145c5eb3a9a00f2ae78afaac391b)
---
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 | 53 ++++++++++++++---------
5 files changed, 37 insertions(+), 36 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 5657cd9bc06d..117c0e9c95a4 100755
--- a/dns/dnsmasq-devel/files/update.py
+++ b/dns/dnsmasq-devel/files/update.py
@@ -1,13 +1,11 @@
#!/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,
+To use, edit Makefile with the new version,
+then run files/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
@@ -15,25 +13,40 @@ import sys
def trace(func):
def wrapper(*args, **kwargs):
- print(f"> {func.__name__}({args}, {kwargs})", file=sys.stderr)
+ print(f"\n> {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)
+traced_run = trace(subprocess.run)
+
+cleanenv={'LC_ALL': 'C.UTF-8',
+ 'PATH': os.environ["PATH"]}
+defargs={"check": "True", "env": cleanenv, "encoding": 'UTF-8'}
-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)
+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)