From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 30 13:20:31 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 F128E16A4CF for ; Fri, 30 Jul 2004 13:20:30 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA96D43D5C for ; Fri, 30 Jul 2004 13:20:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6UDKLEb020173 for ; Fri, 30 Jul 2004 13:20:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6UDKL8j020172; Fri, 30 Jul 2004 13:20:21 GMT (envelope-from gnats) Resent-Date: Fri, 30 Jul 2004 13:20:21 GMT Resent-Message-Id: <200407301320.i6UDKL8j020172@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, Thomas-Martin Seck Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4115616A4CE for ; Fri, 30 Jul 2004 13:19:42 +0000 (GMT) Received: from smtp2.netcologne.de (smtp2.netcologne.de [194.8.194.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA73243D5D for ; Fri, 30 Jul 2004 13:19:41 +0000 (GMT) (envelope-from tmseck@netcologne.de) Received: from laurel.tmseck.homedns.org (xdsl-81-173-175-201.netcologne.de [81.173.175.201]) by smtp2.netcologne.de (Postfix) with SMTP id 42C6E425E for ; Fri, 30 Jul 2004 15:19:24 +0200 (MEST) Received: (qmail 4014 invoked by uid 1001); 30 Jul 2004 13:19:02 -0000 Message-Id: <20040730131902.4013.qmail@laurel.tmseck.homedns.org> Date: 30 Jul 2004 13:19:02 -0000 From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/69801: [Maintainer] www/gatling: update to 0.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Thomas-Martin Seck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jul 2004 13:20:31 -0000 >Number: 69801 >Category: ports >Synopsis: [Maintainer] www/gatling: update to 0.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jul 30 13:20:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 4.10-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of July 30th, 2004. >Description: Update to 0.5. Note: libowfat >= 0.20 is required to build this version of gatling. Note to committer: Please "cvs rm" files/patch-gatling.c >How-To-Repeat: >Fix: Apply this patch: Index: distinfo =================================================================== --- distinfo (.../www/gatling) (revision 159) +++ distinfo (.../local/gatling) (revision 159) @@ -1,2 +1,2 @@ -MD5 (gatling-0.4.tar.bz2) = fcc8dffa24663205c0bb317dee74b22b -SIZE (gatling-0.4.tar.bz2) = 33923 +MD5 (gatling-0.5.tar.bz2) = ee15becac325864afc99cca6f3d08779 +SIZE (gatling-0.5.tar.bz2) = 42576 Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (.../www/gatling) (revision 159) +++ files/patch-Makefile (.../local/gatling) (revision 159) @@ -1,17 +1,17 @@ ---- Makefile.orig Thu Feb 19 17:22:17 2004 -+++ Makefile Mon Feb 23 01:12:25 2004 -@@ -6,9 +6,7 @@ +--- Makefile.orig Sat May 8 02:26:21 2004 ++++ Makefile Fri Jul 30 11:06:07 2004 +@@ -8,10 +8,6 @@ all: $(TARGET) -CC=gcc --CFLAGS=-pipe -Wall -Os -I../libowfat/ +-CFLAGS=-pipe -Wall -O -I../libowfat/ -LDFLAGS=-s -L../libowfat/ -lowfat -+CFLAGS+=-I${LOCALBASE}/include/libowfat - +- gatling: gatling.o libsocket libiconv $(CC) -o $@ gatling.o $(LDFLAGS) `cat libsocket libiconv` -@@ -32,7 +30,7 @@ + +@@ -34,7 +30,7 @@ $(CC) -static -o $@ forkbench.o $(LDFLAGS) pthreadbench: pthreadbench.o Index: files/patch-gatling.c =================================================================== --- files/patch-gatling.c (.../www/gatling) (revision 159) +++ files/patch-gatling.c (.../local/gatling) (revision 159) @@ -1,31 +0,0 @@ -! Fix a filedescriptor leak. This change requires libowfat-0.18 -! Correct return code for FTP CWD -! Obtained from gatling cvs ---- gatling.c.orig Fri Feb 27 16:09:53 2004 -+++ gatling.c Fri Feb 27 16:13:28 2004 -@@ -876,7 +876,7 @@ - c+=fmt_str(c,"\r\n\r\n"); - iob_addbuf_free(&h->iob,h->hdrbuf,c - h->hdrbuf); - if (!head) -- iob_addfile(&h->iob,fd,range_first,range_last-range_first); -+ iob_addfile_close(&h->iob,fd,range_first,range_last-range_first); - if (logging) { - if (h->hdrbuf[9]=='3') { - buffer_puts(buffer_1,head?"HEAD/304 ":"GET/304 "); -@@ -1034,7 +1034,7 @@ - range_last=ss.st_size; - range_first=h->ftp_rest; h->ftp_rest=0; - if (range_first>range_last) range_first=range_last; -- iob_addfile(&b->iob,b->filefd,range_first,range_last-range_first); -+ iob_addfile_close(&b->iob,b->filefd,range_first,range_last-range_first); - if (logging) { - buffer_putulonglong(buffer_1,range_last-range_first); - buffer_putspace(buffer_1); -@@ -1428,7 +1428,7 @@ - } - y[fmt_str(y,x)]=0; - h->ftppath=y; -- h->hdrbuf="200 ok.\r\n"; -+ h->hdrbuf="250 ok.\r\n"; - return 0; - } Index: Makefile =================================================================== --- Makefile (.../www/gatling) (revision 159) +++ Makefile (.../local/gatling) (revision 159) @@ -6,8 +6,7 @@ # PORTNAME= gatling -PORTVERSION= 0.4 -PORTREVISION= 2 +PORTVERSION= 0.5 CATEGORIES= www benchmarks MASTER_SITES= http://dl.fefe.de/ @@ -18,6 +17,7 @@ USE_BZIP2= yes +CFLAGS+= -I${LOCALBASE}/include/libowfat MAKE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lowfat" \ PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -26,7 +26,7 @@ examplesdir= ${EXAMPLESDIR:S,^${PREFIX}/,,} .if !defined(NOPORTDOCS) PORTDOCS= CHANGES README README.ftp README.http README.performance \ - README.prefetch + README.prefetch README.proxy README.redirect .endif OPTIONS= BENCHMARKS "Install system benchmark programs" on >Release-Note: >Audit-Trail: >Unformatted: