From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 18 07:50:13 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 4272016A4CF for ; Sat, 18 Sep 2004 07:50:13 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2489143D5C for ; Sat, 18 Sep 2004 07:50:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i8I7oDPD043252 for ; Sat, 18 Sep 2004 07:50:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i8I7oDr3043249; Sat, 18 Sep 2004 07:50:13 GMT (envelope-from gnats) Resent-Date: Sat, 18 Sep 2004 07:50:13 GMT Resent-Message-Id: <200409180750.i8I7oDr3043249@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, Yen-Ming Lee Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A43F16A4CE for ; Sat, 18 Sep 2004 07:48:01 +0000 (GMT) Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3E8743D3F for ; Sat, 18 Sep 2004 07:48:00 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id BE1EA3E9CEF for ; Sat, 18 Sep 2004 15:47:59 +0800 (CST) Received: from utopia.leeym.com ([127.0.0.1]) by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 88548-02 for ; Sat, 18 Sep 2004 15:47:58 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 1000) id DFA733E9CDE; Sat, 18 Sep 2004 15:47:57 +0800 (CST) Message-Id: <20040918074757.DFA733E9CDE@utopia.leeym.com> Date: Sat, 18 Sep 2004 15:47:57 +0800 (CST) From: Yen-Ming Lee To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/71853: [PATCH] security/bro: unbreak X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2004 07:50:13 -0000 >Number: 71853 >Category: ports >Synopsis: [PATCH] security/bro: unbreak >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: Sat Sep 18 07:50:12 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 5.3-BETA4 i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004 >Description: - unbreak this port on 5.x Added file(s): - files/patch-Conn.h Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- bro-0.8_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/security/bro/Makefile,v retrieving revision 1.25 diff -u -u -r1.25 Makefile --- Makefile 17 Sep 2004 23:02:58 -0000 1.25 +++ Makefile 18 Sep 2004 07:47:18 -0000 @@ -26,20 +26,18 @@ USE_BISON= yes USE_PERL5= yes -.include - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - post-extract: - @(cd ${WRKSRC} && ${TAR} xfvz libedit.src.tar.gz > /dev/null) + @cd ${WRKSRC} && ${TAR} xfz libedit.src.tar.gz post-patch: @${REINPLACE_CMD} -e 's|CFLAGS+=-g -O0||g; \ s|CC=gcc||' \ ${WRKSRC}/libedit/Makefile.in \ ${WRKSRC}/libedit/Makefile + @${REINPLACE_CMD} -e "s,tr '\[a-z\]' '\[A-Z\]',tr 'a-z' 'A-Z',g" \ + ${WRKSRC}/libedit/makelist + @${REINPLACE_CMD} -E -e 's,(const char\*) const (helpstring),\1 \2,g' \ + ${WRKSRC}/DebugCmds.h pre-configure: @${ECHO_CMD} "Configure libedit..." @@ -61,4 +59,4 @@ @${GZIP_CMD} ${DOCSDIR}/bro-CN99.ps .endif -.include +.include Index: files/patch-Conn.h =================================================================== RCS file: files/patch-Conn.h diff -N files/patch-Conn.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Conn.h 18 Sep 2004 07:47:18 -0000 @@ -0,0 +1,20 @@ +--- Conn.h.orig Sat Sep 18 15:42:16 2004 ++++ Conn.h Sat Sep 18 15:42:30 2004 +@@ -223,6 +223,8 @@ + return 1; + } + ++ void DeleteTimer(double t); ++ + protected: + virtual void UpdateEndpointVal(RecordVal* endp, int is_orig) = 0; + +@@ -235,8 +237,6 @@ + + friend class ConnectionTimer; + void RemoveTimer(Timer* t); +- +- void DeleteTimer(double t); + + void InactivityTimer(double t); + --- bro-0.8_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: