Adding upstream version 2.7.0.upstream/2.7.0

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

1 files changed, 22 insertions, 10 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index d129516..335c659 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -130,14 +130,16 @@ PROGRAMS = $(bin_PROGRAMS)
 am__objects_1 = datafile.$(OBJEXT) dns.$(OBJEXT) log.$(OBJEXT) \
 	net.$(OBJEXT) opt.$(OBJEXT) os.$(OBJEXT) strerror.$(OBJEXT) \
 	qtype.$(OBJEXT) edns.$(OBJEXT) tsig.$(OBJEXT) \
-	net_udp.$(OBJEXT) net_tcp.$(OBJEXT) net_dot.$(OBJEXT)
+	net_udp.$(OBJEXT) net_tcp.$(OBJEXT) net_dot.$(OBJEXT) \
+	net_doh.$(OBJEXT) parse_uri.$(OBJEXT)
 am_dnsperf_OBJECTS = $(am__objects_1) dnsperf.$(OBJEXT)
 am__objects_2 =
 dist_dnsperf_OBJECTS = $(am__objects_2)
 dnsperf_OBJECTS = $(am_dnsperf_OBJECTS) $(dist_dnsperf_OBJECTS)
 am__DEPENDENCIES_1 =
 dnsperf_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -146,7 +148,8 @@ am_resperf_OBJECTS = $(am__objects_1) resperf.$(OBJEXT)
 dist_resperf_OBJECTS = $(am__objects_2)
 resperf_OBJECTS = $(am_resperf_OBJECTS) $(dist_resperf_OBJECTS)
 resperf_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -192,9 +195,10 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/datafile.Po ./$(DEPDIR)/dns.Po \
 	./$(DEPDIR)/dnsperf.Po ./$(DEPDIR)/edns.Po ./$(DEPDIR)/log.Po \
-	./$(DEPDIR)/net.Po ./$(DEPDIR)/net_dot.Po \
-	./$(DEPDIR)/net_tcp.Po ./$(DEPDIR)/net_udp.Po \
-	./$(DEPDIR)/opt.Po ./$(DEPDIR)/os.Po ./$(DEPDIR)/qtype.Po \
+	./$(DEPDIR)/net.Po ./$(DEPDIR)/net_doh.Po \
+	./$(DEPDIR)/net_dot.Po ./$(DEPDIR)/net_tcp.Po \
+	./$(DEPDIR)/net_udp.Po ./$(DEPDIR)/opt.Po ./$(DEPDIR)/os.Po \
+	./$(DEPDIR)/parse_uri.Po ./$(DEPDIR)/qtype.Po \
 	./$(DEPDIR)/resperf.Po ./$(DEPDIR)/strerror.Po \
 	./$(DEPDIR)/tsig.Po
 am__mv = mv -f
@@ -405,6 +409,8 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 libldns_CFLAGS = @libldns_CFLAGS@
 libldns_LIBS = @libldns_LIBS@
+libnghttp2_CFLAGS = @libnghttp2_CFLAGS@
+libnghttp2_LIBS = @libnghttp2_LIBS@
 libssl_CFLAGS = @libssl_CFLAGS@
 libssl_LIBS = @libssl_LIBS@
 localedir = @localedir@
@@ -435,20 +441,20 @@ AM_CFLAGS = -I$(srcdir) \
 EXTRA_DIST = dnsperf.1.in resperf-report resperf.1.in
 dist_bin_SCRIPTS = resperf-report
 _libperf_sources = datafile.c dns.c log.c net.c opt.c os.c strerror.c qtype.c \
-  edns.c tsig.c net_udp.c net_tcp.c net_dot.c
+  edns.c tsig.c net_udp.c net_tcp.c net_dot.c net_doh.c parse_uri.c
 
 _libperf_headers = datafile.h dns.h log.h net.h opt.h os.h util.h strerror.h \
-  list.h result.h buffer.h qtype.h edns.h tsig.h
+  list.h result.h buffer.h qtype.h edns.h tsig.h parse_uri.h
 
 dnsperf_SOURCES = $(_libperf_sources) dnsperf.c
 dist_dnsperf_SOURCES = $(_libperf_headers)
 dnsperf_LDADD = $(PTHREAD_LIBS) $(libssl_LIBS) $(libcrypto_LIBS) \
-  $(libldns_LIBS)
+  $(libldns_LIBS) $(libnghttp2_LIBS)
 
 resperf_SOURCES = $(_libperf_sources) resperf.c
 dist_resperf_SOURCES = $(_libperf_headers)
 resperf_LDADD = $(PTHREAD_LIBS) $(libssl_LIBS) $(libcrypto_LIBS) \
-  $(libldns_LIBS)
+  $(libldns_LIBS) $(libnghttp2_LIBS)
 
 man1_MANS = dnsperf.1 resperf.1
 all: config.h
@@ -605,11 +611,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edns.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_doh.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_dot.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_tcp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_udp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opt.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/os.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_uri.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qtype.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resperf.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ # am--include-marker
@@ -902,11 +910,13 @@ distclean: distclean-recursive
 	-rm -f ./$(DEPDIR)/edns.Po
 	-rm -f ./$(DEPDIR)/log.Po
 	-rm -f ./$(DEPDIR)/net.Po
+	-rm -f ./$(DEPDIR)/net_doh.Po
 	-rm -f ./$(DEPDIR)/net_dot.Po
 	-rm -f ./$(DEPDIR)/net_tcp.Po
 	-rm -f ./$(DEPDIR)/net_udp.Po
 	-rm -f ./$(DEPDIR)/opt.Po
 	-rm -f ./$(DEPDIR)/os.Po
+	-rm -f ./$(DEPDIR)/parse_uri.Po
 	-rm -f ./$(DEPDIR)/qtype.Po
 	-rm -f ./$(DEPDIR)/resperf.Po
 	-rm -f ./$(DEPDIR)/strerror.Po
@@ -966,11 +976,13 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f ./$(DEPDIR)/edns.Po
 	-rm -f ./$(DEPDIR)/log.Po
 	-rm -f ./$(DEPDIR)/net.Po
+	-rm -f ./$(DEPDIR)/net_doh.Po
 	-rm -f ./$(DEPDIR)/net_dot.Po
 	-rm -f ./$(DEPDIR)/net_tcp.Po
 	-rm -f ./$(DEPDIR)/net_udp.Po
 	-rm -f ./$(DEPDIR)/opt.Po
 	-rm -f ./$(DEPDIR)/os.Po
+	-rm -f ./$(DEPDIR)/parse_uri.Po
 	-rm -f ./$(DEPDIR)/qtype.Po
 	-rm -f ./$(DEPDIR)/resperf.Po
 	-rm -f ./$(DEPDIR)/strerror.Po