Merging upstream version 2.2.0.

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

1 files changed, 26 insertions, 10 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 8f93ac4..a5cf3e2 100644
--- a/src/Makefile.in
+++ b/src/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,
@@ -118,7 +118,8 @@ am_dnscap_OBJECTS = args.$(OBJEXT) assert.$(OBJEXT) bpft.$(OBJEXT) \
 	pcaps.$(OBJEXT) sig.$(OBJEXT) tcpstate.$(OBJEXT) \
 	tcpreasm.$(OBJEXT) memzero.$(OBJEXT) \
 	pcap-thread/pcap_thread.$(OBJEXT) \
-	pcap-thread/pcap_thread_ext_frag.$(OBJEXT)
+	pcap-thread/pcap_thread_ext_frag.$(OBJEXT) \
+	ext/lookup3.$(OBJEXT)
 dist_dnscap_OBJECTS =
 dnscap_OBJECTS = $(am_dnscap_OBJECTS) $(dist_dnscap_OBJECTS)
 am__DEPENDENCIES_1 =
@@ -152,7 +153,7 @@ am__depfiles_remade = ./$(DEPDIR)/args.Po ./$(DEPDIR)/assert.Po \
 	./$(DEPDIR)/memzero.Po ./$(DEPDIR)/network.Po \
 	./$(DEPDIR)/options.Po ./$(DEPDIR)/pcaps.Po ./$(DEPDIR)/sig.Po \
 	./$(DEPDIR)/tcpreasm.Po ./$(DEPDIR)/tcpstate.Po \
-	pcap-thread/$(DEPDIR)/pcap_thread.Po \
+	ext/$(DEPDIR)/lookup3.Po pcap-thread/$(DEPDIR)/pcap_thread.Po \
 	pcap-thread/$(DEPDIR)/pcap_thread_ext_frag.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -227,8 +228,8 @@ am__recursive_targets = \
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir distdir-am
 am__extra_recursive_targets = gcov-recursive
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -245,8 +246,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
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/depcomp
@@ -289,6 +288,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -299,6 +300,7 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -418,7 +420,8 @@ EXTRA_DIST = dnscap.1.in
 dnscap_SOURCES = args.c assert.c bpft.c daemon.c dnscap.c dump_cbor.c \
     dump_cds.c dump_dns.c dumper.c endpoint.c hashtbl.c iaddr.c log.c \
     network.c options.c pcaps.c sig.c tcpstate.c tcpreasm.c memzero.c \
-    pcap-thread/pcap_thread.c pcap-thread/pcap_thread_ext_frag.c
+    pcap-thread/pcap_thread.c pcap-thread/pcap_thread_ext_frag.c \
+    ext/lookup3.c
 
 dist_dnscap_SOURCES = args.h bpft.h daemon.h dnscap_common.h dnscap.h \
   dump_cbor.h dump_cds.h dump_dns.h dumper.h endpoint.h hashtbl.h iaddr.h \
@@ -537,6 +540,14 @@ pcap-thread/pcap_thread.$(OBJEXT): pcap-thread/$(am__dirstamp) \
 pcap-thread/pcap_thread_ext_frag.$(OBJEXT):  \
 	pcap-thread/$(am__dirstamp) \
 	pcap-thread/$(DEPDIR)/$(am__dirstamp)
+ext/$(am__dirstamp):
+	@$(MKDIR_P) ext
+	@: > ext/$(am__dirstamp)
+ext/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) ext/$(DEPDIR)
+	@: > ext/$(DEPDIR)/$(am__dirstamp)
+ext/lookup3.$(OBJEXT): ext/$(am__dirstamp) \
+	ext/$(DEPDIR)/$(am__dirstamp)
 
 dnscap$(EXEEXT): $(dnscap_OBJECTS) $(dnscap_DEPENDENCIES) $(EXTRA_dnscap_DEPENDENCIES) 
 	@rm -f dnscap$(EXEEXT)
@@ -544,6 +555,7 @@ dnscap$(EXEEXT): $(dnscap_OBJECTS) $(dnscap_DEPENDENCIES) $(EXTRA_dnscap_DEPENDE
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f ext/*.$(OBJEXT)
 	-rm -f pcap-thread/*.$(OBJEXT)
 
 distclean-compile:
@@ -569,6 +581,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpreasm.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcpstate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ext/$(DEPDIR)/lookup3.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@pcap-thread/$(DEPDIR)/pcap_thread.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@pcap-thread/$(DEPDIR)/pcap_thread_ext_frag.Po@am__quote@ # am--include-marker
 
@@ -748,7 +761,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
 
@@ -842,6 +854,8 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f ext/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ext/$(am__dirstamp)
 	-rm -f pcap-thread/$(DEPDIR)/$(am__dirstamp)
 	-rm -f pcap-thread/$(am__dirstamp)
 
@@ -875,6 +889,7 @@ distclean: distclean-recursive
 	-rm -f ./$(DEPDIR)/sig.Po
 	-rm -f ./$(DEPDIR)/tcpreasm.Po
 	-rm -f ./$(DEPDIR)/tcpstate.Po
+	-rm -f ext/$(DEPDIR)/lookup3.Po
 	-rm -f pcap-thread/$(DEPDIR)/pcap_thread.Po
 	-rm -f pcap-thread/$(DEPDIR)/pcap_thread_ext_frag.Po
 	-rm -f Makefile
@@ -946,6 +961,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f ./$(DEPDIR)/sig.Po
 	-rm -f ./$(DEPDIR)/tcpreasm.Po
 	-rm -f ./$(DEPDIR)/tcpstate.Po
+	-rm -f ext/$(DEPDIR)/lookup3.Po
 	-rm -f pcap-thread/$(DEPDIR)/pcap_thread.Po
 	-rm -f pcap-thread/$(DEPDIR)/pcap_thread_ext_frag.Po
 	-rm -f Makefile