From: Stuart Henderson Subject: Re: [UPDATE] net/nfdump-1.7.7 -> 1.7.9 To: Peter Haag Cc: ports@openbsd.org Date: Wed, 9 Sep 2026 14:51:06 +0100 thanks Peter, committed. On 2026/09/08 10:10, Peter Haag wrote: > Sorry - my bad. Fixed diff attached and updated to 1.7.10 > > - Peter > > On 08.09.2026 01:09, Stuart Henderson wrote: > > Thanks, but your diff doesn't apply. Could you send one against cvs head > > or github.com/openbsd/ports.git please? > > > > > > On 2026/09/06 18:29, Peter Haag wrote: > > > Hi Stuart, > > > Find appended the ports diff for nfdump 1.7.7. -> 1.7.9 > > > > > > Bump to the 1.7.9 release: > > > > > > - upstream removed configure args: --enable-maxmind, --enable-tor, --enable-sflow, --enable-nftrack dropped. > > > built now unconditionally. > > > - nftrack always builds alongside nfprofile > > > - upstream renamed --with-rrdpath=/--with-ftpath= renamed to --with-rrd=/--with-ft= > > > - added --enable-readpcap and --with-bz2=${LOCALBASE} > > > - added lib/pkgconfig/nfdump.pc — new in 1.7.9 > > > > > > Many thanks and regards > > > > > > - Peter > > > > > diff -ruN -x CVS nfdump-orig/Makefile nfdump-1.7.9/Makefile > > > --- nfdump/Makefile Thu Apr 16 20:25:09 2026 > > > +++ nfdump/Makefile Sun Sep 6 18:08:58 2026 > > > @@ -1,7 +1,6 @@ > > > COMMENT = tools to collect and process netflow data > > > -V = 1.7.7 > > > -REVISION = 0 > > > +V = 1.7.9 > > > GH_ACCOUNT = phaag > > > GH_PROJECT = nfdump > > > GH_TAGNAME = v$V > > > @@ -30,14 +29,12 @@ > > > CONFIGURE_ARGS += --enable-ftconv \ > > > --enable-ja4 \ > > > - --enable-maxmind \ > > > + --enable-readpcap \ > > > --enable-nfpcapd \ > > > --enable-nfprofile \ > > > - --enable-nftrack \ > > > - --enable-sflow \ > > > - --enable-tor \ > > > - --with-rrdpath=${LOCALBASE} \ > > > - --with-ftpath=${LOCALBASE} > > > + --with-bz2=${LOCALBASE} \ > > > + --with-rrd=${LOCALBASE} \ > > > + --with-ft=${LOCALBASE} > > > LIB_DEPENDS = archivers/bzip2 \ > > > archivers/lz4 \ > > > diff -ruN -x CVS nfdump-orig/distinfo nfdump-1.7.9/distinfo > > > --- nfdump/distinfo Thu Apr 16 20:25:09 2026 > > > +++ nfdump/distinfo Sun Sep 6 17:42:46 2026 > > > @@ -1,2 +1,2 @@ > > > -SHA256 (nfdump-1.7.7.tar.gz) = 0LRtbj2o2DFiBPt00g0S14LYUI8BVZ402cMeM/AW15Q= > > > -SIZE (nfdump-1.7.7.tar.gz) = 873067 > > > +SHA256 (nfdump-1.7.9.tar.gz) = zRWj4ODsCzTI38DDICzg1joJp4NB9TPzy+jWmDOSe78= > > > +SIZE (nfdump-1.7.9.tar.gz) = 918946 > > > diff -ruN -x CVS nfdump-orig/patches/patch-configure_ac nfdump-1.7.9/patches/patch-configure_ac > > > --- nfdump/patches/patch-configure_ac Tue Nov 18 15:24:48 2025 > > > +++ nfdump/patches/patch-configure_ac Thu Jan 1 01:00:00 1970 > > > @@ -1,13 +0,0 @@ > > > -avoid overlinking to rrdtool libs > > > - > > > -Index: configure.ac > > > ---- configure.ac.orig > > > -+++ configure.ac > > > -@@ -242,6 +242,7 @@ AC_SUBST(RRD_LIBS) > > > - > > > - ]])], AC_DEFINE(RRD_NEEDSCONST, 0, [No fix rrd_update const char argument]), AC_DEFINE(RRD_NEEDSCONST, 1, [Fix rrd_update const char argument]) > > > - ) > > > -+LIBS=$saved_LIBS > > > - ] > > > - , > > > - build_nfprofile="no" > > > diff -ruN -x CVS nfdump-orig/patches/patch-src_libnfdump_Makefile_am nfdump-1.7.9/patches/patch-src_libnfdump_Makefile_am > > > --- nfdump/patches/patch-src_libnfdump_Makefile_am Thu Apr 16 20:25:09 2026 > > > +++ nfdump/patches/patch-src_libnfdump_Makefile_am Sun Sep 6 17:30:35 2026 > > > @@ -1,11 +1,12 @@ > > > Index: src/libnfdump/Makefile.am > > > --- src/libnfdump/Makefile.am.orig > > > +++ src/libnfdump/Makefile.am > > > -@@ -21,6 +21,6 @@ tor = tor/tor.c tor/tor.h > > > +@@ -20,7 +20,7 @@ > > > lib_LTLIBRARIES = libnfdump.la > > > libnfdump_la_SOURCES = $(filter) $(maxmind) $(tor) $(regex) $(decode) $(digest) ../libnffile/vcs_track.h > > > -libnfdump_la_LDFLAGS = -release @VERSION@ > > > +libnfdump_la_LDFLAGS = > > > + libnfdump_la_LIBADD = $(LIBATOMIC) > > > CLEANFILES = filter/lex.yy.c filter/grammar.c filter/grammar.h filter/scanner.c filter/scanner.h *.gch > > > diff -ruN -x CVS nfdump-orig/patches/patch-src_libnffile_Makefile_am nfdump-1.7.9/patches/patch-src_libnffile_Makefile_am > > > --- nfdump/patches/patch-src_libnffile_Makefile_am Fri Oct 25 15:21:47 2024 > > > +++ nfdump/patches/patch-src_libnffile_Makefile_am Sun Sep 6 17:30:35 2026 > > > @@ -1,10 +1,10 @@ > > > Index: src/libnffile/Makefile.am > > > --- src/libnffile/Makefile.am.orig > > > +++ src/libnffile/Makefile.am > > > -@@ -30,7 +30,7 @@ vcs_track.h: Makefile > > > - > > > - lib_LTLIBRARIES = libnffile.la > > > +@@ -30,7 +30,7 @@ > > > libnffile_la_SOURCES = $(conf) $(util) $(pidfile) $(compress) $(nffile) $(nflist) $(filter) $(output) $(regex) $(daemon) $(barrier) $(version) vcs_track.h > > > + libnffile_la_CFLAGS = $(LZ4_CFLAGS) $(ZSTD_CFLAGS) $(BZ2_CFLAGS) > > > + libnffile_la_LIBADD = $(LZ4_LIBS) $(ZSTD_LIBS) $(BZ2_LIBS) $(LIBATOMIC) $(RAND_LIBS) > > > -libnffile_la_LDFLAGS = -release @VERSION@ > > > +libnffile_la_LDFLAGS = > > > diff -ruN -x CVS nfdump-orig/pkg/PLIST nfdump-1.7.9/pkg/PLIST > > > --- nfdump/pkg/PLIST Mon Nov 17 18:17:05 2025 > > > +++ nfdump/pkg/PLIST Sun Sep 6 17:43:05 2026 > > > @@ -23,6 +23,7 @@ > > > @static-lib lib/libnffile.a > > > lib/libnffile.la > > > @lib lib/libnffile.so.${LIBnffile_VERSION} > > > +lib/pkgconfig/nfdump.pc > > > @man man/man1/ft2nfdump.1 > > > @man man/man1/geolookup.1 > > > @man man/man1/nfanon.1 > > > > > > > > > > diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile > index 86ead61..79d9b20 100644 > --- a/net/nfdump/Makefile > +++ b/net/nfdump/Makefile > @@ -1,6 +1,6 @@ > COMMENT = tools to collect and process netflow data > > -V = 1.7.8 > +V = 1.7.10 > GH_ACCOUNT = phaag > GH_PROJECT = nfdump > GH_TAGNAME = v$V > @@ -29,14 +29,12 @@ AUTORECONF = ./autogen.sh > > CONFIGURE_ARGS += --enable-ftconv \ > --enable-ja4 \ > - --enable-maxmind \ > + --enable-readpcap \ > --enable-nfpcapd \ > --enable-nfprofile \ > - --enable-nftrack \ > - --enable-sflow \ > - --enable-tor \ > - --with-rrdpath=${LOCALBASE} \ > - --with-ftpath=${LOCALBASE} > + --with-bz2=${LOCALBASE} \ > + --with-rrd=${LOCALBASE} \ > + --with-ft=${LOCALBASE} > > LIB_DEPENDS = archivers/bzip2 \ > archivers/lz4 \ > diff --git a/net/nfdump/distinfo b/net/nfdump/distinfo > index 436a5dc..734c34e 100644 > --- a/net/nfdump/distinfo > +++ b/net/nfdump/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (nfdump-1.7.8.tar.gz) = 2biB9+Ps3igcERboMwrmEtDlrc0OlS9AGyBFxkRqEjI= > -SIZE (nfdump-1.7.8.tar.gz) = 897933 > +SHA256 (nfdump-1.7.10.tar.gz) = mhvITrSExzg+6jtIrSq+W5/+fpCqs/2nBVqj9kvgzCk= > +SIZE (nfdump-1.7.10.tar.gz) = 919358