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,147 +1,147 @@ 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 CATEGORIES= dns #MASTER_SITES= LOCAL/mandree/ \ # https://www.thekelleys.org.uk/dnsmasq/release-candidates/ MASTER_SITES= LOCAL/mandree/ \ https://www.thekelleys.org.uk/dnsmasq/test-releases/ PKGNAMESUFFIX= -devel MAINTAINER= mandree@FreeBSD.org COMMENT= Lightweight DNS forwarder, DHCP, and TFTP server WWW= https://www.thekelleys.org.uk/dnsmasq/doc.html LICENSE= GPLv2 DEPRECATED= Short-lived test branch, to be removed after v2.92 release USES= cpe shebangfix tar:xz CPE_VENDOR= thekelleys SHEBANG_FILES= contrib/dnslist/dnslist.pl \ contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl MAKE_ARGS= CC="${CC}" \ CFLAGS="${CFLAGS}" \ COPTS="${CFLAGS}" \ LIBS="${LDFLAGS}" \ PREFIX="${PREFIX}" \ RPM_OPT_FLAGS="${CPPFLAGS}" CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ -Wno-unused-value -Wno-unused-variable CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS_INSTALL= dnsmasq-2* SUB_FILES= pkg-message PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html OPTIONS_DEFINE= DBUS DNSSEC DOCS IPSET IPV6 LUA OPTIONS_DEFAULT= DNSSEC IPSET OPTIONS_RADIO= INTL OPTIONS_RADIO_INTL= IDN NLS OPTIONS_EXCLUDE+= EXAMPLES DNSSEC_DESC= Enable DNSSEC caching and validation (needs nettle) IDN_DESC= IDN: Int'l Domain Names WITHOUT full NLS INTL_DESC= Internationalization Support Level IPSET_DESC= Dynamic firewall management of resolved names (needs PF) LUA_DESC= Support lease-change scripts written in Lua NLS_DESC= IDN+NLS: Int'l Domain Names & National Language support IPSET_CFLAGS_OFF= -DNO_IPSET IPV6_CFLAGS_OFF= -DNO_IPV6 .include .if ${PORT_OPTIONS:MNLS} USES+= gettext gmake iconv pkgconfig CFLAGS+= -DHAVE_LIBIDN2 LIB_DEPENDS+= libidn2.so:dns/libidn2 PLIST_SUB+= NLS="" ALL_TARGET= all-i18n _intllibs= -lidn2 -lintl .else _intllibs= PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MIDN} USES+= iconv CFLAGS+= -DHAVE_LIBIDN2 LIB_DEPENDS+= libidn2.so:dns/libidn2 _intllibs+= -lidn2 .endif .endif .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= libdbus-1.so:devel/dbus USES+= pkgconfig CPPFLAGS+= `pkg-config --cflags dbus-1` CFLAGS+= -DHAVE_DBUS LDFLAGS+= `pkg-config --libs dbus-1` .endif .if ${PORT_OPTIONS:MLUA} CPPFLAGS+= -I${LUA_INCDIR} CFLAGS+= -DHAVE_LUASCRIPT LDFLAGS+= -L${LUA_LIBDIR} -llua-${LUA_VER} USES+= lua pkgconfig .endif .if ${PORT_OPTIONS:MDNSSEC} CFLAGS+= -DHAVE_DNSSEC -I${LOCALBASE}/include USES+= pkgconfig LIB_DEPENDS+= libgmp.so:math/gmp \ libnettle.so:security/nettle .endif USE_RC_SUBR= dnsmasq .include LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} post-patch: ${REINPLACE_CMD} -e '/^LUA /s/lua/lua-${LUA_VER}/' ${WRKSRC}/Makefile pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} .if empty(PORT_OPTIONS:MNLS) @if ${READELF} -d ${LOCALBASE}/lib/libidn2.so \ | ${EGREP} -q '\.*\[libintl\.so' ; \ then ${ECHO} ; ${ECHO} 'WARNING: dns/libidn2 was compiled with NLS support!' ; \ ${ECHO} 'Recompile libidn2 WITHOUT_NLS to get rid of NLS dependencies.' ; ${ECHO} ; \ fi .else @${ECHO} 'WARNING: IDN and NLS enabled, building IDN WITH NLS.' .endif .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample ${REINPLACE_CMD} -i '' 's}%%PREFIX%%}${PREFIX}}' ${STAGEDIR}${PREFIX}/etc/dnsmasq.conf.sample ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8 ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/trust-anchors.conf ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MNLS} .for i in de es fi fr id it no pl pt_BR ro ${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/src/${i}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/${PORTNAME}.mo .endfor .endif ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/dynamic-dnsmasq ${STAGEDIR}${EXAMPLESDIR}/dnslist ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl ${STAGEDIR}${EXAMPLESDIR}/dynamic-dnsmasq/ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnslist/dnslist.pl ${STAGEDIR}${EXAMPLESDIR}/dnslist/ ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dhcp.css ${STAGEDIR}${EXAMPLESDIR}/dnslist/ ${INSTALL_DATA} ${WRKSRC}/contrib/dnslist/dnslist.tt2 ${STAGEDIR}${EXAMPLESDIR}/dnslist/ .include 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 @@ -1,40 +1,52 @@ #!/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, 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.""" import os import shutil import subprocess import sys def trace(func): def wrapper(*args, **kwargs): 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 traced_run = trace(subprocess.run) 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)