OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-May-2005 19:51:34
Branch: HEAD Handle: 2005051518513300
Modified files:
openpkg-src/flowtools flowtools.patch flowtools.spec
Log:
upgrading package: flowtools 0.67 -> 0.68
Summary:
Revision Changes Path
1.10 +160 -222 openpkg-src/flowtools/flowtools.patch
1.15 +2 -2 openpkg-src/flowtools/flowtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 flowtools.patch
--- openpkg-src/flowtools/flowtools.patch 25 Dec 2004 12:38:43 -0000
1.9
+++ openpkg-src/flowtools/flowtools.patch 15 May 2005 17:51:33 -0000
1.10
@@ -1,10 +1,10 @@
-Index: flow-tools-0.67/configs/Makefile.in
---- flow-tools-0.67/configs/Makefile.in.orig 2004-12-25 10:38:17 +0100
-+++ flow-tools-0.67/configs/Makefile.in 2004-12-25 10:40:33 +0100
-@@ -117,10 +117,10 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+Index: flow-tools-0.68/configs/Makefile.in
+--- flow-tools-0.68/configs/Makefile.in.orig 2005-05-11 16:20:16 +0200
++++ flow-tools-0.68/configs/Makefile.in 2005-05-15 19:46:26 +0200
+@@ -88,10 +88,10 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
-ftsymdir = $(localstatedir)/sym
+ftsymdir = $(datadir)
ftsym_DATA = ip-prot.sym ip-type.sym tcp-port.sym asn.sym tag.sym
@@ -14,50 +14,18 @@
ftcfg_DATA = map.cfg tag.cfg filter.cfg stat.cfg mask.cfg xlate.cfg
subdir = configs
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-Index: flow-tools-0.67/lib/ftpaths.h.in
---- flow-tools-0.67/lib/ftpaths.h.in.orig 2003-11-11 17:49:14 +0100
-+++ flow-tools-0.67/lib/ftpaths.h.in 2004-12-25 10:35:31 +0100
-@@ -29,17 +29,17 @@
- #ifndef FTPATHS_H
- #define FTPATHS_H
+Index: flow-tools-0.68/configure
+--- flow-tools-0.68/configure.orig 2005-05-11 16:15:55 +0200
++++ flow-tools-0.68/configure 2005-05-15 19:45:32 +0200
+@@ -1662,7 +1662,6 @@
--#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 "@sysconfdir@/map.cfg"
-+#define FT_PATH_CFG_TAG "@sysconfdir@/tag.cfg"
-+#define FT_PATH_CFG_FILTER "@sysconfdir@/filter.cfg"
-+#define FT_PATH_CFG_STAT "@sysconfdir@/stat.cfg"
-+#define FT_PATH_CFG_MASK "@sysconfdir@/mask.cfg"
-+#define FT_PATH_CFG_XLATE "@sysconfdir@/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 "@datadir@/ip-prot.sym"
-+#define FT_PATH_SYM_IP_TYPE "@datadir@/ip-type.sym"
-+#define FT_PATH_SYM_TCP_PORT "@datadir@/tcp-port.sym"
-+#define FT_PATH_SYM_ASN "@datadir@/asn.sym"
-+#define FT_PATH_SYM_TAG "@datadir@/tag.sym"
-
- #endif /* FTPATHS_H */
-Index: flow-tools-0.67/configure
---- flow-tools-0.67/configure.orig 2003-12-04 07:19:41 +0100
-+++ flow-tools-0.67/configure 2004-12-24 21:23:56 +0100
-@@ -1674,7 +1674,6 @@
- ac_config_headers="$ac_config_headers
lib/ftconfig.h:lib/ftconfig.h.in"
-CFLAGS="-g -Wall"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3209,7 +3208,7 @@
+@@ -3204,7 +3203,7 @@
if test "x$WHERE_MYSQL" != "x"; then
@@ -66,8 +34,8 @@
echo "$as_me:$LINENO: checking for my_init in -lmysqlclient" >&5
echo $ECHO_N "checking for my_init in -lmysqlclient... $ECHO_C" >&6
if test "${ac_cv_lib_mysqlclient_my_init+set}" = set; then
-@@ -3279,7 +3278,7 @@
- fi
+@@ -3345,7 +3344,7 @@
+
if test "x$WHERE_PGSQL" != "x"; then
- LIBS="-L$WHERE_PGSQL/lib/pgsql"
@@ -75,7 +43,7 @@
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
-@@ -3336,7 +3335,7 @@
+@@ -3402,7 +3401,7 @@
echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6
if test $ac_cv_lib_pq_PQsetdbLogin = yes; then
@@ -84,9 +52,9 @@
PGSQLLIB="-lpq"
cat >>confdefs.h <<\_ACEOF
#define HAVE_PGSQL 1
-Index: flow-tools-0.67/docs/flow-capture.1.in
---- flow-tools-0.67/docs/flow-capture.1.in.orig 2003-11-29 07:41:31
+0100
-+++ flow-tools-0.67/docs/flow-capture.1.in 2004-12-17 19:48:35 +0100
+Index: flow-tools-0.68/docs/flow-capture.1.in
+--- flow-tools-0.68/docs/flow-capture.1.in.orig 2004-01-02 22:26:21
+0100
++++ flow-tools-0.68/docs/flow-capture.1.in 2005-05-15 19:45:32 +0200
@@ -123,7 +123,7 @@
Configure the number of times flow-capture will create a new file per day\&.
The default is 95, or every 15 minutes\&.
@@ -109,92 +77,75 @@
.PP
Receive flows from any exporter on port 9800\&. Do not perform any flow
file space management\&. Store the exports in /flows/krc4\&. Emit a stat
-Index: flow-tools-0.67/src/flow-cat.c
---- flow-tools-0.67/src/flow-cat.c.orig 2003-04-02 20:03:01 +0200
-+++ flow-tools-0.67/src/flow-cat.c 2004-12-17 17:46:49 +0100
-@@ -550,7 +550,7 @@
- if (done)
- break;
-
--next_file:
-+next_file: continue;
-
- } /* FOREACH filename in dir */
-
-Index: flow-tools-0.67/src/flow-dscan.c
---- flow-tools-0.67/src/flow-dscan.c.orig 2003-11-25 11:14:27 +0100
-+++ flow-tools-0.67/src/flow-dscan.c 2004-12-17 17:46:49 +0100
-@@ -559,7 +559,7 @@
- if (ds.ager_timeout && (!(total_flows % 1000)))
- ager(&ds, total_flows32);
-
--skip2:
-+skip2: continue;
-
-
- } /* while rec */
-@@ -805,7 +805,7 @@
- ager_i = 0;
- fterr_info("ager: reset hash run");
-
--skip3:
-+skip3: return;
-
- } /* ager */
-
-Index: flow-tools-0.67/src/flow-fanout.c
---- flow-tools-0.67/src/flow-fanout.c.orig 2003-12-01 00:38:37 +0100
-+++ flow-tools-0.67/src/flow-fanout.c 2004-12-25 13:32:08 +0100
-@@ -412,6 +412,7 @@
- /* default UDP listen port is FT_PORT */
- ftnet.dst_port = (ftpi.dst_port) ? ftpi.dst_port : FT_PORT;
-
-+ ftnet.loc_addr.sin_family = AF_INET;
- ftnet.loc_addr.sin_addr.s_addr = htonl(ftpi.loc_ip);
- ftnet.loc_addr.sin_port = htons(ftnet.dst_port);
+Index: flow-tools-0.68/lib/ftpaths.h.in
+--- flow-tools-0.68/lib/ftpaths.h.in.orig 2003-11-11 17:49:14 +0100
++++ flow-tools-0.68/lib/ftpaths.h.in 2005-05-15 19:45:32 +0200
+@@ -29,17 +29,17 @@
+ #ifndef FTPATHS_H
+ #define FTPATHS_H
-@@ -486,7 +487,7 @@
- /* unicast bind -- multicast support */
- if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
- sizeof(ftnet.loc_addr)) < 0)
-- fterr_err(1, "bind()");
-+ fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
+-#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 "@sysconfdir@/map.cfg"
++#define FT_PATH_CFG_TAG "@sysconfdir@/tag.cfg"
++#define FT_PATH_CFG_FILTER "@sysconfdir@/filter.cfg"
++#define FT_PATH_CFG_STAT "@sysconfdir@/stat.cfg"
++#define FT_PATH_CFG_MASK "@sysconfdir@/mask.cfg"
++#define FT_PATH_CFG_XLATE "@sysconfdir@/xlate.cfg"
- } /* not multicast group */
+-#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 "@datadir@/ip-prot.sym"
++#define FT_PATH_SYM_IP_TYPE "@datadir@/ip-type.sym"
++#define FT_PATH_SYM_TCP_PORT "@datadir@/tcp-port.sym"
++#define FT_PATH_SYM_ASN "@datadir@/asn.sym"
++#define FT_PATH_SYM_TAG "@datadir@/tag.sym"
-@@ -499,7 +500,7 @@
- /* unicast bind -- no multicast support */
- if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
- sizeof(ftnet.loc_addr)) < 0)
-- fterr_err(1, "bind()");
-+ fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
+ #endif /* FTPATHS_H */
+Index: flow-tools-0.68/lib/support.c
+--- flow-tools-0.68/lib/support.c.orig 2003-02-13 03:38:43 +0100
++++ flow-tools-0.68/lib/support.c 2005-05-15 19:45:32 +0200
+@@ -500,26 +500,19 @@
+ int write_pidfile(int pid, char *file, u_int16 port)
+ {
+ int fd, len;
+- char str[16], *c;
++ char str[16];
+
+- if (!(c = (char*)malloc(strlen(file)+16)))
+- return -1;
+-
+- sprintf(c, "%s.%d", file, (int)port);
+-
+ len = sprintf(str, "%u\n", (unsigned)pid);
- #endif /* IP_ADD_MEMBERSHIP */
+- if ((fd = open(c, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
+- fterr_warn("open(%s)", c);
+- free (c);
++ if ((fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
++ fterr_warn("open(%s)", file);
+ return -1;
+ }
+
+
+ if (write(fd, str, len) != len) {
+- fterr_warn("write(%s)", c);
++ fterr_warn("write(%s)", file);
+ close (fd);
+- free (c);
+ return -1;
+ }
-@@ -839,7 +840,7 @@
-
- } /* fte.buf_size */
-
--skip1:
-+skip1: ;
-
- } /* if FD_ISSET */
-
-Index: flow-tools-0.67/src/flow-receive.c
---- flow-tools-0.67/src/flow-receive.c.orig 2003-11-25 06:37:04 +0100
-+++ flow-tools-0.67/src/flow-receive.c 2004-12-17 17:46:49 +0100
-@@ -732,7 +732,7 @@
-
- } /* for */
-
--skip1:
-+skip1: continue;
-
- } /* if FD_ISSET */
-
-Index: flow-tools-0.67/src/flow-export.c
---- flow-tools-0.67/src/flow-export.c.orig 2003-12-04 06:55:31 +0100
-+++ flow-tools-0.67/src/flow-export.c 2004-12-24 21:33:22 +0100
+Index: flow-tools-0.68/src/flow-export.c
+--- flow-tools-0.68/src/flow-export.c.orig 2004-03-31 05:11:14 +0200
++++ flow-tools-0.68/src/flow-export.c 2005-05-15 19:45:32 +0200
@@ -51,12 +51,12 @@
#include <mysql.h>
@@ -233,7 +184,7 @@
#endif /* PGSQL*/
-@@ -694,12 +694,12 @@
+@@ -695,12 +695,12 @@
MYSQL mysql;
@@ -252,7 +203,7 @@
/* parse URI string */
-@@ -758,10 +758,6 @@
+@@ -759,10 +759,6 @@
strcat (query, values);
strcat (query, ")");
@@ -263,7 +214,7 @@
if (mysql_real_query(&mysql, query, strlen(query)) != 0)
fterr_warnx("mysql_real_query(): %s", mysql_error(&mysql));
-@@ -871,12 +867,12 @@
+@@ -872,12 +868,12 @@
PGconn *conn;
PGresult *res;
@@ -282,7 +233,7 @@
/* parse URI string */
-@@ -929,10 +925,6 @@
+@@ -930,10 +926,6 @@
strcat (query, values);
strcat (query, ")");
@@ -293,43 +244,57 @@
res = PQexec(conn, query);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
PQclear(res);
-Index: flow-tools-0.67/lib/support.c
---- flow-tools-0.67/lib/support.c.orig 2003-02-13 03:38:43 +0100
-+++ flow-tools-0.67/lib/support.c 2004-12-17 23:17:21 +0100
-@@ -500,26 +500,19 @@
- int write_pidfile(int pid, char *file, u_int16 port)
- {
- int fd, len;
-- char str[16], *c;
-+ char str[16];
-
-- if (!(c = (char*)malloc(strlen(file)+16)))
-- return -1;
--
-- sprintf(c, "%s.%d", file, (int)port);
--
- len = sprintf(str, "%u\n", (unsigned)pid);
+Index: flow-tools-0.68/src/flow-fanout.c
+--- flow-tools-0.68/src/flow-fanout.c.orig 2005-05-10 17:52:52 +0200
++++ flow-tools-0.68/src/flow-fanout.c 2005-05-15 19:49:06 +0200
+@@ -498,7 +498,7 @@
+ /* unicast bind -- multicast support */
+ if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
+ sizeof(ftnet.loc_addr)) < 0)
+- fterr_err(1, "bind(loc_addr)");
++ fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
-- if ((fd = open(c, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
-- fterr_warn("open(%s)", c);
-- free (c);
-+ if ((fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0 ) {
-+ fterr_warn("open(%s)", file);
- return -1;
- }
+ } /* not multicast group */
+@@ -511,7 +511,7 @@
+ /* unicast bind -- no multicast support */
+ if (bind(ftnet.fd, (struct sockaddr*)&ftnet.loc_addr,
+ sizeof(ftnet.loc_addr)) < 0)
+- fterr_err(1, "bind(loc_addr)");
++ fterr_err(1, "bind(%s)", inet_ntoa(ftnet.loc_addr.sin_addr));
- if (write(fd, str, len) != len) {
-- fterr_warn("write(%s)", c);
-+ fterr_warn("write(%s)", file);
- close (fd);
-- free (c);
- return -1;
- }
+ #endif /* IP_ADD_MEMBERSHIP */
+
+Index: flowextract-2.5/grammar.y
+--- flowextract-2.5/grammar.y.orig 2003-04-28 20:22:02 +0200
++++ flowextract-2.5/grammar.y 2005-05-15 19:45:32 +0200
+@@ -25,6 +25,9 @@
+ #include "timesub.h"
+ #include "stdunix.h"
+
++void yyerror(char *msg);
++unsigned long getmask(unsigned long addr);
++
+ extern int parse_error;
+ #define TCPDATA 6
+ #define UDPDATA 17
+@@ -1159,10 +1162,10 @@
+ };
+
+ void
+-yyerror()
++yyerror(char *msg)
+ {
+- fprintf(stderr, "\"%s\", line %d: syntax error.\n",
+- getfilename(), getlinenum());
++ fprintf(stderr, "\"%s\", line %d: syntax error: %s\n",
++ getfilename(), getlinenum(), msg);
+ parse_error = 1;
+ }
Index: flowextract-2.5/hosts.c
---- flowextract-2.5/hosts.c.orig 2003-04-28 20:22:02.000000000 +0200
-+++ flowextract-2.5/hosts.c 2004-12-23 14:15:53.786366142 +0100
+--- flowextract-2.5/hosts.c.orig 2003-04-28 20:22:02 +0200
++++ flowextract-2.5/hosts.c 2005-05-15 19:45:32 +0200
@@ -24,7 +24,7 @@
static int hnc_init = 0;
static unsigned long hit = 0, miss = 0, coll = 0;
@@ -339,40 +304,9 @@
{
printf("Hit/Miss: %lu/%lu, Collisions: %lu\n",
hit, miss,coll);
-Index: flowextract-2.5/timeval.c
---- flowextract-2.5/timeval.c.orig 2003-04-28 20:22:02.000000000 +0200
-+++ flowextract-2.5/timeval.c 2004-12-23 14:15:04.349213600 +0100
-@@ -1,3 +1,4 @@
-+#include <time.h>
- #include <sys/time.h>
- #include <ftlib.h>
-
-@@ -6,8 +7,10 @@
- {
- struct tm *tm;
- static char buf[50];
-+ time_t t;
-
-- tm = localtime(&tp.secs);
-+ t = (time_t)tp.secs;
-+ tm = localtime(&t);
-
- sprintf(buf, "%02d/%02d/%04d %02d:%02d:%02d",
- tm->tm_mon+1,
-Index: flowextract-2.5/timesub.c
---- flowextract-2.5/timesub.c.orig 2003-04-28 20:22:02.000000000 +0200
-+++ flowextract-2.5/timesub.c 2004-12-23 14:12:10.194290425 +0100
-@@ -8,6 +8,7 @@
-
- */
- #include <sys/types.h>
-+#include <time.h>
- #include <sys/time.h>
- #include "timesub.h"
-
Index: flowextract-2.5/interp.c
---- flowextract-2.5/interp.c.orig 2003-04-28 20:22:02.000000000 +0200
-+++ flowextract-2.5/interp.c 2004-12-23 14:14:33.287259341 +0100
+--- flowextract-2.5/interp.c.orig 2003-04-28 20:22:02 +0200
++++ flowextract-2.5/interp.c 2005-05-15 19:45:32 +0200
@@ -9,6 +9,7 @@
*/
#include <stdio.h>
@@ -394,30 +328,34 @@
rectime = tmb->tm_hour*3600 + tmb->tm_min*60 + tmb->tm_sec;
}
return rectime;
-Index: flowextract-2.5/grammar.y
---- flowextract-2.5/grammar.y.orig 2003-04-28 20:22:02.000000000 +0200
-+++ flowextract-2.5/grammar.y 2004-12-23 14:10:36.294498083 +0100
-@@ -25,6 +25,9 @@
+Index: flowextract-2.5/timesub.c
+--- flowextract-2.5/timesub.c.orig 2003-04-28 20:22:02 +0200
++++ flowextract-2.5/timesub.c 2005-05-15 19:45:32 +0200
+@@ -8,6 +8,7 @@
+
+ */
+ #include <sys/types.h>
++#include <time.h>
+ #include <sys/time.h>
#include "timesub.h"
- #include "stdunix.h"
-+void yyerror(char *msg);
-+unsigned long getmask(unsigned long addr);
-+
- extern int parse_error;
- #define TCPDATA 6
- #define UDPDATA 17
-@@ -1159,10 +1162,10 @@
- };
+Index: flowextract-2.5/timeval.c
+--- flowextract-2.5/timeval.c.orig 2003-04-28 20:22:02 +0200
++++ flowextract-2.5/timeval.c 2005-05-15 19:45:32 +0200
+@@ -1,3 +1,4 @@
++#include <time.h>
+ #include <sys/time.h>
+ #include <ftlib.h>
- void
--yyerror()
-+yyerror(char *msg)
+@@ -6,8 +7,10 @@
{
-- fprintf(stderr, "\"%s\", line %d: syntax error.\n",
-- getfilename(), getlinenum());
-+ fprintf(stderr, "\"%s\", line %d: syntax error: %s\n",
-+ getfilename(), getlinenum(), msg);
- parse_error = 1;
- }
+ struct tm *tm;
+ static char buf[50];
++ time_t t;
+- tm = localtime(&tp.secs);
++ t = (time_t)tp.secs;
++ tm = localtime(&t);
+
+ sprintf(buf, "%02d/%02d/%04d %02d:%02d:%02d",
+ tm->tm_mon+1,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flowtools/flowtools.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 flowtools.spec
--- openpkg-src/flowtools/flowtools.spec 24 Mar 2005 11:18:49 -0000
1.14
+++ openpkg-src/flowtools/flowtools.spec 15 May 2005 17:51:33 -0000
1.15
@@ -23,7 +23,7 @@
##
# package versions
-%define V_flowtools 0.67
+%define V_flowtools 0.68
%define V_flowextract 2.5
%define V_cflow 1.051
@@ -38,7 +38,7 @@
Group: Network
License: BSD
Version: %{V_flowtools}
-Release: 20050218
+Release: 20050515
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
