Adding upstream version 1.4.0.upstream/1.4.0upstream

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

1 files changed, 66 insertions, 53 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index eb8523b..16dd15f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (c) 2018-2023, OARC, Inc.
+# Copyright (c) 2018-2024 OARC, Inc.
 # All rights reserved.
 #
 # This file is part of dnsjit.
@@ -150,18 +150,18 @@ am_dnsjit_OBJECTS = dnsjit.$(OBJEXT) globals.$(OBJEXT) \
 	filter/layer.$(OBJEXT) filter/split.$(OBJEXT) \
 	filter/timing.$(OBJEXT) input/fpcap.$(OBJEXT) \
 	input/mmpcap.$(OBJEXT) input/pcap.$(OBJEXT) \
-	input/zpcap.$(OBJEXT) lib/base64url.$(OBJEXT) \
-	lib/clock.$(OBJEXT) lib/trie.$(OBJEXT) output/dnscli.$(OBJEXT) \
-	output/pcap.$(OBJEXT) output/respdiff.$(OBJEXT) \
-	output/tcpcli.$(OBJEXT) output/tlscli.$(OBJEXT) \
-	output/udpcli.$(OBJEXT)
+	input/zmmpcap.$(OBJEXT) input/zpcap.$(OBJEXT) \
+	lib/base64url.$(OBJEXT) lib/clock.$(OBJEXT) lib/trie.$(OBJEXT) \
+	output/dnscli.$(OBJEXT) output/pcap.$(OBJEXT) \
+	output/respdiff.$(OBJEXT) output/tcpcli.$(OBJEXT) \
+	output/tlscli.$(OBJEXT) output/udpcli.$(OBJEXT)
 dist_dnsjit_OBJECTS =
 dnsjit_OBJECTS = $(am_dnsjit_OBJECTS) $(dist_dnsjit_OBJECTS)
 am__DEPENDENCIES_1 =
 dnsjit_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(lua_hobjects) \
-	$(lua_objects)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(lua_hobjects) $(lua_objects)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -201,11 +201,12 @@ am__depfiles_remade = ./$(DEPDIR)/dnsjit.Po ./$(DEPDIR)/globals.Po \
 	filter/$(DEPDIR)/layer.Po filter/$(DEPDIR)/split.Po \
 	filter/$(DEPDIR)/timing.Po input/$(DEPDIR)/fpcap.Po \
 	input/$(DEPDIR)/mmpcap.Po input/$(DEPDIR)/pcap.Po \
-	input/$(DEPDIR)/zpcap.Po lib/$(DEPDIR)/base64url.Po \
-	lib/$(DEPDIR)/clock.Po lib/$(DEPDIR)/trie.Po \
-	output/$(DEPDIR)/dnscli.Po output/$(DEPDIR)/pcap.Po \
-	output/$(DEPDIR)/respdiff.Po output/$(DEPDIR)/tcpcli.Po \
-	output/$(DEPDIR)/tlscli.Po output/$(DEPDIR)/udpcli.Po
+	input/$(DEPDIR)/zmmpcap.Po input/$(DEPDIR)/zpcap.Po \
+	lib/$(DEPDIR)/base64url.Po lib/$(DEPDIR)/clock.Po \
+	lib/$(DEPDIR)/trie.Po output/$(DEPDIR)/dnscli.Po \
+	output/$(DEPDIR)/pcap.Po output/$(DEPDIR)/respdiff.Po \
+	output/$(DEPDIR)/tcpcli.Po output/$(DEPDIR)/tlscli.Po \
+	output/$(DEPDIR)/udpcli.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -445,6 +446,8 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 liblz4_CFLAGS = @liblz4_CFLAGS@
 liblz4_LIBS = @liblz4_LIBS@
+liblzma_CFLAGS = @liblzma_CFLAGS@
+liblzma_LIBS = @liblzma_LIBS@
 libpcap_CFLAGS = @libpcap_CFLAGS@
 libpcap_LIBS = @libpcap_LIBS@
 libzstd_CFLAGS = @libzstd_CFLAGS@
@@ -481,7 +484,8 @@ AM_CFLAGS = -Werror=attributes \
   $(PTHREAD_CFLAGS) \
   $(luajit_CFLAGS) \
   $(liblz4_CFLAGS) $(libzstd_CFLAGS) \
-  $(libpcap_CFLAGS) $(gnutls_CFLAGS)
+  $(libpcap_CFLAGS) $(gnutls_CFLAGS) \
+  $(liblzma_CFLAGS)
 
 EXTRA_DIST = gen-manpage.lua gen-compat.lua gen-errno.sh dnsjit.1in
 BUILT_SOURCES = core/compat.hh core/log_errstr.c
@@ -496,10 +500,10 @@ dnsjit_SOURCES = dnsjit.c globals.c core/channel.c core/compat.c \
 	core/object/tcp.c core/object/udp.c core/producer.c \
 	core/receiver.c core/thread.c filter/copy.c filter/ipsplit.c \
 	filter/layer.c filter/split.c filter/timing.c input/fpcap.c \
-	input/mmpcap.c input/pcap.c input/zpcap.c lib/base64url.c \
-	lib/clock.c lib/trie.c output/dnscli.c output/pcap.c \
-	output/respdiff.c output/tcpcli.c output/tlscli.c \
-	output/udpcli.c
+	input/mmpcap.c input/pcap.c input/zmmpcap.c input/zpcap.c \
+	lib/base64url.c lib/clock.c lib/trie.c output/dnscli.c \
+	output/pcap.c output/respdiff.c output/tcpcli.c \
+	output/tlscli.c output/udpcli.c
 
 # Lua sources
 dist_dnsjit_SOURCES = core.lua lib.lua input.lua filter.lua output.lua \
@@ -516,9 +520,9 @@ dist_dnsjit_SOURCES = core.lua lib.lua input.lua filter.lua output.lua \
 	core/thread.lua core/timespec.lua filter/copy.lua \
 	filter/ipsplit.lua filter/layer.lua filter/split.lua \
 	filter/timing.lua input/fpcap.lua input/mmpcap.lua \
-	input/pcap.lua input/zero.lua input/zpcap.lua \
-	lib/base64url.lua lib/clock.lua lib/getopt.lua lib/ip.lua \
-	lib/parseconf.lua lib/trie/iter.lua lib/trie.lua \
+	input/pcap.lua input/zero.lua input/zmmpcap.lua \
+	input/zpcap.lua lib/base64url.lua lib/clock.lua lib/getopt.lua \
+	lib/ip.lua lib/parseconf.lua lib/trie/iter.lua lib/trie.lua \
 	lib/trie/node.lua output/dnscli.lua output/null.lua \
 	output/pcap.lua output/respdiff.lua output/tcpcli.lua \
 	output/tlscli.lua output/udpcli.lua
@@ -535,23 +539,23 @@ nobase_dnsjitinclude_HEADERS = globals.h version.h core/assert.h \
 	core/object/udp.h core/producer.h core/receiver.h \
 	core/thread.h core/timespec.h filter/copy.h filter/ipsplit.h \
 	filter/layer.h filter/split.h filter/timing.h input/fpcap.h \
-	input/mmpcap.h input/pcap.h input/zpcap.h lib/base64url.h \
-	lib/clock.h lib/trie.h output/dnscli.h output/pcap.h \
-	output/respdiff.h output/tcpcli.h output/tlscli.h \
-	output/udpcli.h core/channel.hh core/file.hh core/log.hh \
-	core/object/dns.hh core/object/ether.hh core/object/gre.hh \
-	core/object.hh core/object/icmp6.hh core/object/icmp.hh \
-	core/object/ieee802.hh core/object/ip6.hh core/object/ip.hh \
-	core/object/linuxsll.hh core/object/loop.hh \
+	input/mmpcap.h input/pcap.h input/zmmpcap.h input/zpcap.h \
+	lib/base64url.h lib/clock.h lib/trie.h output/dnscli.h \
+	output/pcap.h output/respdiff.h output/tcpcli.h \
+	output/tlscli.h output/udpcli.h core/channel.hh core/file.hh \
+	core/log.hh core/object/dns.hh core/object/ether.hh \
+	core/object/gre.hh core/object.hh core/object/icmp6.hh \
+	core/object/icmp.hh core/object/ieee802.hh core/object/ip6.hh \
+	core/object/ip.hh core/object/linuxsll.hh core/object/loop.hh \
 	core/object/null.hh core/object/payload.hh core/object/pcap.hh \
 	core/object/tcp.hh core/object/udp.hh core/producer.hh \
 	core/receiver.hh core/thread.hh core/timespec.hh \
 	filter/copy.hh filter/ipsplit.hh filter/layer.hh \
 	filter/split.hh filter/timing.hh input/fpcap.hh \
-	input/mmpcap.hh input/pcap.hh input/zpcap.hh lib/base64url.hh \
-	lib/clock.hh lib/trie.hh output/dnscli.hh output/pcap.hh \
-	output/respdiff.hh output/tcpcli.hh output/tlscli.hh \
-	output/udpcli.hh
+	input/mmpcap.hh input/pcap.hh input/zmmpcap.hh input/zpcap.hh \
+	lib/base64url.hh lib/clock.hh lib/trie.hh output/dnscli.hh \
+	output/pcap.hh output/respdiff.hh output/tcpcli.hh \
+	output/tlscli.hh output/udpcli.hh
 lua_hobjects = core/compat.luaho core/channel.luaho core/file.luaho \
 	core/log.luaho core/object/dns.luaho core/object/ether.luaho \
 	core/object/gre.luaho core/object/icmp6.luaho \
@@ -565,10 +569,10 @@ lua_hobjects = core/compat.luaho core/channel.luaho core/file.luaho \
 	core/timespec.luaho filter/copy.luaho filter/ipsplit.luaho \
 	filter/layer.luaho filter/split.luaho filter/timing.luaho \
 	input/fpcap.luaho input/mmpcap.luaho input/pcap.luaho \
-	input/zpcap.luaho lib/base64url.luaho lib/clock.luaho \
-	lib/trie.luaho output/dnscli.luaho output/pcap.luaho \
-	output/respdiff.luaho output/tcpcli.luaho output/tlscli.luaho \
-	output/udpcli.luaho
+	input/zmmpcap.luaho input/zpcap.luaho lib/base64url.luaho \
+	lib/clock.luaho lib/trie.luaho output/dnscli.luaho \
+	output/pcap.luaho output/respdiff.luaho output/tcpcli.luaho \
+	output/tlscli.luaho output/udpcli.luaho
 lua_objects = core.luao lib.luao input.luao filter.luao output.luao \
 	core/channel.luao core/compat.luao core/file.luao \
 	core/loader.luao core/log.luao core/object/dns/label.luao \
@@ -585,15 +589,15 @@ lua_objects = core.luao lib.luao input.luao filter.luao output.luao \
 	core/timespec.luao filter/copy.luao filter/ipsplit.luao \
 	filter/layer.luao filter/split.luao filter/timing.luao \
 	input/fpcap.luao input/mmpcap.luao input/pcap.luao \
-	input/zero.luao input/zpcap.luao lib/base64url.luao \
-	lib/clock.luao lib/getopt.luao lib/ip.luao lib/parseconf.luao \
-	lib/trie/iter.luao lib/trie.luao lib/trie/node.luao \
-	output/dnscli.luao output/null.luao output/pcap.luao \
-	output/respdiff.luao output/tcpcli.luao output/tlscli.luao \
-	output/udpcli.luao
+	input/zero.luao input/zmmpcap.luao input/zpcap.luao \
+	lib/base64url.luao lib/clock.luao lib/getopt.luao lib/ip.luao \
+	lib/parseconf.luao lib/trie/iter.luao lib/trie.luao \
+	lib/trie/node.luao output/dnscli.luao output/null.luao \
+	output/pcap.luao output/respdiff.luao output/tcpcli.luao \
+	output/tlscli.luao output/udpcli.luao
 dnsjit_LDADD = $(PTHREAD_LIBS) $(luajit_LIBS) $(liblz4_LIBS) \
-	$(libzstd_LIBS) $(libpcap_LIBS) $(gnutls_LIBS) $(lua_hobjects) \
-	$(lua_objects)
+	$(libzstd_LIBS) $(libpcap_LIBS) $(gnutls_LIBS) $(liblzma_LIBS) \
+	$(lua_hobjects) $(lua_objects)
 dnsjit_LDFLAGS = -Wl,-E
 man1_MANS = dnsjit.1
 man3_MANS = dnsjit.core.3 dnsjit.lib.3 dnsjit.input.3 dnsjit.filter.3 \
@@ -615,13 +619,14 @@ man3_MANS = dnsjit.core.3 dnsjit.lib.3 dnsjit.input.3 dnsjit.filter.3 \
 	dnsjit.filter.layer.3 dnsjit.filter.split.3 \
 	dnsjit.filter.timing.3 dnsjit.input.fpcap.3 \
 	dnsjit.input.mmpcap.3 dnsjit.input.pcap.3 dnsjit.input.zero.3 \
-	dnsjit.input.zpcap.3 dnsjit.lib.base64url.3 dnsjit.lib.clock.3 \
-	dnsjit.lib.getopt.3 dnsjit.lib.ip.3 dnsjit.lib.parseconf.3 \
-	dnsjit.lib.trie.3 dnsjit.lib.trie.iter.3 \
-	dnsjit.lib.trie.node.3 dnsjit.output.dnscli.3 \
-	dnsjit.output.null.3 dnsjit.output.pcap.3 \
-	dnsjit.output.respdiff.3 dnsjit.output.tcpcli.3 \
-	dnsjit.output.tlscli.3 dnsjit.output.udpcli.3
+	dnsjit.input.zmmpcap.3 dnsjit.input.zpcap.3 \
+	dnsjit.lib.base64url.3 dnsjit.lib.clock.3 dnsjit.lib.getopt.3 \
+	dnsjit.lib.ip.3 dnsjit.lib.parseconf.3 dnsjit.lib.trie.3 \
+	dnsjit.lib.trie.iter.3 dnsjit.lib.trie.node.3 \
+	dnsjit.output.dnscli.3 dnsjit.output.null.3 \
+	dnsjit.output.pcap.3 dnsjit.output.respdiff.3 \
+	dnsjit.output.tcpcli.3 dnsjit.output.tlscli.3 \
+	dnsjit.output.udpcli.3
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -806,6 +811,8 @@ input/mmpcap.$(OBJEXT): input/$(am__dirstamp) \
 	input/$(DEPDIR)/$(am__dirstamp)
 input/pcap.$(OBJEXT): input/$(am__dirstamp) \
 	input/$(DEPDIR)/$(am__dirstamp)
+input/zmmpcap.$(OBJEXT): input/$(am__dirstamp) \
+	input/$(DEPDIR)/$(am__dirstamp)
 input/zpcap.$(OBJEXT): input/$(am__dirstamp) \
 	input/$(DEPDIR)/$(am__dirstamp)
 lib/$(am__dirstamp):
@@ -886,6 +893,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@input/$(DEPDIR)/fpcap.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@input/$(DEPDIR)/mmpcap.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@input/$(DEPDIR)/pcap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@input/$(DEPDIR)/zmmpcap.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@input/$(DEPDIR)/zpcap.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/base64url.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@lib/$(DEPDIR)/clock.Po@am__quote@ # am--include-marker
@@ -1291,6 +1299,7 @@ distclean: distclean-recursive
 	-rm -f input/$(DEPDIR)/fpcap.Po
 	-rm -f input/$(DEPDIR)/mmpcap.Po
 	-rm -f input/$(DEPDIR)/pcap.Po
+	-rm -f input/$(DEPDIR)/zmmpcap.Po
 	-rm -f input/$(DEPDIR)/zpcap.Po
 	-rm -f lib/$(DEPDIR)/base64url.Po
 	-rm -f lib/$(DEPDIR)/clock.Po
@@ -1383,6 +1392,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f input/$(DEPDIR)/fpcap.Po
 	-rm -f input/$(DEPDIR)/mmpcap.Po
 	-rm -f input/$(DEPDIR)/pcap.Po
+	-rm -f input/$(DEPDIR)/zmmpcap.Po
 	-rm -f input/$(DEPDIR)/zpcap.Po
 	-rm -f lib/$(DEPDIR)/base64url.Po
 	-rm -f lib/$(DEPDIR)/clock.Po
@@ -1450,7 +1460,7 @@ uninstall-man: uninstall-man1 uninstall-man3
 .hh.luah:
 	@mkdir -p `dirname "$@"`
 	@echo 'module(...,package.seeall);' > "$@"
-	@cat "$<" | grep '^//lua:' | sed 's%^//lua:%%' >> "$@"
+	@cat "$<" | grep '^// *lua:' | sed 's%^// *lua:%%' >> "$@"
 	@echo 'require("ffi").cdef[[' >> "$@"
 	@cat "$<" | grep -v '^#' >> "$@"
 	@echo ']]' >> "$@"
@@ -1607,6 +1617,9 @@ dnsjit.input.pcap.3in: input/pcap.lua gen-manpage.lua
 dnsjit.input.zero.3in: input/zero.lua gen-manpage.lua
 	$(LUAJIT) "$(srcdir)/gen-manpage.lua" "$(srcdir)/input/zero.lua" > "$@"
 
+dnsjit.input.zmmpcap.3in: input/zmmpcap.lua gen-manpage.lua
+	$(LUAJIT) "$(srcdir)/gen-manpage.lua" "$(srcdir)/input/zmmpcap.lua" > "$@"
+
 dnsjit.input.zpcap.3in: input/zpcap.lua gen-manpage.lua
 	$(LUAJIT) "$(srcdir)/gen-manpage.lua" "$(srcdir)/input/zpcap.lua" > "$@"