diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-analyzer/nfdump/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-analyzer/nfdump/files')
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch | 14 | ||||
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch | 87 |
2 files changed, 101 insertions, 0 deletions
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch new file mode 100644 index 000000000000..3699fa2a5d01 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch @@ -0,0 +1,14 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -125,9 +125,8 @@ + if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then + AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH) + fi +- if test ! -f "$WHERE_FTPATH/lib/libft.a" -a -f "$WHERE_FTPATH/lib64/libft.a" ! -f "$WHERE_FTPATH/lib/libft.so" -a -f "$WHERE_FTPATH/lib64/libft.so"; then +- AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first) +- fi ++ AC_CHECK_LIB([ft], [main],, ++ AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)) + FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" + FT_LDFLAGS="-L$WHERE_FTPATH/lib" + else diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch new file mode 100644 index 000000000000..38482c4bdb1a --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch @@ -0,0 +1,87 @@ +--- a/bin/Makefile.am ++++ b/bin/Makefile.am +@@ -30,7 +30,6 @@ + LDADD = $(DEPS_LIBS) + + #Add extra debug info for gdb +-AM_CFLAGS = -ggdb + + # libnfdump sources + common = nf_common.c nf_common.h +@@ -65,30 +64,36 @@ + + nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \ + $(nflowcache) $(nfprof) ++nfdump_DEPENDENCIES = libnfdump.la + nfdump_LDADD = -lnfdump + + nfreplay_SOURCES = nfreplay.c $(nfprof) \ + $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) ++nfreplay_DEPENDENCIES = libnfdump.la + nfreplay_LDADD = -lnfdump + + nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) ++nfprofile_DEPENDENCIES = libnfdump.la + nfprofile_LDADD = -lnfdump -lrrd + + nftrack_SOURCES = ../extra/nftrack/nftrack.c \ + ../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \ + ../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h + nftrack_CFLAGS = -I ../extra/nftrack ++nftrack_DEPENDENCIES = libnfdump.la + nftrack_LDADD = -lnfdump -lrrd + + nfcapd_SOURCES = nfcapd.c \ + $(nfstatfile) $(launch) \ + $(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire) ++nfcapd_DEPENDENCIES = libnfdump.la + nfcapd_LDADD = -lnfdump + + nfpcapd_SOURCES = nfpcapd.c \ + $(pcaproc) $(netflow_pcap) \ + $(nfstatfile) $(launch) \ + $(nfnet) $(collector) $(bookkeeper) $(expire) $(content) ++nfpcapd_DEPENDENCIES = libnfdump.la + nfpcapd_LDADD = -lnfdump + + if READPCAP +@@ -107,6 +112,7 @@ + sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \ + $(nfstatfile) $(launch) \ + $(nfnet) $(collector) $(bookkeeper) $(expire) ++sfcapd_DEPENDENCIES = libnfdump.la + sfcapd_LDADD = -lnfdump + + if READPCAP +@@ -116,25 +122,31 @@ + endif + + nfreader_SOURCES = nfreader.c ++nfreader_DEPENDENCIES = libnfdump.la + nfreader_LDADD = -lnfdump + + nfanon_SOURCES = nfanon.c $(anon) ++nfanon_DEPENDENCIES = libnfdump.la + nfanon_LDADD = -lnfdump + + nfgen_SOURCES = nfgen.c ++nfgen_DEPENDENCIES = libnfdump.la + nfgen_LDADD = -lnfdump + + nfexpire_SOURCES = nfexpire.c \ + $(bookkeeper) $(expire) $(nfstatfile) ++nfexpire_DEPENDENCIES = libnfdump.la + nfexpire_LDADD = -lnfdump @FTS_OBJ@ + + nftest_SOURCES = nftest.c ++nftest_DEPENDENCIES = libnfdump.la + nftest_LDADD = -lnfdump + nftest_DEPENDENCIES = nfgen + + if FT2NFDUMP + ft2nfdump_SOURCES = ft2nfdump.c + ft2nfdump_CFLAGS = @FT_INCLUDES@ ++ft2nfdump_DEPENDENCIES = libnfdump.la + ft2nfdump_LDADD = -lnfdump -lft -lz + ft2nfdump_LDADD += @FT_LDFLAGS@ + endif |