pkg/49332: Update net/nfdump to 1.6.12

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/49332: Update net/nfdump to 1.6.12
From: bartosz.kuzma%gmail.com@localhost
Date: Wed, 29 Oct 2014 09:00:00 +0000 (UTC)
>Number:         49332
>Category:       pkg
>Synopsis:       Update net/nfdump to 1.6.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 29 09:00:00 +0000 2014
>Originator:     Bartosz Kuzma
>Release:        
>Organization:
>Environment:
>Description:
Changes since 1.6.6:

2014-02-16 v1.6.12
- Add NAT pool port allocation
- Modify/fix NAT vrf tags. Add egress vrf ID
- Modify common record due to exporter exhaustion. new common record
  type 10 adds 4 extra bytes. Reads v1 common record transparently
- Fix sflow potential crash

2013-11-13 v1.6.11
- Add ASA/NSEL 9.x protcol changes
- Make it llvm compilable

2013-08-12 v1.6.10p1
- Fix -t +/- n timeslot option
- Fix bug in nfanon - stat record update.
- Fix bug in netflow v5 mudule: extension map size wrong.
- Fix bug nfexport: In some cases could result in wrong flow counter.
- Fix nftrack - could coredump in some cases.

2013-05-16 v1.6.10
- Fix SPARC compile/optimise bug
- Add output packet/bytes counter to global stat - importatnt for NSEL flows ASA
 > 8.5
- Add NSEL filter options xnet
- Modify extension descriptor code for nfdump1.7. Still use 1.6 extension map layout for compatibility
- Add prototype for nfpcapd - pcap -> nfdump collector. Converts traffoc directly to nfdump files.
- Fix bug in ipfix module: uninitialised variable
- Cleanup syslog/LogError calls
- Fix minor non critical bugs and compile issues

2013-03-02 v1.6.9
- Fix some bugs in beta 1.6.9 NSEL code
- Fix bug statistics update with aggreagted flow records
- Fix sflow bug sfcapd stores wrong (ghost) dump by past samples in same sflow datagram

2013-03-02 v1.6.9
- Fix some bugs in beta 1.6.9 NSEL code
- Fix bug statistics update with aggreagted flow records
- Fix sflow bug sfcapd stores wrong (ghost) dump by past samples in same sflow datagram

2012-12-31
- Add time received in csv output
- ICMP should handled better now - somewhat
- Implement ASA NSEL records
- Add definitions in nffile and nx for ASA NSEL extensions

2012-11-09 v1.6.8p1
- Add dynamic source directory tree for multiple exporters
- Fix exporter bug: 'too many exporters' with large time windows
- Fix uninitialised exporter sysid in default sampler record - v9
- Fix v9/ipfix cache initialisation with no templates > 1 in same packet

2012-10-26 v1.6.8
- Add ip list option for 'next ip' in filter syntax
- Accept v9 sampler_id in 2bytes
- Fix IPFIX mac address bug - did not get collected
- Add IPFIX packet/octet TotalCount fields 85/86
- Add received timestamp to sflow collector
- Fix long flow duration calculation - 32bit overflow
- Fix v9 sampling ID: allow 2 byte ID
- Add IPFIX options as rfc5101 section-6.2
- Add exporter records for sflow collector
- Fix bug for MAC address printing %idmc and %odmc.
- Add received time stamp extension
- Add recursive format parser. Allows to extend predefined formats.
- Change flow record sorting to heapsort. remove limit 1000
- Merge -m option to -O tstart. -m now depricated.
- Add -O tend. Print order according to tend of flows ascending
- Apply -O print order for printing flow cache. Applies to -A

2012-07-31 v1.6.7-tc-1
- Special version for TC
- Print exporter and sampling records with nfdump -E
- Added exporter and sampling records to file.

2012-07-30 v1.6.7
- Prepare for file catalog in current file format.
- Fix bug in ReadBlock when reading flow from stdin pipe
- Add new more flexible translation engine for v9
- Add nprobe client/server delay fields
- Prepare for NSEL merging
- Fix memory corruption with double -A flags
- Fix bug in nfreader with compat15 mode files

>How-To-Repeat:

>Fix:
Apply the following patch:

diff --exclude=CVS --new-file -u -r nfdump/Makefile nfdump-1.6.12/Makefile
--- nfdump/Makefile	2014-05-05 02:48:15.000000000 +0200
+++ nfdump-1.6.12/Makefile	2014-10-28 14:14:02.000000000 +0100
@@ -1,14 +1,14 @@
 # $NetBSD: Makefile,v 1.29 2014/05/05 00:48:15 ryoon Exp $
 #
 
-DISTNAME=	nfdump-1.6.6
-PKGREVISION=	11
+DISTNAME=	nfdump-1.6.12
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nfdump/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://nfdump.sourceforge.net/
 COMMENT=	Tools to collect and process netflow data
+LICENSE=	modified-bsd
 
 GNU_CONFIGURE=	yes
 TEST_TARGET=	test
diff --exclude=CVS --new-file -u -r nfdump/distinfo nfdump-1.6.12/distinfo
--- nfdump/distinfo	2013-01-11 14:33:59.000000000 +0100
+++ nfdump-1.6.12/distinfo	2014-10-27 10:05:28.000000000 +0100
@@ -1,11 +1,12 @@
 $NetBSD: distinfo,v 1.8 2013/01/11 13:33:59 joerg Exp $
 
-SHA1 (nfdump-1.6.6.tar.gz) = f7a30c69419222f1527684fb46f02ae757b3dac0
-RMD160 (nfdump-1.6.6.tar.gz) = 63d5aec9e7f6d2ee151a88451e52ac86263996e4
-Size (nfdump-1.6.6.tar.gz) = 651348 bytes
-SHA1 (patch-bin_nf__common.c) = 2460a84a1e778ba46a64208c6d251cce285019e9
-SHA1 (patch-bin_nf__common.h) = ad44825d41b3126d7df21faaf659f5262a7eef03
-SHA1 (patch-bin_nfcapd.c) = d704b76af63547f9365dc56a65931e0df9d788fb
+SHA1 (nfdump-1.6.12.tar.gz) = 46f9e65d81f458c4699e93dac551c5e475a0eb05
+RMD160 (nfdump-1.6.12.tar.gz) = 0701f249ca8851597bcc0b64354db45957e99efe
+Size (nfdump-1.6.12.tar.gz) = 733604 bytes
+SHA1 (patch-bin_exporter.c) = 9ce6092419cc81999feec28f9121bca8151dc77a
+SHA1 (patch-bin_netflow__v1.c) = a10b924f6e378a32de48ea0e4438b967bb35cb34
+SHA1 (patch-bin_netflow__v5__v7.c) = a9c5c7d217f5659f612203d097096c692de829cd
+SHA1 (patch-bin_nfcapd.c) = b759b9adfaa3cee04fab8392d3c04a21b5bc0dfe
 SHA1 (patch-bin_sfcapd.c) = 14d9cbef9c059629606d38df5a4cfa5aa082942a
 SHA1 (patch-configure) = 02ddab9c6ee4d862b0e8f006ab3432b07923bf0b
 SHA1 (patch-configure.in) = 98d3e0db6f81cfc12b7d719189adf5f7ee8c6594
diff --exclude=CVS --new-file -u -r nfdump/patches/patch-bin_exporter.c nfdump-1.6.12/patches/patch-bin_exporter.c
--- nfdump/patches/patch-bin_exporter.c	1970-01-01 01:00:00.000000000 +0100
+++ nfdump-1.6.12/patches/patch-bin_exporter.c	2014-10-26 23:30:45.000000000 +0100
@@ -0,0 +1,14 @@
+$NetBSD$
+
+add missing sys/time.h header
+
+--- bin/exporter.c.orig	2014-02-16 12:59:29.000000000 +0000
++++ bin/exporter.c
+@@ -36,6 +36,7 @@
+ 
+ #include "config.h"
+ 
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --exclude=CVS --new-file -u -r nfdump/patches/patch-bin_netflow__v1.c nfdump-1.6.12/patches/patch-bin_netflow__v1.c
--- nfdump/patches/patch-bin_netflow__v1.c	1970-01-01 01:00:00.000000000 +0100
+++ nfdump-1.6.12/patches/patch-bin_netflow__v1.c	2014-10-26 23:30:46.000000000 +0100
@@ -0,0 +1,14 @@
+$NetBSD$
+
+add missing sys/time.h header
+
+--- bin/netflow_v1.c.orig	2014-02-16 12:59:29.000000000 +0000
++++ bin/netflow_v1.c
+@@ -39,6 +39,7 @@
+ #include "config.h"
+ 
+ #include <stdio.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
diff --exclude=CVS --new-file -u -r nfdump/patches/patch-bin_netflow__v5__v7.c nfdump-1.6.12/patches/patch-bin_netflow__v5__v7.c
--- nfdump/patches/patch-bin_netflow__v5__v7.c	1970-01-01 01:00:00.000000000 +0100
+++ nfdump-1.6.12/patches/patch-bin_netflow__v5__v7.c	2014-10-26 21:22:02.000000000 +0100
@@ -0,0 +1,14 @@
+$NetBSD$
+
+add missing sys/time.h header
+
+--- bin/netflow_v5_v7.c.orig	2014-02-16 12:59:29.000000000 +0000
++++ bin/netflow_v5_v7.c
+@@ -39,6 +39,7 @@
+ #include "config.h"
+ 
+ #include <stdio.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <unistd.h>
diff --exclude=CVS --new-file -u -r nfdump/patches/patch-bin_nf__common.c nfdump-1.6.12/patches/patch-bin_nf__common.c
--- nfdump/patches/patch-bin_nf__common.c	2013-01-11 14:33:59.000000000 +0100
+++ nfdump-1.6.12/patches/patch-bin_nf__common.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-$NetBSD: patch-bin_nf__common.c,v 1.2 2013/01/11 13:33:59 joerg Exp $
-
-Fix gcc inline.
-
---- bin/nf_common.c.orig	2012-02-19 10:42:43.000000000 +0000
-+++ bin/nf_common.c
-@@ -487,7 +487,7 @@ int Getv6Mode(void) {
- #ifdef __SUNPRO_C
- extern
- #endif
--inline void Proto_string(uint8_t protonum, char *protostr) {
-+void Proto_string(uint8_t protonum, char *protostr) {
- 
- 	if ( protonum >= NumProtos || no_scale ) {
- 		snprintf(protostr,16,"%-5i", protonum );
-@@ -1440,10 +1440,10 @@ int	i, remaining;
- 
- } // End of ParseOutputFormat
- 
--#ifdef __SUNPRO_C
-+#if !defined(__GNUC__) || !defined(__GNUC_STDC_INLINE__)
- extern
- #endif
--inline void format_number(uint64_t num, char *s, int fixed_width) {
-+void format_number(uint64_t num, char *s, int fixed_width) {
- double f = num;
- 
- 	if ( no_scale ) {
-@@ -1475,7 +1475,7 @@ double f = num;
- 
- } // End of format_number
- 
--inline void condense_v6(char *s) {
-+void condense_v6(char *s) {
- size_t len = strlen(s);
- char	*p, *q;
- 
diff --exclude=CVS --new-file -u -r nfdump/patches/patch-bin_nf__common.h nfdump-1.6.12/patches/patch-bin_nf__common.h
--- nfdump/patches/patch-bin_nf__common.h	2013-01-11 14:33:59.000000000 +0100
+++ nfdump-1.6.12/patches/patch-bin_nf__common.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-$NetBSD: patch-bin_nf__common.h,v 1.1 2013/01/11 13:33:59 joerg Exp $
-
---- bin/nf_common.h.orig	2013-01-11 01:23:53.000000000 +0000
-+++ bin/nf_common.h
-@@ -99,17 +99,17 @@ char *Get_fwd_status_name(uint32_t id);
- #ifdef __SUNPRO_C
- extern 
- #endif
--inline void Proto_string(uint8_t protonum, char *protostr);
-+void Proto_string(uint8_t protonum, char *protostr);
- 
- #ifdef __SUNPRO_C
- extern 
- #endif
--inline void format_number(uint64_t num, char *s, int fixed_width);
-+void format_number(uint64_t num, char *s, int fixed_width);
- 
- #ifdef __SUNPRO_C
- extern 
- #endif
--inline void condense_v6(char *s);
-+void condense_v6(char *s);
- 
- #define TAG_CHAR ''
- 
diff --exclude=CVS --new-file -u -r nfdump/patches/patch-bin_nfcapd.c nfdump-1.6.12/patches/patch-bin_nfcapd.c
--- nfdump/patches/patch-bin_nfcapd.c	2012-07-25 23:19:30.000000000 +0200
+++ nfdump-1.6.12/patches/patch-bin_nfcapd.c	2014-10-27 10:04:34.000000000 +0100
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_nfcapd.c,v 1.1 2012/07/25 21:19:30 tez Exp $
+$NetBSD$
 
 use PATH_MAX instead of MAXPATHLEN if available
 
---- bin/nfcapd.c.orig	2012-03-09 18:25:51.000000000 +0000
+--- bin/nfcapd.c.orig	2014-02-16 12:59:29.000000000 +0000
 +++ bin/nfcapd.c
-@@ -72,6 +72,7 @@
+@@ -73,6 +73,7 @@
  #include <sys/mman.h>
  #include <string.h>
  #include <dirent.h>
@@ -12,21 +12,21 @@
  
  #ifdef PCAP
  #include "pcap_reader.h"
-@@ -743,7 +744,12 @@ int main(int argc, char **argv) {
+@@ -764,7 +765,12 @@ int main(int argc, char **argv) {
   
  char	*bindhost, *filter, *datadir, pidstr[32], *launch_process;
  char	*userid, *groupid, *checkptr, *listenport, *mcastgroup, *extension_tags;
--char	*Ident, *pcap_file, pidfile[MAXPATHLEN];
-+char	*Ident, *pcap_file;
+-char	*Ident, *dynsrcdir, pidfile[MAXPATHLEN];
++char	*Ident, *dynsrcdir;
 +#ifdef PATH_MAX
 +char pidfile[PATH_MAX];
 +#else
 +char pidfile[MAXPATHLEN];
 +#endif
  struct stat fstat;
- srecord_t	*commbuff;
  packet_function_t receive_packet;
-@@ -853,18 +859,20 @@ int		c;
+ send_peer_t  peer;
+@@ -897,18 +903,20 @@ char	*pcap_file;
  				break;
  			case 'P':
  				if ( optarg[0] == '/' ) { 	// absolute path given
Prev by Date: Re: pkg/48479 ([PATCH] ghostscript-cidfonts doesn't switch correctly ghostscript-agpl and -gpl)
Next by Date: pkg/49333: libgpg-error 1.15 may cause apache and php to segfault
Previous by Thread: PR/49313 CVS commit: pkgsrc/ham
Next by Thread: pkg/49333: libgpg-error 1.15 may cause apache and php to segfault
Indexes:
Home | Main Index | Thread Index | Old Index