From owner-svn-src-stable@freebsd.org  Tue Feb  2 01:23:06 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F9EBA9818F
 for <svn-src-stable@mailman.ysv.freebsd.org>;
 Tue,  2 Feb 2016 01:23:06 +0000 (UTC)
 (envelope-from sobomax@sippysoft.com)
Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com
 [IPv6:2a00:1450:400c:c09::231])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C6304147F
 for <svn-src-stable@freebsd.org>; Tue,  2 Feb 2016 01:23:05 +0000 (UTC)
 (envelope-from sobomax@sippysoft.com)
Received: by mail-wm0-x231.google.com with SMTP id p63so711104wmp.1
 for <svn-src-stable@freebsd.org>; Mon, 01 Feb 2016 17:23:05 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=sippysoft-com.20150623.gappssmtp.com; s=20150623;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=UBpXhxHRALj8uksailVoJI9znOuWJn0z0HOM4P+X6iI=;
 b=xVj4YnPwLw2GJObZHDKwUA7z0709Oed9y34z4xYwKnfnGi4pqeIMgrjxILrtww8qEC
 Bqn+/pxw3D91oLaSooSROXew8ctbmAPGgkky5kzlzxTUBo4N9Y5CLbbx2xRaMWs8S4+9
 wdcy+Z29HrtEAKZ7OI9ECw/EvS2Ypppy2Hz+hX1osz6frzY56oY1G4S+rA4/jmvdFjrp
 Rc9lTYWO9zK8A4B1OCkNU3y1n/YaJQX725HWsWaemynJUvhMck6MDADL/HJjJa2yMdAT
 RARlBeIn1coFTD3gUWKkwrU2Y/k03VUYvXOxXh6J1e/TUvW3gzCo4WKOdDiNh8dP9n1E
 ucMw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:sender:in-reply-to:references:date
 :message-id:subject:from:to:cc:content-type;
 bh=UBpXhxHRALj8uksailVoJI9znOuWJn0z0HOM4P+X6iI=;
 b=Z6nOceeUBhUEHtgN1INTeQIbascUfqyKgudoAehDPoN28cV5bqYBpBswktDTa6ptH5
 ILAHhG++GwdexeC9yewFmdupmvmELVY2XeXpMnsEr9MKgG2tbcwISC8JQtH1MD4BOC/G
 NXsyS5xPBN5V+5QWjrWczVLaqpj4RytCAyemeTf/kLLijWl6v5OKrBexrLM3YqPsYLL5
 1TknlsuLkAFepU/LpQ+WDpX3tXjE1yKE5r71rw2nYVz0DUv7i88p9nhyKuVV/guM10zx
 9bWRpIMqSaGzNTG772xMpNAY2mtuxWVV4v/oGpnE1kA0gHzVj2ei97ZJE4/Sd0Cx7n96
 9c0g==
X-Gm-Message-State: AG10YORGQaWE5z6zkl86HFUs4HRoylWOuEeKcIDov8bFQLm9dRhNsmm+M36i70x4Rc1Bg48Yoiz1ai/Y4dOZBPuX
MIME-Version: 1.0
X-Received: by 10.194.174.36 with SMTP id bp4mr25141243wjc.137.1454376183183; 
 Mon, 01 Feb 2016 17:23:03 -0800 (PST)
Sender: sobomax@sippysoft.com
Received: by 10.27.39.195 with HTTP; Mon, 1 Feb 2016 17:23:03 -0800 (PST)
In-Reply-To: <201601161906.u0GJ6Cid076259@repo.freebsd.org>
References: <201601161906.u0GJ6Cid076259@repo.freebsd.org>
Date: Mon, 1 Feb 2016 17:23:03 -0800
X-Google-Sender-Auth: ZTjnZUjr2I4xIWc5YV78Ce7xUn0
Message-ID: <CAH7qZfu-wjXGNmy1b61L1+Dqmw9-5W6prcppi6tz-5hFHU4=wA@mail.gmail.com>
Subject: Re: svn: stable/10/contrib/unbound: . compat daemon dns64 dnstap doc
 iterator libunbound libunbound/python libunbound/python/doc
 libunbound/python/doc/modules libunbound/python/exam...
From: Maxim Sobolev <sobomax@FreeBSD.org>
To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= <des@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, 
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2016 01:23:06 -0000

> Added:
>  stable/10/contrib/unbound/.gitignore

Please remove this from both HEAD and stable. It "ignores" config.h, which
is actually needed for the FreeBSD build. But in general, those files don't
need to be in FreeBSD tree. Thanks!

-Max

On Sat, Jan 16, 2016 at 11:06 AM, Dag-Erling Sm=C3=B8rgrav <des@freebsd.org=
>
wrote:

> Author: des
> Date: Sat Jan 16 19:06:12 2016
> New Revision: 294190
> URL: https://svnweb.freebsd.org/changeset/base/294190
>
> Log:
>   MFH (r292206): upgrade to Unbound 1.5.7
>   MFH (r292135): run configure script with correct compiler
>
> Added:
>   stable/10/contrib/unbound/.gitignore
>      - copied unchanged from r292206, head/contrib/unbound/.gitignore
>   stable/10/contrib/unbound/compat/isblank.c
>      - copied unchanged from r292206, head/contrib/unbound/compat/isblank=
.c
> Modified:
>   stable/10/contrib/unbound/Makefile.in
>   stable/10/contrib/unbound/acx_nlnetlabs.m4
>   stable/10/contrib/unbound/compat/arc4random.c
>   stable/10/contrib/unbound/compat/getentropy_linux.c
>   stable/10/contrib/unbound/compat/getentropy_solaris.c
>   stable/10/contrib/unbound/compat/reallocarray.c
>   stable/10/contrib/unbound/compat/sha512.c
>   stable/10/contrib/unbound/compat/snprintf.c
>   stable/10/contrib/unbound/config.h
>   stable/10/contrib/unbound/config.h.in
>   stable/10/contrib/unbound/configure
>   stable/10/contrib/unbound/configure.ac
>   stable/10/contrib/unbound/daemon/remote.c
>   stable/10/contrib/unbound/daemon/unbound.c
>   stable/10/contrib/unbound/daemon/worker.c
>   stable/10/contrib/unbound/dns64/dns64.c
>   stable/10/contrib/unbound/dnstap/dnstap.proto
>   stable/10/contrib/unbound/doc/Changelog
>   stable/10/contrib/unbound/doc/README
>   stable/10/contrib/unbound/doc/example.conf
>   stable/10/contrib/unbound/doc/example.conf.in
>   stable/10/contrib/unbound/doc/libunbound.3
>   stable/10/contrib/unbound/doc/libunbound.3.in
>   stable/10/contrib/unbound/doc/unbound-anchor.8
>   stable/10/contrib/unbound/doc/unbound-anchor.8.in
>   stable/10/contrib/unbound/doc/unbound-checkconf.8
>   stable/10/contrib/unbound/doc/unbound-checkconf.8.in
>   stable/10/contrib/unbound/doc/unbound-control.8
>   stable/10/contrib/unbound/doc/unbound-control.8.in
>   stable/10/contrib/unbound/doc/unbound-host.1
>   stable/10/contrib/unbound/doc/unbound-host.1.in
>   stable/10/contrib/unbound/doc/unbound.8
>   stable/10/contrib/unbound/doc/unbound.8.in
>   stable/10/contrib/unbound/doc/unbound.conf.5
>   stable/10/contrib/unbound/doc/unbound.conf.5.in
>   stable/10/contrib/unbound/freebsd-configure.sh
>   stable/10/contrib/unbound/iterator/iter_scrub.c
>   stable/10/contrib/unbound/iterator/iter_utils.c
>   stable/10/contrib/unbound/iterator/iterator.c
>   stable/10/contrib/unbound/iterator/iterator.h
>   stable/10/contrib/unbound/libunbound/libunbound.c
>   stable/10/contrib/unbound/libunbound/python/Makefile
>   stable/10/contrib/unbound/libunbound/python/doc/install.rst
>   stable/10/contrib/unbound/libunbound/python/doc/modules/unbound.rst
>   stable/10/contrib/unbound/libunbound/python/examples/dnssec-valid.py
>   stable/10/contrib/unbound/libunbound/python/libunbound.i
>   stable/10/contrib/unbound/ltmain.sh
>   stable/10/contrib/unbound/services/cache/dns.c
>   stable/10/contrib/unbound/services/cache/rrset.c
>   stable/10/contrib/unbound/sldns/parseutil.h
>   stable/10/contrib/unbound/sldns/wire2str.c
>   stable/10/contrib/unbound/smallapp/unbound-anchor.c
>   stable/10/contrib/unbound/smallapp/unbound-checkconf.c
>   stable/10/contrib/unbound/smallapp/unbound-control-setup.sh
>   stable/10/contrib/unbound/smallapp/unbound-control-setup.sh.in
>   stable/10/contrib/unbound/smallapp/unbound-control.c
>   stable/10/contrib/unbound/util/config_file.c
>   stable/10/contrib/unbound/util/config_file.h
>   stable/10/contrib/unbound/util/configlexer.lex
>   stable/10/contrib/unbound/util/configparser.y
>   stable/10/contrib/unbound/util/iana_ports.inc
>   stable/10/contrib/unbound/util/locks.c
>   stable/10/contrib/unbound/util/net_help.c
>   stable/10/contrib/unbound/util/random.c
>   stable/10/contrib/unbound/util/rbtree.c
>   stable/10/contrib/unbound/util/rtt.h
>   stable/10/contrib/unbound/util/storage/lookup3.c
>   stable/10/contrib/unbound/util/tube.h
>   stable/10/contrib/unbound/util/winsock_event.h
>   stable/10/contrib/unbound/validator/autotrust.c
>   stable/10/contrib/unbound/validator/val_neg.c
>   stable/10/contrib/unbound/validator/val_neg.h
>   stable/10/contrib/unbound/validator/val_nsec.c
>   stable/10/contrib/unbound/validator/val_nsec.h
>   stable/10/contrib/unbound/validator/val_nsec3.c
>   stable/10/contrib/unbound/validator/val_nsec3.h
>   stable/10/contrib/unbound/validator/val_secalgo.c
>   stable/10/contrib/unbound/validator/val_secalgo.h
>   stable/10/contrib/unbound/validator/val_sigcrypt.c
>   stable/10/contrib/unbound/validator/val_utils.h
>   stable/10/contrib/unbound/validator/validator.c
> Directory Properties:
>   stable/10/   (props changed)
>
> Copied: stable/10/contrib/unbound/.gitignore (from r292206,
> head/contrib/unbound/.gitignore)
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ stable/10/contrib/unbound/.gitignore        Sat Jan 16 19:06:12 2016
>       (r294190, copy of r292206, head/contrib/unbound/.gitignore)
> @@ -0,0 +1,38 @@
> +*.lo
> +*.o
> +/.libs/
> +/Makefile
> +/autom4te.cache/
> +/config.h
> +/config.log
> +/config.status
> +/dnstap/dnstap_config.h
> +/doc/example.conf
> +/doc/libunbound.3
> +/doc/unbound-anchor.8
> +/doc/unbound-checkconf.8
> +/doc/unbound-control.8
> +/doc/unbound-host.1
> +/doc/unbound.8
> +/doc/unbound.conf.5
> +/libtool
> +/libunbound.la
> +/smallapp/unbound-control-setup.sh
> +/unbound
> +/unbound-anchor
> +/unbound-checkconf
> +/unbound-control
> +/unbound-control-setup
> +/unbound-host
> +/unbound.h
> +/asynclook
> +/delayer
> +/lock-verify
> +/memstats
> +/perf
> +/petal
> +/pktview
> +/streamtcp
> +/testbound
> +/unittest
> +
>
> Modified: stable/10/contrib/unbound/Makefile.in
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/Makefile.in       Sat Jan 16 18:59:10 2016
>       (r294189)
> +++ stable/10/contrib/unbound/Makefile.in       Sat Jan 16 19:06:12 2016
>       (r294190)
> @@ -38,6 +38,7 @@ UNBOUND_VERSION_MINOR=3D@UNBOUND_VERSION_M
>  UNBOUND_VERSION_MICRO=3D@UNBOUND_VERSION_MICRO@
>  ALLTARGET=3D@ALLTARGET@
>  INSTALLTARGET=3D@INSTALLTARGET@
> +SSLLIB=3D@SSLLIB@
>
>  # _unbound.la if pyunbound enabled.
>  PYUNBOUND_TARGET=3D@PYUNBOUND_TARGET@
> @@ -132,7 +133,7 @@ compat/memcmp.c compat/memmove.c compat/
>  compat/strlcpy.c compat/strptime.c compat/getentropy_linux.c \
>  compat/getentropy_osx.c compat/getentropy_solaris.c
> compat/getentropy_win.c \
>  compat/explicit_bzero.c compat/arc4random.c compat/arc4random_uniform.c =
\
> -compat/arc4_lock.c compat/sha512.c compat/reallocarray.c
> +compat/arc4_lock.c compat/sha512.c compat/reallocarray.c compat/isblank.=
c
>  COMPAT_OBJ=3D$(LIBOBJS:.o=3D.lo)
>  COMPAT_OBJ_WITHOUT_CTIME=3D$(LIBOBJ_WITHOUT_CTIME:.o=3D.lo)
>  COMPAT_OBJ_WITHOUT_CTIMEARC4=3D$(LIBOBJ_WITHOUT_CTIMEARC4:.o=3D.lo)
> @@ -295,22 +296,22 @@ longtest: tests
>  lib:   libunbound.la unbound.h
>
>  libunbound.la: $(LIBUNBOUND_OBJ_LINK)
> -       $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) -rpath
> $(libdir) -lssl $(LIBS)
> +       $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) -rpath
> $(libdir) $(SSLLIB) $(LIBS)
>
>  unbound$(EXEEXT):      $(DAEMON_OBJ_LINK) libunbound.la
> -       $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
>
>  unbound-checkconf$(EXEEXT):    $(CHECKCONF_OBJ_LINK) libunbound.la
> -       $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS=
)
>
>  unbound-control$(EXEEXT):      $(CONTROL_OBJ_LINK) libunbound.la
> -       $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
>
>  unbound-host$(EXEEXT): $(HOST_OBJ_LINK) libunbound.la
>         $(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
>
>  unbound-anchor$(EXEEXT):       $(UBANCHOR_OBJ_LINK) libunbound.la
> -       $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat
> -lssl $(LIBS)
> +       $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat
> $(SSLLIB) $(LIBS)
>
>  unbound-service-install$(EXEEXT):      $(SVCINST_OBJ_LINK)
>         $(LINK) -o $@ $(SVCINST_OBJ_LINK) $(LIBS)
> @@ -322,37 +323,37 @@ anchor-update$(EXEEXT):  $(ANCHORUPD_OBJ
>         $(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
>
>  unittest$(EXEEXT):     $(UNITTEST_OBJ_LINK)
> -       $(LINK) -o $@ $(UNITTEST_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  testbound$(EXEEXT):    $(TESTBOUND_OBJ_LINK)
> -       $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  lock-verify$(EXEEXT):  $(LOCKVERIFY_OBJ_LINK)
> -       $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  petal$(EXEEXT):        $(PETAL_OBJ_LINK)
> -       $(LINK) -o $@ $(PETAL_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(PETAL_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  pktview$(EXEEXT):      $(PKTVIEW_OBJ_LINK)
> -       $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  memstats$(EXEEXT):     $(MEMSTATS_OBJ_LINK)
> -       $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  asynclook$(EXEEXT):    $(ASYNCLOOK_OBJ_LINK) libunbound.la
>         $(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) $(LIBS) -L. -L.libs -lunbound
>
>  streamtcp$(EXEEXT):    $(STREAMTCP_OBJ_LINK)
> -       $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  perf$(EXEEXT): $(PERF_OBJ_LINK)
> -       $(LINK) -o $@ $(PERF_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  delayer$(EXEEXT):      $(DELAYER_OBJ_LINK)
> -       $(LINK) -o $@ $(DELAYER_OBJ_LINK) -lssl $(LIBS)
> +       $(LINK) -o $@ $(DELAYER_OBJ_LINK) $(SSLLIB) $(LIBS)
>
>  signit$(EXEEXT):       testcode/signit.c
> -       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ testcode/signit.c $(LDFLAGS)
> -lldns -lssl $(LIBS)
> +       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ testcode/signit.c $(LDFLAGS)
> -lldns $(SSLLIB) $(LIBS)
>
>  unbound.h:     $(srcdir)/libunbound/unbound.h
>         sed -e 's/@''UNBOUND_VERSION_MAJOR@/$(UNBOUND_VERSION_MAJOR)/' -e
> 's/@''UNBOUND_VERSION_MINOR@/$(UNBOUND_VERSION_MINOR)/' -e
> 's/@''UNBOUND_VERSION_MICRO@/$(UNBOUND_VERSION_MICRO)/' <
> $(srcdir)/libunbound/unbound.h > $@
> @@ -644,7 +645,7 @@ iterator.lo iterator.o: $(srcdir)/iterat
>   $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.=
h
> $(srcdir)/util/regional.h \
>   $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h
> $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
>   $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h
> $(srcdir)/util/config_file.h $(srcdir)/util/random.h \
> - $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h
> $(srcdir)/sldns/sbuffer.h
> + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
> $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h
>  iter_delegpt.lo iter_delegpt.o: $(srcdir)/iterator/iter_delegpt.c
> config.h $(srcdir)/iterator/iter_delegpt.h \
>   $(srcdir)/util/log.h $(srcdir)/services/cache/dns.h
> $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
>   $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/regional.h \
> @@ -727,8 +728,7 @@ outside_network.lo outside_network.o: $(
>   $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/data/msgencode.h \
>   $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h
> $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \
>   $(srcdir)/util/module.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h
> $(srcdir)/services/modstack.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h \
> -
> + $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h
>  alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
>   $(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
>   $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h
> $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
> @@ -776,14 +776,12 @@ netevent.lo netevent.o: $(srcdir)/util/n
>   $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/packed_rrset.h \
>   $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h
> $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
>   $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h
> $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \
> - $(srcdir)/dnstap/dnstap.h  \
> - $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
> + $(srcdir)/dnstap/dnstap.h  $(srcdir)/util/mini_event.h
> $(srcdir)/util/rbtree.h
>  net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h
> $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
>   $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/module.h \
>   $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/data/msgparse.h \
>   $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
> $(srcdir)/util/regional.h $(srcdir)/sldns/parseutil.h \
> - $(srcdir)/sldns/wire2str.h \
> -
> + $(srcdir)/sldns/wire2str.h
>  random.lo random.o: $(srcdir)/util/random.c config.h
> $(srcdir)/util/random.h $(srcdir)/util/log.h
>  rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.=
h
> $(srcdir)/util/fptr_wlist.h \
>   $(srcdir)/util/netevent.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
> @@ -818,8 +816,7 @@ autotrust.lo autotrust.o: $(srcdir)/vali
>   $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h
> $(srcdir)/util/regional.h $(srcdir)/util/random.h \
>   $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h
> $(srcdir)/services/modstack.h \
>   $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h
> $(srcdir)/validator/val_kcache.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h
> $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h \
> -
> + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h
> $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h
>  val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h
> $(srcdir)/validator/val_anchor.h \
>   $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
> $(srcdir)/validator/val_sigcrypt.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/validator/autotrust.h \
> @@ -844,18 +841,16 @@ val_kcache.lo val_kcache.o: $(srcdir)/va
>  val_kentry.lo val_kentry.o: $(srcdir)/validator/val_kentry.c config.h
> $(srcdir)/validator/val_kentry.h \
>   $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
> $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \
>   $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h
> $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
> -
> -val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h \
> - $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h
> $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \
> - $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
> - $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h
> $(srcdir)/util/data/dname.h \
> - $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h
> $(srcdir)/util/config_file.h \
> - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h
> $(srcdir)/services/cache/dns.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h
> -val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h \
> - $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h
> $(srcdir)/util/data/packed_rrset.h \
> - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
> $(srcdir)/util/log.h $(srcdir)/validator/validator.h \
> + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h
> +val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h
> $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h \
> + $(srcdir)/util/log.h $(srcdir)/util/rbtree.h
> $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h \
> + $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/val_nsec3.h
> $(srcdir)/validator/val_utils.h \
> + $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/net_help.h \
> + $(srcdir)/util/config_file.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/util/storage/slabhash.h \
> + $(srcdir)/services/cache/dns.h $(srcdir)/sldns/rrdef.h
> $(srcdir)/sldns/sbuffer.h
> +val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h
> $(srcdir)/validator/val_nsec3.h \
> + $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
> + $(srcdir)/util/locks.h $(srcdir)/util/log.h
> $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \
>   $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h
> $(srcdir)/validator/val_kentry.h \
>   $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h
> $(srcdir)/util/regional.h \
> @@ -867,17 +862,15 @@ val_nsec.lo val_nsec.o: $(srcdir)/valida
>   $(srcdir)/sldns/rrdef.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/util/storage/slabhash.h
>  val_secalgo.lo val_secalgo.o: $(srcdir)/validator/val_secalgo.c config.h
> $(srcdir)/util/data/packed_rrset.h \
>   $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
> $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
> - $(srcdir)/sldns/sbuffer.h \
> -
> + $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h
> $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
> + $(srcdir)/sldns/sbuffer.h
>  val_sigcrypt.lo val_sigcrypt.o: $(srcdir)/validator/val_sigcrypt.c
> config.h \
>   $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
>   $(srcdir)/util/locks.h $(srcdir)/util/log.h
> $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \
>   $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h
> $(srcdir)/util/data/dname.h $(srcdir)/util/rbtree.h \
> - $(srcdir)/util/net_help.h $(srcdir)/util/regional.h
> $(srcdir)/sldns/keyraw.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h
> $(srcdir)/sldns/wire2str.h \
> -
> + $(srcdir)/util/net_help.h $(srcdir)/util/regional.h
> $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/sbuffer.h \
> + $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h
>  val_utils.lo val_utils.o: $(srcdir)/validator/val_utils.c config.h
> $(srcdir)/validator/val_utils.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
>   $(srcdir)/validator/validator.h $(srcdir)/util/module.h
> $(srcdir)/util/data/msgreply.h \
> @@ -895,11 +888,6 @@ dns64.lo dns64.o: $(srcdir)/dns64/dns64.
>   $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h
> $(srcdir)/util/regional.h
>  checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
>   $(srcdir)/testcode/checklocks.h
> -dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c  config.h
> $(srcdir)/sldns/sbuffer.h \
> - $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h
> $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
> - $(srcdir)/dnstap/dnstap.h \
> - $(srcdir)/dnstap/dnstap.pb-c.h
> -dnstap.pb-c.lo dnstap.pb-c.o: $(srcdir)/dnstap/dnstap.pb-c.c
> $(srcdir)/dnstap/dnstap.pb-c.h
>  unitanchor.lo unitanchor.o: $(srcdir)/testcode/unitanchor.c config.h
> $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \
>   $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
> $(srcdir)/testcode/unitmain.h \
>   $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h
> $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h
> @@ -908,8 +896,7 @@ unitdname.lo unitdname.o: $(srcdir)/test
>   $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h
>  unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h
> $(srcdir)/testcode/unitmain.h \
>   $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h
> -unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
> +unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h
> $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
>   $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h
> $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
>   $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h
> $(srcdir)/services/cache/infra.h \
>   $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rbtree.h \
> @@ -947,38 +934,35 @@ unitldns.lo unitldns.o: $(srcdir)/testco
>  acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h
> $(srcdir)/daemon/acl_list.h \
>   $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h
> $(srcdir)/util/regional.h $(srcdir)/util/log.h \
>   $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h
> -cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h \
> - $(srcdir)/daemon/cachedump.h $(srcdir)/daemon/remote.h
> $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
> - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h
> $(srcdir)/util/alloc.h \
> +cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h
> $(srcdir)/daemon/cachedump.h \
> + $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h
> $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
> + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
> + $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h
> $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
> + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
> $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
> + $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  \
> + $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h
> $(srcdir)/services/cache/dns.h \
> + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h \
> + $(srcdir)/util/regional.h $(srcdir)/util/net_help.h
> $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \
> + $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h
> $(srcdir)/iterator/iter_utils.h \
> + $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h
> $(srcdir)/iterator/iter_hints.h \
> + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
> +daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h
> $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \
> + $(srcdir)/util/log.h $(srcdir)/util/alloc.h
> $(srcdir)/services/modstack.h  \
> + $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h
> $(srcdir)/sldns/sbuffer.h \
> + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/netevent.h \
>   $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h
> $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
>   $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h
> $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
> -  $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
> - $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h
> $(srcdir)/util/storage/dnstree.h \
> - $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/regional.h
> $(srcdir)/util/net_help.h \
> - $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h
> $(srcdir)/services/outbound_list.h \
> - $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h
> $(srcdir)/iterator/iter_resptype.h \
> - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
> $(srcdir)/sldns/wire2str.h \
> - $(srcdir)/sldns/str2wire.h
> -daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
> - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
> $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
> -  $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
> - $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h
> $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
> - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
> - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rbtree.h \
> + $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h
> $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
>   $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h
> $(srcdir)/util/storage/slabhash.h \
>   $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/services/cache/infra.h \
>   $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h
> $(srcdir)/util/random.h $(srcdir)/util/tube.h \
>   $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h
> -remote.lo remote.o: $(srcdir)/daemon/remote.c config.h \
> - $(srcdir)/daemon/remote.h \
> - $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h
> $(srcdir)/sldns/sbuffer.h \
> - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
> - $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h
> $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
> - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
> $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
> - $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h
> $(srcdir)/daemon/daemon.h \
> +remote.lo remote.o: $(srcdir)/daemon/remote.c config.h
> $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \
> + $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h
> $(srcdir)/util/data/packed_rrset.h \
> + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
> $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
> + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
> + $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h
> $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
> + $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
>   $(srcdir)/services/modstack.h $(srcdir)/daemon/cachedump.h
> $(srcdir)/util/config_file.h \
>   $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h
> $(srcdir)/services/cache/rrset.h \
>   $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h
> $(srcdir)/util/storage/dnstree.h \
> @@ -1002,35 +986,33 @@ stats.lo stats.o: $(srcdir)/daemon/stats
>   $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
>  unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h
> $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \
>   $(srcdir)/util/locks.h $(srcdir)/util/alloc.h
> $(srcdir)/services/modstack.h  \
> - $(srcdir)/daemon/remote.h \
> - $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h
> $(srcdir)/util/storage/lruhash.h \
> - $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h
> $(srcdir)/services/cache/rrset.h \
> - $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h
> $(srcdir)/util/storage/dnstree.h \
> - $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.=
h
> $(srcdir)/util/module.h \
> - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h
> $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
> - $(srcdir)/util/tube.h $(srcdir)/services/mesh.h
> $(srcdir)/util/net_help.h $(srcdir)/util/mini_event.h \
> - $(srcdir)/util/rbtree.h
> + $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h
> $(srcdir)/util/storage/slabhash.h \
> + $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h
> $(srcdir)/util/netevent.h \
> + $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/services/cache/infra.h \
> + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h
> $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h \
> + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
> + $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h
> $(srcdir)/util/net_help.h \
> + $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
>  worker.lo worker.o: $(srcdir)/daemon/worker.c config.h
> $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
>   $(srcdir)/util/random.h $(srcdir)/daemon/worker.h
> $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h \
>   $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h
> $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
>   $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
> $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
>   $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h
> $(srcdir)/daemon/daemon.h \
> - $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
> - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rbtree.h \
> - $(srcdir)/util/config_file.h $(srcdir)/util/regional.h
> $(srcdir)/util/storage/slabhash.h \
> - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.=
h
> \
> - $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/services/cache/infra.h \
> - $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h
> $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
> + $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h
> $(srcdir)/daemon/acl_list.h \
> + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h
> $(srcdir)/util/config_file.h $(srcdir)/util/regional.h \
> + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \
> + $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h=
 \
> + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h
> $(srcdir)/util/rtt.h \
> + $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h
> $(srcdir)/services/localzone.h \
>   $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h
> $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
>   $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
> $(srcdir)/validator/autotrust.h \
>   $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h
> $(srcdir)/libunbound/unbound.h \
>   $(srcdir)/libunbound/libworker.h
>  testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h
> $(srcdir)/testcode/testpkts.h \
>   $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h
> $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h \
> - $(srcdir)/daemon/remote.h \
> - $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h
> $(srcdir)/daemon/unbound.c $(srcdir)/util/log.h \
> - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h
> $(srcdir)/services/modstack.h \
> + $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h
> $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c \
> + $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h
> $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
>    $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
>   $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h
> $(srcdir)/util/storage/dnstree.h \
> @@ -1046,12 +1028,12 @@ worker.lo worker.o: $(srcdir)/daemon/wor
>   $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h
> $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
>   $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h
> $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
>   $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h
> $(srcdir)/daemon/daemon.h \
> - $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
> - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rbtree.h \
> - $(srcdir)/util/config_file.h $(srcdir)/util/regional.h
> $(srcdir)/util/storage/slabhash.h \
> - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.=
h
> \
> - $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/services/cache/infra.h \
> - $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h
> $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
> + $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h
> $(srcdir)/daemon/acl_list.h \
> + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h
> $(srcdir)/util/config_file.h $(srcdir)/util/regional.h \
> + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \
> + $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h=
 \
> + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h
> $(srcdir)/util/rtt.h \
> + $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h
> $(srcdir)/services/localzone.h \
>   $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h
> $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
>   $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
> $(srcdir)/validator/autotrust.h \
>   $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h
> $(srcdir)/libunbound/unbound.h \
> @@ -1059,14 +1041,13 @@ worker.lo worker.o: $(srcdir)/daemon/wor
>  acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h
> $(srcdir)/daemon/acl_list.h \
>   $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h
> $(srcdir)/util/regional.h $(srcdir)/util/log.h \
>   $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h
> -daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
> - $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
> $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
> -  $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
> - $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h
> $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
> - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
> - $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rbtree.h \
> +daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h
> $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \
> + $(srcdir)/util/log.h $(srcdir)/util/alloc.h
> $(srcdir)/services/modstack.h  \
> + $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h
> $(srcdir)/sldns/sbuffer.h \
> + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/netevent.h \
> + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h
> $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
> + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h
> $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
> + $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h
> $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
>   $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h
> $(srcdir)/util/storage/slabhash.h \
>   $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/services/cache/infra.h \
>   $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h
> $(srcdir)/util/random.h $(srcdir)/util/tube.h \
> @@ -1141,19 +1122,18 @@ libunbound.lo libunbound.o: $(srcdir)/li
>   $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h
> $(srcdir)/services/localzone.h \
>   $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/util/rtt.h \
>   $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h
> $(srcdir)/sldns/sbuffer.h
> -libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h \
> - $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
> - $(srcdir)/util/locks.h $(srcdir)/util/log.h
> $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h
> $(srcdir)/util/rbtree.h \
> - $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h
> $(srcdir)/libunbound/worker.h \
> - $(srcdir)/sldns/sbuffer.h $(srcdir)/libunbound/unbound-event.h
> $(srcdir)/services/outside_network.h \
> - $(srcdir)/util/netevent.h  $(srcdir)/services/mesh.h \
> - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h
> $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \
> - $(srcdir)/util/data/msgreply.h $(srcdir)/services/localzone.h
> $(srcdir)/services/cache/rrset.h \
> - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h
> $(srcdir)/util/fptr_wlist.h \
> - $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h
> $(srcdir)/util/config_file.h \
> - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h
> $(srcdir)/util/data/dname.h \
> - $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h
> $(srcdir)/iterator/iter_hints.h \
> - $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h
> +libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h
> $(srcdir)/libunbound/libworker.h \
> + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h
> $(srcdir)/util/locks.h $(srcdir)/util/log.h \
> + $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h
> $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
> + $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h
> $(srcdir)/sldns/sbuffer.h \
> + $(srcdir)/libunbound/unbound-event.h
> $(srcdir)/services/outside_network.h $(srcdir)/util/netevent.h \
> +  $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \
> + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.=
h
> $(srcdir)/util/data/msgreply.h \
> + $(srcdir)/services/localzone.h $(srcdir)/services/cache/rrset.h
> $(srcdir)/util/storage/slabhash.h \
> + $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h
> $(srcdir)/util/tube.h $(srcdir)/util/regional.h \
> + $(srcdir)/util/random.h $(srcdir)/util/config_file.h
> $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h \
> + $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h
> $(srcdir)/iterator/iter_fwd.h \
> + $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h
> $(srcdir)/sldns/str2wire.h
>  unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c
> config.h $(srcdir)/libunbound/unbound.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
>  asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h
> $(srcdir)/libunbound/unbound.h \
> @@ -1164,21 +1144,18 @@ streamtcp.lo streamtcp.o: $(srcdir)/test
>   $(srcdir)/util/net_help.h $(srcdir)/util/data/msgencode.h
> $(srcdir)/util/data/msgparse.h \
>   $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h
> $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h
> $(srcdir)/sldns/sbuffer.h \
> - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \
> -
> + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h
>  perf.lo perf.o: $(srcdir)/testcode/perf.c config.h $(srcdir)/util/log.h
> $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
>   $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/storage/lruhash.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h
> $(srcdir)/sldns/pkthdr.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h
> $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
>  delayer.lo delayer.o: $(srcdir)/testcode/delayer.c config.h
> $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
>   $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
> -unbound-control.lo unbound-control.o:
> $(srcdir)/smallapp/unbound-control.c config.h \
> - $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/locks.=
h
> $(srcdir)/util/net_help.h
> +unbound-control.lo unbound-control.o:
> $(srcdir)/smallapp/unbound-control.c config.h $(srcdir)/util/log.h \
> + $(srcdir)/util/config_file.h $(srcdir)/util/locks.h
> $(srcdir)/util/net_help.h
>  unbound-anchor.lo unbound-anchor.o: $(srcdir)/smallapp/unbound-anchor.c
> config.h $(srcdir)/libunbound/unbound.h \
> - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h \
> -
> -petal.lo petal.o: $(srcdir)/testcode/petal.c config.h \
> -
> + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h
> +petal.lo petal.o: $(srcdir)/testcode/petal.c config.h
>  pythonmod_utils.lo pythonmod_utils.o:
> $(srcdir)/pythonmod/pythonmod_utils.c config.h $(srcdir)/util/module.h \
>   $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h
> $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \
>   $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h
> $(srcdir)/sldns/pkthdr.h \
> @@ -1191,8 +1168,7 @@ win_svc.lo win_svc.o: $(srcdir)/winrc/wi
>   $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h
> $(srcdir)/util/storage/lruhash.h \
>   $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h
> $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h
> $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
> - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
> - $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h
> + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h
> $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h
>  w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h
> $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h
>  unbound-service-install.lo unbound-service-install.o:
> $(srcdir)/winrc/unbound-service-install.c config.h \
>   $(srcdir)/winrc/w_inst.h
> @@ -1200,14 +1176,11 @@ unbound-service-remove.lo unbound-servic
>   $(srcdir)/winrc/w_inst.h
>  anchor-update.lo anchor-update.o: $(srcdir)/winrc/anchor-update.c
> config.h $(srcdir)/libunbound/unbound.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h
> $(srcdir)/sldns/wire2str.h
> -keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h
> $(srcdir)/sldns/keyraw.h \
> - $(srcdir)/sldns/rrdef.h \
> -
> +keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h
> $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/rrdef.h
>  sbuffer.lo sbuffer.o: $(srcdir)/sldns/sbuffer.c config.h
> $(srcdir)/sldns/sbuffer.h
>  wire2str.lo wire2str.o: $(srcdir)/sldns/wire2str.c config.h
> $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \
>   $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h
> $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h \
> - $(srcdir)/sldns/keyraw.h \
> -
> + $(srcdir)/sldns/keyraw.h
>  parse.lo parse.o: $(srcdir)/sldns/parse.c config.h
> $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h \
>   $(srcdir)/sldns/sbuffer.h
>  parseutil.lo parseutil.o: $(srcdir)/sldns/parseutil.c config.h
> $(srcdir)/sldns/parseutil.h
> @@ -1227,8 +1200,7 @@ snprintf.lo snprintf.o: $(srcdir)/compat
>  strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h
>  strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h
>  strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h
> -getentropy_linux.lo getentropy_linux.o:
> $(srcdir)/compat/getentropy_linux.c config.h \
> -
> +getentropy_linux.lo getentropy_linux.o:
> $(srcdir)/compat/getentropy_linux.c config.h
>  getentropy_osx.lo getentropy_osx.o: $(srcdir)/compat/getentropy_osx.c
> config.h
>  getentropy_solaris.lo getentropy_solaris.o:
> $(srcdir)/compat/getentropy_solaris.c config.h
>  getentropy_win.lo getentropy_win.o: $(srcdir)/compat/getentropy_win.c
> @@ -1238,3 +1210,4 @@ arc4random_uniform.lo arc4random_uniform
>  arc4_lock.lo arc4_lock.o: $(srcdir)/compat/arc4_lock.c config.h
> $(srcdir)/util/locks.h
>  sha512.lo sha512.o: $(srcdir)/compat/sha512.c config.h
>  reallocarray.lo reallocarray.o: $(srcdir)/compat/reallocarray.c config.h
> +isblank.lo isblank.o: $(srcdir)/compat/isblank.c config.h
>
> Modified: stable/10/contrib/unbound/acx_nlnetlabs.m4
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/acx_nlnetlabs.m4  Sat Jan 16 18:59:10 2016
>       (r294189)
> +++ stable/10/contrib/unbound/acx_nlnetlabs.m4  Sat Jan 16 19:06:12 2016
>       (r294190)
> @@ -2,7 +2,9 @@
>  # Copyright 2009, Wouter Wijngaards, NLnet Labs.
>  # BSD licensed.
>  #
> -# Version 28
> +# Version 30
> +# 2015-11-18 spelling check fix.
> +# 2015-11-05 ACX_SSL_CHECKS no longer adds -ldl needlessly.
>  # 2015-08-28 ACX_CHECK_PIE and ACX_CHECK_RELRO_NOW added.
>  # 2015-03-17 AHX_CONFIG_REALLOCARRAY added
>  # 2013-09-19 FLTO help text improved.
> @@ -24,7 +26,7 @@
>  # 2010-07-02 Add check for ss_family (for minix).
>  # 2010-04-26 Fix to use CPPFLAGS for CHECK_COMPILER_FLAGS.
>  # 2010-03-01 Fix RPATH using CONFIG_COMMANDS to run at the very end.
> -# 2010-02-18 WITH_SSL outputs the LIBSSL_LDFLAGS, LIBS, CPPFLAGS
> seperate, -ldl
> +# 2010-02-18 WITH_SSL outputs the LIBSSL_LDFLAGS, LIBS, CPPFLAGS
> separate, -ldl
>  # 2010-02-01 added ACX_CHECK_MEMCMP_SIGNED, AHX_MEMCMP_BROKEN
>  # 2010-01-20 added AHX_COONFIG_STRLCAT
>  # 2009-07-14 U_CHAR detection improved for windows crosscompile.
> @@ -715,12 +717,6 @@ AC_DEFUN([ACX_SSL_CHECKS], [
>          fi
>          AC_SUBST(HAVE_SSL)
>          AC_SUBST(RUNTIME_PATH)
> -       # openssl engine functionality needs dlopen().
> -       BAKLIBS=3D"$LIBS"
> -       AC_SEARCH_LIBS([dlopen], [dl])
> -       if test "$LIBS" !=3D "$BAKLIBS"; then
> -               LIBSSL_LIBS=3D"$LIBSSL_LIBS -ldl"
> -       fi
>      fi
>  AC_CHECK_HEADERS([openssl/ssl.h],,, [AC_INCLUDES_DEFAULT])
>  AC_CHECK_HEADERS([openssl/err.h],,, [AC_INCLUDES_DEFAULT])
>
> Modified: stable/10/contrib/unbound/compat/arc4random.c
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/compat/arc4random.c       Sat Jan 16
> 18:59:10 2016        (r294189)
> +++ stable/10/contrib/unbound/compat/arc4random.c       Sat Jan 16
> 19:06:12 2016        (r294190)
> @@ -26,7 +26,9 @@
>  #include <fcntl.h>
>  #include <limits.h>
>  #include <signal.h>
> +#ifdef HAVE_STDINT_H
>  #include <stdint.h>
> +#endif
>  #include <stdlib.h>
>  #include <string.h>
>  #include <unistd.h>
>
> Modified: stable/10/contrib/unbound/compat/getentropy_linux.c
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/compat/getentropy_linux.c Sat Jan 16
> 18:59:10 2016        (r294189)
> +++ stable/10/contrib/unbound/compat/getentropy_linux.c Sat Jan 16
> 19:06:12 2016        (r294190)
> @@ -46,7 +46,12 @@
>  #include <errno.h>
>  #include <unistd.h>
>  #include <time.h>
> +
> +#if defined(HAVE_SSL)
>  #include <openssl/sha.h>
> +#elif defined(HAVE_NETTLE)
> +#include <nettle/sha.h>
> +#endif
>
>  #include <linux/types.h>
>  #include <linux/random.h>
> @@ -67,9 +72,21 @@
>                         HD(b); \
>         } while (0)
>
> +#if defined(HAVE_SSL)
> +#define CRYPTO_SHA512_CTX              SHA512_CTX
> +#define CRYPTO_SHA512_INIT(x)          SHA512_Init(x)
> +#define CRYPTO_SHA512_FINAL(r, c)      SHA512_Final(r, c)
>  #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
>  #define HD(x)   (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
>  #define HF(x)    (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
> +#elif defined(HAVE_NETTLE)
> +#define CRYPTO_SHA512_CTX              struct sha512_ctx
> +#define CRYPTO_SHA512_INIT(x)          sha512_init(x)
> +#define CRYPTO_SHA512_FINAL(r, c)      sha512_digest(c,
> SHA512_DIGEST_SIZE, r)
> +#define HR(x, l) (sha512_update(&ctx, (l), (uint8_t *)(x)))
> +#define HD(x)   (sha512_update(&ctx, sizeof (x), (uint8_t *)&(x)))
> +#define HF(x)    (sha512_update(&ctx, sizeof (void*), (uint8_t *)&(x)))
> +#endif
>
>  int    getentropy(void *buf, size_t len);
>
> @@ -122,7 +139,7 @@ getentropy(void *buf, size_t len)
>          * Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID.
>          * sysctl is a failsafe API, so it guarantees a result.  This
>          * should work inside a chroot, or when file descriptors are
> -        * exhuasted.
> +        * exhausted.
>          *
>          * However this can fail if the Linux kernel removes support
>          * for sysctl.  Starting in 2007, there have been efforts to
> @@ -337,7 +354,7 @@ getentropy_fallback(void *buf, size_t le
>         struct rusage ru;
>         sigset_t sigset;
>         struct stat st;
> -       SHA512_CTX ctx;
> +       CRYPTO_SHA512_CTX ctx;
>         static pid_t lastpid;
>         pid_t pid;
>         size_t i, ii, m;
> @@ -354,7 +371,7 @@ getentropy_fallback(void *buf, size_t le
>         }
>         for (i =3D 0; i < len; ) {
>                 int j;
> -               SHA512_Init(&ctx);
> +               CRYPTO_SHA512_INIT(&ctx);
>                 for (j =3D 0; j < repeat; j++) {
>                         HX((e =3D gettimeofday(&tv, NULL)) =3D=3D -1, tv)=
;
>                         if (e !=3D -1) {
> @@ -526,7 +543,7 @@ getentropy_fallback(void *buf, size_t le
>  #  endif
>  #endif /* HAVE_GETAUXVAL */
>
> -               SHA512_Final(results, &ctx);
> +               CRYPTO_SHA512_FINAL(results, &ctx);
>                 memcpy((char*)buf + i, results, min(sizeof(results), len =
-
> i));
>                 i +=3D min(sizeof(results), len - i);
>         }
>
> Modified: stable/10/contrib/unbound/compat/getentropy_solaris.c
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/compat/getentropy_solaris.c       Sat Jan 1=
6
> 18:59:10 2016        (r294189)
> +++ stable/10/contrib/unbound/compat/getentropy_solaris.c       Sat Jan 1=
6
> 19:06:12 2016        (r294190)
> @@ -30,7 +30,9 @@
>  #include <sys/stat.h>
>  #include <sys/time.h>
>  #include <stdlib.h>
> +#ifdef HAVE_STDINT_H
>  #include <stdint.h>
> +#endif
>  #include <stdio.h>
>  #include <termios.h>
>  #include <fcntl.h>
> @@ -39,10 +41,14 @@
>  #include <errno.h>
>  #include <unistd.h>
>  #include <time.h>
> +#ifdef HAVE_SYS_SHA2_H
>  #include <sys/sha2.h>
>  #define SHA512_Init SHA512Init
>  #define SHA512_Update SHA512Update
>  #define SHA512_Final SHA512Final
> +#else
> +#include "openssl/sha.h"
> +#endif
>
>  #include <sys/vfs.h>
>  #include <sys/statfs.h>
>
> Copied: stable/10/contrib/unbound/compat/isblank.c (from r292206,
> head/contrib/unbound/compat/isblank.c)
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ stable/10/contrib/unbound/compat/isblank.c  Sat Jan 16 19:06:12 2016
>       (r294190, copy of r292206, head/contrib/unbound/compat/isblank.c)
> @@ -0,0 +1,45 @@
> +/* isblank - compatibility implementation of isblank
> + *
> + * Copyright (c) 2015, NLnet Labs. All rights reserved.
> + *
> + * This software is open source.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + *
> + * Redistributions of source code must retain the above copyright notice=
,
> + * this list of conditions and the following disclaimer.
> + *
> + * Redistributions in binary form must reproduce the above copyright
> notice,
> + * this list of conditions and the following disclaimer in the
> documentation
> + * and/or other materials provided with the distribution.
> + *
> + * Neither the name of the NLNET LABS nor the names of its contributors
> may
> + * be used to endorse or promote products derived from this software
> without
> + * specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL=
,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> LIMITED
> + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, O=
R
> + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY O=
F
> + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +#include "config.h"
> +
> +/* return true for a blank character: space or tab */
> +int isblank(int c);
> +
> +/* implementation of isblank. unsigned char is the argument */
> +int
> +isblank(int c)
> +{
> +       return (c=3D=3D' ' || c=3D=3D'\t');
> +}
>
> Modified: stable/10/contrib/unbound/compat/reallocarray.c
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/compat/reallocarray.c     Sat Jan 16
> 18:59:10 2016        (r294189)
> +++ stable/10/contrib/unbound/compat/reallocarray.c     Sat Jan 16
> 19:06:12 2016        (r294190)
> @@ -18,7 +18,10 @@
>  #include "config.h"
>  #include <sys/types.h>
>  #include <errno.h>
> +#ifdef HAVE_STDINT_H
>  #include <stdint.h>
> +#endif
> +#include <limits.h>
>  #include <stdlib.h>
>
>  /*
>
> Modified: stable/10/contrib/unbound/compat/sha512.c
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/compat/sha512.c   Sat Jan 16 18:59:10 2016
>       (r294189)
> +++ stable/10/contrib/unbound/compat/sha512.c   Sat Jan 16 19:06:12 2016
>       (r294190)
> @@ -70,7 +70,7 @@ unsigned char *SHA512(void *data, unsign
>   * Please make sure that your system defines BYTE_ORDER.  If your
>   * architecture is little-endian, make sure it also defines
>   * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
> - * equivilent.
> + * equivalent.
>   *
>   * If your system does not define the above, then you can do so by
>   * hand like this:
>
> Modified: stable/10/contrib/unbound/compat/snprintf.c
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/compat/snprintf.c Sat Jan 16 18:59:10 2016
>       (r294189)
> +++ stable/10/contrib/unbound/compat/snprintf.c Sat Jan 16 19:06:12 2016
>       (r294190)
> @@ -42,6 +42,7 @@
>  #ifdef HAVE_STDINT_H
>  #include <stdint.h>
>  #endif
> +#include <limits.h>
>
>  /* for test */
>  /* #define SNPRINTF_TEST 1 */
> @@ -428,7 +429,7 @@ print_num_llp(char** at, size_t* left, i
>         char buf[PRINT_DEC_BUFSZ];
>         int negative =3D 0;
>         int zero =3D (value =3D=3D 0);
> -#if defined(UINTPTR_MAX) && defined(UINT32_MAX) && (UINTPTR_MAX =3D=3D
> UINT32_MAX)
> +#if defined(SIZE_MAX) && defined(UINT32_MAX) && (UINT32_MAX =3D=3D SIZE_=
MAX
> || INT32_MAX =3D=3D SIZE_MAX)
>         /* avoid warning about upcast on 32bit systems */
>         unsigned long long llvalue =3D (unsigned long)value;
>  #else
>
> Modified: stable/10/contrib/unbound/config.h
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/config.h  Sat Jan 16 18:59:10 2016
> (r294189)
> +++ stable/10/contrib/unbound/config.h  Sat Jan 16 19:06:12 2016
> (r294190)
> @@ -95,6 +95,10 @@
>     don't. */
>  /* #undef HAVE_DECL_STRLCPY */
>
> +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0
> if
> +   you don't. */
> +#define HAVE_DECL_XML_STOPPARSER 1
> +
>  /* Define to 1 if you have the <dlfcn.h> header file. */
>  #define HAVE_DLFCN_H 1
>
> @@ -152,6 +156,9 @@
>  /* Define to 1 if fseeko (and presumably ftello) exists and is declared.
> */
>  #define HAVE_FSEEKO 1
>
> +/* Define to 1 if you have the `fsync' function. */
> +#define HAVE_FSYNC 1
> +
>  /* Whether getaddrinfo is available */
>  #define HAVE_GETADDRINFO 1
>
> @@ -206,6 +213,9 @@
>  /* Define to 1 if you have the <iphlpapi.h> header file. */
>  /* #undef HAVE_IPHLPAPI_H */
>
> +/* Define to 1 if you have the `isblank' function. */
> +#define HAVE_ISBLANK 1
> +
>  /* Define to 1 if you have the `kill' function. */
>  #define HAVE_KILL 1
>
> @@ -233,6 +243,9 @@
>  /* Define to 1 if you have the <netinet/in.h> header file. */
>  #define HAVE_NETINET_IN_H 1
>
> +/* Use libnettle for crypto */
> +/* #undef HAVE_NETTLE */
> +
>  /* Use libnss for crypto */
>  /* #undef HAVE_NSS */
>
> @@ -497,7 +510,7 @@
>  #define PACKAGE_NAME "unbound"
>
>  /* Define to the full name and version of this package. */
> -#define PACKAGE_STRING "unbound 1.5.5"
> +#define PACKAGE_STRING "unbound 1.5.7"
>
>  /* Define to the one symbol short name of this package. */
>  #define PACKAGE_TARNAME "unbound"
> @@ -506,7 +519,7 @@
>  #define PACKAGE_URL ""
>
>  /* Define to the version of this package. */
> -#define PACKAGE_VERSION "1.5.5"
> +#define PACKAGE_VERSION "1.5.7"
>
>  /* default pidfile location */
>  #define PIDFILE "/var/unbound/unbound.pid"
> @@ -525,7 +538,7 @@
>  #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem"
>
>  /* version number for resource files */
> -#define RSRC_PACKAGE_VERSION 1,5,5,0
> +#define RSRC_PACKAGE_VERSION 1,5,7,0
>
>  /* Directory to chdir to */
>  #define RUN_DIR "/var/unbound"
> @@ -536,6 +549,9 @@
>  /* The size of `time_t', as computed by sizeof. */
>  #define SIZEOF_TIME_T 8
>
> +/* define if (v)snprintf does not return length needed, (but length used=
)
> */
> +/* #undef SNPRINTF_RET_BROKEN */
> +
>  /* Define to 1 if you have the ANSI C header files. */
>  #define STDC_HEADERS 1
>
> @@ -570,7 +586,7 @@
>  /* #undef USE_ECDSA_EVP_WORKAROUND */
>
>  /* Define this to enable GOST support. */
> -/* #undef USE_GOST */
> +#define USE_GOST 1
>
>  /* Define if you want to use internal select based events */
>  #define USE_MINI_EVENT 1
> @@ -849,15 +865,13 @@
>  #define MAXHOSTNAMELEN 256
>  #endif
>
> -
> -#ifndef HAVE_SNPRINTF
> +#if !defined(HAVE_SNPRINTF) || defined(SNPRINTF_RET_BROKEN)
>  #define snprintf snprintf_unbound
>  #define vsnprintf vsnprintf_unbound
>  #include <stdarg.h>
>  int snprintf (char *str, size_t count, const char *fmt, ...);
>  int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
> -#endif /* HAVE_SNPRINTF */
> -
> +#endif /* HAVE_SNPRINTF or SNPRINTF_RET_BROKEN */
>
>  #ifndef HAVE_INET_PTON
>  #define inet_pton inet_pton_unbound
> @@ -953,6 +967,11 @@ int memcmp(const void *x, const void *y,
>  char *ctime_r(const time_t *timep, char *buf);
>  #endif
>
> +#ifndef HAVE_ISBLANK
> +#define isblank unbound_isblank
> +int isblank(int c);
> +#endif
> +
>  #if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS)
>  #define strptime unbound_strptime
>  struct tm;
>
> Modified: stable/10/contrib/unbound/config.h.in
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/config.h.in       Sat Jan 16 18:59:10 2016
>       (r294189)
> +++ stable/10/contrib/unbound/config.h.in       Sat Jan 16 19:06:12 2016
>       (r294190)
> @@ -94,6 +94,10 @@
>     don't. */
>  #undef HAVE_DECL_STRLCPY
>
> +/* Define to 1 if you have the declaration of `XML_StopParser', and to 0
> if
> +   you don't. */
> +#undef HAVE_DECL_XML_STOPPARSER
> +
>  /* Define to 1 if you have the <dlfcn.h> header file. */
>  #undef HAVE_DLFCN_H
>
> @@ -151,6 +155,9 @@
>  /* Define to 1 if fseeko (and presumably ftello) exists and is declared.
> */
>  #undef HAVE_FSEEKO
>
> +/* Define to 1 if you have the `fsync' function. */
> +#undef HAVE_FSYNC
> +
>  /* Whether getaddrinfo is available */
>  #undef HAVE_GETADDRINFO
>
> @@ -205,6 +212,9 @@
>  /* Define to 1 if you have the <iphlpapi.h> header file. */
>  #undef HAVE_IPHLPAPI_H
>
> +/* Define to 1 if you have the `isblank' function. */
> +#undef HAVE_ISBLANK
> +
>  /* Define to 1 if you have the `kill' function. */
>  #undef HAVE_KILL
>
> @@ -232,6 +242,9 @@
>  /* Define to 1 if you have the <netinet/in.h> header file. */
>  #undef HAVE_NETINET_IN_H
>
> +/* Use libnettle for crypto */
> +#undef HAVE_NETTLE
> +
>  /* Use libnss for crypto */
>  #undef HAVE_NSS
>
> @@ -535,6 +548,9 @@
>  /* The size of `time_t', as computed by sizeof. */
>  #undef SIZEOF_TIME_T
>
> +/* define if (v)snprintf does not return length needed, (but length used=
)
> */
> +#undef SNPRINTF_RET_BROKEN
> +
>  /* Define to 1 if you have the ANSI C header files. */
>  #undef STDC_HEADERS
>
> @@ -848,15 +864,13 @@
>  #define MAXHOSTNAMELEN 256
>  #endif
>
> -
> -#ifndef HAVE_SNPRINTF
> +#if !defined(HAVE_SNPRINTF) || defined(SNPRINTF_RET_BROKEN)
>  #define snprintf snprintf_unbound
>  #define vsnprintf vsnprintf_unbound
>  #include <stdarg.h>
>  int snprintf (char *str, size_t count, const char *fmt, ...);
>  int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
> -#endif /* HAVE_SNPRINTF */
> -
> +#endif /* HAVE_SNPRINTF or SNPRINTF_RET_BROKEN */
>
>  #ifndef HAVE_INET_PTON
>  #define inet_pton inet_pton_unbound
> @@ -952,6 +966,11 @@ int memcmp(const void *x, const void *y,
>  char *ctime_r(const time_t *timep, char *buf);
>  #endif
>
> +#ifndef HAVE_ISBLANK
> +#define isblank unbound_isblank
> +int isblank(int c);
> +#endif
> +
>  #if !defined(HAVE_STRPTIME) || !defined(STRPTIME_WORKS)
>  #define strptime unbound_strptime
>  struct tm;
>
> Modified: stable/10/contrib/unbound/configure
>
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- stable/10/contrib/unbound/configure Sat Jan 16 18:59:10 2016
> (r294189)
> +++ stable/10/contrib/unbound/configure Sat Jan 16 19:06:12 2016
> (r294190)
> @@ -1,6 +1,6 @@
>  #! /bin/sh
>  # Guess values for system-dependent variables and create Makefiles.
> -# Generated by GNU Autoconf 2.69 for unbound 1.5.5.
> +# Generated by GNU Autoconf 2.69 for unbound 1.5.7.
>  #
>  # Report bugs to <unbound-bugs@nlnetlabs.nl>.
>  #
> @@ -590,8 +590,8 @@ MAKEFLAGS=3D
>  # Identity of this package.
>  PACKAGE_NAME=3D'unbound'
>  PACKAGE_TARNAME=3D'unbound'
> -PACKAGE_VERSION=3D'1.5.5'
> -PACKAGE_STRING=3D'unbound 1.5.5'
> +PACKAGE_VERSION=3D'1.5.7'
> +PACKAGE_STRING=3D'unbound 1.5.7'
>  PACKAGE_BUGREPORT=3D'unbound-bugs@nlnetlabs.nl'
>  PACKAGE_URL=3D''
>
> @@ -661,6 +661,7 @@ CHECKLOCK_OBJ
>  staticexe
>  UNBOUND_EVENT_UNINSTALL
>  UNBOUND_EVENT_INSTALL
> +SSLLIB
>  HAVE_SSL
>  CONFIG_DATE
>  NETBSD_LINTFLAGS
> @@ -823,6 +824,7 @@ with_solaris_threads
>  with_pyunbound
>  with_pythonmodule
>  with_nss
> +with_nettle
>  with_ssl
>  enable_sha2
>  enable_gost
> @@ -1391,7 +1393,7 @@ if test "$ac_init_help" =3D "long"; then
>    # Omit some internal or obsolete options to make the list less imposin=
g.
>    # This message is too long to be a string in the A/UX 3.1 sh.
>    cat <<_ACEOF
> -\`configure' configures unbound 1.5.5 to adapt to many kinds of systems.
> +\`configure' configures unbound 1.5.7 to adapt to many kinds of systems.
>
>  Usage: $0 [OPTION]... [VAR=3DVALUE]...
>
> @@ -1456,7 +1458,7 @@ fi
>
>  if test -n "$ac_init_help"; then
>    case $ac_init_help in
>
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
>
>