summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2005-02-18 10:08:33 +0000
committerseb <seb@pkgsrc.org>2005-02-18 10:08:33 +0000
commita188cdd2dbd994a762c841468494229c5e481aff (patch)
tree6cd10554d0eff91cf97ef2ad2ea74deae9ce6a4e /net
parentc3622e01df9dd712f2801de7e664012ef196259e (diff)
downloadpkgsrc-a188cdd2dbd994a762c841468494229c5e481aff.tar.gz
Fix runtime error for flow-export's PostgreSQL support.
Also fix string constants quoting for flow-export's PostgreSQL and MySQL support. Bump PKGREVISION to 2.
Diffstat (limited to 'net')
-rw-r--r--net/flow-tools/Makefile4
-rw-r--r--net/flow-tools/distinfo4
-rw-r--r--net/flow-tools/patches/patch-ak92
3 files changed, 95 insertions, 5 deletions
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index fc406b229bc..129ac89168a 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/18 10:08:33 seb Exp $
DISTNAME= flow-tools-0.67
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/
diff --git a/net/flow-tools/distinfo b/net/flow-tools/distinfo
index 96bc763eb0c..13df2006250 100644
--- a/net/flow-tools/distinfo
+++ b/net/flow-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/04/22 15:33:35 seb Exp $
+$NetBSD: distinfo,v 1.5 2005/02/18 10:08:33 seb Exp $
SHA1 (flow-tools-0.67.tar.gz) = 1896dad27db0c89e3e14d86b30aed15581134335
Size (flow-tools-0.67.tar.gz) = 983667 bytes
@@ -12,4 +12,4 @@ SHA1 (patch-ag) = 60d7c6d07cc8f102d6281a55c8188d13eca80bdf
SHA1 (patch-ah) = cd55409fd5781e204f32ffa51a9b39222eadb8c7
SHA1 (patch-ai) = 5e0a5f3148e80c156198d74036ff2f1bf35ed779
SHA1 (patch-aj) = d183dc3b360110a1a90165b0094e349d3a964a2e
-SHA1 (patch-ak) = d44f230e0d5a9713268801ff308cbadc3ff4f3ab
+SHA1 (patch-ak) = 0ae5fa523263fa9be836846b46b7f87b52557156
diff --git a/net/flow-tools/patches/patch-ak b/net/flow-tools/patches/patch-ak
index 7219bd9614c..2f173e4b3fb 100644
--- a/net/flow-tools/patches/patch-ak
+++ b/net/flow-tools/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2004/04/22 15:33:35 seb Exp $
+$NetBSD: patch-ak,v 1.2 2005/02/18 10:08:33 seb Exp $
--- src/flow-export.c.orig 2003-12-04 05:55:31.000000000 +0000
+++ src/flow-export.c
@@ -23,3 +23,93 @@ $NetBSD: patch-ak,v 1.1 2004/04/22 15:33:35 seb Exp $
format_index = 0;
bzero(&opt, sizeof opt);
ascii_mask = 0;
+@@ -864,7 +864,7 @@ int format5(struct ftio *ftio, struct op
+ struct ftver ftv;
+ char fields[1024], values[1024], query[3*1024];
+ char *rec;
+- char *db_host, *db_name, *db_table, *db_user, *db_pwd, *db_tmp, *tmp;
++ char *db_host, *db_name, *db_table, *db_user, *db_pwd, *tmp;
+ char *db_port;
+ int len;
+
+@@ -891,7 +891,7 @@ int format5(struct ftio *ftio, struct op
+ db_name = strsep(&tmp, ":");
+ db_table = strsep(&tmp, ":");
+
+- if (!db_user || !db_pwd || !db_host || !db_tmp || !db_name || !db_table) {
++ if (!db_user || !db_pwd || !db_host || !db_name || !db_table) {
+ fterr_warnx("Missing field in dbaseURI, expecting user:pwd:host:port:name:table.");
+ return -1;
+ }
+@@ -1199,10 +1199,10 @@ int fmt_xfields_val(char *fmt_buf, char
+
+ if (xfields & FT_XFIELD_EXADDR) {
+ if (comma) fmt_buf[len++] = ',';
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->exaddr)),
+ FMT_JUST_LEFT);
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ comma = 1;
+ }
+
+@@ -1257,28 +1257,28 @@ int fmt_xfields_val(char *fmt_buf, char
+
+ if (xfields & FT_XFIELD_SRCADDR) {
+ if (comma) fmt_buf[len++] = ',';
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->srcaddr)),
+ FMT_JUST_LEFT);
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ comma = 1;
+ }
+
+ if (xfields & FT_XFIELD_DSTADDR) {
+ if (comma) fmt_buf[len++] = ',';
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->dstaddr)),
+ FMT_JUST_LEFT);
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ comma = 1;
+ }
+
+ if (xfields & FT_XFIELD_NEXTHOP) {
+ if (comma) fmt_buf[len++] = ',';
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->nexthop)),
+ FMT_JUST_LEFT);
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ comma = 1;
+ }
+
+@@ -1375,19 +1375,19 @@ int fmt_xfields_val(char *fmt_buf, char
+
+ if (xfields & FT_XFIELD_PEER_NEXTHOP) {
+ if (comma) fmt_buf[len++] = ',';
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->peer_nexthop)),
+ FMT_JUST_LEFT);
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ comma = 1;
+ }
+
+ if (xfields & FT_XFIELD_ROUTER_SC) {
+ if (comma) fmt_buf[len++] = ',';
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ len += fmt_ipv4(fmt_buf+len, *((u_int32*)(rec+fo->router_sc)),
+ FMT_JUST_LEFT);
+- if (quote) fmt_buf[len++] = '"';
++ if (quote) fmt_buf[len++] = '\'';
+ comma = 1;
+ }
+