Date: Tue, 5 Aug 2008 08:40:04 +0900 (JST) From: Tomoyuki Sakurai <cherry@trombik.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stas@FreeBSD.org Subject: ports/126252: [PATCH] net-mgmt/flow-tools: update to 0.68.4 Message-ID: <20080804234004.0FEF91CD0F@spica.trombik.org> Resent-Message-ID: <200808042350.m74No15n057637@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126252 >Category: ports >Synopsis: [PATCH] net-mgmt/flow-tools: update to 0.68.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 04 23:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Tomoyuki Sakurai >Release: FreeBSD 7.0-STABLE amd64 >Organization: >Environment: System: FreeBSD spica.trombik.org 7.0-STABLE FreeBSD 7.0-STABLE #5: Thu Jul 10 22:29:26 JST 2008 >Description: - Update to 0.68.4 from the forked project IMO, the project is considered as a successor (compatibilities, anouncements on Flow-tools list, etc) - Fix ports/125871 - Tested by Volodymyr Kostyrko Added file(s): - files/patch-configs_Makefile.in - files/patch-lib_ftpaths.c Removed file(s): - files/patch-configs_Makefile - files/patch-configure - files/patch-flow-header.c - files/patch-ftpaths.h - files/patch-lib-ftfile.c - files/patch-lib_Makefile.in - files/patch-lib_ftchash.c - files/patch-lib_ftio.c - files/patch-lib_ftlib.h - files/patch-lib_fttlv.c - files/patch-src_Makefile.in - files/patch-src_flow-export.c Port maintainer (stas@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- flow-tools-0.68.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/Makefile /usr/home/cherry/svk/ports/net-mgmt/flow-tools/Makefile --- /usr/ports/net-mgmt/flow-tools/Makefile 2007-11-09 08:09:46.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/Makefile 2008-08-05 08:28:00.000000000 +0900 @@ -6,10 +6,9 @@ # PORTNAME= flow-tools -PORTVERSION= 0.68 -PORTREVISION= 6 +PORTVERSION= 0.68.4 CATEGORIES= net-mgmt -MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= stas@FreeBSD.org COMMENT= Suite of tools and library to work with netflow data @@ -17,6 +16,9 @@ USE_PYTHON_RUN= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--localstatedir="${PREFIX}" +USE_BZIP2= Yes +USE_GMAKE= Yes +USE_LDCONFIG= Yes MAN1= flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1 \ flow-export.1 flow-fanout.1 flow-filter.1 flow-gen.1 \ @@ -44,23 +46,30 @@ FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-capture .if defined(WITH_PGSQL) -CONFIGURE_ARGS+=--with-pgsql="${PREFIX}" +CONFIGURE_ARGS+=--with-postgresql="${PREFIX}" USE_PGSQL= yes +.else +CONFIGURE_ARGS+=--without-postgresql .endif .if defined(WITH_MYSQL) CONFIGURE_ARGS+=--with-mysql="${PREFIX}" USE_MYSQL= yes +.else +CONFIGURE_ARGS+=--without-mysql .endif .if defined(WITH_OPENSSL) +USE_OPENSSL= Yes CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}" +.else +CONFIGURE_ARGS+=--without-openssl .endif post-patch: - ${REINPLACE_CMD}\ - -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \ - -e 's|@localstatedir@/cfg/|${PREFIX}/etc/flow-tools/|' \ + @${REINPLACE_CMD}\ + -e 's|@sysconfdir@/sym/|${PREFIX}/share/flow-tools/|' \ + -e 's|@sysconfdir@/cfg/|${PREFIX}/etc/flow-tools/|' \ ${WRKSRC}/docs/flow-*.1.in ${WRKSRC}/docs/flow-*.html.in pre-su-install: diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/distinfo /usr/home/cherry/svk/ports/net-mgmt/flow-tools/distinfo --- /usr/ports/net-mgmt/flow-tools/distinfo 2006-02-01 10:08:04.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/distinfo 2008-08-01 19:59:14.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (flow-tools-0.68.tar.gz) = c9e0a8b53c79611b6bffcb9d510a5a38 -SHA256 (flow-tools-0.68.tar.gz) = 69d5353b339f917fc141919db042b007d5c8d31c9ad1bc2f989a41aa41d629df -SIZE (flow-tools-0.68.tar.gz) = 987151 +MD5 (flow-tools-0.68.4.tar.bz2) = 5741720ad01b5a83a9bb7eaa991dcbb6 +SHA256 (flow-tools-0.68.4.tar.bz2) = e06a050f19276736cc352e1aeeb52edc92b1abb12ee978430f95e591fd7ef0ca +SIZE (flow-tools-0.68.4.tar.bz2) = 871835 diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-configs_Makefile /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-configs_Makefile --- /usr/ports/net-mgmt/flow-tools/files/patch-configs_Makefile 2005-06-16 05:14:59.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-configs_Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -1,26 +0,0 @@ ---- configs/Makefile.am.orig Tue Jun 7 22:43:47 2005 -+++ configs/Makefile.am Tue Jun 7 22:44:44 2005 -@@ -1,6 +1,6 @@ --ftsymdir=$(localstatedir)/sym -+ftsymdir=$(localstatedir)/share/flow-tools - ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym - --ftcfgdir=$(localstatedir)/cfg -+ftcfgdir=$(localstatedir)/etc/flow-tools - ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg - ---- configs/Makefile.in.orig Tue Jun 7 22:44:14 2005 -+++ configs/Makefile.in Tue Jun 7 22:45:10 2005 -@@ -88,10 +88,10 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --ftsymdir = $(localstatedir)/sym -+ftsymdir = $(localstatedir)/share/flow-tools - ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym - --ftcfgdir = $(localstatedir)/cfg -+ftcfgdir = $(localstatedir)/etc/flow-tools - ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg - subdir = configs - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-configs_Makefile.in /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-configs_Makefile.in --- /usr/ports/net-mgmt/flow-tools/files/patch-configs_Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-configs_Makefile.in 2008-08-02 02:20:53.000000000 +0900 @@ -0,0 +1,14 @@ +--- configs/Makefile.in.orig 2008-03-30 22:08:38.000000000 +0900 ++++ configs/Makefile.in 2008-08-02 02:18:10.000000000 +0900 +@@ -182,9 +182,9 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-ftsymdir = $(sysconfdir)/sym ++ftsymdir = $(sysconfdir)/flow-tools + dist_ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym +-ftcfgdir = $(sysconfdir)/cfg ++ftcfgdir = $(sysconfdir)/flow-tools + dist_ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg + all: all-am + diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-configure /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-configure --- /usr/ports/net-mgmt/flow-tools/files/patch-configure 2006-12-20 07:44:25.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 @@ -1,59 +0,0 @@ ---- configure.orig Wed May 11 18:15:55 2005 -+++ configure Wed Dec 20 01:34:55 2006 -@@ -1662,7 +1662,7 @@ - - - --CFLAGS="-g -Wall" -+CFLAGS="-fPIC" - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -2254,7 +2254,6 @@ - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" - echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 - echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_g+set}" = set; then -@@ -2299,21 +2298,6 @@ - fi - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 --if test "$ac_test_CFLAGS" = set; then -- CFLAGS=$ac_save_CFLAGS --elif test $ac_cv_prog_cc_g = yes; then -- if test "$GCC" = yes; then -- CFLAGS="-g -O2" -- else -- CFLAGS="-g" -- fi --else -- if test "$GCC" = yes; then -- CFLAGS="-O2" -- else -- CFLAGS= -- fi --fi - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 - echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_stdc+set}" = set; then -@@ -3345,7 +3329,7 @@ - - - if test "x$WHERE_PGSQL" != "x"; then -- LIBS="-L$WHERE_PGSQL/lib/pgsql" -+ LIBS="-L$WHERE_PGSQL/lib" - echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5 - echo $ECHO_N "checking for PQsetdbLogin in -lpq... $ECHO_C" >&6 - if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then -@@ -3402,7 +3386,7 @@ - echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6 - if test $ac_cv_lib_pq_PQsetdbLogin = yes; then - -- PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql" -+ PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include" - PGSQLLIB="-lpq" - cat >>confdefs.h <<\_ACEOF - #define HAVE_PGSQL 1 diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-flow-header.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-flow-header.c --- /usr/ports/net-mgmt/flow-tools/files/patch-flow-header.c 2004-08-05 13:10:58.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-flow-header.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- src/flow-header.c.orig Mon Jul 26 13:21:36 2004 -+++ src/flow-header.c Mon Jul 26 13:21:45 2004 -@@ -32,6 +32,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <unistd.h> - - void usage(void); - diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-ftpaths.h /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-ftpaths.h --- /usr/ports/net-mgmt/flow-tools/files/patch-ftpaths.h 2004-07-08 07:17:17.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-ftpaths.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,62 +0,0 @@ ---- lib/ftpaths.h.orig Wed Dec 3 22:19:47 2003 -+++ lib/ftpaths.h Wed Jul 7 15:06:42 2004 -@@ -29,17 +29,17 @@ - #ifndef FTPATHS_H - #define FTPATHS_H - --#define FT_PATH_CFG_MAP "/usr/local/netflow/var/cfg/map.cfg" --#define FT_PATH_CFG_TAG "/usr/local/netflow/var/cfg/tag.cfg" --#define FT_PATH_CFG_FILTER "/usr/local/netflow/var/cfg/filter.cfg" --#define FT_PATH_CFG_STAT "/usr/local/netflow/var/cfg/stat.cfg" --#define FT_PATH_CFG_MASK "/usr/local/netflow/var/cfg/mask.cfg" --#define FT_PATH_CFG_XLATE "/usr/local/netflow/var/cfg/xlate.cfg" -+#define FT_PATH_CFG_MAP "/usr/local/etc/flow-tools/map.cfg" -+#define FT_PATH_CFG_TAG "/usr/local/etc/flow-tools/tag.cfg" -+#define FT_PATH_CFG_FILTER "/usr/local/etc/flow-tools/filter.cfg" -+#define FT_PATH_CFG_STAT "/usr/local/etc/flow-tools/stat.cfg" -+#define FT_PATH_CFG_MASK "/usr/local/etc/flow-tools/mask.cfg" -+#define FT_PATH_CFG_XLATE "/usr/local/etc/flow-tools/xlate.cfg" - --#define FT_PATH_SYM_IP_PROT "/usr/local/netflow/var/sym/ip-prot.sym" --#define FT_PATH_SYM_IP_TYPE "/usr/local/netflow/var/sym/ip-type.sym" --#define FT_PATH_SYM_TCP_PORT "/usr/local/netflow/var/sym/tcp-port.sym" --#define FT_PATH_SYM_ASN "/usr/local/netflow/var/sym/asn.sym" --#define FT_PATH_SYM_TAG "/usr/local/netflow/var/sym/tag.sym" -+#define FT_PATH_SYM_IP_PROT "/usr/local/share/flow-tools/ip-prot.sym" -+#define FT_PATH_SYM_IP_TYPE "/usr/local/share/flow-tools/ip-type.sym" -+#define FT_PATH_SYM_TCP_PORT "/usr/local/share/flow-tools/tcp-port.sym" -+#define FT_PATH_SYM_ASN "/usr/local/share/flow-tools/asn.sym" -+#define FT_PATH_SYM_TAG "/usr/local/share/flow-tools/tag.sym" - - #endif /* FTPATHS_H */ ---- lib/ftpaths.h.in.orig Tue Nov 11 08:49:14 2003 -+++ lib/ftpaths.h.in Wed Jul 7 15:05:45 2004 -@@ -29,17 +29,17 @@ - #ifndef FTPATHS_H - #define FTPATHS_H - --#define FT_PATH_CFG_MAP "@localstatedir@/cfg/map.cfg" --#define FT_PATH_CFG_TAG "@localstatedir@/cfg/tag.cfg" --#define FT_PATH_CFG_FILTER "@localstatedir@/cfg/filter.cfg" --#define FT_PATH_CFG_STAT "@localstatedir@/cfg/stat.cfg" --#define FT_PATH_CFG_MASK "@localstatedir@/cfg/mask.cfg" --#define FT_PATH_CFG_XLATE "@localstatedir@/cfg/xlate.cfg" -+#define FT_PATH_CFG_MAP "@localstatedir@/etc/flow-tools/map.cfg" -+#define FT_PATH_CFG_TAG "@localstatedir@/etc/flow-tools/tag.cfg" -+#define FT_PATH_CFG_FILTER "@localstatedir@/etc/flow-tools/filter.cfg" -+#define FT_PATH_CFG_STAT "@localstatedir@/etc/flow-tools/stat.cfg" -+#define FT_PATH_CFG_MASK "@localstatedir@/etc/flow-tools/mask.cfg" -+#define FT_PATH_CFG_XLATE "@localstatedir@/etc/flow-tools/xlate.cfg" - --#define FT_PATH_SYM_IP_PROT "@localstatedir@/sym/ip-prot.sym" --#define FT_PATH_SYM_IP_TYPE "@localstatedir@/sym/ip-type.sym" --#define FT_PATH_SYM_TCP_PORT "@localstatedir@/sym/tcp-port.sym" --#define FT_PATH_SYM_ASN "@localstatedir@/sym/asn.sym" --#define FT_PATH_SYM_TAG "@localstatedir@/sym/tag.sym" -+#define FT_PATH_SYM_IP_PROT "@localstatedir@/share/flow-tools/ip-prot.sym" -+#define FT_PATH_SYM_IP_TYPE "@localstatedir@/share/flow-tools/ip-type.sym" -+#define FT_PATH_SYM_TCP_PORT "@localstatedir@/share/flow-tools/tcp-port.sym" -+#define FT_PATH_SYM_ASN "@localstatedir@/share/flow-tools/asn.sym" -+#define FT_PATH_SYM_TAG "@localstatedir@/share/flow-tools/tag.sym" - - #endif /* FTPATHS_H */ diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib-ftfile.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib-ftfile.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib-ftfile.c 2007-11-09 08:09:46.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib-ftfile.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,109 +0,0 @@ ---- lib/ftfile.c.orig 2003-02-13 05:38:42.000000000 +0300 -+++ lib/ftfile.c 2007-11-09 01:07:46.000000000 +0300 -@@ -311,7 +311,7 @@ - int ftfile_expire (struct ftfile_entries *fte, int doit, int curbytes) - { - u_int i; -- struct ftfile_entry *n1; -+ struct ftfile_entry *n1, *n2; - u_int64 bytes; - - /* -@@ -323,15 +323,20 @@ - bytes = 0; - - if (fte->max_files && (fte->num_files > fte->max_files)) { -+ n2 = NULL; - FT_TAILQ_FOREACH(n1, &fte->head, chain) { -+ if (n2 != NULL) { -+ ftfile_entry_free(n2); -+ n2 = NULL; -+ } - fterr_info("remove/1 %s", n1->name); - bytes += n1->size; - ++i; - if (doit) { -+ n2 = n1; - FT_TAILQ_REMOVE(&fte->head, n1, chain); - if (unlink(n1->name) == -1) - fterr_warn("unlink(%s)", n1->name); -- ftfile_entry_free(n1); - } /* doit */ - if ((fte->num_files - i) <= fte->max_files) - break; -@@ -340,6 +345,10 @@ - fte->num_files -= i; - fte->num_bytes -= bytes; - } /* doit */ -+ if (n2 != NULL) { -+ ftfile_entry_free(n2); -+ n2 = NULL; -+ } - } /* if */ - - if (debug) -@@ -354,15 +363,20 @@ - */ - - if (fte->max_bytes && (fte->num_bytes+curbytes > fte->max_bytes)) { -+ n2 = NULL; - FT_TAILQ_FOREACH(n1, &fte->head, chain) { -+ if (n2 != NULL) { -+ ftfile_entry_free(n2); -+ n2 = NULL; -+ } - fterr_info("remove/2 %s", n1->name); - bytes += n1->size; - ++i; - if (doit) { -+ n2 = n1; - FT_TAILQ_REMOVE(&fte->head, n1, chain); - if (unlink(n1->name) == -1) - fterr_warn("unlink(%s)", n1->name); -- ftfile_entry_free(n1); - } /* doit */ - if ((fte->num_bytes+curbytes - bytes) <= fte->max_bytes) - break; -@@ -371,6 +385,10 @@ - fte->num_files -= i; - fte->num_bytes -= bytes; - } /* doit */ -+ if (n2 != NULL) { -+ ftfile_entry_free(n2); -+ n2 = NULL; -+ } - } /* if */ - - if (debug) -@@ -499,7 +517,7 @@ - * returns -1 on error - * - */ --int ftfile_mkpath(u_int32 ftime, int nest) -+int ftfile_mkpath(time_t ftime, int nest) - { - struct tm *tm; - char buf[32]; -@@ -762,13 +780,19 @@ - { - struct ftfile_entry *n1, *n2; - -+ n2 = NULL; - FT_TAILQ_FOREACH(n1, &fte->head, chain) { -+ if (n2 != NULL) { -+ ftfile_entry_free(n2); -+ n2 = NULL; -+ } - FT_TAILQ_REMOVE(&fte->head, n1, chain); - n2 = n1; -- n1 = FT_TAILQ_NEXT(n1, chain); -+ } -+ -+ if (n2 != NULL) { - ftfile_entry_free(n2); -- if (!n1) -- break; -+ n2 = NULL; - } - - } /* ftfile_free */ diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_Makefile.in /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_Makefile.in --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_Makefile.in 2006-12-20 07:44:25.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_Makefile.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- lib/Makefile.in.orig Wed Dec 20 01:38:19 2006 -+++ lib/Makefile.in Wed Dec 20 01:38:25 2006 -@@ -91,7 +91,7 @@ - - #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs - #AM_CFLAGS=-O2 --AM_CFLAGS = -g -Wall -+#AM_CFLAGS = -g -Wall - - DEFS = -I. -I$(srcdir)/lib - diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftchash.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftchash.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftchash.c 2006-10-02 18:11:16.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftchash.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- lib/ftchash.c.orig Mon Oct 2 12:30:55 2006 -+++ lib/ftchash.c Mon Oct 2 12:31:29 2006 -@@ -326,7 +326,7 @@ - (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) { - - ret = ftch->traverse_rec; -- (char*)ftch->traverse_rec += ftch->d_size; -+ ftch->traverse_rec = (char *)ftch->traverse_rec + ftch->d_size; - return ret; - - } else { diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftio.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftio.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftio.c 2006-10-02 18:11:16.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftio.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- lib/ftio.c.orig Mon Oct 2 12:26:19 2006 -+++ lib/ftio.c Mon Oct 2 12:27:53 2006 -@@ -2267,7 +2267,7 @@ - break; - - nleft -= nread; -- (char*)ptr += nread; -+ ptr = (char *)ptr + nread; - } - return (nbytes - nleft); - } /* readn */ -@@ -2292,7 +2292,7 @@ - return(nwritten); /* error */ - - nleft -= nwritten; -- (char*)ptr += nwritten; -+ ptr = (char *)ptr + nwritten; - } - return(nbytes - nleft); - } /* writen */ diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftlib.h /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftlib.h --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftlib.h 2007-11-09 08:09:46.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftlib.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,24 +0,0 @@ ---- lib/ftlib.h.orig Wed Sep 26 16:21:50 2007 -+++ lib/ftlib.h Wed Sep 26 16:21:23 2007 -@@ -416,8 +416,8 @@ - }; - - struct fttime { -- u_int32 secs; -- u_int32 msecs; -+ time_t secs; -+ time_t msecs; - }; - - struct ftver { -@@ -2710,7 +2710,7 @@ - int ftfile_dump(struct ftfile_entries *fte); - struct ftfile_entry *ftfile_entry_new(int len); - void ftfile_entry_free(struct ftfile_entry *entry); --int ftfile_mkpath(u_int32 ftime, int nest); -+int ftfile_mkpath(time_t ftime, int nest); - void ftfile_pathname(char *buf, int bsize, int nest, struct ftver ftv, - int done, u_int32 ftime); - - ---XsQoSWH+UP9D9v3l-- diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftpaths.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftpaths.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftpaths.c 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftpaths.c 2008-08-02 02:21:50.000000000 +0900 @@ -0,0 +1,32 @@ +--- lib/ftpaths.c.orig 2008-08-02 02:19:52.000000000 +0900 ++++ lib/ftpaths.c 2008-08-02 02:20:47.000000000 +0900 +@@ -1,18 +1,18 @@ + #include <ftlib.h> + + static const char* ftpaths[] = { +- [_FT_PATH_CFG_MAP] = SYSCONFDIR "/cfg/map.cfg", +- [_FT_PATH_CFG_TAG] = SYSCONFDIR "/cfg/tag.cfg", +- [_FT_PATH_CFG_FILTER] = SYSCONFDIR "/cfg/filter.cfg", +- [_FT_PATH_CFG_STAT] = SYSCONFDIR "/cfg/stat.cfg", +- [_FT_PATH_CFG_MASK] = SYSCONFDIR "/cfg/mask.cfg", +- [_FT_PATH_CFG_XLATE] = SYSCONFDIR "/cfg/xlate.cfg", ++ [_FT_PATH_CFG_MAP] = SYSCONFDIR "/flow-tools/map.cfg", ++ [_FT_PATH_CFG_TAG] = SYSCONFDIR "/flow-tools/tag.cfg", ++ [_FT_PATH_CFG_FILTER] = SYSCONFDIR "/flow-tools/filter.cfg", ++ [_FT_PATH_CFG_STAT] = SYSCONFDIR "/flow-tools/stat.cfg", ++ [_FT_PATH_CFG_MASK] = SYSCONFDIR "/flow-tools/mask.cfg", ++ [_FT_PATH_CFG_XLATE] = SYSCONFDIR "/flow-tools/xlate.cfg", + +- [_FT_PATH_SYM_IP_PROT] = SYSCONFDIR "/sym/ip-prot.sym", +- [_FT_PATH_SYM_IP_TYPE] = SYSCONFDIR "/sym/ip-type.sym", +- [_FT_PATH_SYM_TCP_PORT] = SYSCONFDIR "/sym/tcp-port.sym", +- [_FT_PATH_SYM_ASN] = SYSCONFDIR "/sym/asn.sym", +- [_FT_PATH_SYM_TAG] = SYSCONFDIR "/sym/tag.sym" ++ [_FT_PATH_SYM_IP_PROT] = SYSCONFDIR "/flow-tools/ip-prot.sym", ++ [_FT_PATH_SYM_IP_TYPE] = SYSCONFDIR "/flow-tools/ip-type.sym", ++ [_FT_PATH_SYM_TCP_PORT] = SYSCONFDIR "/flow-tools/tcp-port.sym", ++ [_FT_PATH_SYM_ASN] = SYSCONFDIR "/flow-tools/asn.sym", ++ [_FT_PATH_SYM_TAG] = SYSCONFDIR "/flow-tools/tag.sym" + }; + + const char *ft_get_path(enum ft_config_path pathid) { diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftsym.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftsym.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_ftsym.c 2006-11-08 10:06:16.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_ftsym.c 2008-08-02 02:20:53.000000000 +0900 @@ -1,6 +1,6 @@ ---- lib/ftsym.c.orig Wed Nov 8 03:51:51 2006 -+++ lib/ftsym.c Wed Nov 8 03:51:56 2006 -@@ -35,6 +35,7 @@ +--- lib/ftsym.c.orig 2008-01-28 05:48:49.000000000 +0900 ++++ lib/ftsym.c 2008-08-02 02:18:10.000000000 +0900 +@@ -46,6 +46,7 @@ #include <ctype.h> #include <stddef.h> #include <stdlib.h> diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_fttlv.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_fttlv.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_fttlv.c 2006-10-02 18:11:16.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_fttlv.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,100 +0,0 @@ ---- lib/fttlv.c.orig Mon Oct 2 12:27:59 2006 -+++ lib/fttlv.c Mon Oct 2 12:30:50 2006 -@@ -68,10 +68,10 @@ - } - - bcopy(&t, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&len, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&v, buf, 4); - -@@ -107,10 +107,10 @@ - } - - bcopy(&t, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&len, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&v, buf, 2); - -@@ -145,10 +145,10 @@ - } - - bcopy(&t, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&len, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&v, buf, 1); - -@@ -183,10 +183,10 @@ - } - - bcopy(&t, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&len, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(v, buf, len); - -@@ -230,16 +230,16 @@ - return -1; - - bcopy(&t, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&len, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&ip, buf, 4); -- (char*)buf += 4; -+ buf = (char *)buf + 4; - - bcopy(&ifIndex, buf, 2); -- (char*)buf += 2; -+ buf = (char *)buf + 2; - - bcopy(name, buf, n); - -@@ -287,19 +287,19 @@ - } - - bcopy(&t, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&len, buf, 2); -- (char*)buf+= 2; -+ buf = (char *)buf + 2; - - bcopy(&ip, buf, 4); -- (char*)buf += 4; -+ buf = (char *)buf + 4; - - bcopy(&entries, buf, 2); -- (char*)buf += 2; -+ buf = (char *)buf + 2; - - bcopy(ifIndex_list, buf, esize); -- (char*)buf += esize; -+ buf = (char *)buf + esize; - - bcopy(name, buf, n); - diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-lib_support.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_support.c --- /usr/ports/net-mgmt/flow-tools/files/patch-lib_support.c 2006-11-08 10:06:16.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-lib_support.c 2008-08-02 02:20:53.000000000 +0900 @@ -1,6 +1,6 @@ ---- lib/support.c.orig Wed Nov 8 03:50:31 2006 -+++ lib/support.c Wed Nov 8 03:51:27 2006 -@@ -40,6 +40,7 @@ +--- lib/support.c.orig 2008-02-21 11:31:42.000000000 +0900 ++++ lib/support.c 2008-08-02 02:18:10.000000000 +0900 +@@ -44,6 +44,7 @@ #include <stdio.h> #include <stdlib.h> #include <syslog.h> diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-src_Makefile.in /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-src_Makefile.in --- /usr/ports/net-mgmt/flow-tools/files/patch-src_Makefile.in 2006-12-20 07:44:25.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-src_Makefile.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Wed Dec 20 01:37:38 2006 -+++ src/Makefile.in Wed Dec 20 01:37:57 2006 -@@ -97,7 +97,7 @@ - - #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs - #AM_CFLAGS=-O2 --AM_CFLAGS = -g -Wall -+#AM_CFLAGS = -g -Wall - - bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \ - flow-send flow-receive flow-gen flow-expire \ diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-src_flow-export.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-src_flow-export.c --- /usr/ports/net-mgmt/flow-tools/files/patch-src_flow-export.c 2007-07-10 23:17:21.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-src_flow-export.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- src/flow-export.c.orig Tue Jul 10 17:59:28 2007 -+++ src/flow-export.c Tue Jul 10 18:00:22 2007 -@@ -961,7 +961,7 @@ - - int fmt_xfields_type(char *buf, u_int64 xfield) - { -- int comma; -+ int comma = 0; - - buf[0] = 0; - diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/files/patch-src_flow-fanout.c /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-src_flow-fanout.c --- /usr/ports/net-mgmt/flow-tools/files/patch-src_flow-fanout.c 2005-06-16 05:14:59.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/files/patch-src_flow-fanout.c 2008-08-02 02:20:53.000000000 +0900 @@ -1,6 +1,6 @@ ---- src/flow-fanout.c.orig Tue Jun 7 22:52:16 2005 -+++ src/flow-fanout.c Tue Jun 7 22:52:39 2005 -@@ -855,6 +855,7 @@ +--- src/flow-fanout.c.orig 2008-01-28 05:48:55.000000000 +0900 ++++ src/flow-fanout.c 2008-08-02 02:18:10.000000000 +0900 +@@ -854,6 +854,7 @@ } /* if FD_ISSET */ skip1: diff -ruN --exclude=CVS /usr/ports/net-mgmt/flow-tools/pkg-plist /usr/home/cherry/svk/ports/net-mgmt/flow-tools/pkg-plist --- /usr/ports/net-mgmt/flow-tools/pkg-plist 2006-10-02 18:11:16.000000000 +0900 +++ /usr/home/cherry/svk/ports/net-mgmt/flow-tools/pkg-plist 2008-08-05 08:30:10.000000000 +0900 @@ -1,43 +1,47 @@ bin/flow-capture bin/flow-cat +bin/flow-stat +bin/flow-print bin/flow-dscan +bin/flow-send +bin/flow-receive +bin/flow-gen bin/flow-expire -bin/flow-export -bin/flow-fanout bin/flow-filter -bin/flow-gen +bin/flow-export bin/flow-header -bin/flow-import -bin/flow-log2rrd -bin/flow-mask +bin/flow-split +bin/flow-xlate bin/flow-merge +bin/flow-import +bin/flow-fanout +bin/flow-tag bin/flow-nfilter -bin/flow-print -bin/flow-receive bin/flow-report -bin/flow-rpt2rrd +bin/flow-mask +bin/flow-log2rrd bin/flow-rptfmt -bin/flow-send -bin/flow-split -bin/flow-stat -bin/flow-tag -bin/flow-xlate -etc/flow-tools/filter.cfg +bin/flow-rpt2rrd etc/flow-tools/map.cfg -etc/flow-tools/mask.cfg -etc/flow-tools/stat.cfg etc/flow-tools/tag.cfg +etc/flow-tools/filter.cfg +etc/flow-tools/stat.cfg +etc/flow-tools/mask.cfg etc/flow-tools/xlate.cfg -include/ftconfig.h +etc/flow-tools/ip-prot.sym +etc/flow-tools/ip-type.sym +etc/flow-tools/tcp-port.sym +etc/flow-tools/asn.sym +etc/flow-tools/tag.sym include/ftlib.h -include/ftpaths.h include/ftqueue.h -include/radix.h +lib/libft.so.0 +lib/libft.so +lib/libft.la lib/libft.a -%%DATADIR%%/asn.sym -%%DATADIR%%/ip-prot.sym -%%DATADIR%%/ip-type.sym -%%DATADIR%%/tag.sym -%%DATADIR%%/tcp-port.sym -@dirrm %%DATADIR%% -@dirrm etc/flow-tools +%%DATADIR%%/asn2c +%%DATADIR%%/gasn +%%DATADIR%%/gprot +%%DATADIR%%/gserv +@dirrmtry %%DATADIR%% +@dirrmtry etc/flow-tools --- flow-tools-0.68.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080804234004.0FEF91CD0F>