Re: git: 2fad974ce20a - main - dns/bind918: update to 9.18.1
Date: Thu, 24 Mar 2022 18:45:53 UTC
this fails to build on today's current:
https://home.lerctr.org:8888/data/live-host-ports/2022-03-24_13h27m13s/logs/errors/bind918-9.18.1.log
On 03/24/2022 12:03 pm, Mathieu Arnold wrote:
> The branch main has been updated by mat:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=2fad974ce20a88b9186c87ee75db3042e7e53014
>
> commit 2fad974ce20a88b9186c87ee75db3042e7e53014
> Author: Mathieu Arnold <mat@FreeBSD.org>
> AuthorDate: 2022-03-24 15:27:20 +0000
> Commit: Mathieu Arnold <mat@FreeBSD.org>
> CommitDate: 2022-03-24 17:02:15 +0000
>
> dns/bind918: update to 9.18.1
>
> MFH: 2021Q1
> Security: CVE-2021-25220, CVE-2022-0396, CVE-2022-0635,
> CVE-2022-0667
> ---
> dns/bind918/Makefile | 2 +-
> dns/bind918/distinfo | 6 +++---
> dns/bind918/files/extrapatch-bind-min-override-ttl | 16
> ++++++++--------
> dns/bind918/files/patch-configure.ac | 6 +++---
> 4 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
> index e25d62f9cfa5..3778ae838135 100644
> --- a/dns/bind918/Makefile
> +++ b/dns/bind918/Makefile
> @@ -43,7 +43,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
>
> USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl
> tar:xz
> # ISC releases things like 9.8.0-P1, which our versioning doesn't like
> -ISCVERSION= 9.18.0
> +ISCVERSION= 9.18.1
>
> CPE_VENDOR= isc
> CPE_VERSION= ${ISCVERSION:C/-.*//}
> diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
> index c269b36ae275..abf3548ad733 100644
> --- a/dns/bind918/distinfo
> +++ b/dns/bind918/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1644500257
> -SHA256 (bind-9.18.0.tar.xz) =
> 56525bf5caf01fd8fd9d90910880cc0f8a90a27a97d169187d651d4ecf0c411c
> -SIZE (bind-9.18.0.tar.xz) = 5292320
> +TIMESTAMP = 1648135372
> +SHA256 (bind-9.18.1.tar.xz) =
> 57c7afd871694d615cb4defb1c1bd6ed023350943d7458414db8d493ef560427
> +SIZE (bind-9.18.1.tar.xz) = 5059456
> diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl
> b/dns/bind918/files/extrapatch-bind-min-override-ttl
> index e9dd87270a1e..f70f5794c603 100644
> --- a/dns/bind918/files/extrapatch-bind-min-override-ttl
> +++ b/dns/bind918/files/extrapatch-bind-min-override-ttl
> @@ -1,6 +1,6 @@
> Add the override-cache-ttl feature.
>
> ---- bin/named/config.c.orig 2022-01-24 08:28:57 UTC
> +--- bin/named/config.c.orig 2022-03-07 08:05:16 UTC
> +++ bin/named/config.c
> @@ -172,6 +172,7 @@ options {\n\
> notify-source *;\n\
> @@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
> parental-source *;\n\
> parental-source-v6 *;\n\
> provide-ixfr true;\n\
> ---- bin/named/server.c.orig 2022-01-24 08:28:57 UTC
> +--- bin/named/server.c.orig 2022-03-07 08:05:16 UTC
> +++ bin/named/server.c
> -@@ -4482,6 +4482,11 @@ configure_view(dns_view_t *view, dns_viewlist_t
> *viewl
> +@@ -4496,6 +4496,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 2022-01-24 08:28:57 UTC
> +--- lib/dns/include/dns/view.h.orig 2022-03-07 08:05:16 UTC
> +++ lib/dns/include/dns/view.h
> @@ -155,6 +155,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 2022-01-24 08:28:57 UTC
> +--- lib/dns/resolver.c.orig 2022-03-07 08:05:16 UTC
> +++ lib/dns/resolver.c
> -@@ -6119,6 +6119,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name,
> dns_mes
> +@@ -6130,6 +6130,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name,
> dns_mes
> }
>
> /*
> @@ -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 2022-01-24 08:28:57 UTC
> +--- lib/isccfg/namedconf.c.orig 2022-03-07 08:05:16 UTC
> +++ lib/isccfg/namedconf.c
> -@@ -2086,6 +2086,7 @@ static cfg_clausedef_t view_clauses[] = {
> +@@ -2091,6 +2091,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 },
> diff --git a/dns/bind918/files/patch-configure.ac
> b/dns/bind918/files/patch-configure.ac
> index 7ca1502ec151..a5d7ab563b46 100644
> --- a/dns/bind918/files/patch-configure.ac
> +++ b/dns/bind918/files/patch-configure.ac
> @@ -1,13 +1,13 @@
> automake has warnings, it is ok here.
>
> ---- configure.ac.orig 2022-01-24 20:06:11 UTC
> +--- configure.ac.orig 2022-03-07 08:05:16 UTC
> +++ configure.ac
> @@ -48,7 +48,7 @@ AC_CANONICAL_HOST
> AC_CANONICAL_TARGET
>
> AC_CONFIG_SRCDIR([bin/named/main.c])
> --AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz
> no-dist-gzip -Wall -Werror])
> -+AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz
> no-dist-gzip -Wall])
> +-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])
--
Larry Rosenman http://www.lerctr.org/~ler
Phone: +1 214-642-9640 E-Mail: ler@lerctr.org
US Mail: 5708 Sabbia Dr, Round Rock, TX 78665-2106