diff --git a/net-mgmt/ipfixcol2/Makefile b/net-mgmt/ipfixcol2/Makefile index f9c1be6bac6c..bafe96743955 100644 --- a/net-mgmt/ipfixcol2/Makefile +++ b/net-mgmt/ipfixcol2/Makefile @@ -1,47 +1,46 @@ PORTNAME= ipfixcol2 DISTVERSIONPREFIX= v -DISTVERSION= 2.6.0 -PORTREVISION= 1 +DISTVERSION= 2.8.0 CATEGORIES= net-mgmt MAINTAINER= zarychtam@plan-b.pwste.edu.pl COMMENT= NetFlow v5/v9 and IPFIX flow (RFC 7011) data collector WWW= https://github.com/CESNET/ipfixcol2 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= Require SSE2 and static_assert(sizeof(uint64_t) == sizeof(time_t), "Assumed that time_t is uint64_t, but it's not") -BUILD_DEPENDS_aarch64= ${LOCALBASE}/include/sse2neon.h:devel/sse2neon -BUILD_DEPENDS= rst2man:textproc/py-docutils ${BUILD_DEPENDS_${ARCH}} -LIB_DEPENDS= librdkafka.so:net/librdkafka \ - libepoll-shim.so:devel/libepoll-shim \ - libfds.so:net-mgmt/libfds +BUILD_DEPENDS= rst2man:textproc/py-docutils +LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ + libfds.so:net-mgmt/libfds \ + liblz4.so:archivers/liblz4 \ + librdkafka.so:net/librdkafka USES= cmake:testing localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= CESNET USE_RC_SUBR= ${PORTNAME} CXXFLAGS+= -D_GNU_SOURCE LDFLAGS+= -rdynamic SUB_LIST= USER=${USERS:[0]} USERS= ${PORTNAME} GROUPS= ${PORTNAME} PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/run/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/doc/data/configs/udp2json.xml \ ${STAGEDIR}${ETCDIR}/startup.xml.sample post-install-EXAMPLES-on: (cd ${WRKSRC}/doc/data && ${COPYTREE_SHARE} "configs" \ ${STAGEDIR}${EXAMPLESDIR}) .include diff --git a/net-mgmt/ipfixcol2/distinfo b/net-mgmt/ipfixcol2/distinfo index 21e6c7926aac..d5d3721e3b84 100644 --- a/net-mgmt/ipfixcol2/distinfo +++ b/net-mgmt/ipfixcol2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723058329 -SHA256 (CESNET-ipfixcol2-v2.6.0_GH0.tar.gz) = 6eb9660a40638b557e3e8ffecebc356667e7678917579b33ddcb713849cf219e -SIZE (CESNET-ipfixcol2-v2.6.0_GH0.tar.gz) = 667376 +TIMESTAMP = 1742484704 +SHA256 (CESNET-ipfixcol2-v2.8.0_GH0.tar.gz) = 460f1272fd1a857bf8788ae226adfcb83cf8ffcf40583386f207eb6bb4186e1c +SIZE (CESNET-ipfixcol2-v2.8.0_GH0.tar.gz) = 715656 diff --git a/net-mgmt/ipfixcol2/files/patch-src_tools_fdsdump_src_aggregator_hashTable.cpp b/net-mgmt/ipfixcol2/files/patch-src_tools_fdsdump_src_aggregator_hashTable.cpp deleted file mode 100644 index 250fa05e6475..000000000000 --- a/net-mgmt/ipfixcol2/files/patch-src_tools_fdsdump_src_aggregator_hashTable.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tools/fdsdump/src/aggregator/hashTable.cpp.orig 2024-10-15 16:33:15 UTC -+++ src/tools/fdsdump/src/aggregator/hashTable.cpp -@@ -6,7 +6,11 @@ - - #define XXH_INLINE_ALL - -+#if defined(__arm__) || defined(__aarch64__) -+#include -+#else - #include -+#endif - - #include "hashTable.hpp" - #include "3rd_party/xxhash/xxhash.h" diff --git a/net-mgmt/ipfixcol2/pkg-plist b/net-mgmt/ipfixcol2/pkg-plist index b4bcb5707de9..b63de4a1411f 100644 --- a/net-mgmt/ipfixcol2/pkg-plist +++ b/net-mgmt/ipfixcol2/pkg-plist @@ -1,44 +1,47 @@ @dir etc/ipfixcol2 bin/fdsdump bin/ipfixcol2 bin/ipfixsend2 include/ipfixcol2.h include/ipfixcol2/api.h include/ipfixcol2/message.h include/ipfixcol2/message_garbage.h include/ipfixcol2/message_ipfix.h +include/ipfixcol2/message_periodic.h include/ipfixcol2/message_session.h include/ipfixcol2/plugins.h include/ipfixcol2/session.h include/ipfixcol2/utils.h include/ipfixcol2/verbose.h lib/ipfixcol2/libanonymization-intermediate.so lib/ipfixcol2/libdummy-input.so lib/ipfixcol2/libdummy-output.so lib/ipfixcol2/libfds-input.so lib/ipfixcol2/libfds-output.so +lib/ipfixcol2/libfilter-intermediate.so lib/ipfixcol2/libforwarder-output.so lib/ipfixcol2/libipfix-input.so lib/ipfixcol2/libipfix-output.so lib/ipfixcol2/libjson-kafka-output.so lib/ipfixcol2/libjson-output.so lib/ipfixcol2/libtcp-input.so lib/ipfixcol2/libtimecheck-output.so lib/ipfixcol2/libudp-input.so lib/ipfixcol2/libviewer-output.so libdata/pkgconfig/ipfixcol2.pc share/man/man7/ipfixcol2-anonymization-inter.7.gz share/man/man7/ipfixcol2-dummy-output.7.gz share/man/man7/ipfixcol2-fds-input.7.gz share/man/man7/ipfixcol2-fds-output.7.gz +share/man/man7/ipfixcol2-filter-inter.7.gz share/man/man7/ipfixcol2-forwarder-output.7.gz share/man/man7/ipfixcol2-ipfix-input.7.gz share/man/man7/ipfixcol2-ipfix-output.7.gz share/man/man7/ipfixcol2-json-kafka-output.7.gz share/man/man7/ipfixcol2-json-output.7.gz share/man/man7/ipfixcol2-tcp-input.7.gz share/man/man7/ipfixcol2-timecheck-output.7.gz share/man/man7/ipfixcol2-udp-input.7.gz share/man/man7/ipfixcol2-viewer-output.7.gz @sample etc/ipfixcol2/startup.xml.sample @dir(ipfixcol2,ipfixcol2) /var/run/ipfixcol2