update to nfdump-1.7.8

This commit is contained in:
sthen
2026-05-06 13:21:39 +00:00
parent 181ac685fb
commit 34bb313e49
6 changed files with 13 additions and 24 deletions
+5 -5
View File
@@ -1,13 +1,12 @@
COMMENT = tools to collect and process netflow data
V = 1.7.7
REVISION = 0
V = 1.7.8
GH_ACCOUNT = phaag
GH_PROJECT = nfdump
GH_TAGNAME = v$V
SHARED_LIBS += nffile 1.0 # unknown
SHARED_LIBS += nfdump 4.0 # unknown
SHARED_LIBS += nffile 2.0 # unknown
SHARED_LIBS += nfdump 5.0 # unknown
CATEGORIES = net
@@ -45,7 +44,8 @@ LIB_DEPENDS = archivers/bzip2 \
net/flow-tools>=0.68.5 \
net/rrdtool
CONFIGURE_ENV = LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -DMAXPATHLEN=PATH_MAX" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
ac_cv_path_DOXYGEN=
TEST_FLAGS = TZ=CET
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/nfdump
+2 -2
View File
@@ -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.8.tar.gz) = 2biB9+Ps3igcERboMwrmEtDlrc0OlS9AGyBFxkRqEjI=
SIZE (nfdump-1.7.8.tar.gz) = 897933
-13
View File
@@ -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"
@@ -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 @@ endif
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
@@ -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 @@ lib_LTLIBRARIES = libnffile.la
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 =
+1
View File
@@ -23,6 +23,7 @@ lib/libnfdump.la
@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