From 5c77f25a9bdf4490b4bca3c01466d31b438ff6fb Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 7 Jul 2020 10:49:54 +0000 Subject: [PATCH] Update to latest commit. --- dns/bind-tools/pkg-plist-devel | 22 +++++++++++++ dns/bind9-devel/Makefile | 9 +++--- dns/bind9-devel/distinfo | 6 ++-- .../files/extrapatch-bind-min-override-ttl | 16 +++++----- dns/bind9-devel/pkg-plist | 32 +++++++++++++------ 5 files changed, 61 insertions(+), 24 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index 0ae644283809..05959225bad9 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -17,6 +17,27 @@ bin/named-rrchecker bin/nsec3hash bin/nslookup bin/nsupdate +lib/bind-tools/libbind9.so +lib/bind-tools/libbind9.so.1701 +lib/bind-tools/libbind9.so.1701.0.0 +lib/bind-tools/libdns.so +lib/bind-tools/libdns.so.1702 +lib/bind-tools/libdns.so.1702.0.0 +lib/bind-tools/libirs.so +lib/bind-tools/libirs.so.1701 +lib/bind-tools/libirs.so.1701.0.0 +lib/bind-tools/libisc.so +lib/bind-tools/libisc.so.1702 +lib/bind-tools/libisc.so.1702.0.0 +lib/bind-tools/libisccc.so +lib/bind-tools/libisccc.so.1701 +lib/bind-tools/libisccc.so.1701.0.0 +lib/bind-tools/libisccfg.so +lib/bind-tools/libisccfg.so.1701 +lib/bind-tools/libisccfg.so.1701.0.0 +lib/bind-tools/libns.so +lib/bind-tools/libns.so.1702 +lib/bind-tools/libns.so.1702.0.0 man/man1/arpaname.1.gz man/man1/delv.1.gz man/man1/dig.1.gz @@ -47,3 +68,4 @@ man/man1/nsupdate.1.gz @comment man/man8/named.8.gz @comment man/man8/rndc-confgen.8.gz @comment man/man8/rndc.8.gz +@comment man/man8/tsig-keygen.8.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index f72e38bebc5d..9cb15ae358a4 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -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.06.23 +ISCVERSION= 9.17.0a0.2020.07.06 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= e8fa9986bd3bc6fdb7d40b60ecebfdcafbabea4c +GL_COMMIT= f34b179d12f74ad1851488d0363ee1471a6926ed CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} @@ -64,7 +64,6 @@ CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-linux-caps \ - --disable-shared \ --localstatedir=/var \ --sysconfdir=${ETCDIR} \ --with-dlopen=yes \ @@ -75,6 +74,7 @@ ETCDIR= ${PREFIX}/etc/namedb .if defined(BIND_TOOLS_SLAVE) EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools +CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/bind-tools .else USE_RC_SUBR= named # XXX: remove the big warning about it being a development version from pkg-message @@ -272,9 +272,10 @@ post-install-DOCS-on: .else do-install: - for dir in bin doc/man; do \ + 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 .endif # BIND_TOOLS_SLAVE diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 52a670a87232..99dab3fc8eef 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1592905941 -SHA256 (isc-projects-bind9-e8fa9986bd3bc6fdb7d40b60ecebfdcafbabea4c_GL0.tar.gz) = 07dd4fd1c1a2df373a0080215df9a0aebc86bff5355736a0219df3a1201bb793 -SIZE (isc-projects-bind9-e8fa9986bd3bc6fdb7d40b60ecebfdcafbabea4c_GL0.tar.gz) = 4486388 +TIMESTAMP = 1594033999 +SHA256 (isc-projects-bind9-f34b179d12f74ad1851488d0363ee1471a6926ed_GL0.tar.gz) = 708fcc1b193fb149ac814cd7d1b32279b70e36ceb78bf54e7f05638e1634965a +SIZE (isc-projects-bind9-f34b179d12f74ad1851488d0363ee1471a6926ed_GL0.tar.gz) = 4496597 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index eae34a9f5d6f..6b6e32a82358 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-06-06 05:02:12 UTC +--- bin/named/config.c.orig 2020-07-06 09:00:26 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-06-06 05:02:12 UTC +--- bin/named/server.c.orig 2020-07-06 09:00:26 UTC +++ bin/named/server.c -@@ -4331,6 +4331,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4333,6 +4333,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-06-06 05:02:12 UTC +--- lib/dns/include/dns/view.h.orig 2020-07-06 09:00:26 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,9 +34,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2020-06-06 05:02:12 UTC +--- lib/dns/resolver.c.orig 2020-07-06 09:00:26 UTC +++ lib/dns/resolver.c -@@ -6235,6 +6235,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6244,6 +6244,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -49,9 +49,9 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-06-06 05:02:12 UTC +--- lib/isccfg/namedconf.c.orig 2020-07-06 09:00:26 UTC +++ lib/isccfg/namedconf.c -@@ -1992,6 +1992,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -1993,6 +1993,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 }, diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 01341381c678..2c4a3723a0ae 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -261,13 +261,27 @@ 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/libbind9.so +lib/libbind9.so.1701 +lib/libbind9.so.1701.0.0 +lib/libdns.so +lib/libdns.so.1702 +lib/libdns.so.1702.0.0 +lib/libirs.so +lib/libirs.so.1701 +lib/libirs.so.1701.0.0 +lib/libisc.so +lib/libisc.so.1702 +lib/libisc.so.1702.0.0 +lib/libisccc.so +lib/libisccc.so.1701 +lib/libisccc.so.1701.0.0 +lib/libisccfg.so +lib/libisccfg.so.1701 +lib/libisccfg.so.1701.0.0 +lib/libns.so +lib/libns.so.1702 +lib/libns.so.1702.0.0 @comment lib/named/filter-aaaa.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @@ -298,16 +312,16 @@ lib/libns.a %%MANPAGES%%%%NATIVE_PKCS11%%man/man1/pkcs11-tokens.1.gz %%MANPAGES%%man/man5/named.conf.5.gz %%MANPAGES%%man/man5/rndc.conf.5.gz -%%MANPAGES%%man/man8/ddns-confgen.8.gz %%MANPAGES%%man/man8/filter-aaaa.8.gz %%MANPAGES%%man/man8/named.8.gz %%MANPAGES%%man/man8/rndc-confgen.8.gz %%MANPAGES%%man/man8/rndc.8.gz +%%MANPAGES%%man/man8/tsig-keygen.8.gz sbin/ddns-confgen sbin/named sbin/rndc sbin/rndc-confgen -sbin/tsig-confgen +sbin/tsig-keygen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir(bind,bind,) %%ETCDIR%%/slave @dir(bind,bind,) %%ETCDIR%%/working