summaryrefslogtreecommitdiff
path: root/net-analyzer/nfdump
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/nfdump')
-rw-r--r--net-analyzer/nfdump/Manifest19
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch87
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch104
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch10
-rw-r--r--net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch21
-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
-rw-r--r--net-analyzer/nfdump/metadata.xml1
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild58
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.19.ebuild (renamed from net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild)28
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.20.ebuild (renamed from net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild)20
10 files changed, 59 insertions, 300 deletions
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 2f2b29898afc..9474ab03c1b3 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,12 +1,7 @@
-AUX nfdump-1.6.14-libft.patch 709 BLAKE2B c24a246e36dd99d61a5ba04ef50bb3509a7a6ec4add1e1690f9635a17998deb13a4b4b336686a00c1aba556ae4d75667f68c3878148a8b093bcaeabe5fdfed40 SHA512 2a1e3559ae3f1d1ad1a17305888469852211c984324c56c0f58f510ff1a6fb1d85f5b5367b3e325d932f20be6832ed98d56b8e85e220da948aa6a28ecd9d0cdd
-AUX nfdump-1.6.14-libnfdump.patch 2439 BLAKE2B cb714491b19a70cc6f458167d8dfed619026d2ef7600d1413a32d15717e7fbfe9db3a794eb5aa922bb9afa53a3cc5d8d3c8cb5ada20ef5c9dc8eebf1331bd4a5 SHA512 09746329df3ad517875d907c16842c8b8ee31f06de649217cc3650cf566e0b059563df93eaf48a60595d2ada41fd43d1279f5bcb400122d9d60fdcb0b813ef46
-AUX nfdump-1.6.16-DEVEL.patch 3694 BLAKE2B 09d5f15aa3ff4a6a9536bca05db5f425b894582347c27bc5b9a9c1497cf9304a0e7cd6c53264de2397977ba3e2b9b1d4f60e560984c0e9e480fd8a6e62d7e3ef SHA512 fd5c3e0aa804eeb7ff1dd7cd2122043308e925b0ac0782a107edb96f7cffe9c5ec60df3ebd8a8f15431d62b412dcf338ee56c24c70a0fde5cd96254fb3e64ca9
-AUX nfdump-1.6.16-libnfdump.patch 196 BLAKE2B 2c97bd45eb810f67f1bcf5d62fee19fd3617cb4ac7d3d085d0031869a398b9d905b7f47043e9b0626e5069145778d85a6aa7e8278428c6f05a75127f6e5853ab SHA512 4c5a7c4deec55ffd66165dbf8dc4229a6288f628f4decd7a6142e34c604ff07a6546796afba9b1e05cb4420858e83a71bf1e0eaeeb6619c741eb3136d5e07c15
-DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853bb44ea54bc6ca2a9977565742e1485b706f3f33370005ccf5c854429635de01f5cf594fd43122d4a6f8912e2a457d8caf SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97
-DIST nfdump-1.6.14.tar.gz 1834355 BLAKE2B be92ec6c6eb60c883863a21e7d203c487f176e862f6227bf21d17ade2a04815095c5c119719a18c106401519d7976a2b82e46a11b7f207494abef3e0f73d2716 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe
-DIST nfdump-1.6.15.tar.gz 1834855 BLAKE2B 1892cfbd1d1299c44b14a39b55c766d3dd411d7410a66b8ecbebe590c9da595c79764966ef1c91adb91b936ee3c052ad14bca27c6bcb98472011eb2c67dff60f SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2
-DIST nfdump-1.6.16.tar.gz 1814857 BLAKE2B cd50680adbb6023915232bb780daf2bcc4319348444a28c89fc4fdfd19225bdf243bb42179a6bd545c06ab6fafa50091401b7a286527d1863c888a96c0b0a2eb SHA512 c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32
-EBUILD nfdump-1.6.14-r1.ebuild 1407 BLAKE2B b7b8cf843c604e3b9dedc14d7e9b091620f1acfc797f9e493b07c773eb089cad249455dbea296a431f3c184bee7a0ba22c21325b376227c693c12d77b392c8cd SHA512 2b3bf14b9d0888d1e98f394eec8f2ac8b9ea2769adf6a1893dee3a0b7fe61f8ae363f1ff8dac2743192a0d18bad563c68f1e9f6c3cdebed0dde207ded2a8caac
-EBUILD nfdump-1.6.15-r1.ebuild 1378 BLAKE2B 3bb3017b1ffa1dc7f7e366938ac5c7b999efb265a48bcb1b37bd9a533a47493c4d304f69c2736c89682c84d1826772ade943f36bd9ee82b4e847ff7686915167 SHA512 d27f7031a7a3f5a608ac295c346fcbdb44090a2fc7dc2a6d717c47ddf53dbe15663d704429e1b38fdc291a122776c46fc999d9c5fabb8da96000f109c18bb2f8
-EBUILD nfdump-1.6.16-r1.ebuild 1411 BLAKE2B 602acf354c5fcd2486bae8c6273039585ef2c734ec7d60bdfc6eaaad2bceba8e620653ae9cb41bdaea231d3ec6872c6b3d022cc527b42410c7a4dec43bb50527 SHA512 be8eef2a778067b0c7322b84ca9722436a7e9eb391ad5b012395d69c6253aef8f650cdeac32779d08fdeef36f74e256d59bbf449a84f450259ee92651eb9e397
-MISC metadata.xml 1010 BLAKE2B 0f80dce100cf4a9b5b6011b0690b928d149e9430e894cceaf2ae18a37588f8edb81477b2fc70bd2ba1101bb3b4e225dfc7a82d60513dcb5273b7f230727db9d6 SHA512 81abafe5f8da7c40612127765d5b62532168b16d93bd0f0414e8e6c4e86339c8fd77e7ecb4a5b406cf5f33c087f8d2ecd971fdf065c7be0430bd8a095a503c67
+AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
+AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
+DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e
+DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137
+EBUILD nfdump-1.6.19.ebuild 1390 BLAKE2B ccd3bc87b5f005bd5e5767090f41b7380bfb39224c1f5d31007004e171483e18bb293f9cc157f887f30749a8f694fbc25418a883ebeace04f4a3dbf90a88c662 SHA512 e0e772dae0a2550fd14808e2132a83587508684fe57136754db314add1c55857e5b8d6787eadcb066c73f48522157c2bf414b6cfbd028977adc63c99a6f42035
+EBUILD nfdump-1.6.20.ebuild 1392 BLAKE2B f9d43b2f41c5c901255e06c391eff327bf2b56bf9af02add91e22ad8a935c682e6e332b252be90dfa9564971f59d908c37ea532b36a08ac7df09106b9ea41218 SHA512 5da3069596339dd040c1573a65b538e1cedc75d30420e84cf0864474a391e5a19a6914a2dafa8f7f4024b491c84799a926bd9b4f4d31cd7fff57788e822b2f9f
+MISC metadata.xml 909 BLAKE2B 51cc25f3d90d566c345857c50aafb86601e1c48350291f18cee655d008bb90a73f54277c78141fec70923d6e3f0af5a86b3f77f87c0142ea7fa3963282213103 SHA512 ff5188e78baccfa693342af4e1f053a1685e78e68ce11ae43b1f7ae6c31eec31dbf1efc7f3b0628e6f77bf237072830dcffae58e0c06ad5d52aeb35ee92b9ede
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
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index f6dc8af136ae..435ade187731 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
- <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag>
<flag name="ftconv">Build the flow-tools to nfdump converter</flag>
<flag name="nfprofile">Build nfprofile used by NfSen</flag>
<flag name="nftrack">Build nfprofile used by PortTracker</flag>
diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
deleted file mode 100644
index 64b2478d5f8f..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="https://github.com/phaag/nfdump"
-SRC_URI="
- https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/phaag/nfdump/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch
-"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow"
-
-COMMON_DEPEND="
- app-arch/bzip2
- sys-libs/zlib
- ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
- nfprofile? ( net-analyzer/rrdtool )
- nftrack? ( net-analyzer/rrdtool )
- readpcap? ( net-libs/libpcap )
-"
-DEPEND="
- ${COMMON_DEPEND}
- sys-devel/flex
- virtual/yacc
-"
-RDEPEND="
- ${COMMON_DEPEND}
- dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.6.14-libft.patch \
- "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch \
- "${DISTDIR}"/${P}-security.patch
-
- eautoreconf
-}
-
-src_configure() {
- # --without-ftconf is not handled well #322201
- econf \
- $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
- $(use nfprofile && echo --enable-nfprofile) \
- $(use nftrack && echo --enable-nftrack) \
- $(use_enable compat15) \
- $(use_enable debug devel) \
- $(use_enable readpcap) \
- $(use_enable sflow)
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild
index 1bc02e2ad824..3c3245ff7c29 100644
--- a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.19.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools eutils ltprune
+EAPI=7
+inherit autotools
DESCRIPTION="A set of tools to collect and process netflow data"
HOMEPAGE="https://github.com/phaag/nfdump"
SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs"
+SLOT="0/1.6.15"
+KEYWORDS="amd64 x86"
+IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs"
COMMON_DEPEND="
app-arch/bzip2
@@ -23,6 +23,7 @@ COMMON_DEPEND="
"
DEPEND="
${COMMON_DEPEND}
+ app-doc/doxygen
sys-devel/flex
virtual/yacc
"
@@ -30,17 +31,18 @@ RDEPEND="
${COMMON_DEPEND}
dev-lang/perl
"
-
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.19-compiler.patch
+ "${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
DOCS=( AUTHORS ChangeLog README.md )
src_prepare() {
- eapply \
- "${FILESDIR}"/${PN}-1.6.14-libft.patch \
- "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch
-
- eapply_user
+ default
eautoreconf
+
+ doxygen -u doc/Doxyfile.in || die
}
src_configure() {
@@ -49,7 +51,6 @@ src_configure() {
$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
$(use nfprofile && echo --enable-nfprofile) \
$(use nftrack && echo --enable-nftrack) \
- $(use_enable compat15) \
$(use_enable debug devel) \
$(use_enable readpcap) \
$(use_enable sflow) \
@@ -58,6 +59,5 @@ src_configure() {
src_install() {
default
-
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.20.ebuild
index 1c1536dcf588..d866f89da5b1 100644
--- a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.20.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools eutils ltprune
+EAPI=7
+inherit autotools
DESCRIPTION="A set of tools to collect and process netflow data"
HOMEPAGE="https://github.com/phaag/nfdump"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/1.6.15"
KEYWORDS="~amd64 ~x86"
-IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs"
+IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs"
COMMON_DEPEND="
app-arch/bzip2
@@ -23,6 +23,7 @@ COMMON_DEPEND="
"
DEPEND="
${COMMON_DEPEND}
+ app-doc/doxygen
sys-devel/flex
virtual/yacc
"
@@ -30,17 +31,18 @@ RDEPEND="
${COMMON_DEPEND}
dev-lang/perl
"
-DOCS=( AUTHORS ChangeLog README.md )
PATCHES=(
- "${FILESDIR}"/${PN}-1.6.14-libft.patch
- "${FILESDIR}"/${PN}-1.6.16-libnfdump.patch
- "${FILESDIR}"/${PN}-1.6.16-DEVEL.patch
+ "${FILESDIR}"/${PN}-1.6.19-compiler.patch
+ "${FILESDIR}"/${PN}-1.6.19-libft.patch
)
+DOCS=( AUTHORS ChangeLog README.md )
src_prepare() {
default
eautoreconf
+
+ doxygen -u doc/Doxyfile.in || die
}
src_configure() {
@@ -49,7 +51,6 @@ src_configure() {
$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
$(use nfprofile && echo --enable-nfprofile) \
$(use nftrack && echo --enable-nftrack) \
- $(use_enable compat15) \
$(use_enable debug devel) \
$(use_enable readpcap) \
$(use_enable sflow) \
@@ -58,6 +59,5 @@ src_configure() {
src_install() {
default
-
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 00:28:57 +0000