svn commit: r294236 - in user/ngie/stable-10-libnv: contrib/openpam contrib/openpam/bin contrib/openpam/bin/su contrib/openpam/doc contrib/openpam/doc/man contrib/openpam/include contrib/openpam/in...

Garrett Cooper ngie at FreeBSD.org
Sun Jan 17 22:05:52 UTC 2016 

Author: ngie
Date: Sun Jan 17 22:05:48 2016
New Revision: 294236
URL: https://svnweb.freebsd.org/changeset/base/294236

Log:
  MFstable/10 @ r294235

Added:
  user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_ctype.c
     - copied unchanged from r294235, stable/10/contrib/openpam/t/t_openpam_ctype.c
  user/ngie/stable-10-libnv/contrib/unbound/.gitignore
     - copied unchanged from r294235, stable/10/contrib/unbound/.gitignore
  user/ngie/stable-10-libnv/contrib/unbound/compat/isblank.c
     - copied unchanged from r294235, stable/10/contrib/unbound/compat/isblank.c
  user/ngie/stable-10-libnv/sys/dev/uart/uart_ppstypes.h
     - copied unchanged from r294235, stable/10/sys/dev/uart/uart_ppstypes.h
  user/ngie/stable-10-libnv/usr.bin/kdump/linux32_syscalls.conf
     - copied unchanged from r294235, stable/10/usr.bin/kdump/linux32_syscalls.conf
Modified:
  user/ngie/stable-10-libnv/contrib/openpam/CREDITS   (contents, props changed)
  user/ngie/stable-10-libnv/contrib/openpam/configure.ac   (contents, props changed)
  user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c
  user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h
  user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c   (contents, props changed)
  user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am
  user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c
  user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c
  user/ngie/stable-10-libnv/contrib/unbound/Makefile.in
  user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4
  user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c
  user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c
  user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c
  user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c
  user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c
  user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c
  user/ngie/stable-10-libnv/contrib/unbound/config.h
  user/ngie/stable-10-libnv/contrib/unbound/config.h.in
  user/ngie/stable-10-libnv/contrib/unbound/configure
  user/ngie/stable-10-libnv/contrib/unbound/configure.ac
  user/ngie/stable-10-libnv/contrib/unbound/daemon/remote.c
  user/ngie/stable-10-libnv/contrib/unbound/daemon/unbound.c
  user/ngie/stable-10-libnv/contrib/unbound/daemon/worker.c
  user/ngie/stable-10-libnv/contrib/unbound/dns64/dns64.c
  user/ngie/stable-10-libnv/contrib/unbound/dnstap/dnstap.proto
  user/ngie/stable-10-libnv/contrib/unbound/doc/Changelog
  user/ngie/stable-10-libnv/contrib/unbound/doc/README
  user/ngie/stable-10-libnv/contrib/unbound/doc/example.conf
  user/ngie/stable-10-libnv/contrib/unbound/doc/example.conf.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/libunbound.3
  user/ngie/stable-10-libnv/contrib/unbound/doc/libunbound.3.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-anchor.8
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-anchor.8.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-checkconf.8
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-checkconf.8.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-control.8
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-control.8.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-host.1
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-host.1.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.8
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.8.in
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.conf.5
  user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.conf.5.in
  user/ngie/stable-10-libnv/contrib/unbound/freebsd-configure.sh
  user/ngie/stable-10-libnv/contrib/unbound/iterator/iter_scrub.c
  user/ngie/stable-10-libnv/contrib/unbound/iterator/iter_utils.c
  user/ngie/stable-10-libnv/contrib/unbound/iterator/iterator.c
  user/ngie/stable-10-libnv/contrib/unbound/iterator/iterator.h
  user/ngie/stable-10-libnv/contrib/unbound/libunbound/libunbound.c
  user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/Makefile
  user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/doc/install.rst
  user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/doc/modules/unbound.rst
  user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/examples/dnssec-valid.py
  user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/libunbound.i
  user/ngie/stable-10-libnv/contrib/unbound/ltmain.sh
  user/ngie/stable-10-libnv/contrib/unbound/services/cache/dns.c
  user/ngie/stable-10-libnv/contrib/unbound/services/cache/rrset.c
  user/ngie/stable-10-libnv/contrib/unbound/sldns/parseutil.h
  user/ngie/stable-10-libnv/contrib/unbound/sldns/wire2str.c
  user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-anchor.c
  user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-checkconf.c
  user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-control-setup.sh
  user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-control-setup.sh.in
  user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-control.c
  user/ngie/stable-10-libnv/contrib/unbound/util/config_file.c
  user/ngie/stable-10-libnv/contrib/unbound/util/config_file.h
  user/ngie/stable-10-libnv/contrib/unbound/util/configlexer.lex
  user/ngie/stable-10-libnv/contrib/unbound/util/configparser.y
  user/ngie/stable-10-libnv/contrib/unbound/util/iana_ports.inc
  user/ngie/stable-10-libnv/contrib/unbound/util/locks.c
  user/ngie/stable-10-libnv/contrib/unbound/util/net_help.c
  user/ngie/stable-10-libnv/contrib/unbound/util/random.c
  user/ngie/stable-10-libnv/contrib/unbound/util/rbtree.c
  user/ngie/stable-10-libnv/contrib/unbound/util/rtt.h
  user/ngie/stable-10-libnv/contrib/unbound/util/storage/lookup3.c
  user/ngie/stable-10-libnv/contrib/unbound/util/tube.h
  user/ngie/stable-10-libnv/contrib/unbound/util/winsock_event.h
  user/ngie/stable-10-libnv/contrib/unbound/validator/autotrust.c
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_neg.c
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_neg.h
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec.c
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec.h
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec3.c
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec3.h
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_secalgo.c
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_secalgo.h
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_sigcrypt.c
  user/ngie/stable-10-libnv/contrib/unbound/validator/val_utils.h
  user/ngie/stable-10-libnv/contrib/unbound/validator/validator.c
  user/ngie/stable-10-libnv/crypto/openssh/digest-libc.c
  user/ngie/stable-10-libnv/lib/libc/net/if_nametoindex.c
  user/ngie/stable-10-libnv/lib/libc/sys/futimens.c
  user/ngie/stable-10-libnv/lib/libc/sys/utimensat.2
  user/ngie/stable-10-libnv/lib/libc/sys/utimensat.c
  user/ngie/stable-10-libnv/lib/libfetch/common.c
  user/ngie/stable-10-libnv/lib/libfetch/fetch.3
  user/ngie/stable-10-libnv/lib/libfetch/file.c
  user/ngie/stable-10-libnv/lib/libfetch/http.c
  user/ngie/stable-10-libnv/lib/libpam/Makefile.inc
  user/ngie/stable-10-libnv/lib/libpam/libpam/Makefile
  user/ngie/stable-10-libnv/sbin/ifconfig/sfp.c
  user/ngie/stable-10-libnv/share/man/man4/uart.4
  user/ngie/stable-10-libnv/sys/amd64/amd64/elf_machdep.c
  user/ngie/stable-10-libnv/sys/amd64/amd64/trap.c
  user/ngie/stable-10-libnv/sys/amd64/linux/linux_sysvec.c
  user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysvec.c
  user/ngie/stable-10-libnv/sys/arm/arm/elf_machdep.c
  user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  user/ngie/stable-10-libnv/sys/compat/ia32/ia32_sysvec.c
  user/ngie/stable-10-libnv/sys/compat/svr4/svr4_sysvec.c
  user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.c
  user/ngie/stable-10-libnv/sys/dev/uart/uart_bus.h
  user/ngie/stable-10-libnv/sys/dev/uart/uart_core.c
  user/ngie/stable-10-libnv/sys/dev/uart/uart_dev_ns8250.c
  user/ngie/stable-10-libnv/sys/i386/i386/elf_machdep.c
  user/ngie/stable-10-libnv/sys/i386/ibcs2/ibcs2_sysvec.c
  user/ngie/stable-10-libnv/sys/i386/linux/linux_sysvec.c
  user/ngie/stable-10-libnv/sys/kern/imgact_aout.c
  user/ngie/stable-10-libnv/sys/kern/init_main.c
  user/ngie/stable-10-libnv/sys/mips/mips/elf_machdep.c
  user/ngie/stable-10-libnv/sys/mips/mips/freebsd32_machdep.c
  user/ngie/stable-10-libnv/sys/net/sff8436.h
  user/ngie/stable-10-libnv/sys/netinet/sctp.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_asconf.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_auth.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_constants.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_header.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_indata.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_indata.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_input.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_os_bsd.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_output.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_output.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_pcb.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_pcb.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_structs.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_sysctl.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_sysctl.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_timer.c
  user/ngie/stable-10-libnv/sys/netinet/sctp_uio.h
  user/ngie/stable-10-libnv/sys/netinet/sctp_usrreq.c
  user/ngie/stable-10-libnv/sys/netinet/sctputil.c
  user/ngie/stable-10-libnv/sys/netinet/sctputil.h
  user/ngie/stable-10-libnv/sys/netinet6/sctp6_usrreq.c
  user/ngie/stable-10-libnv/sys/powerpc/powerpc/elf32_machdep.c
  user/ngie/stable-10-libnv/sys/powerpc/powerpc/elf64_machdep.c
  user/ngie/stable-10-libnv/sys/sparc64/sparc64/elf_machdep.c
  user/ngie/stable-10-libnv/sys/sys/sysent.h
  user/ngie/stable-10-libnv/usr.bin/fetch/fetch.1
  user/ngie/stable-10-libnv/usr.bin/fetch/fetch.c
  user/ngie/stable-10-libnv/usr.bin/kdump/Makefile
  user/ngie/stable-10-libnv/usr.bin/kdump/kdump.c
  user/ngie/stable-10-libnv/usr.bin/netstat/sctp.c
  user/ngie/stable-10-libnv/usr.bin/sockstat/sockstat.1
  user/ngie/stable-10-libnv/usr.bin/sockstat/sockstat.c
  user/ngie/stable-10-libnv/usr.sbin/arp/arp.c
  user/ngie/stable-10-libnv/usr.sbin/mountd/exports.5
  user/ngie/stable-10-libnv/usr.sbin/mountd/mountd.c
  user/ngie/stable-10-libnv/usr.sbin/ndp/ndp.c
  user/ngie/stable-10-libnv/usr.sbin/service/service.sh
Directory Properties:
  user/ngie/stable-10-libnv/   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/HISTORY   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/INSTALL   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/LICENSE   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/README   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/RELNOTES   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/aclocal.m4   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/autogen.sh   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/bin/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/bin/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/bin/su/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/bin/su/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/bin/su/su.c   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/compile   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/config.guess   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/config.h.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/config.sub   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/configure   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/depcomp   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam.man   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_borrow_cred.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_free_data.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_free_envlist.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_get_option.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_log.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_nullconv.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_readline.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_restore_cred.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_set_option.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_ttyconv.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam.conf.5   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam.man   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_acct_mgmt.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_authenticate.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_chauthtok.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_close_session.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_conv.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_end.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_error.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_authtok.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_data.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_item.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_user.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_getenv.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_getenvlist.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_info.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_open_session.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_prompt.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_putenv.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_set_data.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_set_item.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_setcred.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_setenv.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_acct_mgmt.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_authenticate.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_chauthtok.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_close_session.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_open_session.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_setcred.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_start.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_strerror.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_verror.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_vinfo.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_vprompt.3   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/openpam.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/openpam_attr.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/openpam_version.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_appl.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_constants.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_modules.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_types.h   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/install-sh   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/ltmain.sh   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/misc/gendoc.pl   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/missing   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_deny/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_deny/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_deny/pam_deny.c   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_permit/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_permit/Makefile.in   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_permit/pam_permit.c   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/Makefile.am   (props changed)
  user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/Makefile.in   (props changed)

Modified: user/ngie/stable-10-libnv/contrib/openpam/CREDITS
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/CREDITS	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/CREDITS	Sun Jan 17 22:05:48 2016	(r294236)
@@ -21,6 +21,7 @@ ideas:
 	Christos Zoulas <christos at netbsd.org>
 	Daniel Richard G. <skunk at iskunk.org>
 	Darren J. Moffat <darren.moffat at sun.com>
+	Dimitry Andric <dim at freebsd.org>
 	Dmitry V. Levin <ldv at altlinux.org>
 	Don Lewis <truckman at freebsd.org>
 	Emmanuel Dreyfus <manu at netbsd.org>
@@ -32,9 +33,9 @@ ideas:
 	Hubert Feyrer <hubert at feyrer.de>
 	Jason Evans <jasone at freebsd.org>
 	Joe Marcus Clarke <marcus at freebsd.org>
-	Juli Mallett <jmallett at freebsd.org>
-	Ankita Pal <pal.ankita.ankita at gmail.com>
 	Jörg Sonnenberger <joerg at britannica.bec.de>
+	Juli Mallett <jmallett at freebsd.org>
+	Larry Baird <lab at gta.com>
 	Maëlle Lesage <lesage.maelle at gmail.com>
 	Mark Murray <markm at freebsd.org>
 	Matthias Drochner <drochner at netbsd.org>

Modified: user/ngie/stable-10-libnv/contrib/openpam/configure.ac
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/configure.ac	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/configure.ac	Sun Jan 17 22:05:48 2016	(r294236)
@@ -110,7 +110,7 @@ AC_SUBST(CRYPTO_LIBS)
 
 AC_ARG_ENABLE([developer-warnings],
     AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]),
-    [CFLAGS="${CFLAGS} -Wall -Wextra"])
+    [CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual"])
 AC_ARG_ENABLE([debugging-symbols],
     AS_HELP_STRING([--enable-debugging-symbols], [enable debugging symbols (default is NO)]),
     [CFLAGS="${CFLAGS} -O0 -g -fno-inline"])

Modified: user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -137,6 +137,9 @@ const char *openpam_policy_path[] = {
 const char *openpam_module_path[] = {
 #ifdef OPENPAM_MODULES_DIRECTORY
 	OPENPAM_MODULES_DIRECTORY,
+#elif COMPAT_32BIT
+	"/usr/lib32",
+	"/usr/local/lib32",
 #else
 	"/usr/lib",
 	"/usr/local/lib",

Modified: user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h	Sun Jan 17 22:05:48 2016	(r294236)
@@ -39,10 +39,18 @@
 	(ch >= '0' && ch <= '9')
 
 /*
+ * Evaluates to non-zero if the argument is a hex digit.
+ */
+#define is_xdigit(ch)				\
+	((ch >= '0' && ch <= '9') ||		\
+	 (ch >= 'a' && ch <= 'f') ||		\
+	 (ch >= 'A' && ch <= 'F'))
+
+/*
  * Evaluates to non-zero if the argument is an uppercase letter.
  */
 #define is_upper(ch)				\
-	(ch >= 'A' && ch <= 'A')
+	(ch >= 'A' && ch <= 'Z')
 
 /*
  * Evaluates to non-zero if the argument is a lowercase letter.

Modified: user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -117,7 +117,7 @@ openpam_dispatch(pam_handle_t *pamh,
 			openpam_log(PAM_LOG_LIBDEBUG, "calling %s() in %s",
 			    pam_sm_func_name[primitive], chain->module->path);
 			r = (chain->module->func[primitive])(pamh, flags,
-			    chain->optc, (const char **)chain->optv);
+			    chain->optc, (const char **)(intptr_t)chain->optv);
 			pamh->current = NULL;
 			openpam_log(PAM_LOG_LIBDEBUG, "%s: %s(): %s",
 			    chain->module->path, pam_sm_func_name[primitive],

Modified: user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -74,7 +74,7 @@ pam_sm_authenticate(pam_handle_t *pamh, 
 #endif
 	struct passwd *pwd;
 	const char *user;
-	char *crypt_password, *password;
+	const char *crypt_password, *password;
 	int pam_err, retry;
 
 	(void)argc;
@@ -98,7 +98,7 @@ pam_sm_authenticate(pam_handle_t *pamh, 
 	for (retry = 0; retry < 3; ++retry) {
 #ifdef OPENPAM
 		pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
-		    (const char **)&password, NULL);
+		    &password, NULL);
 #else
 		resp = NULL;
 		pam_err = (*conv->conv)(1, &msgp, &resp, conv->appdata_ptr);

Modified: user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am	Sun Jan 17 22:05:48 2016	(r294236)
@@ -6,6 +6,7 @@ noinst_HEADERS = t.h
 
 # tests
 TESTS =
+TESTS += t_openpam_ctype
 TESTS += t_openpam_readword
 TESTS += t_openpam_readlinev
 check_PROGRAMS = $(TESTS)

Copied: user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_ctype.c (from r294235, stable/10/contrib/openpam/t/t_openpam_ctype.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_ctype.c	Sun Jan 17 22:05:48 2016	(r294236, copy of r294235, stable/10/contrib/openpam/t/t_openpam_ctype.c)
@@ -0,0 +1,122 @@
+/*-
+ * Copyright (c) 2014 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF 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.
+ *
+ * $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "openpam_ctype.h"
+
+#include "t.h"
+
+#define OC_DIGIT	"0123456789"
+#define OC_XDIGIT	OC_DIGIT "ABCDEFabcdef"
+#define OC_UPPER	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+#define OC_LOWER	"abcdefghijklmnopqrstuvwxyz"
+#define OC_LETTER	OC_UPPER OC_LOWER
+#define OC_LWS		" \t\f\r"
+#define OC_WS		OC_LWS "\n"
+#define OC_P		"!\"#$%&'()*+,-./" OC_DIGIT ":;<=>?@" OC_UPPER "[\\]^_`" OC_LOWER "{|}~"
+#define OC_PFCS		OC_DIGIT OC_LETTER "._-"
+
+static const char oc_digit[] = OC_DIGIT;
+static const char oc_xdigit[] = OC_XDIGIT;
+static const char oc_upper[] = OC_UPPER;
+static const char oc_lower[] = OC_LOWER;
+static const char oc_letter[] = OC_LETTER;
+static const char oc_lws[] = OC_LWS;
+static const char oc_ws[] = OC_WS;
+static const char oc_p[] = OC_P;
+static const char oc_pfcs[] = OC_PFCS;
+
+#define T_OC(set)							\
+	T_FUNC(t_oc_##set, "is_" #set)					\
+	{								\
+		char crib[256];						\
+		unsigned int i, ret;					\
+									\
+		memset(crib, 0, sizeof crib);				\
+		for (i = 0; oc_##set[i]; ++i)				\
+			crib[(int)oc_##set[i]] = 1;			\
+		for (i = ret = 0; i < sizeof crib; ++i) {		\
+			if (is_##set(i) != crib[i]) {			\
+				t_verbose("is_%s() incorrect "		\
+				    "for %#02x\n", #set, i);		\
+				++ret;					\
+			}						\
+		}							\
+		return (ret == 0);					\
+	}
+
+T_OC(digit)
+T_OC(xdigit)
+T_OC(upper)
+T_OC(lower)
+T_OC(letter)
+T_OC(lws)
+T_OC(ws)
+T_OC(p)
+T_OC(pfcs)
+
+

+/***************************************************************************
+ * Boilerplate
+ */
+
+static const struct t_test *t_plan[] = {
+	T(t_oc_digit),
+	T(t_oc_xdigit),
+	T(t_oc_upper),
+	T(t_oc_lower),
+	T(t_oc_letter),
+	T(t_oc_lws),
+	T(t_oc_ws),
+	T(t_oc_p),
+	T(t_oc_pfcs),
+	NULL
+};
+
+const struct t_test **
+t_prepare(int argc, char *argv[])
+{
+
+	(void)argc;
+	(void)argv;
+	return (t_plan);
+}
+
+void
+t_cleanup(void)
+{
+}

Modified: user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -255,7 +255,7 @@ T_FUNC(unterminated_line, "unterminated 
  * Boilerplate
  */
 
-const struct t_test *t_plan[] = {
+static const struct t_test *t_plan[] = {
 	T(empty_input),
 	T(empty_line),
 	T(unterminated_empty_line),

Modified: user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -823,7 +823,7 @@ T_FUNC(escaped_double_quote_within_doubl
  * Boilerplate
  */
 
-const struct t_test *t_plan[] = {
+static const struct t_test *t_plan[] = {
 	T(empty_input),
 	T(empty_line),
 	T(single_whitespace),

Copied: user/ngie/stable-10-libnv/contrib/unbound/.gitignore (from r294235, stable/10/contrib/unbound/.gitignore)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/unbound/.gitignore	Sun Jan 17 22:05:48 2016	(r294236, copy of r294235, stable/10/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: user/ngie/stable-10-libnv/contrib/unbound/Makefile.in
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/Makefile.in	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/Makefile.in	Sun Jan 17 22:05:48 2016	(r294236)
@@ -38,6 +38,7 @@ UNBOUND_VERSION_MINOR=@UNBOUND_VERSION_M
 UNBOUND_VERSION_MICRO=@UNBOUND_VERSION_MICRO@
 ALLTARGET=@ALLTARGET@
 INSTALLTARGET=@INSTALLTARGET@
+SSLLIB=@SSLLIB@
 
 # _unbound.la if pyunbound enabled.
 PYUNBOUND_TARGET=@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=$(LIBOBJS:.o=.lo)
 COMPAT_OBJ_WITHOUT_CTIME=$(LIBOBJ_WITHOUT_CTIME:.o=.lo)
 COMPAT_OBJ_WITHOUT_CTIMEARC4=$(LIBOBJ_WITHOUT_CTIMEARC4:.o=.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: user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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="$LIBS"
-	AC_SEARCH_LIBS([dlopen], [dl])
-	if test "$LIBS" != "$BAKLIBS"; then
-		LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
-	fi
     fi
 AC_CHECK_HEADERS([openssl/ssl.h],,, [AC_INCLUDES_DEFAULT])
 AC_CHECK_HEADERS([openssl/err.h],,, [AC_INCLUDES_DEFAULT])

Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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: user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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 = 0; i < len; ) {
 		int j;
-		SHA512_Init(&ctx);
+		CRYPTO_SHA512_INIT(&ctx);
 		for (j = 0; j < repeat; j++) {
 			HX((e = gettimeofday(&tv, NULL)) == -1, tv);
 			if (e != -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 += min(sizeof(results), len - i);
 	}

Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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: user/ngie/stable-10-libnv/contrib/unbound/compat/isblank.c (from r294235, stable/10/contrib/unbound/compat/isblank.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/isblank.c	Sun Jan 17 22:05:48 2016	(r294236, copy of r294235, stable/10/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, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * 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==' ' || c=='\t');
+}

Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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: user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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: user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c	Sun Jan 17 21:19:45 2016	(r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c	Sun Jan 17 22:05:48 2016	(r294236)
@@ -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 = 0;
 	int zero = (value == 0);
-#if defined(UINTPTR_MAX) && defined(UINT32_MAX) && (UINTPTR_MAX == UINT32_MAX)
+#if defined(SIZE_MAX) && defined(UINT32_MAX) && (UINT32_MAX == SIZE_MAX || INT32_MAX == SIZE_MAX)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list