Index: branches/2020Q2/dns/bind-tools/pkg-plist =================================================================== --- branches/2020Q2/dns/bind-tools/pkg-plist (revision 539533) +++ branches/2020Q2/dns/bind-tools/pkg-plist (revision 539534) @@ -1,44 +1,55 @@ bin/arpaname bin/delv bin/dig bin/host bin/mdig bin/named-rrchecker bin/nslookup bin/nsupdate -man/man1/arpaname.1.gz -man/man1/delv.1.gz -man/man1/dig.1.gz -man/man1/host.1.gz -man/man1/mdig.1.gz -man/man1/named-rrchecker.1.gz -man/man1/nslookup.1.gz -man/man1/nsupdate.1.gz -man/man8/dnssec-cds.8.gz -%%PYTHON%%man/man8/dnssec-checkds.8.gz -%%PYTHON%%man/man8/dnssec-coverage.8.gz -man/man8/dnssec-dsfromkey.8.gz -man/man8/dnssec-importkey.8.gz -man/man8/dnssec-keyfromlabel.8.gz -man/man8/dnssec-keygen.8.gz -%%PYTHON%%man/man8/dnssec-keymgr.8.gz -man/man8/dnssec-revoke.8.gz -man/man8/dnssec-settime.8.gz -man/man8/dnssec-signzone.8.gz -man/man8/dnssec-verify.8.gz -man/man8/named-journalprint.8.gz -man/man8/nsec3hash.8.gz +%%MANPAGES%%man/man1/arpaname.1.gz +%%MANPAGES%%man/man1/delv.1.gz +%%MANPAGES%%man/man1/dig.1.gz +%%MANPAGES%%@comment man/man1/dnstap-read.1.gz +%%MANPAGES%%man/man1/host.1.gz +%%MANPAGES%%man/man1/mdig.1.gz +%%MANPAGES%%man/man1/named-rrchecker.1.gz +%%MANPAGES%%man/man1/nslookup.1.gz +%%MANPAGES%%man/man1/nsupdate.1.gz +%%MANPAGES%%@comment man/man5/named.conf.5.gz +%%MANPAGES%%@comment man/man5/rndc.conf.5.gz +%%MANPAGES%%@comment man/man8/ddns-confgen.8.gz +%%MANPAGES%%man/man8/dnssec-cds.8.gz +%%MANPAGES%%%%PYTHON%%man/man8/dnssec-checkds.8.gz +%%MANPAGES%%%%PYTHON%%man/man8/dnssec-coverage.8.gz +%%MANPAGES%%man/man8/dnssec-dsfromkey.8.gz +%%MANPAGES%%man/man8/dnssec-importkey.8.gz +%%MANPAGES%%man/man8/dnssec-keyfromlabel.8.gz +%%MANPAGES%%man/man8/dnssec-keygen.8.gz +%%MANPAGES%%%%PYTHON%%man/man8/dnssec-keymgr.8.gz +%%MANPAGES%%man/man8/dnssec-revoke.8.gz +%%MANPAGES%%man/man8/dnssec-settime.8.gz +%%MANPAGES%%man/man8/dnssec-signzone.8.gz +%%MANPAGES%%man/man8/dnssec-verify.8.gz +%%MANPAGES%%@comment man/man8/filter-aaaa.8.gz +%%MANPAGES%%@comment man/man8/named-checkconf.8.gz +%%MANPAGES%%@comment man/man8/named-checkzone.8.gz +%%MANPAGES%%man/man8/named-journalprint.8.gz +%%MANPAGES%%@comment man/man8/named-nzd2nzf.8.gz +%%MANPAGES%%@comment man/man8/named.8.gz +%%MANPAGES%%man/man8/nsec3hash.8.gz +%%MANPAGES%%@comment man/man8/rndc-confgen.8.gz +%%MANPAGES%%@comment man/man8/rndc.8.gz sbin/dnssec-cds %%PYTHON%%sbin/dnssec-checkds %%PYTHON%%sbin/dnssec-coverage sbin/dnssec-dsfromkey sbin/dnssec-importkey sbin/dnssec-keyfromlabel sbin/dnssec-keygen %%PYTHON%%sbin/dnssec-keymgr sbin/dnssec-revoke sbin/dnssec-settime sbin/dnssec-signzone sbin/dnssec-verify sbin/named-journalprint sbin/nsec3hash Index: branches/2020Q2/dns/bind916/Makefile =================================================================== --- branches/2020Q2/dns/bind916/Makefile (revision 539533) +++ branches/2020Q2/dns/bind916/Makefile (revision 539534) @@ -1,272 +1,275 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 .else # dns/bind916 here PORTREVISION= 0 .endif CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 916 .endif DISTNAME= ${PORTNAME}-${ISCVERSION} 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 # Uncomment when bind920 comes of age. # DEPRECATED= End of life, please migrate to a newer version of BIND9 # EXPIRATION_DATE= 2023-12-31 LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libuv.so:devel/libuv \ libxml2.so:textproc/libxml2 .if !defined(BIND_TOOLS_SLAVE) RUN_DEPENDS= bind-tools>0:dns/bind-tools .endif USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.16.3 +ISCVERSION= 9.16.4 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-linux-caps \ --localstatedir=/var \ --sysconfdir=${ETCDIR} \ --with-dlopen=yes \ --with-libxml2 \ --with-openssl=${OPENSSLBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" ETCDIR= ${PREFIX}/etc/namedb .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools .else USE_RC_SUBR= named SUB_FILES= named.conf pkg-message EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * CONFLICTS= bind911 bind912 bind913 bind914 bind9-devel .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes OPTIONS_DEFAULT= DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB PYTHON \ - SIGCHASE TCP_FASTOPEN + SIGCHASE TCP_FASTOPEN MANPAGES OPTIONS_DEFINE= DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \ OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE SIGCHASE \ - START_LATE TCP_FASTOPEN TUNING_LARGE + START_LATE TCP_FASTOPEN TUNING_LARGE MANPAGES OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_BDB DLZ_FILESYSTEM DLZ_LDAP DLZ_MYSQL \ DLZ_POSTGRESQL DLZ_STUB OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if defined(BIND_TOOLS_SLAVE) OPTIONS_EXCLUDE= ${OPTIONS_GROUP_DLZ} DNSTAP DOCS GEOIP LMDB \ OVERRIDECACHE PORTREVISION QUERYTRACE START_LATE \ TCP_FASTOPEN TUNING_LARGE .else OPTIONS_EXCLUDE= PYTHON .endif # BIND_TOOLS_SLAVE OPTIONS_SUB= yes CRYPTO_DESC= Choose which crypto engine to use DLZ_BDB_DESC= DLZ BDB driver DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_LDAP_DESC= DLZ LDAP driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver DNSTAP_DESC= Provides fast passive logging of DNS messages FIXED_RRSET_DESC= Enable fixed rrset ordering GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal 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 NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string PYTHON_DESC= Build with Python utilities QUERYTRACE_DESC= Enable the very verbose query tracelogging SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation START_LATE_DESC= Start BIND late in the boot process (see help) TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= OPENLDAP=yes DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_ENABLE= geoip GEOIP_CONFIGURE_WITH= maxminddb GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} \ KRB5CONFIG="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} \ KRB5CONFIG="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} \ KRB5CONFIG="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi IDN_CONFIGURE_OFF= --without-libidn2 IDN_CONFIGURE_ON= ${ICONV_CONFIGURE_BASE} \ --with-libidn2=${LOCALBASE} IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv JSON_CONFIGURE_WITH= json-c JSON_LIB_DEPENDS= libjson-c.so:devel/json-c JSON_LDFLAGS= -L${LOCALBASE}/lib -ljson-c LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb +MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx + OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" START_LATE_SUB_LIST= NAMED_BEFORE="LOGIN" \ NAMED_REQUIRE="SERVERS cleanvar" START_LATE_SUB_LIST_OFF= NAMED_BEFORE="SERVERS" \ NAMED_REQUIRE="NETWORKING ldconfig syslogd" TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen TUNING_LARGE_CONFIGURE_ON= --with-tuning=large TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default .include .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-developer \ --enable-symtable USES+= perl5 USE_PERL5= build BUILD_DEPENDS+= cmocka>0:sysutils/cmocka .else CONFIGURE_ARGS+= --disable-symtable .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.8 named/named.8 nsupdate/nsupdate.1 \ - rndc/rndc.8 +.for FILE in named-checkconf.8 named.8 nsupdate.1 \ + rndc.8 @${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} + ${WRKSRC}/doc/man/${FILE}in .endfor .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version . endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} . for i in dynamic master slave 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}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${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 ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm - ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .else + +post-install-MANPAGES-on: + @(cd ${WRKSRC}/doc/man && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .endif # BIND_TOOLS_SLAVE .include Index: branches/2020Q2/dns/bind916/distinfo =================================================================== --- branches/2020Q2/dns/bind916/distinfo (revision 539533) +++ branches/2020Q2/dns/bind916/distinfo (revision 539534) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589559917 -SHA256 (bind-9.16.3.tar.xz) = 27ac6513de5f8d0db34b9f241da53baa15a14b2ad21338d0cde0826eaf564f7e -SIZE (bind-9.16.3.tar.xz) = 4573044 +TIMESTAMP = 1592316528 +SHA256 (bind-9.16.4.tar.xz) = 7522088d3daac8bcabaae37998178e09139ef5ccae6631cb1d8a625b770f370a +SIZE (bind-9.16.4.tar.xz) = 3465172 Index: branches/2020Q2/dns/bind916/files/extrapatch-bind-min-override-ttl =================================================================== --- branches/2020Q2/dns/bind916/files/extrapatch-bind-min-override-ttl (revision 539533) +++ branches/2020Q2/dns/bind916/files/extrapatch-bind-min-override-ttl (revision 539534) @@ -1,61 +1,61 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-05-06 09:59:35 UTC +--- bin/named/config.c.orig 2020-06-10 21:01:43 UTC +++ bin/named/config.c @@ -179,6 +179,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ + override-cache-ttl 0; /* do not override */\n\ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-05-06 09:59:35 UTC +--- bin/named/server.c.orig 2020-06-10 21:01:43 UTC +++ bin/named/server.c @@ -4328,6 +4328,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_asuint32(obj); + + obj = NULL; result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asduration(obj); ---- lib/dns/include/dns/view.h.orig 2020-05-06 09:59:35 UTC +--- lib/dns/include/dns/view.h.orig 2020-06-10 21:01:43 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; 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 2020-05-06 09:59:35 UTC +--- lib/dns/resolver.c.orig 2020-06-10 21:01:43 UTC +++ lib/dns/resolver.c -@@ -6248,6 +6248,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6247,6 +6247,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* + * 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 2020-05-06 09:59:35 UTC +--- lib/isccfg/namedconf.c.orig 2020-06-10 21:01:43 UTC +++ lib/isccfg/namedconf.c @@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "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 }, Index: branches/2020Q2/dns/bind916/files/extrapatch-bind-tools =================================================================== --- branches/2020Q2/dns/bind916/files/extrapatch-bind-tools (revision 539533) +++ branches/2020Q2/dns/bind916/files/extrapatch-bind-tools (revision 539534) @@ -1,34 +1,34 @@ Only select the "tools" part of bind for building. ---- Makefile.in.orig 2019-08-12 14:08:48 UTC +--- Makefile.in.orig 2020-06-10 21:01:43 UTC +++ Makefile.in @@ -14,7 +14,7 @@ top_builddir = @top_builddir@ VERSION=@BIND9_VERSION@ -SUBDIRS = make lib fuzz bin doc +SUBDIRS = lib bin TARGETS = PREREQS = bind.keys.h -@@ -51,7 +51,6 @@ installdirs: +@@ -50,7 +50,6 @@ installdirs: $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 install:: installdirs - ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} uninstall:: rm -f ${DESTDIR}${sysconfdir}/bind.keys ---- bin/Makefile.in.orig 2019-08-12 14:08:48 UTC +--- bin/Makefile.in.orig 2020-06-10 21:01:43 UTC +++ bin/Makefile.in @@ -11,8 +11,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ - @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests +SUBDIRS = dig delv dnssec tools nsupdate \ + @NZD_TOOLS@ @PYTHON_TOOLS@ TARGETS = @BIND9_MAKE_RULES@ Index: branches/2020Q2/dns/bind916/files/extrapatch-no-bind-tools =================================================================== --- branches/2020Q2/dns/bind916/files/extrapatch-no-bind-tools (revision 539533) +++ branches/2020Q2/dns/bind916/files/extrapatch-no-bind-tools (revision 539534) @@ -1,51 +1,46 @@ Exclude the "tools" from building and installing. ---- bin/Makefile.in.orig 2019-06-28 12:33:29 UTC +--- bin/Makefile.in.orig 2020-06-10 21:01:43 UTC +++ bin/Makefile.in @@ -11,8 +11,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen \ - @NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests +SUBDIRS = named rndc tools check confgen \ + @NZD_TOOLS@ @PKCS11_TOOLS@ plugins tests TARGETS = @BIND9_MAKE_RULES@ ---- bin/tools/Makefile.in.orig 2019-06-28 12:33:29 UTC +--- bin/tools/Makefile.in.orig 2020-06-10 21:01:43 UTC +++ bin/tools/Makefile.in -@@ -41,10 +41,7 @@ SUBDIRS = +@@ -43,10 +43,7 @@ SUBDIRS = DNSTAPTARGETS = dnstap-read@EXEEXT@ NZDTARGETS = named-nzd2nzf@EXEEXT@ -TARGETS = arpaname@EXEEXT@ named-journalprint@EXEEXT@ \ - named-rrchecker@EXEEXT@ nsec3hash@EXEEXT@ \ - mdig@EXEEXT@ \ - @DNSTAPTARGETS@ @NZDTARGETS@ +TARGETS = @DNSTAPTARGETS@ @NZDTARGETS@ DNSTAPSRCS = dnstap-read.c NZDSRCS = named-nzd2nzf.c -@@ -120,21 +117,6 @@ dnstap: - ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1 +@@ -103,16 +100,6 @@ dnstap: + ${DESTDIR}${bindir} install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \ - ${DESTDIR}${bindir} - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \ - ${DESTDIR}${sbindir} - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \ - ${DESTDIR}${bindir} - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \ - ${DESTDIR}${sbindir} - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \ - ${DESTDIR}${bindir} -- ${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1 -- ${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8 -- ${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1 -- ${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8 -- ${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1 uninstall:: - rm -f ${DESTDIR}${mandir}/man1/mdig.1 + ${LIBTOOL_MODE_UNINSTALL} rm -f \ Index: branches/2020Q2/dns/bind916/files/patch-configure =================================================================== --- branches/2020Q2/dns/bind916/files/patch-configure (revision 539533) +++ branches/2020Q2/dns/bind916/files/patch-configure (revision 539534) @@ -1,92 +1,92 @@ Fixup gssapi and db detection. ---- configure.orig 2020-05-06 09:59:35 UTC +--- configure.orig 2020-06-10 21:01:43 UTC +++ configure -@@ -17491,27 +17491,9 @@ done +@@ -17602,27 +17602,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ - "-lgssapi_krb5" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss -lkrb5" + "$($KRB5CONFIG gssapi --libs)"; \ do - # Note that this does not include $saved_libs, because - # on FreeBSD machines this configure script has added - # -L/usr/local/lib to LIBS, which can make the - # -lgssapi_krb5 test succeed with shared libraries even - # when you are trying to build with KTH in /usr/lib. - if test "/usr" = "$use_gssapi" - then - LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS" - else - LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS" - fi + LIBS="$TRY_LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -17554,47 +17536,7 @@ $as_echo "no" >&6; } ;; +@@ -17665,47 +17647,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac - # - # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib - # but MIT in /usr/local/lib and trying to build with KTH. - # /usr/local/lib can end up earlier on the link lines. - # Like most kludges, this one is not only inelegant it - # is also likely to be the wrong thing to do at least as - # many times as it is the right thing. Something better - # needs to be done. - # - if test "/usr" = "$use_gssapi" -a \ - -f /usr/local/lib/libkrb5.a; then - FIX_KTH_VS_MIT=yes - fi - - case "$FIX_KTH_VS_MIT" in - yes) - case "$enable_static_linking" in - yes) gssapi_lib_suffix=".a" ;; - *) gssapi_lib_suffix=".so" ;; - esac - - for lib in $LIBS; do - case $lib in - -L*) - ;; - -l*) - new_lib=`echo $lib | - sed -e s%^-l%$use_gssapi/lib/lib% \ - -e s%$%$gssapi_lib_suffix%` - NEW_LIBS="$NEW_LIBS $new_lib" - ;; - *) - as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 - ;; - esac - done - LIBS="$NEW_LIBS" - ;; - esac - - DST_GSSAPI_INC="-I$use_gssapi/include" + DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -23103,7 +23045,7 @@ $as_echo "" >&6; } +@@ -23208,7 +23150,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). - bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" + bdb_incdirs="/db6 /db5 /db48" # include a blank element first for d in "" $bdb_incdirs do Index: branches/2020Q2/dns/bind916/pkg-plist =================================================================== --- branches/2020Q2/dns/bind916/pkg-plist (revision 539533) +++ branches/2020Q2/dns/bind916/pkg-plist (revision 539534) @@ -1,306 +1,328 @@ %%DNSTAP%%bin/dnstap-read @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db %%ETCDIR%%/master/localhost-reverse.db @sample %%ETCDIR%%/named.conf.sample %%ETCDIR%%/named.root %%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h 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/dbtable.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnsrps.h include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h include/dns/ecdb.h include/dns/ecs.h include/dns/edns.h include/dns/enumclass.h include/dns/enumtype.h include/dns/events.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/kasp.h include/dns/keymgr.h include/dns/keytable.h include/dns/keyvalues.h include/dns/lib.h include/dns/librpz.h +%%LMDB%%include/dns/lmdb.h include/dns/log.h include/dns/lookup.h include/dns/master.h include/dns/masterdump.h include/dns/message.h include/dns/name.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/portlist.h include/dns/private.h include/dns/rbt.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/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/sdb.h include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/soa.h include/dns/ssu.h include/dns/stats.h include/dns/tcpmsg.h include/dns/time.h include/dns/timer.h include/dns/tkey.h include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h include/dns/update.h include/dns/validator.h include/dns/version.h include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonekey.h include/dns/zoneverify.h include/dns/zt.h include/dst/dst.h include/dst/gssapi.h include/dst/result.h include/irs/context.h include/irs/dnsconf.h include/irs/netdb.h include/irs/platform.h include/irs/resconf.h include/irs/types.h include/irs/version.h include/isc/aes.h include/isc/align.h include/isc/app.h include/isc/assertions.h include/isc/astack.h include/isc/atomic.h include/isc/backtrace.h include/isc/base32.h include/isc/base64.h include/isc/bind9.h include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h include/isc/condition.h include/isc/counter.h include/isc/crc64.h include/isc/deprecated.h include/isc/dir.h include/isc/endian.h include/isc/errno.h include/isc/error.h include/isc/event.h include/isc/eventclass.h include/isc/file.h include/isc/formatcheck.h include/isc/fsaccess.h include/isc/fuzz.h include/isc/hash.h include/isc/heap.h include/isc/hex.h include/isc/hmac.h include/isc/hp.h include/isc/ht.h include/isc/httpd.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h include/isc/likely.h include/isc/list.h include/isc/log.h include/isc/magic.h include/isc/md.h include/isc/mem.h include/isc/meminfo.h include/isc/mutex.h include/isc/mutexatomic.h include/isc/mutexblock.h include/isc/net.h include/isc/netaddr.h include/isc/netdb.h include/isc/netmgr.h include/isc/netscope.h include/isc/nonce.h include/isc/offset.h include/isc/once.h include/isc/os.h include/isc/parseint.h include/isc/platform.h include/isc/pool.h include/isc/portset.h include/isc/print.h include/isc/queue.h include/isc/quota.h include/isc/radix.h include/isc/random.h include/isc/ratelimiter.h include/isc/refcount.h include/isc/regex.h include/isc/region.h include/isc/resource.h include/isc/result.h include/isc/resultclass.h include/isc/rwlock.h include/isc/safe.h include/isc/serial.h include/isc/siphash.h include/isc/sockaddr.h include/isc/socket.h include/isc/stat.h include/isc/stats.h include/isc/stdatomic.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/task.h include/isc/taskpool.h include/isc/thread.h include/isc/time.h include/isc/timer.h include/isc/tm.h include/isc/types.h +include/isc/utf8.h include/isc/util.h include/isc/version.h include/isccc/alist.h include/isccc/base64.h include/isccc/cc.h include/isccc/ccmsg.h include/isccc/events.h include/isccc/result.h include/isccc/sexpr.h include/isccc/symtab.h include/isccc/symtype.h include/isccc/types.h include/isccc/util.h include/isccc/version.h include/isccfg/aclconf.h include/isccfg/cfg.h include/isccfg/dnsconf.h include/isccfg/grammar.h include/isccfg/kaspconf.h include/isccfg/log.h include/isccfg/namedconf.h include/isccfg/version.h include/ns/client.h include/ns/hooks.h include/ns/interfacemgr.h include/ns/lib.h include/ns/listenlist.h include/ns/log.h include/ns/notify.h include/ns/query.h include/ns/server.h include/ns/sortlist.h include/ns/stats.h include/ns/types.h include/ns/update.h include/ns/version.h include/ns/xfrout.h include/pk11/constants.h include/pk11/internal.h include/pk11/pk11.h include/pk11/result.h include/pk11/site.h include/pkcs11/pkcs11.h lib/libbind9.a lib/libdns.a lib/libirs.a lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/libns.a lib/named/filter-aaaa.so -%%DNSTAP%%man/man1/dnstap-read.1.gz -man/man5/named.conf.5.gz -man/man5/rndc.conf.5.gz -man/man8/ddns-confgen.8.gz -man/man8/filter-aaaa.8.gz -man/man8/named-checkconf.8.gz -man/man8/named-checkzone.8.gz -man/man8/named-compilezone.8.gz -%%LMDB%%man/man8/named-nzd2nzf.8.gz -man/man8/named.8.gz -%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz -%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz -%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz -%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz -man/man8/rndc-confgen.8.gz -man/man8/rndc.8.gz -man/man8/tsig-keygen.8.gz +%%MANPAGES%%@comment man/man1/arpaname.1.gz +%%MANPAGES%%@comment man/man1/delv.1.gz +%%MANPAGES%%@comment man/man1/dig.1.gz +%%MANPAGES%%%%DNSTAP%%man/man1/dnstap-read.1.gz +%%MANPAGES%%@comment man/man1/host.1.gz +%%MANPAGES%%@comment man/man1/mdig.1.gz +%%MANPAGES%%@comment man/man1/named-rrchecker.1.gz +%%MANPAGES%%@comment man/man1/nslookup.1.gz +%%MANPAGES%%@comment man/man1/nsupdate.1.gz +%%MANPAGES%%man/man5/named.conf.5.gz +%%MANPAGES%%man/man5/rndc.conf.5.gz +%%MANPAGES%%man/man8/ddns-confgen.8.gz +%%MANPAGES%%@comment man/man8/dnssec-cds.8.gz +%%MANPAGES%%@comment man/man8/dnssec-checkds.8.gz +%%MANPAGES%%@comment man/man8/dnssec-coverage.8.gz +%%MANPAGES%%@comment man/man8/dnssec-dsfromkey.8.gz +%%MANPAGES%%@comment man/man8/dnssec-importkey.8.gz +%%MANPAGES%%@comment man/man8/dnssec-keyfromlabel.8.gz +%%MANPAGES%%@comment man/man8/dnssec-keygen.8.gz +%%MANPAGES%%@comment man/man8/dnssec-keymgr.8.gz +%%MANPAGES%%@comment man/man8/dnssec-revoke.8.gz +%%MANPAGES%%@comment man/man8/dnssec-settime.8.gz +%%MANPAGES%%@comment man/man8/dnssec-signzone.8.gz +%%MANPAGES%%@comment man/man8/dnssec-verify.8.gz +%%MANPAGES%%man/man8/filter-aaaa.8.gz +%%MANPAGES%%man/man8/named-checkconf.8.gz +%%MANPAGES%%man/man8/named-checkzone.8.gz +%%MANPAGES%%@comment man/man8/named-journalprint.8.gz +%%MANPAGES%%%%LMDB%%man/man8/named-nzd2nzf.8.gz +%%MANPAGES%%man/man8/named.8.gz +%%MANPAGES%%@comment man/man8/nsec3hash.8.gz +%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz +%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz +%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz +%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz +%%MANPAGES%%man/man8/rndc-confgen.8.gz +%%MANPAGES%%man/man8/rndc.8.gz sbin/ddns-confgen sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone %%LMDB%%sbin/named-nzd2nzf %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list %%NATIVE_PKCS11%%sbin/pkcs11-tokens sbin/rndc sbin/rndc-confgen sbin/tsig-keygen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir(bind,bind,) %%ETCDIR%%/slave @dir(bind,bind,) %%ETCDIR%%/working Index: branches/2020Q2 =================================================================== --- branches/2020Q2 (revision 539533) +++ branches/2020Q2 (revision 539534) Property changes on: branches/2020Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r539518