Release v1.7.2

phaag · Apr 23, 2023 · 62ca665 · 62ca665
1 parent 2eaac76
commit 62ca665
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4  1,6 @@
 2023-04-23
 -   Release v1.7.2
 -   Fix Makefiles for make dist
 -   Update nfcapd/sfcapd man pages for erspan data link
 
 2023-04-15

diff --git a/configure.ac b/configure.ac
@@ -3,7  3,7 @@
 
 AC_PREREQ([2.69])
 AC_REVISION($Revision: 244 $)dnl 
-AC_INIT([nfdump],[1.7.1],[[email protected]])
 AC_INIT([nfdump],[1.7.2],[[email protected]])
 
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([subdir-objects])

diff --git a/extra/docker/Dockerfile.alpine b/extra/docker/Dockerfile.alpine
@@ -4,7  4,7 @@
 
 FROM alpine:3
 
-ARG NFDUMP_VERSION=1.7.0.1
 ARG NFDUMP_VERSION=1.7.2
 
 WORKDIR /tmp
 

diff --git a/extra/docker/Dockerfile.ubuntu b/extra/docker/Dockerfile.ubuntu
@@ -5,7  5,7 @@
 # Pull base image.
 FROM ubuntu:latest
 
-ARG NFDUMP_VERSION=1.7.0.1
 ARG NFDUMP_VERSION=1.7.2
 
 #Expose netflow port
 EXPOSE 9995/udp

diff --git a/src/lib/nffileV2.h b/src/lib/nffileV2.h
@@ -61,7  61,7 @@ typedef struct fileHeaderV2_s {
 #define LAYOUT_VERSION_2 2
 
     uint32_t nfdversion;  // version of nfdump created this file
-#define NFDVERSION 0xF1070100
 #define NFDVERSION 0x01070200
                           // 4bytes 1.7.1-1 0x01070101
                           // 4bytes 1.7.1-1 0xF1070101 - git repo based on 1.7.1
     time_t created;  // file create time

diff --git a/src/maxmind/Makefile.am b/src/maxmind/Makefile.am
@@ -16,3  16,5 @@ geolookup_LDADD = ../lib/libnfdump.la ../conf/libconf.a libmaxmind.a
 endif
 
 CLEANFILES = *.gch
 
 EXTRA_DIST = updateGeoDB.sh
diff --git a/src/nfpcapd/Makefile.am b/src/nfpcapd/Makefile.am
@@ -9,7  9,7 @@ LDADD = $(DEPS_LIBS)
 pcapdump = pcapdump.c pcapdump.h 
 flowdump = flowdump.c flowdump.h
 flowsend = flowsend.c flowsend.h
-pcaproc = pcaproc.c pcaproc.h flowtree.c flowtree.h 
 pcaproc = pcaproc.c pcaproc.h nflog.h pflog.h flowtree.c flowtree.h 
 
 nfpcapd_SOURCES = nfpcapd.c packet_pcap.c packet_pcap.h \
 	$(pcaproc) $(pcapdump) $(flowdump) $(flowsend)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 16,5 @@ geolookup_LDADD = ../lib/libnfdump.la ../conf/libconf.a libmaxmind.a
		endif

		CLEANFILES = *.gch

		EXTRA_DIST = updateGeoDB.sh