commit: b436d3c2ada1caf225f72520c8b5dce4c7ba9aac Author: Vjaceslavs Klimovs <vklimovs <AT> gmail <DOT> com> AuthorDate: Sun Aug 23 22:58:00 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 15 21:03:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b436d3c2
net-analyzer/nfdump: fix upstream issue #241 and prevent always building nfpcapd Closes: https://github.com/gentoo/gentoo/pull/17119 Signed-off-by: Sam James <sam <AT> gentoo.org> ...mp-1.6.21-remove-strict-rfc-7011-handling.patch | 49 ++++++++++++++++++++++ net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild | 3 +- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch new file mode 100644 index 00000000000..a36af2242d4 --- /dev/null +++ b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch @@ -0,0 +1,49 @@ +From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001 +From: Peter Haag <[email protected]> +Date: Sat, 8 Aug 2020 16:46:04 +0200 +Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011 + +--- + ChangeLog | 3 +++ + bin/ipfix.c | 3 --- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index a0b2b67..8b92e58 100755 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,6 @@ ++2020-08-02 ++- Re-address issue #231 - remove strict rule rfc 7011 ++ + 2020-08-02 + - Release 1.6.21 + - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification +diff --git a/bin/ipfix.c b/bin/ipfix.c +index a730a8b..19c9d63 100644 +--- a/bin/ipfix.c ++++ b/bin/ipfix.c +@@ -158,7 +158,6 @@ typedef struct exporterDomain_s { + + // exporter information + exporter_info_record_t info; +- in_port_t port; // follow rfc 7011 - matching src port + + uint64_t packets; // number of packets sent by this exporter + uint64_t flows; // number of flow records sent by this exporter +@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); + + while ( *e ) { + if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && +- (*e)->port == fs->port && + (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) + return *e; + e = &((*e)->next); +@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); + (*e)->info.header.size = sizeof(exporter_info_record_t); + (*e)->info.id = ObservationDomain; + (*e)->info.ip = fs->ip; +- (*e)->port = fs->port; + (*e)->info.sa_family = fs->sa_family; + (*e)->info.version = 10; + (*e)->info.sysid = 0; diff --git a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild index 975d26b9c44..4b780ec598c 100644 --- a/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.21-r1.ebuild @@ -36,6 +36,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.6.19-compiler.patch "${FILESDIR}"/${PN}-1.6.19-libft.patch + "${FILESDIR}"/${PN}-1.6.21-remove-strict-rfc-7011-handling.patch ) DOCS=( AUTHORS ChangeLog README.md ) @@ -53,11 +54,11 @@ src_configure() { # --without-ftconf is not handled well #322201 econf \ $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ + $(use nfpcapd && echo --enable-nfpcapd) \ $(use nfprofile && echo --enable-nfprofile) \ $(use nftrack && echo --enable-nftrack) \ $(use_enable debug devel) \ $(use_enable jnat) \ - $(use_enable nfpcapd) \ $(use_enable nsel) \ $(use_enable readpcap) \ $(use_enable sflow) \
