From nobody Sat Oct 28 19:39:10 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHqbg3LS0z4xwjw; Sat, 28 Oct 2023 19:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SHqbg0d0kz4KcC; Sat, 28 Oct 2023 19:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698521951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TcqTUL8BkUvH6akSU9UtuQRre9QFQmPbTEcKrcTxcD0=; b=qOCYPODqMdyJZqTQv9jQayfwSSMZT5+H/2IXj1hi3ZR6aA5UHa7NoDcpy/hd+jzkrU8AgZ K3nWV7S6e3PathiJrjzPWZey/74NE+FP1okBl5kUgHIxWFDm7xkOUeYTrIy4QTffseM0cm g26XPOs8262aYT1BkdnjFsA/JXL+HG7YhYiGIqDb2ghwX2k15zFI6xKSghVb4y5w1RGs4y 8yUSKBr+d/zrSK+/SHkB052A5Vq0lFQ7PYOEyxDnQDs4BnmTTg9kAroi9SExwXrI0RTSJW Q/Zt6ctbKKM496IMlN5cixNcKAQ9g4ypJCHIGK/Qsp5KiNVBldUc8LRGRtNiQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698521951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TcqTUL8BkUvH6akSU9UtuQRre9QFQmPbTEcKrcTxcD0=; b=STFqen+srUaPF9CU0GYAFY2lG7u2wl9cfopVakWvEKxBwu9b8tVs9oluPwE7hUIGCssbSR imtCvqmentCQUo8HDX4xqRr0coeaA4HtpzzS3EuaT0VUbRJdXBdss99FSbDOCfoC8GkgOe Pp/BFL1fxp4VObORgL2tPINE6ZUB4YTY8eTdtufZ6CXOz/DaNFwqvqSkyTcwyJ5lx0waLv og0wYBRGWks6PYLz+68yYzQ9TKdiW8WYvxmQiHRdCTEg24YMWdulcjRPG01rEt4dgodZk5 uGVjRkfdR1Uu7MUJ2WL8HZY5DtWkJDrxP5raBuFLpunWSAtM3PZshJmhLMVwHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698521951; a=rsa-sha256; cv=none; b=oXsgjv/wXiR8sYabqFZHq90TqRkBmbCWYhezVx59iZXNWa31k7Ni0X1WXTCtVxefDUN36x HTywz0lxLff8XFmX+liIo2jlqDVLF8atFd8Mz40VTkP2bT6Gs+gM2oyJFe422IiYSl6QlM MRBRdRiWbIvsxplbINw0GC5wXoG+JRgIT75iY89E8VjeGm4QeQvs00oRUsWhGK2CH/SmIL bAVBkwsMPbLYugUDC/dpY60pTDS1ex0O9J7io9eMUQ7LEDEumEWtUBHTgLIMA31Gfp7+D0 XiyINTHPOeemOrKaMXWcoZHLgxgFPiY/pC3bklxRd8SQKgAc2qi+0yXHTgZ6wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHqbf6hMJz17kg; Sat, 28 Oct 2023 19:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39SJdA7M093107; Sat, 28 Oct 2023 19:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SJdACe093104; Sat, 28 Oct 2023 19:39:10 GMT (envelope-from git) Date: Sat, 28 Oct 2023 19:39:10 GMT Message-Id: <202310281939.39SJdACe093104@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 33a1d3492cfb - main - net-mgmt/nfdump: update 1.6.20 -> 1.7.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33a1d3492cfb451e39017911d919bcc8215a76ff Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=33a1d3492cfb451e39017911d919bcc8215a76ff commit 33a1d3492cfb451e39017911d919bcc8215a76ff Author: geoffroy desvernay AuthorDate: 2023-10-28 19:36:18 +0000 Commit: Kurt Jaeger CommitDate: 2023-10-28 19:36:18 +0000 net-mgmt/nfdump: update 1.6.20 -> 1.7.3 - Check UPDATING for compat with older 1.6.x PR: 271429 Reviewed by: chadf@triularity.org Changes: https://github.com/phaag/nfdump/releases --- UPDATING | 18 +++++++++ net-mgmt/nfdump/Makefile | 53 ++++++++---------------- net-mgmt/nfdump/distinfo | 6 +-- net-mgmt/nfdump/files/patch-bin_ipfrag.c | 10 ----- net-mgmt/nfdump/files/patch-configure.ac | 69 ++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 49 deletions(-) diff --git a/UPDATING b/UPDATING index c625d3b5619c..13908a1c7a7f 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20231028: + AFFECTS: users of net-mgmt/nfdump + + nfdump-1.7.x is compatible to nfdump-1.6.18, which means it can + read files created with nfdump-1.6.18 or newer. Flow files created + with earlier nfdump versions may not contain all flow elements. + If you have older files, it is recommended to use nfdump-1.6.17 + to update the records. + + nfdump 1.7.x provides the same set of programs as 1.6.x and can + be used almost as a drop-in replacement. This may change in future + and older legacy programs may be removed. You can convert any old + files from nfdump-1.6 to nfdump-1.7 format by reading/writing + files: ./nfdump -r old-flowfile -y -w new-flowfile + + Please note, that only nfdump may read older flow files. All other + programs relay on the new file format. + 20231027: AFFECTS: users of net-mgmt/librenms AUTHOR: dvl@FreeBSD.org diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile index 5b6c4e02378b..f373dea030f9 100644 --- a/net-mgmt/nfdump/Makefile +++ b/net-mgmt/nfdump/Makefile @@ -1,7 +1,6 @@ PORTNAME= nfdump -PORTVERSION= 1.6.20 +PORTVERSION= 1.7.3 DISTVERSIONPREFIX=v -PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= pi@FreeBSD.org @@ -20,18 +19,19 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes - +INSTALL_TARGET= install-strip PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \ - lib/libnfdump-${PORTVERSION}.so \ + lib/libnfdump-${PORTVERSION}.so lib/libnfdump.so \ + lib/libnfdump.a \ man/man1/nfanon.1.gz man/man1/nfcapd.1.gz man/man1/nfdump.1.gz \ - man/man1/nfexpire.1.gz man/man1/nfreplay.1.gz + man/man1/nfexpire.1.gz 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 -OPTIONS_DEFAULT= NFPROFILE + 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 @@ -42,6 +42,7 @@ 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 @@ -57,10 +58,11 @@ NFPROFILE_PLIST_FILES= bin/nfprofile man/man1/nfprofile.1.gz NFTRACK_CONFIGURE_ENABLE= nftrack NFTRACK_PLIST_FILES= bin/nftrack NSEL_CONFIGURE_ENABLE= nsel -READPCAP_LIB_DEPENDS= libpcap.so:net/libpcap READPCAP_CONFIGURE_ENABLE= readpcap SFLOW_CONFIGURE_ENABLE= sflow SFLOW_PLIST_FILES= bin/sfcapd man/man1/sfcapd.1.gz +GEODB_PLIST_FILES= bin/geolookup bin/updateGeoDB.sh man/man1/geolookup.1.gz +GEODB_CONFIGURE_ENABLE= maxmind .include @@ -75,36 +77,15 @@ RUN_DEPENDS+= rrdtool:databases/rrdtool .endif post-patch: - ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/bin/Makefile.am - -do-install: -.for binary in nfanon nfcapd nfdump nfexpire nfreplay - ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/${binary} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${binary}.1 ${STAGEDIR}${PREFIX}/man/man1 -.endfor - ${INSTALL_LIB} ${WRKSRC}/bin/.libs/libnfdump-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib - -do-install-NFPROFILE-on: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfprofile ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/nfprofile.1 ${STAGEDIR}${PREFIX}/man/man1 - -do-install-NFTRACK-on: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nftrack ${STAGEDIR}${PREFIX}/bin - -do-install-FT2NFDUMP-on: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/ft2nfdump ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/ft2nfdump.1 ${STAGEDIR}${PREFIX}/man/man1 - -do-install-SFLOW-on: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sfcapd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/sfcapd.1 ${STAGEDIR}${PREFIX}/man/man1 - -do-install-NFPCAPD-on: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfpcapd ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/nfpcapd.1 ${STAGEDIR}${PREFIX}/man/man1 + ${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 9c050ee7fab0..3963d10e8949 100644 --- a/net-mgmt/nfdump/distinfo +++ b/net-mgmt/nfdump/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1590491538 -SHA256 (phaag-nfdump-v1.6.20_GH0.tar.gz) = 672f4fbe2b7424cfdba5917441100a440cbc9083f2a79147562fb5a966838543 -SIZE (phaag-nfdump-v1.6.20_GH0.tar.gz) = 561053 +TIMESTAMP = 1698484412 +SHA256 (phaag-nfdump-v1.7.3_GH0.tar.gz) = 9ea7e1ded34a81839b73e66cb62c9bc11a8070210584f9a508798d7bd6058c89 +SIZE (phaag-nfdump-v1.7.3_GH0.tar.gz) = 725364 diff --git a/net-mgmt/nfdump/files/patch-bin_ipfrag.c b/net-mgmt/nfdump/files/patch-bin_ipfrag.c deleted file mode 100644 index cb839322f94b..000000000000 --- a/net-mgmt/nfdump/files/patch-bin_ipfrag.c +++ /dev/null @@ -1,10 +0,0 @@ ---- bin/ipfrag.c.orig 2019-09-20 22:19:55.060019000 +0200 -+++ bin/ipfrag.c 2019-09-20 22:20:13.307477000 +0200 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_NETINET_IN_SYSTM_H - #include - #endif diff --git a/net-mgmt/nfdump/files/patch-configure.ac b/net-mgmt/nfdump/files/patch-configure.ac new file mode 100644 index 000000000000..2f8171cdcca0 --- /dev/null +++ b/net-mgmt/nfdump/files/patch-configure.ac @@ -0,0 +1,69 @@ +--- 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)