Attachment 245763 Details for Bug 271429 – 1.6.20 to 1.7.3 patch

[patch] 1.6.20 to 1.7.3 patch

nfdump-1.6.20-to-1.7.3.patch (text/plain), 8.00 KB, created by chadf on 2023-10-20 20:57:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: chadf

Created: 2023-10-20 20:57:06 UTC

Size: 8.00 KB

patch

obsolete

>diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
>index 5b6c4e02378b..a5fb42d220db 100644
>--- a/net-mgmt/nfdump/Makefile
>+++ b/net-mgmt/nfdump/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	nfdump
>-PORTVERSION=	1.6.20
>+PORTVERSION=	1.7.3
> DISTVERSIONPREFIX=v
>-PORTREVISION=	1
>+PORTREVISION=	0
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	pi@FreeBSD.org
>@@ -29,11 +29,10 @@ PLIST_FILES=	bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \
> PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README
> 
> #flow-tools support
>-OPTIONS_DEFINE=		DOCS FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \
>+OPTIONS_DEFINE=		DOCS FT2NFDUMP NFPROFILE READPCAP NFTRACK \
> 			SFLOW NFPCAPD NSEL INFLUXDB
> OPTIONS_DEFAULT=	NFPROFILE
> 
>-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
>@@ -43,7 +42,6 @@ NSEL_DESC=		Read and process ASA/NSEL/NEL event data
> READPCAP_DESC=		With pcap support
> SFLOW_DESC=		Build sflow collector daemon also
> 
>-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}
>@@ -75,32 +73,33 @@ RUN_DEPENDS+=	rrdtool:databases/rrdtool
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/bin/Makefile.am
>+	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/lib/Makefile.am
>+	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/src/nfcapd/Makefile.am
> 
> do-install:
> .for binary in nfanon nfcapd nfdump nfexpire nfreplay
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/${binary} ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/${binary}/.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
>+	${INSTALL_LIB} ${WRKSRC}/src/lib/.libs/libnfdump-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib
> 
> do-install-NFPROFILE-on:
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfprofile ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/nfsen/.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
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/nfsen/.libs/nftrack ${STAGEDIR}${PREFIX}/bin
> 
> do-install-FT2NFDUMP-on:
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/ft2nfdump ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/ft2nfdump/.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_PROGRAM} ${WRKSRC}/src/sflow/.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_PROGRAM} ${WRKSRC}/src/nfpcapd/.libs/nfpcapd ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN}	${WRKSRC}/man/nfpcapd.1	${STAGEDIR}${PREFIX}/man/man1
> 
> post-install-DOCS-on:
>diff --git a/net-mgmt/nfdump/distinfo b/net-mgmt/nfdump/distinfo
>index 9c050ee7fab0..2df387566ff3 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 = 1697330394
>+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 <string.h>
>- #include <errno.h>
>- #include <sys/types.h>
>-+#include <sys/socket.h>
>- #ifdef HAVE_NETINET_IN_SYSTM_H
>- #include <netinet/in_systm.h>
>- #endif
>diff --git a/net-mgmt/nfdump/files/patch-configure-disable-xxxx b/net-mgmt/nfdump/files/patch-configure-disable-xxxx
>new file mode 100644
>index 000000000000..d54b3385dea9
>--- /dev/null
>+++ b/net-mgmt/nfdump/files/patch-configure-disable-xxxx
>@@ -0,0 +1,71 @@
>+diff --git a/configure.ac b/configure.ac
>+index 6ffca60..ee9b65d 100644
>+--- configure.ac
>++++ configure.ac.orig
>+@@ -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/files/pkg-message.in b/net-mgmt/nfdump/files/pkg-message.in
>new file mode 100644
>index 000000000000..c0d0c4a21bf9
>--- /dev/null
>+++ b/net-mgmt/nfdump/files/pkg-message.in
>@@ -0,0 +1,12 @@
>+
>+**** From nfdump/README.md ****
>+
>+Compatibility
>+
>+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.
>+
>+Note for NfSen users: If you use NfSen, you must upgrade NfSen to the latest Github version https://github.com/phaag/nfsen. All specific binaries such as nfprofile and nftrack are still available with nfdump-1.7 but may be removed in future.

Actions: View | Diff

Attachments on bug 271429: 242184 | 245763 | 245936