Date: Mon, 4 May 2020 08:23:43 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533902 - in head/dns/bind9-devel: . files Message-ID: <202005040823.0448Nh9r003094@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 4 08:23:43 2020 New Revision: 533902 URL: https://svnweb.freebsd.org/changeset/ports/533902 Log: Update to latest commit. BIND9 switched to using autoconf, this broke a few things, for example, man pages are not there any more, plugins are somehow missing too. Added: head/dns/bind9-devel/files/patch-configure.ac (contents, props changed) Deleted: head/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in head/dns/bind9-devel/files/patch-configure Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/distinfo (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-tools (contents, props changed) head/dns/bind9-devel/files/extrapatch-no-bind-tools (contents, props changed) head/dns/bind9-devel/pkg-plist (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon May 4 08:23:39 2020 (r533901) +++ head/dns/bind9-devel/Makefile Mon May 4 08:23:43 2020 (r533902) @@ -46,15 +46,15 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools .endif # XXX: remove tar:bz2 -USES= compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 +USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.17.0a0.2020.03.30 +ISCVERSION= 9.17.0a0.2020.05.02 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 2df610a882d57fd95221ece4df03c04cd0f702b7 +GL_COMMIT= a6e6d0c1d5d5add2901abd03050001fbc910ec76 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -167,16 +167,13 @@ 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_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} \ - KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} \ - KRB5CONFIG="${KRB5CONFIG}" +GSSAPI_MIT_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi @@ -243,8 +240,8 @@ post-extract: # XXX: Remove first REINPLACE_CMD post-patch: - @${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \ - ${WRKSRC}/version + @${REINPLACE_CMD} -e '/^m4_define.*bind_VERSION_EXTRA/s#)#-${GL_COMMIT})#' \ + ${WRKSRC}/configure.ac .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ @@ -256,8 +253,8 @@ post-patch: .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} post-patch-PORTREVISION-on: - @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ - ${WRKSRC}/version + @${REINPLACE_CMD} '/^m4_define.*bind_VERSION_EXTRA/s#)#_${PORTREVISION})#' \ + ${WRKSRC}/configure.ac . endif post-install: Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon May 4 08:23:39 2020 (r533901) +++ head/dns/bind9-devel/distinfo Mon May 4 08:23:43 2020 (r533902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585571421 -SHA256 (isc-projects-bind9-2df610a882d57fd95221ece4df03c04cd0f702b7_GL0.tar.gz) = 15695727f29d643611cf17d2daa857f8829ddfb7c6beddbabf451ee7958d5fb9 -SIZE (isc-projects-bind9-2df610a882d57fd95221ece4df03c04cd0f702b7_GL0.tar.gz) = 6345127 +TIMESTAMP = 1588577860 +SHA256 (isc-projects-bind9-a6e6d0c1d5d5add2901abd03050001fbc910ec76_GL0.tar.gz) = 0ea19ab6c2242c85e633b4bb693d5d1f1e6667fed24441a137a1e1136ed685b6 +SIZE (isc-projects-bind9-a6e6d0c1d5d5add2901abd03050001fbc910ec76_GL0.tar.gz) = 5818943 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 4 08:23:39 2020 (r533901) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 4 08:23:43 2020 (r533902) @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-03-30 08:17:31 UTC +--- bin/named/config.c.orig 2020-04-30 06:25:30 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-03-30 08:17:31 UTC +--- bin/named/server.c.orig 2020-04-30 06:25:30 UTC +++ bin/named/server.c -@@ -4331,6 +4331,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4327,6 +4327,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,7 +24,7 @@ Add the override-cache-ttl feature. 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-03-30 08:17:31 UTC +--- lib/dns/include/dns/view.h.orig 2020-04-30 06:25:30 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,7 +34,7 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2020-03-30 08:17:31 UTC +--- lib/dns/resolver.c.orig 2020-04-30 06:25:30 UTC +++ lib/dns/resolver.c @@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-03-30 08:17:31 UTC +--- lib/isccfg/namedconf.c.orig 2020-04-30 06:25:30 UTC +++ lib/isccfg/namedconf.c @@ -1992,6 +1992,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ Modified: head/dns/bind9-devel/files/extrapatch-bind-tools ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-tools Mon May 4 08:23:39 2020 (r533901) +++ head/dns/bind9-devel/files/extrapatch-bind-tools Mon May 4 08:23:43 2020 (r533902) @@ -1,34 +1,18 @@ Only select the "tools" part of bind for building. ---- Makefile.in.orig 2019-08-12 14:08:48 UTC -+++ Makefile.in -@@ -14,7 +14,7 @@ top_builddir = @top_builddir@ +--- Makefile.am.orig 2020-04-30 06:25:30 UTC ++++ Makefile.am +@@ -7,5 +7,3 @@ CLEANFILES = bind.keys.h - VERSION=@BIND9_VERSION@ + bind.keys.h: bind.keys Makefile + ${PERL} ${top_srcdir}/util/bindkeys.pl < ${top_srcdir}/bind.keys > $@ +- +-dist_sysconf_DATA = bind.keys +--- bin/Makefile.am.orig 2020-04-30 06:25:30 UTC ++++ bin/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins ++SUBDIRS = dig delv dnssec tools nsupdate --SUBDIRS = make lib fuzz bin doc -+SUBDIRS = lib bin - TARGETS = - PREREQS = bind.keys.h - -@@ -51,7 +51,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 -@@ -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@ + if HAVE_PKCS11 + SUBDIRS += pkcs11 Modified: head/dns/bind9-devel/files/extrapatch-no-bind-tools ============================================================================== --- head/dns/bind9-devel/files/extrapatch-no-bind-tools Mon May 4 08:23:39 2020 (r533901) +++ head/dns/bind9-devel/files/extrapatch-no-bind-tools Mon May 4 08:23:43 2020 (r533902) @@ -1,51 +1,30 @@ Exclude the "tools" from building and installing. ---- bin/Makefile.in.orig 2020-03-30 08:17:31 UTC -+++ bin/Makefile.in -@@ -11,8 +11,8 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ +--- bin/Makefile.am.orig 2020-04-30 07:10:53 UTC ++++ bin/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins ++SUBDIRS = named rndc tools check confgen tests plugins --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 = + if HAVE_PKCS11 + SUBDIRS += pkcs11 +--- bin/tools/Makefile.am.orig 2020-04-30 07:08:39 UTC ++++ bin/tools/Makefile.am +@@ -8,15 +8,10 @@ LDADD = \ + $(LIBISC_LIBS) \ + $(LIBDNS_LIBS) - @BIND9_MAKE_RULES@ ---- bin/tools/Makefile.in.orig 2020-03-30 08:17:31 UTC -+++ bin/tools/Makefile.in -@@ -40,10 +40,7 @@ SUBDIRS = +-bin_PROGRAMS = \ +- arpaname \ +- named-rrchecker \ +- mdig ++bin_PROGRAMS = - 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@ +-sbin_PROGRAMS = \ +- named-journalprint \ +- nsec3hash ++sbin_PROGRAMS = - DNSTAPSRCS = dnstap-read.c - NZDSRCS = named-nzd2nzf.c -@@ -119,21 +116,6 @@ dnstap: - ${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1 - - 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 + mdig_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(LIBBIND9_CFLAGS) Added: head/dns/bind9-devel/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/bind9-devel/files/patch-configure.ac Mon May 4 08:23:43 2020 (r533902) @@ -0,0 +1,13 @@ +automake has warnings, it is ok here. + +--- configure.ac.orig 2020-04-30 08:56:31 UTC ++++ configure.ac +@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$bind_CONFI + AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio]) + + AC_CONFIG_SRCDIR([bin/named/main.c]) +-AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall -Werror]) ++AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall]) + AM_SILENT_RULES([yes]) + AM_EXTRA_RECURSIVE_TARGETS([test unit]) + Modified: head/dns/bind9-devel/pkg-plist ============================================================================== --- head/dns/bind9-devel/pkg-plist Mon May 4 08:23:39 2020 (r533901) +++ head/dns/bind9-devel/pkg-plist Mon May 4 08:23:43 2020 (r533902) @@ -10,7 +10,6 @@ %%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 @@ -37,7 +36,6 @@ 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 @@ -106,7 +104,6 @@ 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 @@ -116,19 +113,14 @@ 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/attributes.h include/isc/backtrace.h include/isc/base32.h include/isc/base64.h @@ -162,7 +154,6 @@ 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 @@ -222,7 +213,6 @@ include/isc/timer.h include/isc/tm.h include/isc/types.h include/isc/util.h -include/isc/version.h include/isccc/alist.h include/isccc/base64.h include/isccc/cc.h @@ -234,7 +224,6 @@ 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 @@ -242,7 +231,6 @@ 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 @@ -256,14 +244,12 @@ 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/eddsa.h include/pkcs11/pkcs11.h lib/libbind9.a lib/libdns.a @@ -272,24 +258,24 @@ 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 +@comment lib/named/filter-aaaa.so +@comment %%DNSTAP%%man/man1/dnstap-read.1.gz +@comment man/man5/named.conf.5.gz +@comment man/man5/rndc.conf.5.gz +@comment man/man8/ddns-confgen.8.gz +@comment man/man8/filter-aaaa.8.gz +@comment man/man8/named-checkconf.8.gz +@comment man/man8/named-checkzone.8.gz +@comment man/man8/named-compilezone.8.gz +@comment %%LMDB%%man/man8/named-nzd2nzf.8.gz +@comment man/man8/named.8.gz +@comment %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz +@comment %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz +@comment %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz +@comment %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz +@comment man/man8/rndc-confgen.8.gz +@comment man/man8/rndc.8.gz +@comment man/man8/tsig-keygen.8.gz sbin/ddns-confgen sbin/named sbin/named-checkconf @@ -302,7 +288,7 @@ sbin/named-compilezone %%NATIVE_PKCS11%%sbin/pkcs11-tokens sbin/rndc sbin/rndc-confgen -sbin/tsig-keygen +sbin/tsig-confgen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir(bind,bind,) %%ETCDIR%%/slave @dir(bind,bind,) %%ETCDIR%%/working
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005040823.0448Nh9r003094>