Merging upstream version 1.9.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 8 deletions

diff --git a/ext/ipcrypt/Makefile.in b/ext/ipcrypt/Makefile.in
index 19a00e6..deaac7e 100644
--- a/ext/ipcrypt/Makefile.in
+++ b/ext/ipcrypt/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -97,6 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread_set_name.m4 \
 	$(top_srcdir)/m4/ax_python_module.m4 $(top_srcdir)/m4/boost.m4 \
 	$(top_srcdir)/m4/dnsdist_enable_dnscrypt.m4 \
 	$(top_srcdir)/m4/dnsdist_enable_doh.m4 \
+	$(top_srcdir)/m4/dnsdist_enable_doh3.m4 \
+	$(top_srcdir)/m4/dnsdist_enable_doq.m4 \
 	$(top_srcdir)/m4/dnsdist_enable_tls_providers.m4 \
 	$(top_srcdir)/m4/dnsdist_with_cdb.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -116,6 +118,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread_set_name.m4 \
 	$(top_srcdir)/m4/pdns_check_ragel.m4 \
 	$(top_srcdir)/m4/pdns_check_secure_memset.m4 \
 	$(top_srcdir)/m4/pdns_d_fortify_source.m4 \
+	$(top_srcdir)/m4/pdns_enable_coverage.m4 \
+	$(top_srcdir)/m4/pdns_enable_fuzz_targets.m4 \
 	$(top_srcdir)/m4/pdns_enable_ipcipher.m4 \
 	$(top_srcdir)/m4/pdns_enable_lto.m4 \
 	$(top_srcdir)/m4/pdns_enable_sanitizers.m4 \
@@ -133,10 +137,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_pthread_set_name.m4 \
 	$(top_srcdir)/m4/pdns_with_lua.m4 \
 	$(top_srcdir)/m4/pdns_with_net_snmp.m4 \
 	$(top_srcdir)/m4/pdns_with_nghttp2.m4 \
+	$(top_srcdir)/m4/pdns_with_quiche.m4 \
 	$(top_srcdir)/m4/pdns_with_re2.m4 \
 	$(top_srcdir)/m4/pdns_with_service_user.m4 \
-	$(top_srcdir)/m4/systemd.m4 $(top_srcdir)/m4/warnings.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/pdns_with_xsk.m4 $(top_srcdir)/m4/systemd.m4 \
+	$(top_srcdir)/m4/warnings.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -211,8 +216,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -220,6 +223,7 @@ AMTAR = @AMTAR@
 AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+ARC4RANDOM_LIBS = @ARC4RANDOM_LIBS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -230,13 +234,16 @@ BOOST_ROOT = @BOOST_ROOT@
 BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
 BOOST_UNIT_TEST_FRAMEWORK_LDPATH = @BOOST_UNIT_TEST_FRAMEWORK_LDPATH@
 BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+BPF_CFLAGS = @BPF_CFLAGS@
+BPF_LIBS = @BPF_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CDB_CFLAGS = @CDB_CFLAGS@
 CDB_LIBS = @CDB_LIBS@
 CFLAGS = @CFLAGS@
-CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -253,8 +260,10 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FILECMD = @FILECMD@
 FSTRM_CFLAGS = @FSTRM_CFLAGS@
 FSTRM_LIBS = @FSTRM_LIBS@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
@@ -326,6 +335,8 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
+QUICHE_CFLAGS = @QUICHE_CFLAGS@
+QUICHE_LIBS = @QUICHE_LIBS@
 RAGEL = @RAGEL@
 RANLIB = @RANLIB@
 RE2_CFLAGS = @RE2_CFLAGS@
@@ -345,6 +356,8 @@ SYSTEMD_MODULES_LOAD = @SYSTEMD_MODULES_LOAD@
 THREADFLAGS = @THREADFLAGS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
+XDP_CFLAGS = @XDP_CFLAGS@
+XDP_LIBS = @XDP_LIBS@
 YAHTTP_CFLAGS = @YAHTTP_CFLAGS@
 YAHTTP_LIBS = @YAHTTP_LIBS@
 abs_builddir = @abs_builddir@
@@ -559,7 +572,6 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am