From 62ca66561084c0373115a6520ac5fe9cd652e1c3 Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Sun, 23 Apr 2023 14:29:32 +0200 Subject: [PATCH] Release v1.7.2 --- ChangeLog | 2 ++ configure.ac | 2 +- extra/docker/Dockerfile.alpine | 2 +- extra/docker/Dockerfile.ubuntu | 2 +- src/lib/nffileV2.h | 2 +- src/maxmind/Makefile.am | 2 ++ src/nfpcapd/Makefile.am | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b51621c..15ed44fd 100755 --- 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 index bb776dd7..c423a455 100644 --- 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],[peter@people.ops-trust.net]) +AC_INIT([nfdump],[1.7.2],[peter@people.ops-trust.net]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/extra/docker/Dockerfile.alpine b/extra/docker/Dockerfile.alpine index 42094084..5d7f9bd3 100644 --- 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 index f503c2e0..38ca40e0 100644 --- 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 index a8813e55..9cb897f4 100755 --- 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 index aed1d48d..53e3dcfb 100755 --- 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 index fb16acae..8751f403 100755 --- 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)