svn commit: r534905 - in head/dns/bind9-devel: . files
Mathieu Arnold
mat at FreeBSD.org
Mon May 11 11:06:10 UTC 2020
Author: mat
Date: Mon May 11 11:06:07 2020
New Revision: 534905
URL: https://svnweb.freebsd.org/changeset/ports/534905
Log:
Update to latest commits.
Man pages are back.
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/files/patch-configure.ac (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 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/Makefile Mon May 11 11:06:07 2020 (r534905)
@@ -48,13 +48,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove 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.05.02
+ISCVERSION= 9.17.0a0.2020.05.10
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
-GL_COMMIT= a6e6d0c1d5d5add2901abd03050001fbc910ec76
+GL_COMMIT= 7b4d07c31dab70e9c168dd134a61b121b2587718
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
@@ -64,10 +64,10 @@ CPE_UPDATE= ${ISCVERSION:C/.*-//:tl}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-linux-caps \
+ --disable-shared \
--localstatedir=/var \
--sysconfdir=${ETCDIR} \
--with-dlopen=yes \
- --disable-shared \
--with-libxml2 \
--with-openssl=${OPENSSLBASE} \
--with-readline="-L${LOCALBASE}/lib -ledit"
@@ -89,11 +89,11 @@ CONFLICTS= bind911 bind912 bind913 bind914 bind916
MAKE_JOBS_UNSAFE= yes
-OPTIONS_DEFAULT= DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB PYTHON \
- SIGCHASE TCP_FASTOPEN
+OPTIONS_DEFAULT= DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB MANPAGES \
+ PYTHON SIGCHASE TCP_FASTOPEN
OPTIONS_DEFINE= DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
- OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE SIGCHASE \
- START_LATE TCP_FASTOPEN TUNING_LARGE
+ MANPAGES OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE \
+ SIGCHASE START_LATE TCP_FASTOPEN TUNING_LARGE
OPTIONS_RADIO= CRYPTO
OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11
@@ -193,6 +193,8 @@ 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
@@ -242,8 +244,8 @@ post-extract:
post-patch:
@${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
+.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#" \
@@ -272,11 +274,11 @@ post-install:
${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
+# FIXME: these are strange.
+ @${RM} -rf ${STAGEDIR}/wrkdirs ${STAGEDIR}${PREFIX}/lib/bind
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
Modified: head/dns/bind9-devel/distinfo
==============================================================================
--- head/dns/bind9-devel/distinfo Mon May 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/distinfo Mon May 11 11:06:07 2020 (r534905)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588577860
-SHA256 (isc-projects-bind9-a6e6d0c1d5d5add2901abd03050001fbc910ec76_GL0.tar.gz) = 0ea19ab6c2242c85e633b4bb693d5d1f1e6667fed24441a137a1e1136ed685b6
-SIZE (isc-projects-bind9-a6e6d0c1d5d5add2901abd03050001fbc910ec76_GL0.tar.gz) = 5818943
+TIMESTAMP = 1589189924
+SHA256 (isc-projects-bind9-7b4d07c31dab70e9c168dd134a61b121b2587718_GL0.tar.gz) = 71218dbb3e33916a138e92562ee2f36471fc79aae8ebdbf10e976633e5730290
+SIZE (isc-projects-bind9-7b4d07c31dab70e9c168dd134a61b121b2587718_GL0.tar.gz) = 4462883
Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 11 11:06:07 2020 (r534905)
@@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2020-04-30 06:25:30 UTC
+--- bin/named/config.c.orig 2020-05-10 23:44:14 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-04-30 06:25:30 UTC
+--- bin/named/server.c.orig 2020-05-10 23:44:14 UTC
+++ bin/named/server.c
-@@ -4327,6 +4327,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4331,6 +4331,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-04-30 06:25:30 UTC
+--- lib/dns/include/dns/view.h.orig 2020-05-10 23:44:14 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-04-30 06:25:30 UTC
+--- lib/dns/resolver.c.orig 2020-05-10 23:44:14 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-04-30 06:25:30 UTC
+--- lib/isccfg/namedconf.c.orig 2020-05-10 23:44:14 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 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/files/extrapatch-bind-tools Mon May 11 11:06:07 2020 (r534905)
@@ -1,14 +1,23 @@
Only select the "tools" part of bind for building.
---- Makefile.am.orig 2020-04-30 06:25:30 UTC
+--- Makefile.am.orig 2020-05-10 23:44:14 UTC
+++ Makefile.am
-@@ -7,5 +7,3 @@ CLEANFILES = bind.keys.h
+@@ -1,13 +1,9 @@
+ include $(top_srcdir)/Makefile.top
+-SUBDIRS = . libltdl lib doc bin
++SUBDIRS = . libltdl lib bin
+
+ BUILT_SOURCES = bind.keys.h
+ CLEANFILES = bind.keys.h
+
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
+-
+-.PHONY: doc
+--- bin/Makefile.am.orig 2020-05-10 23:44:14 UTC
+++ bin/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
Modified: head/dns/bind9-devel/files/extrapatch-no-bind-tools
==============================================================================
--- head/dns/bind9-devel/files/extrapatch-no-bind-tools Mon May 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/files/extrapatch-no-bind-tools Mon May 11 11:06:07 2020 (r534905)
@@ -1,6 +1,6 @@
Exclude the "tools" from building and installing.
---- bin/Makefile.am.orig 2020-04-30 07:10:53 UTC
+--- bin/Makefile.am.orig 2020-05-10 23:44:14 UTC
+++ bin/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
@@ -8,9 +8,9 @@ Exclude the "tools" from building and installing.
if HAVE_PKCS11
SUBDIRS += pkcs11
---- bin/tools/Makefile.am.orig 2020-04-30 07:08:39 UTC
+--- bin/tools/Makefile.am.orig 2020-05-10 23:44:14 UTC
+++ bin/tools/Makefile.am
-@@ -8,15 +8,10 @@ LDADD = \
+@@ -8,14 +8,9 @@ LDADD = \
$(LIBISC_LIBS) \
$(LIBDNS_LIBS)
@@ -27,4 +27,3 @@ Exclude the "tools" from building and installing.
mdig_CPPFLAGS = \
$(AM_CPPFLAGS) \
- $(LIBBIND9_CFLAGS)
Modified: head/dns/bind9-devel/files/patch-configure.ac
==============================================================================
--- head/dns/bind9-devel/files/patch-configure.ac Mon May 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/files/patch-configure.ac Mon May 11 11:06:07 2020 (r534905)
@@ -1,6 +1,6 @@
automake has warnings, it is ok here.
---- configure.ac.orig 2020-04-30 08:56:31 UTC
+--- configure.ac.orig 2020-05-10 23:44:14 UTC
+++ configure.ac
@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$bind_CONFI
AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
@@ -9,5 +9,5 @@ automake has warnings, it is ok here.
-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])
+ AM_EXTRA_RECURSIVE_TARGETS([test unit doc])
Modified: head/dns/bind9-devel/pkg-plist
==============================================================================
--- head/dns/bind9-devel/pkg-plist Mon May 11 11:06:04 2020 (r534904)
+++ head/dns/bind9-devel/pkg-plist Mon May 11 11:06:07 2020 (r534905)
@@ -260,21 +260,41 @@ lib/libisccfg.a
lib/libns.a
@comment lib/named/filter-aaaa.so
@comment %%DNSTAP%%man/man1/dnstap-read.1.gz
- at comment man/man5/named.conf.5.gz
- at comment man/man5/rndc.conf.5.gz
- at comment man/man8/ddns-confgen.8.gz
- at comment man/man8/filter-aaaa.8.gz
- at comment man/man8/named-checkconf.8.gz
- at comment man/man8/named-checkzone.8.gz
+ at comment man/man1/arpaname.1.gz
+ at comment man/man1/delv.1.gz
+ at comment man/man1/dig.1.gz
+ at comment man/man1/dnstap-read.1.gz
+ at comment man/man1/host.1.gz
+ at comment man/man1/mdig.1.gz
+ at comment man/man1/named-rrchecker.1.gz
+ at comment man/man1/nslookup.1.gz
+ at 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
+ at comment man/man8/dnssec-cds.8.gz
+ at comment man/man8/dnssec-dsfromkey.8.gz
+ at comment man/man8/dnssec-importkey.8.gz
+ at comment man/man8/dnssec-keyfromlabel.8.gz
+ at comment man/man8/dnssec-keygen.8.gz
+ at comment man/man8/dnssec-revoke.8.gz
+ at comment man/man8/dnssec-settime.8.gz
+ at comment man/man8/dnssec-signzone.8.gz
+ at 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
@comment man/man8/named-compilezone.8.gz
- at comment %%LMDB%%man/man8/named-nzd2nzf.8.gz
- at comment man/man8/named.8.gz
- at comment %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
- at comment %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
- at comment %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
- at comment %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
- at comment man/man8/rndc-confgen.8.gz
- at comment man/man8/rndc.8.gz
+ at comment man/man8/named-journalprint.8.gz
+%%MANPAGES%%%%LMDB%%man/man8/named-nzd2nzf.8.gz
+%%MANPAGES%%man/man8/named.8.gz
+ at 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
@comment man/man8/tsig-keygen.8.gz
sbin/ddns-confgen
sbin/named
More information about the svn-ports-all
mailing list