diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index c49c630b825c..1362469e19c8 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -1,63 +1,67 @@ bin/arpaname bin/delv bin/dig bin/dnssec-cds bin/dnssec-dsfromkey bin/dnssec-importkey bin/dnssec-keyfromlabel bin/dnssec-keygen bin/dnssec-ksr bin/dnssec-revoke bin/dnssec-settime bin/dnssec-signzone bin/dnssec-verify %%DNSTAP%%bin/dnstap-read bin/host bin/mdig -bin/named-rrchecker bin/nsec3hash bin/nslookup bin/nsupdate -lib/bind-tools/libdns-9.21.9.so +lib/bind-tools/libdns.so.9.21.10 +lib/bind-tools/libdns.so.9.21 lib/bind-tools/libdns.so -lib/bind-tools/libisc-9.21.9.so +lib/bind-tools/libisc.so.9.21.10 +lib/bind-tools/libisc.so.9.21 lib/bind-tools/libisc.so -lib/bind-tools/libisccc-9.21.9.so +lib/bind-tools/libisccc.so.9.21.10 +lib/bind-tools/libisccc.so.9.21 lib/bind-tools/libisccc.so -lib/bind-tools/libisccfg-9.21.9.so +lib/bind-tools/libisccfg.so.9.21.10 +lib/bind-tools/libisccfg.so.9.21 lib/bind-tools/libisccfg.so -lib/bind-tools/libns-9.21.9.so +lib/bind-tools/libns.so.9.21.10 +lib/bind-tools/libns.so.9.21 lib/bind-tools/libns.so share/man/man1/arpaname.1.gz share/man/man1/delv.1.gz share/man/man1/dig.1.gz share/man/man1/dnssec-cds.1.gz share/man/man1/dnssec-dsfromkey.1.gz share/man/man1/dnssec-importkey.1.gz share/man/man1/dnssec-keyfromlabel.1.gz share/man/man1/dnssec-keygen.1.gz share/man/man1/dnssec-ksr.1.gz share/man/man1/dnssec-revoke.1.gz share/man/man1/dnssec-settime.1.gz share/man/man1/dnssec-signzone.1.gz share/man/man1/dnssec-verify.1.gz %%DNSTAP%%share/man/man1/dnstap-read.1.gz share/man/man1/host.1.gz share/man/man1/mdig.1.gz @comment share/man/man1/named-checkconf.1.gz @comment share/man/man1/named-checkzone.1.gz @comment share/man/man1/named-compilezone.1.gz @comment share/man/man1/named-journalprint.1.gz -share/man/man1/named-rrchecker.1.gz +@comment share/man/man1/named-rrchecker.1.gz share/man/man1/nsec3hash.1.gz share/man/man1/nslookup.1.gz share/man/man1/nsupdate.1.gz @comment share/man/man5/named.conf.5.gz @comment share/man/man5/rndc.conf.5.gz @comment share/man/man8/ddns-confgen.8.gz @comment share/man/man8/filter-a.8.gz @comment share/man/man8/filter-aaaa.8.gz @comment share/man/man8/named.8.gz @comment share/man/man8/rndc-confgen.8.gz @comment share/man/man8/rndc.8.gz @comment share/man/man8/tsig-keygen.8.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index a19ad3f7ffcf..5f2ffdbc3007 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -1,236 +1,216 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.21.9 +DISTVERSION= 9.21.10 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 1 +PORTREVISION= 0 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${DISTVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else # XXX: correct SUFFIX. PKGNAMESUFFIX= 9-devel .endif MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) COMMENT= Command line tools from BIND: delv, dig, host, nslookup... .else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif WWW= https://www.isc.org/bind/ # Uncomment when bind9xx comes of age. +3 years if ESV, +1year otherwise, see # https://kb.isc.org/docs/aa-00896 # DEPRECATED= End of life, please migrate to a newer version of BIND9 # EXPIRATION_DATE= XXX-12-31 LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libnghttp2.so:www/libnghttp2 \ liburcu.so:sysutils/liburcu \ libuv.so:devel/libuv .if !defined(BIND_TOOLS_SLAVE) RUN_DEPENDS= bind-tools>0:dns/bind-tools .endif -USES= autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \ - tar:xz +USES= compiler:c11 cpe gnome libedit libtool meson perl5 pkgconfig \ + ssl tar:xz CPE_VENDOR= isc CPE_VERSION= ${DISTVERSION:C/-.*//} .if ${DISTVERSION:M*-*} CPE_UPDATE= ${DISTVERSION:C/.*-//:tl} .endif +USE_PERL5= build + .if !defined(BIND_TOOLS_SLAVE) USE_RC_SUBR= named .endif # !BIND_TOOLS_SLAVE -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --localstatedir=/var \ +MESON_ARGS= --localstatedir=/var \ --sysconfdir=${ETCDIR} \ - --with-openssl=${OPENSSLBASE} + -Dcap=disabled \ + -Ddoh=enabled \ + -Djemalloc=disabled MAKE_JOBS_UNSAFE= yes .if !defined(BIND_TOOLS_SLAVE) # XXX: Add -devel CONFLICTS= bind9[0-9][0-9] .endif # !BIND_TOOLS_SLAVE ETCDIR= ${PREFIX}/etc/namedb # FIXME: figure out why build fails if enabled -CONFIGURE_ARGS+= --disable-tracing +MESON_ARGS+= -Dtracing=disabled .if defined(BIND_TOOLS_SLAVE) -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools -CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/bind-tools +MESON_ARGS+= -Dbind-tools=enabled \ + -Dlibdir=${PREFIX}/lib/bind-tools .else +MESON_ARGS+= -Dbind-tools=disabled # XXX: remove the big warning about it being a development version from pkg-message -SUB_FILES= named.conf pkg-message -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools +SUB_FILES= named.conf pkg-message PORTDOCS= * .endif # BIND_TOOLS_SLAVE -OPTIONS_DEFINE= DNSTAP DOCS GEOIP IDN LARGE_FILE LMDB OVERRIDECACHE \ - QUERYTRACE START_LATE TCP_FASTOPEN -OPTIONS_DEFAULT= DNSTAP GSSAPI_NONE IDN LMDB STATS_JSON STATS_XML \ - TCP_FASTOPEN +OPTIONS_DEFINE= DNSTAP DOCS GEOIP IDN LMDB OVERRIDECACHE QUERYTRACE \ + START_LATE +OPTIONS_DEFAULT= DNSTAP GSSAPI_NONE IDN LMDB STATS_JSON STATS_XML OPTIONS_GROUP= STATS OPTIONS_GROUP_STATS= STATS_JSON STATS_XML OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if defined(BIND_TOOLS_SLAVE) OPTIONS_EXCLUDE= DOCS GEOIP LMDB OVERRIDECACHE QUERYTRACE START_LATE \ - STATS_JSON STATS_XML TCP_FASTOPEN + STATS_JSON STATS_XML .endif # BIND_TOOLS_SLAVE OPTIONS_SUB= yes DNSTAP_DESC= Provides fast passive logging of DNS messages GSSAPI_BASE_DESC= Using Heimdal in base (nsupdate is broken) GSSAPI_HEIMDAL_DESC= Using security/heimdal (nsupdate is broken) GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable -LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management OVERRIDECACHE_DESC= Use the override-cache patch QUERYTRACE_DESC= Enable the very verbose query tracelogging START_LATE_DESC= Start BIND late in the boot process (see help) STATS_DESC= Statistics channels STATS_JSON_DESC= Enable JSON statistics channel STATS_XML_DESC= Enable XML statistics channel -TCP_FASTOPEN_DESC= RFC 7413 support -DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ - libprotobuf-c.so:devel/protobuf-c -DNSTAP_CONFIGURE_ENABLE= dnstap +DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ + libprotobuf-c.so:devel/protobuf-c +DNSTAP_MESON_ENABLED= dnstap DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ sphinx-build:textproc/py-sphinx -DOCS_USES= gmake python:env -DOCS_ALL_TARGET= all html +DOCS_USES= python:env +DOCS_MESON_ENABLED= doc +DOCS_ALL_TARGET= all arm GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb -GEOIP_CONFIGURE_ENABLE= geoip -GEOIP_CONFIGURE_WITH= maxminddb +GEOIP_MESON_ENABLED= geoip GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gssapi="${KRB5CONFIG}" +GSSAPI_BASE_CONFIGURE_ENV= ${GSSAPI_CONFIGURE_ARGS} \ + KRB5_CONFIG="${KRB5CONFIG}" +GSSAPI_BASE_MESON_ON= -Dgssapi=enabled GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gssapi="${KRB5CONFIG}" +GSSAPI_HEIMDAL_CONFIGURE_ENV= ${GSSAPI_CONFIGURE_ARGS} \ + KRB5_CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_MESON_ON= -Dgssapi=enabled GSSAPI_MIT_USES= gssapi:mit -GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ - --with-gssapi="${KRB5CONFIG}" +GSSAPI_MIT_CONFIGURE_ENV= ${GSSAPI_CONFIGURE_ARGS} \ + KRB5_CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_MESON_ON= -Dgssapi=enabled -GSSAPI_NONE_CONFIGURE_ON= --without-gssapi +GSSAPI_NONE_MESON_ON= -Dgssapi=disabled IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv -IDN_CONFIGURE_ON= ${ICONV_CONFIGURE_BASE} \ - --with-libidn2=${LOCALBASE} -IDN_CONFIGURE_OFF= --without-libidn2 - -LARGE_FILE_CONFIGURE_ENABLE= largefile +IDN_MESON_ENABLED= idn LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb -LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} +LMDB_MESON_ENABLED= lmdb OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl -QUERYTRACE_CONFIGURE_ENABLE= querytrace +QUERYTRACE_MESON_ON= -Dtrace-logging=query START_LATE_SUB_LIST= NAMED_BEFORE="LOGIN" \ NAMED_REQUIRE="SERVERS cleanvar" START_LATE_SUB_LIST_OFF= NAMED_BEFORE="SERVERS" \ NAMED_REQUIRE="NETWORKING ldconfig syslogd" STATS_JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -STATS_JSON_CONFIGURE_WITH= json-c +STATS_JSON_MESON_ENABLED= stats-json STATS_JSON_LDFLAGS= -L${LOCALBASE}/lib -ljson-c STATS_XML_USE= GNOME=libxml2 -STATS_XML_CONFIGURE_WITH= libxml2 - -TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen +STATS_XML_MESON_ENABLED= stats-xml .include .if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-developer -USES+= perl5 -USE_PERL5= build -BUILD_DEPENDS+= cmocka>0:sysutils/cmocka -.endif - -.if !${PORT_OPTIONS:MDOCS} -CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= +MESON_ARGS+= -Ddeveloper=enabled +BUILD_DEPENDS+= cmocka>0:sysutils/cmocka +.else +MESON_ARGS+= -Dcmocka=disabled \ + -Ddeveloper=disabled .endif .include .if ${SSL_DEFAULT} == base SUB_LIST+= ENGINES=/usr/lib/engines .else SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines .endif -post-patch: -.for FILE in check/named-checkconf.rst named/named.rst nsupdate/nsupdate.rst \ - rndc/rndc.rst - @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ - -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ - -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ - ${WRKSRC}/bin/${FILE} -.endfor - .if !defined(BIND_TOOLS_SLAVE) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} . for i in dynamic primary secondary working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i . endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/primary ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/primary ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample + (for dir in ${WRKSRC}/lib/*/include; do \ + cd $$dir && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include '-name *.h'; \ + done) + post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm -.else - -do-install: - for dir in bin lib doc/man; do \ - (cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \ - done - @${RM} -r ${STAGEDIR}${PREFIX}/include - + cd ${WRKSRC}/_build/arm && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm .endif # BIND_TOOLS_SLAVE .include diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index a0c73ca647d4..f7c1f8770c43 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750354542 -SHA256 (bind-9.21.9.tar.xz) = 1218c0f78a6fab3a7bd42844c839ef79159c6dfc13cf60f0571405f3f78aeb03 -SIZE (bind-9.21.9.tar.xz) = 5583264 +TIMESTAMP = 1752909925 +SHA256 (bind-9.21.10.tar.xz) = bb1ea8d74d9b4f597f6d4622e8238f6f76a2e101fe17a5f2c64fc18f530da113 +SIZE (bind-9.21.10.tar.xz) = 5197276 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 19b831342b94..a8654eeaa0a9 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,74 +1,84 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2025-06-06 09:09:52 UTC +--- bin/named/config.c.orig 2025-07-04 09:34:56 UTC +++ bin/named/config.c -@@ -184,6 +184,7 @@ options {\n\ +@@ -187,6 +187,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ + override-cache-ttl 0; /* do not override */\n\ parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2025-06-06 09:09:52 UTC +--- bin/named/server.c.orig 2025-07-04 09:34:56 UTC +++ bin/named/server.c -@@ -4183,6 +4183,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4236,6 +4236,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; + result = named_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asduration(obj); + + obj = NULL; result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- doc/arm/reference.rst.orig 2025-06-06 09:09:53 UTC +--- doc/arm/reference.rst.orig 2025-07-04 09:34:56 UTC +++ doc/arm/reference.rst -@@ -4184,6 +4184,10 @@ Tuning +@@ -4187,6 +4187,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a greater value. +.. namedconf:statement:: override-cache-ttl + + Enforce the configure cache TTL override. + .. namedconf:statement:: max-cache-ttl :tags: server :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers. ---- lib/dns/include/dns/view.h.orig 2025-06-06 09:09:53 UTC +--- doc/misc/options.orig 2025-07-04 09:34:56 UTC ++++ doc/misc/options +@@ -171,6 +171,7 @@ options { + masterfile-style ( full | relative ); + match-mapped-addresses ; + max-cache-size ( default | unlimited | | ); ++ override-cache-ttl ; + max-cache-ttl ; + max-clients-per-query ; + max-ixfr-ratio ( unlimited | ); +--- lib/dns/include/dns/view.h.orig 2025-07-04 09:34:56 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,7 @@ struct dns_view { bool requestzoneversion; bool sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2025-06-06 09:09:53 UTC +--- lib/dns/resolver.c.orig 2025-07-04 09:34:56 UTC +++ lib/dns/resolver.c @@ -5918,6 +5918,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2025-06-06 09:09:53 UTC +--- lib/isccfg/namedconf.c.orig 2025-07-04 09:34:56 UTC +++ lib/isccfg/namedconf.c @@ -2084,6 +2084,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_duration, 0 }, { "max-cache-ttl", &cfg_type_duration, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_duration, 0 }, diff --git a/dns/bind9-devel/files/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools deleted file mode 100644 index 0416f8b80b37..000000000000 --- a/dns/bind9-devel/files/extrapatch-bind-tools +++ /dev/null @@ -1,27 +0,0 @@ -Only select the "tools" part of bind for building. - ---- Makefile.am.orig 2023-12-02 10:13:03 UTC -+++ Makefile.am -@@ -17,7 +17,6 @@ bind.keys.h: bind.keys Makefile - .PHONY: doc - - EXTRA_DIST = \ -- bind.keys \ - util/bindkeys.pl \ - util/dtrace.sh \ - contrib \ ---- bin/Makefile.am.orig 2023-12-01 14:21:34 UTC -+++ bin/Makefile.am -@@ -1 +1 @@ --SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins -+SUBDIRS = dig delv dnssec tools nsupdate ---- bin/tools/Makefile.am.orig 2023-12-01 14:21:34 UTC -+++ bin/tools/Makefile.am -@@ -11,7 +11,6 @@ LDADD += \ - bin_PROGRAMS = \ - arpaname \ - mdig \ -- named-journalprint \ - named-rrchecker \ - nsec3hash - diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools deleted file mode 100644 index 9a168202eb50..000000000000 --- a/dns/bind9-devel/files/extrapatch-no-bind-tools +++ /dev/null @@ -1,40 +0,0 @@ -Exclude the "tools" from building and installing. - ---- bin/Makefile.am.orig 2024-05-03 07:23:28 UTC -+++ bin/Makefile.am -@@ -1 +1 @@ --SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins -+SUBDIRS = named rndc tools check confgen tests plugins ---- bin/tools/Makefile.am.orig 2024-05-03 07:23:29 UTC -+++ bin/tools/Makefile.am -@@ -9,29 +9,10 @@ LDADD += \ - $(LIBISC_LIBS) - - bin_PROGRAMS = \ -- arpaname \ -- mdig \ -- named-journalprint \ -- named-rrchecker \ -- nsec3hash -+ named-journalprint - - arpaname_LDADD = \ - $(LIBISC_LIBS) -- --if HAVE_DNSTAP --bin_PROGRAMS += \ -- dnstap-read -- --dnstap_read_CPPFLAGS = \ -- $(AM_CPPFLAGS) \ -- $(DNSTAP_CFLAGS) \ -- -I$(top_builddir)/lib/dns -- --dnstap_read_LDADD = \ -- $(LIBDNS_LIBS) \ -- $(LIBISC_LIBS) \ -- $(DNSTAP_LIBS) --endif - - if HAVE_LMDB - bin_PROGRAMS += \ diff --git a/dns/bind9-devel/files/patch-configure.ac b/dns/bind9-devel/files/patch-configure.ac deleted file mode 100644 index ecb07886e570..000000000000 --- a/dns/bind9-devel/files/patch-configure.ac +++ /dev/null @@ -1,13 +0,0 @@ -automake has warnings, it is ok here. - ---- configure.ac.orig 2022-02-09 16:40:14 UTC -+++ configure.ac -@@ -48,7 +48,7 @@ AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - AC_CONFIG_SRCDIR([bin/named/main.c]) --AM_INIT_AUTOMAKE([1.14 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall -Werror]) -+AM_INIT_AUTOMAKE([1.14 tar-pax foreign subdir-objects dist-xz no-dist-gzip -Wall]) - AM_SILENT_RULES([yes]) - AM_EXTRA_RECURSIVE_TARGETS([test unit doc]) - diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build new file mode 100644 index 000000000000..ff19913b1a32 --- /dev/null +++ b/dns/bind9-devel/files/patch-meson.build @@ -0,0 +1,125 @@ +--- meson.build.orig 2025-07-04 09:34:56 UTC ++++ meson.build +@@ -69,6 +69,8 @@ zlib_opt = get_option('zlib') + tracing_opt = get_option('tracing') + zlib_opt = get_option('zlib') + ++bind_tools = get_option('bind-tools').enabled() ++ + if meson.version().version_compare('>=1.1.0') + build_options = meson.build_options() + if build_options == '' +@@ -956,9 +958,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false) + + isc_srcconf = isc_srcset.apply(config, strict: false) + ++project_version = meson.project_version() ++soversion_parts = project_version.split('.') # ['1', '2', '3'] ++soversion = '@0@.@1@'.format(soversion_parts[0], soversion_parts[1]) ++ + libisc = library( + 'isc', + isc_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + objects: isc_probe_objects, + install: true, + install_rpath: libdir, +@@ -986,6 +994,8 @@ libdns = library( + libdns = library( + 'dns', + dns_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + include_directories: dns_inc, + install: true, + install_rpath: libdir, +@@ -1020,6 +1030,8 @@ libns = library( + libns = library( + 'ns', + ns_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + objects: ns_probe_objects, + install: true, + install_rpath: libdir, +@@ -1046,6 +1058,8 @@ libisccc = library( + libisccc = library( + 'isccc', + isccc_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + implicit_include_directories: false, + include_directories: isccc_inc, + install: true, +@@ -1067,6 +1081,8 @@ libisccfg = library( + libisccfg = library( + 'isccfg', + isccfg_srcconf.sources(), ++ version: project_version, ++ soversion: soversion, + implicit_include_directories: false, + include_directories: isccfg_inc, + install: true, +@@ -1087,6 +1103,7 @@ named_srcconf = named_srcset.apply(config, strict: fal + + named_srcconf = named_srcset.apply(config, strict: false) + ++if bind_tools + executable( + 'arpaname', + arpaname_src, +@@ -1315,7 +1332,9 @@ executable( + libisc_dep, + ], + ) ++endif + ++if not bind_tools + executable( + 'named-checkconf', + named_checkconf_src, +@@ -1438,7 +1457,9 @@ executable( + named_srcconf.dependencies(), + ], + ) ++endif + ++if bind_tools + executable( + 'nsec3hash', + nsec3hash_src, +@@ -1486,7 +1507,9 @@ executable( + edit_dep, + ], + ) ++endif + ++if not bind_tools + executable( + 'rndc-confgen', + rndc_confgen_src, +@@ -1572,6 +1595,7 @@ shared_library( + libns_dep, + ], + ) ++endif + + subdir('doc') + subdir('tests') +@@ -1632,7 +1656,6 @@ alias_target('doc-misc', doc_misc_targets) + + alias_target('doc-misc', doc_misc_targets) + +-if doc_opt.allowed() + man_srcconf = man_srcset.apply(config, strict: false) + foreach man : man_srcconf.sources() + man_pages += configure_file( +@@ -1647,6 +1670,7 @@ if doc_opt.allowed() + + install_man(man_pages) + ++if doc_opt.allowed() + if sphinx_build.found() + meson.add_dist_script( + 'util' / 'meson-dist-package.sh', diff --git a/dns/bind9-devel/files/patch-meson__options.txt b/dns/bind9-devel/files/patch-meson__options.txt new file mode 100644 index 000000000000..de50de448714 --- /dev/null +++ b/dns/bind9-devel/files/patch-meson__options.txt @@ -0,0 +1,8 @@ +--- meson_options.txt.orig 2025-07-19 11:32:37 UTC ++++ meson_options.txt +@@ -188,3 +188,5 @@ option( + value: 'disabled', + description: 'enable the memory leak detection in external libraries (libxml2, libuv, OpenSSL)', + ) ++ ++option('bind-tools', type: 'feature', value: 'disabled', description: 'build tools only') diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 57d15551dd46..0231f563dd78 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -1,289 +1,293 @@ bin/named-checkconf bin/named-checkzone bin/named-compilezone bin/named-journalprint +bin/named-makejournal %%LMDB%%bin/named-nzd2nzf +bin/named-rrchecker @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample @sample %%ETCDIR%%/named.conf.sample %%ETCDIR%%/named.root %%ETCDIR%%/primary/empty.db %%ETCDIR%%/primary/localhost-forward.db %%ETCDIR%%/primary/localhost-reverse.db include/dns/acl.h include/dns/adb.h include/dns/badcache.h include/dns/bit.h include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/catz.h include/dns/cert.h include/dns/client.h include/dns/clientinfo.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h include/dns/ecs.h include/dns/ede.h include/dns/edns.h -include/dns/enumclass.h -include/dns/enumtype.h include/dns/fixedname.h include/dns/forward.h include/dns/geoip.h include/dns/ipkeylist.h include/dns/iptable.h include/dns/journal.h include/dns/kasp.h include/dns/keydata.h include/dns/keyflags.h include/dns/keymgr.h include/dns/keystore.h include/dns/keytable.h include/dns/keyvalues.h include/dns/lib.h include/dns/master.h include/dns/masterdump.h include/dns/message.h include/dns/name.h include/dns/nametree.h include/dns/ncache.h include/dns/nsec.h include/dns/nsec3.h include/dns/nta.h include/dns/opcode.h include/dns/order.h include/dns/peer.h include/dns/private.h include/dns/qp.h include/dns/rcode.h include/dns/rdata.h include/dns/rdataclass.h include/dns/rdatalist.h include/dns/rdataset.h include/dns/rdatasetiter.h include/dns/rdataslab.h -include/dns/rdatastruct.h include/dns/rdatatype.h include/dns/remote.h include/dns/request.h include/dns/resolver.h include/dns/result.h include/dns/rootns.h include/dns/rpz.h include/dns/rriterator.h include/dns/rrl.h include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/skr.h include/dns/soa.h include/dns/ssu.h include/dns/stats.h include/dns/time.h include/dns/tkey.h include/dns/trace.h include/dns/transport.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h include/dns/unreachcache.h include/dns/update.h include/dns/validator.h include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zoneverify.h include/dns/zt.h include/dst/dst.h include/dst/gssapi.h include/irs/resconf.h include/isc/ascii.h include/isc/assertions.h include/isc/async.h include/isc/atomic.h include/isc/attributes.h include/isc/backtrace.h include/isc/barrier.h include/isc/base32.h include/isc/base64.h include/isc/buffer.h include/isc/commandline.h include/isc/counter.h include/isc/crypto.h include/isc/dir.h include/isc/dnsstream.h include/isc/endian.h include/isc/entropy.h include/isc/errno.h include/isc/error.h include/isc/file.h include/isc/formatcheck.h include/isc/fuzz.h include/isc/fxhash.h include/isc/getaddresses.h include/isc/hash.h include/isc/hashmap.h include/isc/heap.h include/isc/helper.h include/isc/hex.h include/isc/histo.h include/isc/hmac.h include/isc/ht.h include/isc/httpd.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/job.h include/isc/lex.h include/isc/lib.h include/isc/list.h include/isc/log.h include/isc/loop.h include/isc/magic.h include/isc/managers.h include/isc/md.h include/isc/mem.h include/isc/meminfo.h include/isc/mutex.h include/isc/net.h include/isc/netaddr.h include/isc/netmgr.h include/isc/netscope.h include/isc/nonce.h include/isc/once.h include/isc/os.h include/isc/overflow.h include/isc/parseint.h include/isc/pause.h include/isc/portset.h include/isc/proxy2.h include/isc/queue.h include/isc/quota.h include/isc/radix.h include/isc/random.h include/isc/ratelimiter.h include/isc/readline.h include/isc/refcount.h include/isc/regex.h include/isc/region.h include/isc/result.h include/isc/rwlock.h include/isc/safe.h include/isc/serial.h include/isc/sieve.h include/isc/signal.h include/isc/siphash.h include/isc/sockaddr.h include/isc/spinlock.h include/isc/stats.h include/isc/stdio.h include/isc/stdtime.h include/isc/strerr.h include/isc/string.h include/isc/symtab.h include/isc/syslog.h include/isc/thread.h include/isc/tid.h include/isc/time.h include/isc/timer.h include/isc/tls.h include/isc/tm.h include/isc/types.h include/isc/urcu.h include/isc/url.h include/isc/utf8.h include/isc/util.h include/isc/uv.h include/isc/work.h include/isc/xml.h include/isccc/alist.h include/isccc/base64.h include/isccc/cc.h include/isccc/ccmsg.h include/isccc/sexpr.h include/isccc/symtype.h include/isccc/types.h include/isccc/util.h include/isccfg/aclconf.h include/isccfg/cfg.h include/isccfg/check.h include/isccfg/duration.h include/isccfg/grammar.h include/isccfg/kaspconf.h include/isccfg/namedconf.h include/ns/client.h include/ns/hooks.h include/ns/interfacemgr.h include/ns/listenlist.h include/ns/notify.h include/ns/query.h include/ns/server.h include/ns/stats.h include/ns/types.h include/ns/update.h include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so -lib/libdns-9.21.9.so +lib/libdns.so.9.21.10 +lib/libdns.so.9.21 lib/libdns.so -lib/libisc-9.21.9.so +lib/libisc.so.9.21.10 +lib/libisc.so.9.21 lib/libisc.so -lib/libisccc-9.21.9.so +lib/libisccc.so.9.21.10 +lib/libisccc.so.9.21 lib/libisccc.so -lib/libisccfg-9.21.9.so +lib/libisccfg.so.9.21.10 +lib/libisccfg.so.9.21 lib/libisccfg.so -lib/libns-9.21.9.so +lib/libns.so.9.21.10 +lib/libns.so.9.21 lib/libns.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz @comment share/man/man1/dig.1.gz @comment share/man/man1/dnssec-cds.1.gz @comment share/man/man1/dnssec-dsfromkey.1.gz @comment share/man/man1/dnssec-importkey.1.gz @comment share/man/man1/dnssec-keyfromlabel.1.gz @comment share/man/man1/dnssec-keygen.1.gz @comment share/man/man1/dnssec-ksr.1.gz @comment share/man/man1/dnssec-revoke.1.gz @comment share/man/man1/dnssec-settime.1.gz @comment share/man/man1/dnssec-signzone.1.gz @comment share/man/man1/dnssec-verify.1.gz @comment share/man/man1/dnstap-read.1.gz @comment share/man/man1/host.1.gz @comment share/man/man1/mdig.1.gz share/man/man1/named-checkconf.1.gz share/man/man1/named-checkzone.1.gz share/man/man1/named-compilezone.1.gz share/man/man1/named-journalprint.1.gz %%LMDB%%share/man/man1/named-nzd2nzf.1.gz @comment share/man/man1/named-rrchecker.1.gz @comment share/man/man1/nsec3hash.1.gz @comment share/man/man1/nslookup.1.gz @comment share/man/man1/nsupdate.1.gz share/man/man5/named.conf.5.gz share/man/man5/rndc.conf.5.gz share/man/man8/ddns-confgen.8.gz share/man/man8/filter-a.8.gz share/man/man8/filter-aaaa.8.gz share/man/man8/named.8.gz share/man/man8/rndc-confgen.8.gz share/man/man8/rndc.8.gz share/man/man8/tsig-keygen.8.gz sbin/ddns-confgen sbin/named sbin/rndc sbin/rndc-confgen sbin/tsig-keygen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir(bind,bind,) %%ETCDIR%%/secondary @dir(bind,bind,) %%ETCDIR%%/working