From nobody Mon Feb 07 05:54:53 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1DAD119C32BC; Mon, 7 Feb 2022 05:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jsb2Q0Bxjz4lbk; Mon, 7 Feb 2022 05:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644213294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fp6j0gix34ps6SvZKEeapKowjhFEphsTKj7yefZezU8=; b=A98vhqloOBtvlnVQq/ICTCqbGJPZMF95JIIx7m4ZPseWLIgo0E4FtbSkM31ru2BhwEfAIq Gl83KYYKQWs2AAqKeult0BmgQGumBEnUFeqzpjlNBxyxVd0ezhj13qoIec1kMgEq7AUTKl yN5n+2LRfBTm9ccv4Lyl/56IP4J/3ELG7+7qVsKnXCxHBdhZ/9UOup1cZqeHjDDw0Fq0gE zm4QhWdiRU+C3TQs8YJ3fNpaCsyWnnWuAZCmAakRy5SdHhv1MooyQyStHGdX7o0o3Xm0ZZ NdPGU+4vCFZdnwRvnNmCOoepHsSHaIytO5oWsQwSnwOqDKd2ZOi+E/lBJtpsuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2EE120885; Mon, 7 Feb 2022 05:54:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2175srtB042706; Mon, 7 Feb 2022 05:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2175srMJ042705; Mon, 7 Feb 2022 05:54:53 GMT (envelope-from git) Date: Mon, 7 Feb 2022 05:54:53 GMT Message-Id: <202202070554.2175srMJ042705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 155e36d55038 - stable/12 - unbound: Vendor import 1.14.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 155e36d55038e0cb45d963628ca85b57060a4fd2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644213294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fp6j0gix34ps6SvZKEeapKowjhFEphsTKj7yefZezU8=; b=VbN/TMl8R5P51IYMlr1ZRRN2gUAKthlDrgM24sch1/+XvcQPvYSj8/cLgfEkgqG5n6nwKv qBV9uAwTDxOKFjJBfnaxyXQhCssLYTIqFLzI/m616/Thi8tGQFVZj3Zr6L/1UZ+wtog8Ip lT6ju8OCXR2jY5w+ulyZDlfhVbmvFN2C9nJHWtFC6sYfU9DdBHqEQOA3Qn1R44jwhgt8bP prW1PUULYZMxMpYrHMHJ8JAlYajg7+cgirwPAw7Hy/4B28T06aThUIO471eb5+wIlDY/z+ Z6kp5YgYDILen/2mLnJV+xny+9QyqGXur4ZAet4kS1CEV3SqII9TkKKYpyStiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644213294; a=rsa-sha256; cv=none; b=kjtLnYAlDxhXnSRFiiu+y6DSZaS/kdBbSN3Q6TeYgGcj4ZitNkzvUeKV3kYnd59z0wyyY0 CnDpfw21ueIH02rL0XYZQQX+Vng/3gGLVth1OCG6n25fwXOM0ZwKEYEYUXI4EVDF+qEtaS +4pzttHhkqffYJTFIr8NHs+cVLnLVDm0tTXyGw0d1XHdrbS1jdWz5kkmpHzEYnqWTzj1Tq KohEReEYwtEtfUJL9JLePB/snilnwNA8k45jILoaxN1x4BzSVRRTZZM7i0EpFfDoErGCot 3hWMB/xQYJu5O3QMyDJUD/wz2h0Qi7C6eYHX7mr3ISKoOkoiJJ3dTjTusJQDsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=155e36d55038e0cb45d963628ca85b57060a4fd2 commit 155e36d55038e0cb45d963628ca85b57060a4fd2 Author: Cy Schubert AuthorDate: 2022-01-24 05:58:36 +0000 Commit: Cy Schubert CommitDate: 2022-02-07 05:54:24 +0000 unbound: Vendor import 1.14.0 Vendor import GA release of unbound 1.14.0. Merge commit '9b87431a326169e72d5ca55670cb3c95205aa350' into unbound/main (cherry picked from commit 273016e836aa378789612e0a0e08d50f28be778e) --- contrib/unbound/configure | 22 +++++++++++----------- contrib/unbound/configure.ac | 2 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3.in | 4 ++-- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 ++-- contrib/unbound/doc/unbound.conf.5.in | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contrib/unbound/configure b/contrib/unbound/configure index df25819eabbf..0e964568e234 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.14.0rc1. +# Generated by GNU Autoconf 2.69 for unbound 1.14.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.14.0rc1' -PACKAGE_STRING='unbound 1.14.0rc1' +PACKAGE_VERSION='1.14.0' +PACKAGE_STRING='unbound 1.14.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1466,7 +1466,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.14.0rc1 to adapt to many kinds of systems. +\`configure' configures unbound 1.14.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1531,7 +1531,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.14.0rc1:";; + short | recursive ) echo "Configuration of unbound 1.14.0:";; esac cat <<\_ACEOF @@ -1773,7 +1773,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.14.0rc1 +unbound configure 1.14.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2482,7 +2482,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.14.0rc1, which was +It was created by unbound $as_me 1.14.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2834,7 +2834,7 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=14 -UNBOUND_VERSION_MICRO=0rc1 +UNBOUND_VERSION_MICRO=0 LIBUNBOUND_CURRENT=9 @@ -21840,7 +21840,7 @@ _ACEOF -version=1.14.0rc1 +version=1.14.0 date=`date +'%b %e, %Y'` @@ -22359,7 +22359,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.14.0rc1, which was +This file was extended by unbound $as_me 1.14.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22425,7 +22425,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.14.0rc1 +unbound config.status 1.14.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 418ea099f6ad..36fdb4598c27 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,7 +11,7 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[14]) -m4_define([VERSION_MICRO],[0rc1]) +m4_define([VERSION_MICRO],[0]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) diff --git a/contrib/unbound/doc/README b/contrib/unbound/doc/README index ea18f4fe5c05..3b8d0cce3170 100644 --- a/contrib/unbound/doc/README +++ b/contrib/unbound/doc/README @@ -1,4 +1,4 @@ -README for Unbound 1.14.0rc1 +README for Unbound 1.14.0 Copyright 2007 NLnet Labs http://unbound.net diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in index 2dfd770fd4c5..d9f4995e41ef 100644 --- a/contrib/unbound/doc/example.conf.in +++ b/contrib/unbound/doc/example.conf.in @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.14.0rc1. +# See unbound.conf(5) man page, version 1.14.0. # # this is a comment. diff --git a/contrib/unbound/doc/libunbound.3.in b/contrib/unbound/doc/libunbound.3.in index a35b41bf0525..6c5217aa04c4 100644 --- a/contrib/unbound/doc/libunbound.3.in +++ b/contrib/unbound/doc/libunbound.3.in @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "libunbound" "3" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -44,7 +44,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.14.0rc1 functions. +\- Unbound DNS validating resolver 1.14.0 functions. .SH "SYNOPSIS" .B #include .LP diff --git a/contrib/unbound/doc/unbound-anchor.8.in b/contrib/unbound/doc/unbound-anchor.8.in index 84d6f348c484..ddab3d27f120 100644 --- a/contrib/unbound/doc/unbound-anchor.8.in +++ b/contrib/unbound/doc/unbound-anchor.8.in @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "unbound-anchor" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" diff --git a/contrib/unbound/doc/unbound-checkconf.8.in b/contrib/unbound/doc/unbound-checkconf.8.in index 2453a1984532..bd1ab8ad696d 100644 --- a/contrib/unbound/doc/unbound-checkconf.8.in +++ b/contrib/unbound/doc/unbound-checkconf.8.in @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "unbound-checkconf" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" diff --git a/contrib/unbound/doc/unbound-control.8.in b/contrib/unbound/doc/unbound-control.8.in index d268b0b94b7e..ab5413c9a0ba 100644 --- a/contrib/unbound/doc/unbound-control.8.in +++ b/contrib/unbound/doc/unbound-control.8.in @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "unbound-control" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" unbound-control.8 -- unbound remote control manual .\" diff --git a/contrib/unbound/doc/unbound-host.1.in b/contrib/unbound/doc/unbound-host.1.in index 85863835b505..b7d4d2350074 100644 --- a/contrib/unbound/doc/unbound-host.1.in +++ b/contrib/unbound/doc/unbound-host.1.in @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "unbound\-host" "1" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" diff --git a/contrib/unbound/doc/unbound.8.in b/contrib/unbound/doc/unbound.8.in index 6f956b6a184d..11b02aebcb2e 100644 --- a/contrib/unbound/doc/unbound.8.in +++ b/contrib/unbound/doc/unbound.8.in @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "unbound" "8" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.14.0rc1. +\- Unbound DNS validating resolver 1.14.0. .SH "SYNOPSIS" .B unbound .RB [ \-h ] diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in index baf024b70960..4c144db22ab5 100644 --- a/contrib/unbound/doc/unbound.conf.5.in +++ b/contrib/unbound/doc/unbound.conf.5.in @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Dec 2, 2021" "NLnet Labs" "unbound 1.14.0rc1" +.TH "unbound.conf" "5" "Dec 9, 2021" "NLnet Labs" "unbound 1.14.0" .\" .\" unbound.conf.5 -- unbound.conf manual .\"