From owner-freebsd-ports-bugs Mon Mar 17 0:20:13 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 347F437B404 for ; Mon, 17 Mar 2003 00:20:09 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A83D43F85 for ; Mon, 17 Mar 2003 00:20:07 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h2H8K7NS003250 for ; Mon, 17 Mar 2003 00:20:07 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h2H8K7AQ003249; Mon, 17 Mar 2003 00:20:07 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1B4837B401 for ; Mon, 17 Mar 2003 00:12:49 -0800 (PST) Received: from bk.twincreeks.net (bk.twincreeks.net [204.61.208.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4CEC43FB1 for ; Mon, 17 Mar 2003 00:12:48 -0800 (PST) (envelope-from feldman@bk.twincreeks.net) Received: from bk.twincreeks.net (feldman@localhost [IPv6:::1]) by bk.twincreeks.net (8.12.6/8.12.6) with ESMTP id h2H8CmhH081118 for ; Mon, 17 Mar 2003 00:12:48 -0800 (PST) (envelope-from feldman@bk.twincreeks.net) Received: (from feldman@localhost) by bk.twincreeks.net (8.12.6/8.12.6/Submit) id h2H8Cmpo081117; Mon, 17 Mar 2003 00:12:48 -0800 (PST) Message-Id: <200303170812.h2H8Cmpo081117@bk.twincreeks.net> Date: Mon, 17 Mar 2003 00:12:48 -0800 (PST) From: Steve Feldman Reply-To: Steve Feldman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/50065: Update port: net/flow-tools version 0.64 Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 50065 >Category: ports >Synopsis: Update port: net/flow-tools version 0.64 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 17 00:20:06 PST 2003 >Closed-Date: >Last-Modified: >Originator: Steve Feldman >Release: FreeBSD 4.7-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD bk.twincreeks.net 4.7-RELEASE-p3 FreeBSD 4.7-RELEASE-p3 #10: Wed Jan 8 16:29:19 PST 2003 root@bk.twincreeks.net:/usr/obj/usr/src/sys/BK i386 >Description: Update flow-tools port to latest version, 0.64 >How-To-Repeat: >Fix: diff -urN /usr/ports/net/flow-tools/Makefile ./Makefile --- /usr/ports/net/flow-tools/Makefile Fri Feb 21 05:14:40 2003 +++ ./Makefile Sat Mar 15 10:50:38 2003 @@ -6,7 +6,7 @@ # PORTNAME= flow-tools -PORTVERSION= 0.62 +PORTVERSION= 0.64 CATEGORIES= net MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ diff -urN /usr/ports/net/flow-tools/distinfo ./distinfo --- /usr/ports/net/flow-tools/distinfo Tue Nov 19 00:04:19 2002 +++ ./distinfo Sat Mar 15 10:51:27 2003 @@ -1 +1 @@ -MD5 (flow-tools-0.62.tar.gz) = 68ec3cd86903370c019f12593f437f78 +MD5 (flow-tools-0.64.tar.gz) = 7a68697c3ca95fbf0dd621baf6a6fbd6 diff -urN /usr/ports/net/flow-tools/files/patch-configs_Makefile ./files/patch-configs_Makefile --- /usr/ports/net/flow-tools/files/patch-configs_Makefile Tue Nov 19 00:04:19 2002 +++ ./files/patch-configs_Makefile Sat Mar 15 11:04:14 2003 @@ -11,13 +11,13 @@ --- configs/Makefile.in Fri Aug 9 05:06:41 2002 +++ configs/Makefile.in Sat Jan 12 08:04:39 2002 -@@ -81,10 +81,10 @@ +@@ -82,10 +82,10 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ -ftsymdir = $(localstatedir)/sym +ftsymdir = $(localstatedir)/share/flow-tools - ftsym_DATA = asn ip-prot tcp-port + ftsym_DATA = asn ip-prot tcp-port ip-type -ftcfgdir = $(localstatedir)/cfg +ftcfgdir = $(localstatedir)/etc/flow-tools diff -urN /usr/ports/net/flow-tools/files/patch-flow-fanout.c ./files/patch-flow-fanout.c --- /usr/ports/net/flow-tools/files/patch-flow-fanout.c Wed Dec 31 16:00:00 1969 +++ ./files/patch-flow-fanout.c Tue Feb 25 16:28:40 2003 @@ -0,0 +1,14 @@ +--- src/flow-fanout.c.old Wed Feb 26 08:44:26 2003 ++++ src/flow-fanout.c Wed Feb 26 08:43:38 2003 +@@ -873,9 +873,9 @@ + /* see Stevens Unix Network Programming Volume 1 2nd edition page 657 */ + /* conditional from rawsend.c */ + #if defined (__linux__) || (defined (__OpenBSD__) && (OpenBSD > 199702)) +- ip_hdr->ip_len = htons(FT_ENC_IPHDR_LEN+fte.buf_size); ++ ip_hdr->ip_len = htons((FT_ENC_IPHDR_LEN+fte)->buf_size); + #else +- ip_hdr->ip_len = FT_ENC_IPHDR_LEN+fte->buf_size; ++ ip_hdr->ip_len = (FT_ENC_IPHDR_LEN+fte)->buf_size; + #endif + ip_hdr->ip_ttl = peers[j].ttl; + /* use transmit source if loc_addr is not specified */ diff -urN /usr/ports/net/flow-tools/files/patch-ftpaths.h ./files/patch-ftpaths.h --- /usr/ports/net/flow-tools/files/patch-ftpaths.h Tue Nov 19 00:04:19 2002 +++ ./files/patch-ftpaths.h Sat Mar 15 11:08:24 2003 @@ -1,6 +1,6 @@ --- lib/ftpaths.h.in Thu Aug 15 17:28:04 2002 +++ lib/ftpaths.h.in Mon Apr 22 11:29:07 2002 -@@ -29,16 +29,16 @@ +@@ -29,17 +29,17 @@ #ifndef FTPATHS_H #define FTPATHS_H @@ -8,10 +8,12 @@ -#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag" -#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter" -#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat" +-#define FT_PATH_CFG_MASK "@localstatedir@/cfg/mask" +#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map" +#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag" +#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filter" +#define FT_PATH_CFG_STAT "@localstatedir@/etc/flow-tools/stat" ++#define FT_PATH_CFG_MASK "@localstatedir@/etc/flow-tools/mask" -#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot" -#define FT_PATH_SYM_IP_CLASS "@localstatedir@/sym/ip-class" diff -urN /usr/ports/net/flow-tools/pkg-plist ./pkg-plist --- /usr/ports/net/flow-tools/pkg-plist Tue Nov 19 00:04:19 2002 +++ ./pkg-plist Sun Mar 16 23:17:32 2003 @@ -8,6 +8,7 @@ bin/flow-gen bin/flow-header bin/flow-import +bin/flow-mask bin/flow-merge bin/flow-nfilter bin/flow-print @@ -28,6 +29,7 @@ lib/libft.a share/flow-tools/asn share/flow-tools/ip-prot +share/flow-tools/ip-type share/flow-tools/tcp-port @dirrm etc/flow-tools @dirrm share/flow-tools >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message