Page MenuHomeFreeBSD
Files F170936061

D57835.id185019.diff
No OneTemporary
Actions

D57835.id185019.diff
View Options

diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nfdump
-DISTVERSION= 1.7.6
+DISTVERSION= 1.7.8
DISTVERSIONPREFIX=v
CATEGORIES= net-mgmt
@@ -10,8 +10,6 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/BSD-license.txt
-BROKEN= fails to build with rrdtool 1.10+
-
USES= autoreconf compiler:c11 cpe libtool pkgconfig
CPE_VENDOR= nfdump_project
USE_CSTD= gnu89
@@ -22,69 +20,43 @@
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+LIB_DEPENDS= liblz4.so:archivers/liblz4 libzstd.so:archivers/zstd
+
INSTALL_TARGET= install-strip
-PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \
+PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump \
+ bin/nfexpire bin/nfreplay bin/sfcapd \
+ bin/geolookup bin/updateGeoDB.sh \
+ bin/torlookup bin/updateTorDB.sh \
lib/libnfdump-${PORTVERSION}.so lib/libnfdump.so \
lib/libnffile-${PORTVERSION}.so lib/libnffile.so \
lib/libnfdump.a lib/libnffile.a \
+ libdata/pkgconfig/nfdump.pc \
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
+ share/man/man1/nfreplay.1.gz share/man/man1/sfcapd.1.gz \
+ share/man/man1/geolookup.1.gz share/man/man1/torlookup.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
+OPTIONS_DEFINE= DOCS FT2NFDUMP NFPCAPD NFPROFILE READPCAP
+OPTIONS_DEFAULT= NFPCAPD NFPROFILE READPCAP
-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
+NFPROFILE_DESC= With nfprofile and nftrack (nfsen requires it)
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_BUILD_DEPENDS= flow-cat:net-mgmt/flow-tools
+FT2NFDUMP_LIB_DEPENDS= libft.so:net-mgmt/flow-tools
+FT2NFDUMP_CONFIGURE_ON= --enable-ftconv --with-ft=${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 <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-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/libnfdump/Makefile.am
- ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/libnffile/Makefile.am
- ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/nfcapd/Makefile.am
- ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/test/Makefile.am
+NFPROFILE_LIB_DEPENDS+= librrd.so:databases/rrdtool
+NFPROFILE_CONFIGURE_ON= --enable-nfprofile --with-rrd=${LOCALBASE}
+NFPROFILE_PLIST_FILES= bin/nfprofile bin/nftrack share/man/man1/nfprofile.1.gz
+READPCAP_LIB_DEPENDS= libpcap.so:net/libpcap
+READPCAP_CONFIGURE_ON= --enable-readpcap --with-pcap=${LOCALBASE}
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -93,4 +65,4 @@
post-install:
${MV} ${STAGEDIR}${PREFIX}/etc/nfdump.conf.dist ${STAGEDIR}${PREFIX}/etc/nfdump.conf.sample
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/nfdump/distinfo b/net-mgmt/nfdump/distinfo
--- a/net-mgmt/nfdump/distinfo
+++ b/net-mgmt/nfdump/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746547576
-SHA256 (phaag-nfdump-v1.7.6_GH0.tar.gz) = 2d25220d7a48f57ba65f228fb5d2eb4d2a0ab2b352a037ed6249b39cf68c1b9a
-SIZE (phaag-nfdump-v1.7.6_GH0.tar.gz) = 844753
+TIMESTAMP = 1782244643
+SHA256 (phaag-nfdump-v1.7.8_GH0.tar.gz) = d9b881f7e3ecde281c1116e8330ae612d0e5adcd0e952f401b2045c6446a1232
+SIZE (phaag-nfdump-v1.7.8_GH0.tar.gz) = 897933

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 8, 5:31 PM (1 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38300317
Default Alt Text
D57835.id185019.diff (4 KB)

Event Timeline