Date: Sat, 12 May 2018 14:19:14 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333560 - in head/contrib/unbound: . doc services Message-ID: <201805121419.w4CEJEhe090499@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Sat May 12 14:19:14 2018 New Revision: 333560 URL: https://svnweb.freebsd.org/changeset/base/333560 Log: Upgrade Unbound to 1.6.3. More to follow. Modified: head/contrib/unbound/config.h head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3 head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8 head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8 head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8 head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5 head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/services/outside_network.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/config.h ============================================================================== --- head/contrib/unbound/config.h Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/config.h Sat May 12 14:19:14 2018 (r333560) @@ -595,7 +595,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.6.2" +#define PACKAGE_STRING "unbound 1.6.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -604,7 +604,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6.2" +#define PACKAGE_VERSION "1.6.3" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -623,7 +623,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,6,2,0 +#define RSRC_PACKAGE_VERSION 1,6,3,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" Modified: head/contrib/unbound/configure ============================================================================== --- head/contrib/unbound/configure Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/configure Sat May 12 14:19:14 2018 (r333560) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.6.2. +# Generated by GNU Autoconf 2.69 for unbound 1.6.3. # # Report bugs to <unbound-bugs@nlnetlabs.nl>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.6.2' -PACKAGE_STRING='unbound 1.6.2' +PACKAGE_VERSION='1.6.3' +PACKAGE_STRING='unbound 1.6.3' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -1429,7 +1429,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.6.2 to adapt to many kinds of systems. +\`configure' configures unbound 1.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1494,7 +1494,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.6.2:";; + short | recursive ) echo "Configuration of unbound 1.6.3:";; esac cat <<\_ACEOF @@ -1703,7 +1703,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.6.2 +unbound configure 1.6.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2412,7 +2412,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.6.2, which was +It was created by unbound $as_me 1.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2764,11 +2764,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=6 -UNBOUND_VERSION_MICRO=2 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=1 +LIBUNBOUND_REVISION=2 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2821,6 +2821,7 @@ LIBUNBOUND_AGE=5 # 1.6.0 had 6:3:4 # 1.6.1 had 7:0:5 # ub_callback_t typedef renamed to ub_callback_type # 1.6.2 had 7:1:5 +# 1.6.3 had 7:2:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -20487,7 +20488,7 @@ _ACEOF -version=1.6.2 +version=1.6.3 date=`date +'%b %e, %Y'` @@ -21006,7 +21007,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.6.2, which was +This file was extended by unbound $as_me 1.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21072,7 +21073,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.6.2 +unbound config.status 1.6.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Modified: head/contrib/unbound/configure.ac ============================================================================== --- head/contrib/unbound/configure.ac Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/configure.ac Sat May 12 14:19:14 2018 (r333560) @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[6]) -m4_define([VERSION_MICRO],[2]) +m4_define([VERSION_MICRO],[3]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=7 -LIBUNBOUND_REVISION=1 +LIBUNBOUND_REVISION=2 LIBUNBOUND_AGE=5 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -71,6 +71,7 @@ LIBUNBOUND_AGE=5 # 1.6.0 had 6:3:4 # 1.6.1 had 7:0:5 # ub_callback_t typedef renamed to ub_callback_type # 1.6.2 had 7:1:5 +# 1.6.3 had 7:2:5 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary Modified: head/contrib/unbound/doc/Changelog ============================================================================== --- head/contrib/unbound/doc/Changelog Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/Changelog Sat May 12 14:19:14 2018 (r333560) @@ -1,3 +1,9 @@ +13 June 2017: Wouter + - Fix #1280: Unbound fails assert when response from authoritative + contains malformed qname. When 0x20 caps-for-id is enabled, when + assertions are not enabled the malformed qname is handled correctly. + - tag for 1.6.3 + 13 April 2017: Wouter - Fix #1250: inconsistent indentation in services/listen_dnsport.c. - tag for 1.6.2rc1 Modified: head/contrib/unbound/doc/README ============================================================================== --- head/contrib/unbound/doc/README Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/README Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -README for Unbound 1.6.2 +README for Unbound 1.6.3 Copyright 2007 NLnet Labs http://unbound.net Modified: head/contrib/unbound/doc/example.conf ============================================================================== --- head/contrib/unbound/doc/example.conf Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/example.conf Sat May 12 14:19:14 2018 (r333560) @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.6.2. +# See unbound.conf(5) man page, version 1.6.3. # # this is a comment. Modified: head/contrib/unbound/doc/example.conf.in ============================================================================== --- head/contrib/unbound/doc/example.conf.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/example.conf.in Sat May 12 14:19:14 2018 (r333560) @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.6.2. +# See unbound.conf(5) man page, version 1.6.3. # # this is a comment. Modified: head/contrib/unbound/doc/libunbound.3 ============================================================================== --- head/contrib/unbound/doc/libunbound.3 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/libunbound.3 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "libunbound" "3" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -43,7 +43,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.6.2 functions. +\- Unbound DNS validating resolver 1.6.3 functions. .SH "SYNOPSIS" .B #include <unbound.h> .LP Modified: head/contrib/unbound/doc/libunbound.3.in ============================================================================== --- head/contrib/unbound/doc/libunbound.3.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/libunbound.3.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "libunbound" "3" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -43,7 +43,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.6.2 functions. +\- Unbound DNS validating resolver 1.6.3 functions. .SH "SYNOPSIS" .B #include <unbound.h> .LP Modified: head/contrib/unbound/doc/unbound-anchor.8 ============================================================================== --- head/contrib/unbound/doc/unbound-anchor.8 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-anchor.8 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound-anchor" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" Modified: head/contrib/unbound/doc/unbound-anchor.8.in ============================================================================== --- head/contrib/unbound/doc/unbound-anchor.8.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-anchor.8.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound-anchor" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" Modified: head/contrib/unbound/doc/unbound-checkconf.8 ============================================================================== --- head/contrib/unbound/doc/unbound-checkconf.8 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-checkconf.8 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound-checkconf" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" Modified: head/contrib/unbound/doc/unbound-checkconf.8.in ============================================================================== --- head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-checkconf.8.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound-checkconf" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" Modified: head/contrib/unbound/doc/unbound-control.8 ============================================================================== --- head/contrib/unbound/doc/unbound-control.8 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-control.8 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound-control" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-control.8 -- unbound remote control manual .\" Modified: head/contrib/unbound/doc/unbound-control.8.in ============================================================================== --- head/contrib/unbound/doc/unbound-control.8.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-control.8.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound-control" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-control.8 -- unbound remote control manual .\" Modified: head/contrib/unbound/doc/unbound-host.1 ============================================================================== --- head/contrib/unbound/doc/unbound-host.1 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-host.1 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound\-host" "1" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" Modified: head/contrib/unbound/doc/unbound-host.1.in ============================================================================== --- head/contrib/unbound/doc/unbound-host.1.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound-host.1.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound\-host" "1" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" Modified: head/contrib/unbound/doc/unbound.8 ============================================================================== --- head/contrib/unbound/doc/unbound.8 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound.8 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.6.2. +\- Unbound DNS validating resolver 1.6.3. .SH "SYNOPSIS" .B unbound .RB [ \-h ] Modified: head/contrib/unbound/doc/unbound.8.in ============================================================================== --- head/contrib/unbound/doc/unbound.8.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound.8.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound" "8" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.6.2. +\- Unbound DNS validating resolver 1.6.3. .SH "SYNOPSIS" .B unbound .RB [ \-h ] Modified: head/contrib/unbound/doc/unbound.conf.5 ============================================================================== --- head/contrib/unbound/doc/unbound.conf.5 Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound.conf.5 Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound.conf" "5" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound.conf.5 -- unbound.conf manual .\" Modified: head/contrib/unbound/doc/unbound.conf.5.in ============================================================================== --- head/contrib/unbound/doc/unbound.conf.5.in Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/doc/unbound.conf.5.in Sat May 12 14:19:14 2018 (r333560) @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Apr 24, 2017" "NLnet Labs" "unbound 1.6.2" +.TH "unbound.conf" "5" "Jun 13, 2017" "NLnet Labs" "unbound 1.6.3" .\" .\" unbound.conf.5 -- unbound.conf manual .\" Modified: head/contrib/unbound/services/outside_network.c ============================================================================== --- head/contrib/unbound/services/outside_network.c Sat May 12 14:15:39 2018 (r333559) +++ head/contrib/unbound/services/outside_network.c Sat May 12 14:19:14 2018 (r333560) @@ -1549,7 +1549,7 @@ serviced_check_qname(sldns_buffer* pkt, uint8_t* qbuf, return 0; while(len1 != 0 || len2 != 0) { if(LABEL_IS_PTR(len1)) { - d1 = sldns_buffer_at(pkt, PTR_OFFSET(len1, *d1)); + d1 = sldns_buffer_begin(pkt)+PTR_OFFSET(len1, *d1); if(d1 >= sldns_buffer_at(pkt, sldns_buffer_limit(pkt))) return 0; len1 = *d1++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805121419.w4CEJEhe090499>