diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile index 29cc06fa8666..f2324b570211 100644 --- a/net-mgmt/nfdump/Makefile +++ b/net-mgmt/nfdump/Makefile @@ -1,94 +1,93 @@ PORTNAME= nfdump -PORTVERSION= 1.7.3 -PORTREVISION= 1 +PORTVERSION= 1.7.4 DISTVERSIONPREFIX=v CATEGORIES= net-mgmt MAINTAINER= pi@FreeBSD.org -COMMENT= Command-line tools to collect and process NetFlow data +COMMENT= Command-line tools to collect and process NetFlow, sFlow and IPFIX data WWW= https://github.com/phaag/nfdump LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/BSD-license.txt USES= autoreconf compiler:c11 cpe libtool pkgconfig CPE_VENDOR= nfdump_project USE_CSTD= gnu89 USE_GITHUB= yes GH_ACCOUNT= phaag USE_LDCONFIG= yes GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share INSTALL_TARGET= install-strip PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \ lib/libnfdump-${PORTVERSION}.so lib/libnfdump.so \ lib/libnfdump.a \ share/man/man1/nfanon.1.gz share/man/man1/nfcapd.1.gz \ share/man/man1/nfdump.1.gz share/man/man1/nfexpire.1.gz \ share/man/man1/nfreplay.1.gz \ etc/nfdump.conf.sample PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README #flow-tools support OPTIONS_DEFINE= DOCS FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \ SFLOW NFPCAPD NSEL INFLUXDB GEODB OPTIONS_DEFAULT= NFPROFILE NFPCAPD READPCAP NFTRACK NSEL SFLOW FIXTIMEBUG_DESC= With fixing swap time bug of some v5 FT2NFDUMP_DESC= With Flow-tools to nfdump converter INFLUXDB_DESC= Enable stats to InfluxDB NFPCAPD_DESC= Build nfpcapd collector daemon also NFPROFILE_DESC= With nfprofile (nfsen requires it) NFTRACK_DESC= With PortTracker support NSEL_DESC= Read and process ASA/NSEL/NEL event data READPCAP_DESC= With pcap support SFLOW_DESC= Build sflow collector daemon also GEODB_DESC= Build geolookup for MaxMind GeoDB FIXTIMEBUG_CONFIGURE_ENABLE= fixtimebug FT2NFDUMP_BUILD_DEPENDS= flow-cat:net-mgmt/flow-tools FT2NFDUMP_LIB_DEPENDS= libft.so:net-mgmt/flow-tools FT2NFDUMP_CONFIGURE_ON= --enable-ftconv --with-ftpath=${LOCALBASE} FT2NFDUMP_PLIST_FILES= bin/ft2nfdump share/man/man1/ft2nfdump.1.gz INFLUXDB_LIB_DEPENDS= libcurl.so:ftp/curl INFLUXDB_CONFIGURE_ENABLE= influxdb NFPCAPD_CONFIGURE_ENABLE= nfpcapd NFPCAPD_PLIST_FILES= bin/nfpcapd share/man/man1/nfpcapd.1.gz NFPROFILE_CONFIGURE_ENABLE= nfprofile NFPROFILE_PLIST_FILES= bin/nfprofile share/man/man1/nfprofile.1.gz NFTRACK_CONFIGURE_ENABLE= nftrack NFTRACK_PLIST_FILES= bin/nftrack NSEL_CONFIGURE_ENABLE= nsel READPCAP_CONFIGURE_ENABLE= readpcap SFLOW_CONFIGURE_ENABLE= sflow SFLOW_PLIST_FILES= bin/sfcapd share/man/man1/sfcapd.1.gz GEODB_PLIST_FILES= bin/geolookup bin/updateGeoDB.sh share/man/man1/geolookup.1.gz GEODB_CONFIGURE_ENABLE= maxmind .include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif .if ${PORT_OPTIONS:MNFPROFILE} || ${PORT_OPTIONS:MNFTRACK} CONFIGURE_ARGS+= --with-rrdpath=${LOCALBASE} BUILD_DEPENDS+= rrdtool:databases/rrdtool RUN_DEPENDS+= rrdtool:databases/rrdtool .endif post-patch: ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/lib/Makefile.am ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/nfcapd/Makefile.am ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/test/Makefile.am post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/nfdump.conf.dist ${STAGEDIR}${PREFIX}/etc/nfdump.conf.sample .include diff --git a/net-mgmt/nfdump/distinfo b/net-mgmt/nfdump/distinfo index 3963d10e8949..1bd21b53693c 100644 --- a/net-mgmt/nfdump/distinfo +++ b/net-mgmt/nfdump/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698484412 -SHA256 (phaag-nfdump-v1.7.3_GH0.tar.gz) = 9ea7e1ded34a81839b73e66cb62c9bc11a8070210584f9a508798d7bd6058c89 -SIZE (phaag-nfdump-v1.7.3_GH0.tar.gz) = 725364 +TIMESTAMP = 1710006224 +SHA256 (phaag-nfdump-v1.7.4_GH0.tar.gz) = 8cf76ad0b4e3c1e7edf9532ec7508b11f125adcfcdac5010fd7eec8fe792cfd8 +SIZE (phaag-nfdump-v1.7.4_GH0.tar.gz) = 756319 diff --git a/net-mgmt/nfdump/files/patch-configure.ac b/net-mgmt/nfdump/files/patch-configure.ac deleted file mode 100644 index 2f8171cdcca0..000000000000 --- a/net-mgmt/nfdump/files/patch-configure.ac +++ /dev/null @@ -1,69 +0,0 @@ ---- configure.ac.orig 2023-09-02 11:27:28 UTC -+++ configure.ac -@@ -124,7 +124,9 @@ fi - - #Tidz up? esp not using in source dist flow-tools - AC_ARG_ENABLE(ftconv, --[ --enable-ftconv Build the flow-tools to nfdump converter; default is NO], -+[ --enable-ftconv Build the flow-tools to nfdump converter; default is NO]) -+ -+AS_IF([test "x$enable_ftconv" = "xyes"], - AC_CHECK_LIB(z, zlibVersion,, - AC_MSG_ERROR(Link with "-lz" failed! (Need zlib >= 1.0.2)) - ) -@@ -147,7 +149,9 @@ AM_CONDITIONAL(FT2NFDUMP, false) - ) - - AC_ARG_ENABLE(maxmind, --[ --enable-maxmind Build geolookup for MaxMind GeoDB; default is NO], -+[ --enable-maxmind Build geolookup for MaxMind GeoDB; default is NO]) -+ -+AS_IF([test "x$enable_maxmind" = "xyes"], - AM_CONDITIONAL(MAXMIND, true) - , - AM_CONDITIONAL(MAXMIND, false) -@@ -156,8 +160,10 @@ AM_CONDITIONAL(MAXMIND, false) - - #Needs tidy - AC_ARG_ENABLE(nfprofile, --[ --enable-nfprofile Build nfprofile used by NfSen; default is NO], --[ -+[ --enable-nfprofile Build nfprofile used by NfSen; default is NO]) -+ -+AS_IF([test "x$enable_nfprofile" = "xyes"], -+[ - AC_CHECK_LIB(rrd, rrd_update,[ - cat >>config.h <<_ACEOF - #define HAVE_LIBRRD 1 -@@ -211,8 +217,10 @@ AM_CONDITIONAL(INFLXDB, false) - ) - - AC_ARG_ENABLE(nftrack, --[ --enable-nftrack Build nftrack used by PortTracker; default is NO], --[ -+[ --enable-nftrack Build nftrack used by PortTracker; default is NO]) -+ -+AS_IF([test "x$enable_nftrack" = "xyes"], -+[ - AC_CHECK_LIB(rrd, rrd_update,[ - cat >>config.h <<_ACEOF - #define HAVE_LIBRRD 1 -@@ -252,7 +260,9 @@ AC_ARG_ENABLE(readpcap, - AM_CONDITIONAL(READPCAP, test "$enable_readpcap" = yes) - - AC_ARG_ENABLE(nfpcapd, --[ --enable-nfpcapd Build nfpcapd collector to create netflow data from interface or pcap data; default is NO], -+[ --enable-nfpcapd Build nfpcapd collector to create netflow data from interface or pcap data; default is NO]) -+ -+AS_IF([test "x$enable_nfpcapd" = "xyes"], - [ - AC_CHECK_LIB(pcap, pcap_create,[ - cat >>config.h <<_ACEOF -@@ -279,7 +289,6 @@ AC_SUBST(PCAP_LIBS) - struct pcap_pkthdr p; - ]]) - ],, AC_MSG_ERROR(Can not load pcap library. Not in loader search path! )) -- - ] - , - AM_CONDITIONAL(BUILDNFPCAPD, false) diff --git a/net-mgmt/nfdump/pkg-descr b/net-mgmt/nfdump/pkg-descr index d6ef7a7ffba6..03d666cc5124 100644 --- a/net-mgmt/nfdump/pkg-descr +++ b/net-mgmt/nfdump/pkg-descr @@ -1,19 +1,20 @@ -NFDUMP tools support netflow v5, v7 and v9 capturing and processing. +NFDUMP tools support: NetFlow v5, v7, v9, sFlow and IPFIX capturing and +processing. nfcapd - netflow capture daemon. Reads the netflow data from the network and stores the data into files. nfdump - netflow dump. Reads the netflow data from the files stored by nfcapd. It's syntax is similar to tcpdump. If you like tcpdump you will like nfdump. nfprofile - netflow profiler. Reads the netflow data from the files stored by nfcapd. Filters the netflow data according to the specified filter sets (profiles) and stores the filtered data into files for later use. nfreplay - netflow replay. Reads the netflow data from the files stored by nfcapd and sends it over the network to another host. ft2nfdump - flow-tools to nfdump - optional component.