From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 29 13:10:27 2004 Return-Path: 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 047E116A4D0 for ; Fri, 29 Oct 2004 13:10:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA74B43D1F for ; Fri, 29 Oct 2004 13:10:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9TDAQlc050875 for ; Fri, 29 Oct 2004 13:10:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9TDAQaW050874; Fri, 29 Oct 2004 13:10:26 GMT (envelope-from gnats) Resent-Date: Fri, 29 Oct 2004 13:10:26 GMT Resent-Message-Id: <200410291310.i9TDAQaW050874@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Yuri Y.Bushmelev" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E97B16A4CE for ; Fri, 29 Oct 2004 13:06:19 +0000 (GMT) Received: from services.simcom.ru (ip250.simcom.mv.ru [81.176.143.250]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8D1643D41 for ; Fri, 29 Oct 2004 13:06:18 +0000 (GMT) (envelope-from jay@simcom.ru) Received: from xeon.simcom.ru ([193.124.127.9] ident=mailnull) by services.simcom.ru with esmtps (TLSv1:AES256-SHA:256) (Exim 4.43 (FreeBSD)) id 1CNWSN-000Oh0-S8 for FreeBSD-gnats-submit@freebsd.org; Fri, 29 Oct 2004 17:06:16 +0400 Received: from jay by xeon.simcom.ru with local (Exim 4.43 (FreeBSD)) id 1CNWSL-0000jk-Vb for FreeBSD-gnats-submit@freebsd.org; Fri, 29 Oct 2004 17:06:13 +0400 Message-Id: Date: Fri, 29 Oct 2004 17:06:13 +0400 From: "Yuri Y.Bushmelev" Sender: "Yuri Y. Bushmelev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/73285: flow-tools port improvements X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Yuri Y.Bushmelev" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Oct 2004 13:10:27 -0000 >Number: 73285 >Category: ports >Synopsis: flow-tools port improvements >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: Fri Oct 29 13:10:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Yuri Y. Bushmelev >Release: FreeBSD 5.2-CURRENT i386 >Organization: SimCom LLC, ISP "Simbirsk Communications" >Environment: System: FreeBSD xeon.simcom.ru 5.2-CURRENT FreeBSD 5.2-CURRENT #3: Tue Aug 10 20:26:21 MSD 2004 jay@xeon.simcom.ru:/local/obj/local/src/sys/XEON i386 postgresql-7.4.5 installed from ports flow-tools-0.67 from ports >Description: 1. Flow-tools can export flows data to postgresql and mysql databases. But port has no this functionality. I fix it with following patches. NOTE: mysql functionality has not been tested - I have no mysql right now. Sorry. 2. Also fixed small bug in flow-tools, when making flow-export shows error about variable 'debug'. See following patches for details. >How-To-Repeat: cd /usr/ports/net-mgmt/flow-tools && make >Fix: Patches start here: ====== /usr/ports/net-mgmt/flow-tools/Makefile patch ====== --- Makefile.orig Fri Oct 29 16:08:11 2004 +++ Makefile Fri Oct 29 16:09:54 2004 @@ -25,6 +25,14 @@ flow-tag.1 flow-tools.1 flow-tools-examples.1 \ flow-xlate.1 +.if defined(WITH_PGSQL) +CONFIGURE_ARGS+=--with-pgsql=${PREFIX} +.endif + +.if defined(WITH_MYSQL) +CONFIGURE_ARGS+=--with-mysql=${PREFIX} +.endif + post-patch: ${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in ${REINPLACE_CMD}\ ====== end of patch ====== ====== /usr/ports/net-mgmt/flow-tools/files/patch-configure-pgsql patch ====== --- configure.orig Fri Oct 29 15:07:41 2004 +++ configure Fri Oct 29 15:11:21 2004 @@ -3279,7 +3279,7 @@ fi 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 @@ -3336,7 +3336,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 ====== end of patch ====== ====== /usr/ports/net-mgmt/flow-tools/files/patch-flow-export.c patch ====== --- flow-export.c.orig Fri Oct 29 16:23:01 2004 +++ flow-export.c Fri Oct 29 16:23:15 2004 @@ -115,13 +115,14 @@ struct jump format[] = {{format0}, {format1}, {format2}, {format3}, {format4}, {format5}}; +int debug=0; + int main(int argc, char **argv) { int i, format_index, ret, ascii_mask; struct ftio ftio; struct ftprof ftp; struct options opt; - int debug; /* init fterr */ fterr_setid(argv[0]); ====== end of patch ====== >Release-Note: >Audit-Trail: >Unformatted: