Upgrade to 1.6.16

1 files changed, 133 insertions, 20 deletions

diff --git a/contrib/ldns/configure b/contrib/ldns/configure
index 3693656..be312d1 100755
--- a/contrib/ldns/configure
+++ b/contrib/ldns/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ldns 1.6.13.
+# Generated by GNU Autoconf 2.68 for ldns 1.6.16.
 #
 # Report bugs to <libdns@nlnetlabs.nl>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ldns'
 PACKAGE_TARNAME='libdns'
-PACKAGE_VERSION='1.6.13'
-PACKAGE_STRING='ldns 1.6.13'
+PACKAGE_VERSION='1.6.16'
+PACKAGE_STRING='ldns 1.6.16'
 PACKAGE_BUGREPORT='libdns@nlnetlabs.nl'
 PACKAGE_URL=''
 
@@ -613,17 +613,23 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+CONFIG_FILES
 ldns_build_config_have_attr_unused
 ldns_build_config_have_attr_format
 ldns_build_config_have_ssl
+DEFAULT_CAPATH
+DEFAULT_CAFILE
+LDNS_TRUST_ANCHOR_FILE
 WINDRES
 LIBOBJS
+ldns_build_config_have_socklen_t
 LIBPCAP_LIBS
 include_unistd_h
 include_systypes_h
 include_inttypes_h
 ldns_build_config_have_inttypes_h
 include_sys_socket_h
+LIBSSL_SSL_LIBS
 LIBSSL_LIBS
 LIBSSL_LDFLAGS
 LIBSSL_CPPFLAGS
@@ -767,6 +773,9 @@ enable_sha2
 enable_gost
 enable_ecdsa
 enable_rpath
+with_trust_anchor
+with_ca_file
+with_ca_path
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1320,7 +1329,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ldns 1.6.13 to adapt to many kinds of systems.
+\`configure' configures ldns 1.6.16 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1385,7 +1394,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ldns 1.6.13:";;
+     short | recursive ) echo "Configuration of ldns 1.6.16:";;
    esac
   cat <<\_ACEOF
 
@@ -1421,6 +1430,12 @@ Optional Packages:
   --with-ssl=pathname     enable SSL (will check /usr/local/ssl /usr/lib/ssl
                           /usr/ssl /usr/pkg /usr/local /opt/local /usr/sfw
                           /usr)
+  --with-trust-anchor=KEYFILE
+                          Default location of the trust anchor file for drill
+                          and ldns-dane. [default=SYSCONFDIR/unbound/root.key]
+  --with-ca-file=CAFILE   File containing CA certificates for ldns-dane
+  --with-ca-path=CAPATH   Directory containing CA certificate files for
+                          ldns-dane
 
 Some influential environment variables:
   CC          C compiler command
@@ -1502,7 +1517,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ldns configure 1.6.13
+ldns configure 1.6.16
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2206,7 +2221,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ldns $as_me 1.6.13, which was
+It was created by ldns $as_me 1.6.16, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2556,13 +2571,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # needed to build correct soname
-LIBTOOL_VERSION_INFO=1:6:13
+LIBTOOL_VERSION_INFO=1:6:16
 
 LDNS_VERSION_MAJOR=1
 
 LDNS_VERSION_MINOR=6
 
-LDNS_VERSION_MICRO=13
+LDNS_VERSION_MICRO=16
 
 
 OURCPPFLAGS=''
@@ -4684,6 +4699,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+if test "x$CFLAGS" = "x" ; then
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -g" >&5
@@ -4707,7 +4723,7 @@ if eval "test \"`echo '$cv_prog_cc_flag_'$cache`\" = yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 :
-CFLAGS="-g $CFLAGS"
+CFLAGS="-g"
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -4746,6 +4762,7 @@ $as_echo "no" >&6; }
 
 fi
 
+fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wall" >&5
@@ -5931,6 +5948,7 @@ This does not work with the --with-drill option.
 Please remove the config.h from the drill subdirectory
 or do not use the --with-drill option." "$LINENO" 5
 	fi
+	DRILL_CONFIG=" drill/drill.1"
 else
 	DRILL=""
 
@@ -5942,6 +5960,7 @@ else
 
 	LINT_DRILL=""
 
+	DRILL_CONFIG=""
 fi
 
 
@@ -5971,6 +5990,7 @@ This does not work with the --with-examples option.
 Please remove the config.h from the examples subdirectory
 or do not use the --with-examples option." "$LINENO" 5
 	fi
+	EXAMPLES_CONFIG=" examples/ldns-dane.1 examples/ldns-verify-zone.1"
 else
 	EXAMPLES=""
 
@@ -5982,6 +6002,7 @@ else
 
 	LINT_EXAMPLES=""
 
+	EXAMPLES_CONFIG=""
 fi
 
 # add option to disable installation of ldns-config script
@@ -6981,7 +7002,6 @@ else
 
 fi
 
-
 # Use libtool
 
 # skip these tests, we do not need them.
@@ -14706,6 +14726,10 @@ esac
 
 
 
+if test "x$HAVE_SSL" = "xyes"; then
+LIBSSL_SSL_LIBS="$LIBSSL_LIBS -lssl"
+
+fi
 CPPFLAGS=$tmp_CPPFLAGS
 LDFLAGS=$tmp_LDFLAGS
 LIBS=$tmp_LIBS
@@ -15452,6 +15476,13 @@ $as_echo "#define socklen_t int" >>confdefs.h
 
 fi
 
+if test "x$ac_cv_type_socklen_t" = xyes; then
+  ldns_build_config_have_socklen_t=1
+
+else
+  ldns_build_config_have_socklen_t=0
+
+fi
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 if test "x$ac_cv_type_size_t" = xyes; then :
 
@@ -16514,6 +16545,91 @@ $as_echo "#define SYSCONFDIR sysconfdir" >>confdefs.h
 
 
 
+# Check whether --with-trust-anchor was given.
+if test "${with_trust_anchor+set}" = set; then :
+  withval=$with_trust_anchor;
+ LDNS_TRUST_ANCHOR_FILE="$withval"
+
+else
+
+ if test "x$LDNS_TRUST_ANCHOR_FILE" = "x"; then
+  if test "x$sysconfdir" = 'x${prefix}/etc' ; then
+   if test "x$prefix" = 'xNONE' ; then
+    LDNS_TRUST_ANCHOR_FILE="/etc/unbound/root.key"
+   else
+    LDNS_TRUST_ANCHOR_FILE="${prefix}/etc/unbound/root.key"
+   fi
+  else
+    LDNS_TRUST_ANCHOR_FILE="${sysconfdir}/unbound/root.key"
+  fi
+ fi
+
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define LDNS_TRUST_ANCHOR_FILE "$LDNS_TRUST_ANCHOR_FILE"
+_ACEOF
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Default trust anchor: $LDNS_TRUST_ANCHOR_FILE" >&5
+$as_echo "$as_me: Default trust anchor: $LDNS_TRUST_ANCHOR_FILE" >&6;}
+
+
+# Check whether --with-ca-file was given.
+if test "${with_ca_file+set}" = set; then :
+  withval=$with_ca_file;
+
+$as_echo "#define HAVE_DANE_CA_FILE 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define LDNS_DANE_CA_FILE "$withval"
+_ACEOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using CAfile: $withval" >&5
+$as_echo "$as_me: Using CAfile: $withval" >&6;}
+ DEFAULT_CAFILE="Default is $withval"
+
+
+else
+
+
+$as_echo "#define HAVE_DANE_CA_FILE 0" >>confdefs.h
+
+
+
+fi
+
+
+
+# Check whether --with-ca-path was given.
+if test "${with_ca_path+set}" = set; then :
+  withval=$with_ca_path;
+
+$as_echo "#define HAVE_DANE_CA_PATH 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define LDNS_DANE_CA_PATH "$withval"
+_ACEOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using CApath: $withval" >&5
+$as_echo "$as_me: Using CApath: $withval" >&6;}
+ DEFAULT_CAPATH="Default is $withval"
+
+
+else
+
+
+$as_echo "#define HAVE_DANE_CA_PATH 0" >>confdefs.h
+
+
+
+fi
+
+
+
 
 
 
@@ -16539,7 +16655,9 @@ else
 
 fi
 
-ac_config_files="$ac_config_files Makefile ldns/common.h ldns/net.h ldns/util.h packaging/libldns.pc packaging/ldns-config"
+CONFIG_FILES="Makefile ldns/common.h ldns/net.h ldns/util.h packaging/libldns.pc packaging/ldns-config $DRILL_CONFIG $EXAMPLES_CONFIG"
+
+ac_config_files="$ac_config_files $CONFIG_FILES"
 
 
 ac_config_headers="$ac_config_headers ldns/config.h"
@@ -17063,7 +17181,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ldns $as_me 1.6.13, which was
+This file was extended by ldns $as_me 1.6.16, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17129,7 +17247,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ldns config.status 1.6.13
+ldns config.status 1.6.16
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -17534,12 +17652,7 @@ do
   case $ac_config_target in
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "disable-rpath") CONFIG_COMMANDS="$CONFIG_COMMANDS disable-rpath" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "ldns/common.h") CONFIG_FILES="$CONFIG_FILES ldns/common.h" ;;
-    "ldns/net.h") CONFIG_FILES="$CONFIG_FILES ldns/net.h" ;;
-    "ldns/util.h") CONFIG_FILES="$CONFIG_FILES ldns/util.h" ;;
-    "packaging/libldns.pc") CONFIG_FILES="$CONFIG_FILES packaging/libldns.pc" ;;
-    "packaging/ldns-config") CONFIG_FILES="$CONFIG_FILES packaging/ldns-config" ;;
+    "$CONFIG_FILES") CONFIG_FILES="$CONFIG_FILES $CONFIG_FILES" ;;
     "ldns/config.h") CONFIG_HEADERS="$CONFIG_HEADERS ldns/config.h" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;