[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/files/

[Sam James]

commit:     6efaf753254faf7b1778f6712965ad131cc6d0c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 16:00:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 16:02:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efaf753

net-analyzer/nfdump: add missing (slibtool) patch

Fixes: 252dcb79de46102f998eca4451467ccba81f13a9
Bug: https://bugs.gentoo.org/778704
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../nfdump-1.6.22-libtool-archives-slibtool.patch  | 111 +++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch b/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch
new file mode 100644
index 00000000000..0a0048120ea
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.6.22-libtool-archives-slibtool.patch
@@ -0,0 +1,111 @@
+https://bugs.gentoo.org/778704
+https://github.com/phaag/nfdump/pull/282
+
+From 44b6854a7e67bec438659452993a517b9ec3e753 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 27 Mar 2021 07:23:12 -0700
+Subject: [PATCH] bin: Use the libtool archives to link.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ bin/Makefile.am | 40 ++++++++++++++--------------------------
+ 1 file changed, 14 insertions(+), 26 deletions(-)
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 0f8e787..456cda4 100755
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -68,37 +68,31 @@ libnfdump_la_LDFLAGS = -release 1.6.22
+ 
+ nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \
+ 	$(nflowcache) $(nfprof)
+-nfdump_LDADD = -lnfdump
+-nfdump_DEPENDENCIES = libnfdump.la
++nfdump_LDADD = libnfdump.la
+ 
+ nfreplay_SOURCES = nfreplay.c $(nfprof) \
+ 	$(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix)
+-nfreplay_LDADD = -lnfdump
+-nfreplay_DEPENDENCIES = libnfdump.la
++nfreplay_LDADD = libnfdump.la
+ 
+ nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) 
+-nfprofile_LDADD = -lnfdump -lrrd
+-nfprofile_DEPENDENCIES = libnfdump.la
++nfprofile_LDADD = libnfdump.la -lrrd
+ 
+ nftrack_SOURCES = ../extra/nftrack/nftrack.c \
+ 	../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \
+ 	../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h 
+ nftrack_CFLAGS = -I ../extra/nftrack
+-nftrack_LDADD = -lnfdump -lrrd
+-nftrack_DEPENDENCIES = libnfdump.la
++nftrack_LDADD = libnfdump.la -lrrd
+ 
+ nfcapd_SOURCES = nfcapd.c \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire)
+-nfcapd_LDADD = -lnfdump 
+-nfcapd_DEPENDENCIES = libnfdump.la
++nfcapd_LDADD = libnfdump.la
+ 
+ nfpcapd_SOURCES = nfpcapd.c \
+ 	$(pcaproc) $(netflow_pcap) \
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(bookkeeper) $(expire) $(content)
+-nfpcapd_LDADD = -lnfdump 
+-nfpcapd_DEPENDENCIES = libnfdump.la
++nfpcapd_LDADD = libnfdump.la
+ 
+ if READPCAP
+ nfcapd_CFLAGS = -DPCAP
+@@ -116,8 +110,7 @@ endif
+ sfcapd_SOURCES = sfcapd.c sflow_nfdump.c sflow_nfdump.h sflow.h sflow_v2v4.h sflow_process.c  sflow_process.h\
+ 	$(nfstatfile) $(launch) \
+ 	$(nfnet) $(collector) $(bookkeeper) $(expire)
+-sfcapd_LDADD = -lnfdump 
+-sfcapd_DEPENDENCIES = libnfdump.la
++sfcapd_LDADD = libnfdump.la
+ 
+ if READPCAP
+ sfcapd_CFLAGS = -DPCAP
+@@ -126,32 +119,27 @@ sfcapd_LDADD += -lpcap
+ endif
+ 
+ nfreader_SOURCES = nfreader.c 
+-nfreader_LDADD = -lnfdump 
+-nfreader_DEPENDENCIES = libnfdump.la
++nfreader_LDADD = libnfdump.la
+ 
+ nfanon_SOURCES = nfanon.c $(anon)
+-nfanon_LDADD = -lnfdump 
+-nfanon_DEPENDENCIES = libnfdump.la
++nfanon_LDADD = libnfdump.la
+ 
+ nfgen_SOURCES = nfgen.c 
+-nfgen_LDADD = -lnfdump 
+-nfgen_DEPENDENCIES = libnfdump.la
++nfgen_LDADD = libnfdump.la
+ 
+ nfexpire_SOURCES = nfexpire.c \
+ 	$(bookkeeper) $(expire) $(nfstatfile)
+-nfexpire_LDADD = -lnfdump @FTS_OBJ@
+-nfexpire_DEPENDENCIES = libnfdump.la
++nfexpire_LDADD = libnfdump.la @FTS_OBJ@
+ 
+ nftest_SOURCES = nftest.c 
+-nftest_LDADD = -lnfdump 
+-nftest_DEPENDENCIES = nfgen libnfdump.la
++nftest_LDADD = libnfdump.la
++nftest_DEPENDENCIES = nfgen
+ 
+ if FT2NFDUMP
+ ft2nfdump_SOURCES = ft2nfdump.c 
+ ft2nfdump_CFLAGS = @FT_INCLUDES@
+-ft2nfdump_LDADD = -lnfdump -lft -lz
++ft2nfdump_LDADD = libnfdump.la -lft -lz
+ ft2nfdump_LDADD += @FT_LDFLAGS@
+-ft2nfdump_DEPENDENCIES = libnfdump.la
+ endif
+ 
+ check_DIST = inline.c collector_inline.c nffile_inline.c nfdump_inline.c heapsort_inline.c applybits_inline.c 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nfdump/files/

[Conrad Kostecki]

commit:     7d8754c2bfe3ac71c69d42faf587a2f4f5435ac8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jul 12 18:16:05 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 21:14:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8754c2

net-analyzer/nfdump: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21613
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...mp-1.6.21-remove-strict-rfc-7011-handling.patch | 49 ----------------------
 1 file changed, 49 deletions(-)

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
deleted file mode 100644
index a36af2242d4..00000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001
-From: Peter Haag <peter@people.ops-trust.net>
-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;