diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-analyzer/nfdump/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-analyzer/nfdump/files')
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch | 87 | ||||
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch | 104 | ||||
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch | 10 | ||||
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch | 21 | ||||
-rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch (renamed from net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch) | 11 |
5 files changed, 28 insertions, 205 deletions
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch deleted file mode 100644 index 38482c4bdb1a..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- 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 diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch deleted file mode 100644 index 21aeb6f0e343..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- a/bin/flowtree.c -+++ b/bin/flowtree.c -@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) { - NodeList->last = node; - NodeList->length++; - #ifdef DEVEL -- int proto = node->proto; - printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", -- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); -+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); - ListCheck(NodeList); - #endif - if ( NodeList->waiting ) { -@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) { - - struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) { - struct FlowNode *node; --int proto; - - GetTreeLock(NodeList); - while ( NodeList->length == 0 && !*done ) { -@@ -522,12 +520,11 @@ int proto; - - node->left = NULL; - node->right = NULL; -- proto = node->proto; - - NodeList->length--; - #ifdef DEVEL - printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", -- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); -+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); - - ListCheck(NodeList); - #endif ---- a/bin/nfexpire.c -+++ b/bin/nfexpire.c -@@ -212,12 +212,12 @@ int main( int argc, char **argv ) { - struct stat fstat; - int c, err, maxsize_set, maxlife_set; - int do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format; --char *maxsize_string, *lifetime_string, *datadir; -+char *lifetime_string, *datadir; - uint64_t maxsize, lifetime, low_water; - uint32_t runtime; - channel_t *channel, *current_channel; - -- maxsize_string = lifetime_string = NULL; -+ lifetime_string = NULL; - datadir = NULL; - maxsize = lifetime = 0; - do_rescan = 0; ---- a/bin/nfstat.c -+++ b/bin/nfstat.c -@@ -1670,7 +1670,7 @@ uint32_t maxindex, c; - else - printf("Top flows ordered by %s:\n", order_mode[order_index].string); - } -- if ( !record_header ) -+ if ( record_header ) - printf("%s\n", record_header); - } - PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list); ---- a/bin/sflow.c -+++ b/bin/sflow.c -@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs); - - static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs); - -+extern int verbose; -+ - #ifdef DEVEL - static inline char *printTag(uint32_t tag, char *buf, int bufLen); --#endif - --extern int verbose; -+static inline char *printTag(uint32_t tag, char *buf, int bufLen) { -+ snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -+ return buf; -+} // End of printTag -+ -+#endif - - - /*_________________---------------------------__________________ -@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) { - static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) { - - #ifdef DEVEL --static inline char *printTag(uint32_t tag, char *buf, int bufLen) { -- snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -- return buf; --} // End of printTag -- --char buf[51]; -+ char buf[51]; -+ snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -+ printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len); - #endif - -- dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len); - skipBytes(sample, len); - } // End of skipTLVRecord - diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch deleted file mode 100644 index a748969da2e7..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch new file mode 100644 index 000000000000..8826c50c9dc2 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -9,8 +9,6 @@ + AM_INIT_AUTOMAKE([subdir-objects]) + + # Checks for programs. +-CFLAGS="-g -O3" +-AC_PROG_CC([clang gcc]) + AX_CHECK_C11 + CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" + +--- 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 + output = output_util.h output_util.c output_raw.h output_raw.c diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch index 3699fa2a5d01..47953c772172 100644 --- a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch @@ -1,14 +1,17 @@ --- a/configure.ac +++ b/configure.ac -@@ -125,9 +125,8 @@ +@@ -115,12 +115,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 +- if test -f "$WHERE_FTPATH/lib/libft.a" -o -f "$WHERE_FTPATH/lib64/libft.a" -o -f "$WHERE_FTPATH/lib/libft.so" -o -f "$WHERE_FTPATH/lib64/libft.so"; then +- FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" +- FT_LDFLAGS="-L$WHERE_FTPATH/lib" +- else - 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 + AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH) + fi |