Date: Sun, 11 May 2008 00:10:38 GMT From: Oleg Gawriloff <barzog@telecom.by> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/123580: flow-extract updateto 2.61 Message-ID: <200805110010.m4B0Ac1t081051@www.freebsd.org> Resent-Message-ID: <200805110020.m4B0K19w039855@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123580
>Category: ports
>Synopsis: flow-extract updateto 2.61
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun May 11 00:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Oleg Gawriloff
>Release: 6.3
>Organization:
Atlant Telecom
>Environment:
FreeBSD netflow.telecom.by 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Wed Jan 16 01:43:02 UTC 2008 root@palmer.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP amd64
>Description:
flow-extract 2.4 contains bug that cripples port information when convertion from binary to text form. In 2.5 and above this bug is fixed.
Here is port patch that updates port to 2.61. This patch contains only one problem, that I cannot solve: in portarchive pkg-name is flow-extract, but port seeks ${PKGNAME}-${DISTNAME}
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -Nru /home/barzog/flow-extract/Makefile /usr/ports/net-mgmt/flow-extract/Makefile
--- /home/barzog/flow-extract/Makefile 2006-05-11 22:49:39.000000000 +0000
+++ /usr/ports/net-mgmt/flow-extract/Makefile 2008-05-11 00:06:27.000000000 +0000
@@ -6,15 +6,13 @@
#
PORTNAME= flow-extract
-PORTVERSION= 2.4
+PORTVERSION= 2.61
CATEGORIES= net-mgmt
-MASTER_SITES= http://security.uchicago.edu/tools/net-forensics/files/
-DISTNAME= flowextract-${PORTVERSION}
-EXTRACT_SUFX= .cpio.gz
-
+MASTER_SITES= http://security.uchicago.edu/tools/net-forensics/
+DISTNAME= flow-extract-${PORTVERSION}
+EXTRACT_SUFX= .tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Cisco NetFlow awk-like extracting tool
-
BUILD_DEPENDS= flow-cat:${PORTSDIR}/net-mgmt/flow-tools
EXTRACT_AFTER_ARGS= | ${CPIO} -idmu
diff -Nru /home/barzog/flow-extract/distinfo /usr/ports/net-mgmt/flow-extract/distinfo
--- /home/barzog/flow-extract/distinfo 2005-11-25 16:56:02.000000000 +0000
+++ /usr/ports/net-mgmt/flow-extract/distinfo 2008-05-10 23:29:59.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (flowextract-2.4.cpio.gz) = b1fdb245df78a5804e42b47c18275aaa
-SHA256 (flowextract-2.4.cpio.gz) = 1e66936481c9c8706b076ae4ce9a54b33aa32dd2307321bedaeb75608d892a7f
-SIZE (flowextract-2.4.cpio.gz) = 138571
+MD5 (flow-extract-2.61.tar.gz) = be11dd12b3f7c09b93a2858add6ae656
+SHA256 (flow-extract-2.61.tar.gz) = dfe6b55e201c557bc6d03beca3a0ae88e09054d1cf405c4b51af520f91d06f10
+SIZE (flow-extract-2.61.tar.gz) = 36882
diff -Nru /home/barzog/flow-extract/files/patch-Makefile /usr/ports/net-mgmt/flow-extract/files/patch-Makefile
--- /home/barzog/flow-extract/files/patch-Makefile 2003-08-28 11:15:22.000000000 +0000
+++ /usr/ports/net-mgmt/flow-extract/files/patch-Makefile 2008-05-11 00:03:24.000000000 +0000
@@ -1,25 +1,39 @@
---- Makefile.original Fri Mar 14 13:20:42 2003
-+++ Makefile Fri Mar 14 13:21:33 2003
-@@ -10,10 +10,9 @@
+--- /home/barzog/Makefile 2008-05-11 02:57:48.000000000 +0000
++++ Makefile 2008-05-11 02:59:59.000000000 +0000
+@@ -10,10 +10,10 @@
#
# For SunOS 5, use LIBS=-lsocket -lnsl
#
-CC=gcc
--FLAGS=-ggdb3 -gstabs
+-FLAGS=-ggdb3 -gstabs -D_FILE_OFFSET_BITS=64
-LIBS=-L/opt/lib -R/opt/lib /opt/lib/libft.a -lsocket -lnsl -lz
-INCLUDES=-I/opt/include
-+CC ?= cc
-+LIBS = -L%%PREFIX%%/lib -lft -lz
-+INCLUDES = -I%%PREFIX%%/include
++#CC=gcc
++#FLAGS=-ggdb3 -gstabs -D_FILE_OFFSET_BITS=64
++#LIBS=-L/opt/lib -R/opt/lib /opt/lib/libft.a -lsocket -lnsl -lz
++#INCLUDES=-I/opt/include
#
# For Linux
#
-@@ -30,7 +29,7 @@
+@@ -22,9 +22,9 @@
+ #INCLUDES=
+ #
+ # For BSD
+-FLAGS=-ggdb3 -gstabs -D_FILE_OFFSET_BITS=64
+-LIBS=-L/usr/local/netflow/lib /usr/local/netflow/lib/libft.a -lz
+-INCLUDES=-I/usr/local/netflow/include
++CC ?= cc
++LIBS=-L%%PREFIX%%/lib -lft -lz
++INCLUDES=-I%%PREFIX%%/include
+ #
+ #
+ #------------------------------------------------------------------------
+@@ -36,7 +36,7 @@
#CC = cc
LIB=$(LIBS)
-CFLAGS=-O $(FLAGS) $(INCLUDES)
-+CFLAGS+=$(INCLUDES)
++CFLAGS=$(INCLUDES)
all: flow-extract
diff -Nru /home/barzog/flow-extract/files/patch-includes /usr/ports/net-mgmt/flow-extract/files/patch-includes
--- /home/barzog/flow-extract/files/patch-includes 2003-08-28 11:15:22.000000000 +0000
+++ /usr/ports/net-mgmt/flow-extract/files/patch-includes 1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
---- extract.c.orig Mon Jun 17 16:59:16 2002
-+++ extract.c Fri Mar 14 13:01:27 2003
-@@ -13,7 +13,6 @@
- #include <sys/stat.h>
- #include <netdb.h>
- #include <errno.h>
--#include <malloc.h>
- #include <unistd.h>
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
-@@ -22,7 +21,6 @@
-
-
- #include <ftlib.h>
--#include <fmt.h>
- #include "extract.h"
- #include "chario.h"
- #include "parser.h"
---- chario.c.orig Mon Jun 17 16:59:16 2002
-+++ chario.c Fri Mar 14 13:01:27 2003
-@@ -11,7 +11,7 @@
- #include <stdio.h>
- #include <sys/stat.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "stdunix.h"
-
- #include "chario.h"
---- grammar.y.orig Mon Jun 17 16:59:16 2002
-+++ grammar.y Fri Mar 14 13:01:27 2003
-@@ -13,7 +13,7 @@
- #include <netdb.h>
- #include <sys/types.h>
- #include <netinet/in.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "lex.h"
- #include "chario.h"
- #include "parser.h"
---- lex.c.orig Mon Jun 17 16:59:16 2002
-+++ lex.c Fri Mar 14 13:01:27 2003
-@@ -9,15 +9,13 @@
- */
- #include <stdio.h>
- #include <ctype.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "y.tab.h"
- #include "lex.h"
- #include "chario.h"
-
- #define TRUE 1
- #define FALSE 0
--
--extern int atoi(char *);
-
- static int buflen = 0;
- static int bufptr = 0;
---- builder.c.orig Fri Mar 14 13:03:45 2003
-+++ builder.c Fri Mar 14 13:03:55 2003
-@@ -8,7 +8,7 @@
-
- */
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "stdunix.h"
-
- #include "parser.h"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805110010.m4B0Ac1t081051>