Date: Mon, 10 Dec 2012 06:52:30 +0000 (UTC) From: David Thiel <lx@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308589 - in head/www/gatling: . files Message-ID: <201212100652.qBA6qU2J045541@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lx Date: Mon Dec 10 06:52:30 2012 New Revision: 308589 URL: http://svnweb.freebsd.org/changeset/ports/308589 Log: Update to 0.13. Corrects a directory traversal issue in non-chrooted FTP mode. Feature safe: yes Deleted: head/www/gatling/files/patch-rellink.c Modified: head/www/gatling/Makefile head/www/gatling/distinfo head/www/gatling/files/patch-GNUmakefile Modified: head/www/gatling/Makefile ============================================================================== --- head/www/gatling/Makefile Mon Dec 10 06:49:34 2012 (r308588) +++ head/www/gatling/Makefile Mon Dec 10 06:52:30 2012 (r308589) @@ -6,21 +6,21 @@ # PORTNAME= gatling -PORTVERSION= 0.12 +PORTVERSION= 0.13 CATEGORIES= www benchmarks ftp ipv6 MASTER_SITES= http://dl.fefe.de/ MAINTAINER= tmseck@netcologne.de COMMENT= A high performance webserver with scalability benchmark tools -BUILD_DEPENDS= libowfat>=0.25:${PORTSDIR}/devel/libowfat +BUILD_DEPENDS= libowfat>=0.29:${PORTSDIR}/devel/libowfat USE_BZIP2= yes USE_GMAKE= yes USE_OPENSSL= yes USE_RC_SUBR= gatling -CFLAGS+= -I${LOCALBASE}/include/libowfat -I${OPENSSLINC} +CFLAGS+= -I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} MAKEFILE= GNUmakefile Modified: head/www/gatling/distinfo ============================================================================== --- head/www/gatling/distinfo Mon Dec 10 06:49:34 2012 (r308588) +++ head/www/gatling/distinfo Mon Dec 10 06:52:30 2012 (r308589) @@ -1,2 +1,2 @@ -SHA256 (gatling-0.12.tar.bz2) = ffe4dbff99404eb80e6aac215fdf6bf8174355edc33dd1848a51fc1093296a7c -SIZE (gatling-0.12.tar.bz2) = 99540 +SHA256 (gatling-0.13.tar.bz2) = b42145fdf7b66602fa8bc64661c2762172f6d33dbd9d53efebf821cd81e89245 +SIZE (gatling-0.13.tar.bz2) = 108128 Modified: head/www/gatling/files/patch-GNUmakefile ============================================================================== --- head/www/gatling/files/patch-GNUmakefile Mon Dec 10 06:49:34 2012 (r308588) +++ head/www/gatling/files/patch-GNUmakefile Mon Dec 10 06:52:30 2012 (r308589) @@ -1,6 +1,6 @@ ---- GNUmakefile.orig 2010-04-11 07:49:08.000000000 +0200 -+++ GNUmakefile 2010-04-14 18:29:35.000000000 +0200 -@@ -1,24 +1,23 @@ +--- GNUmakefile.orig 2012-12-07 12:27:09.595489622 -0800 ++++ GNUmakefile 2012-12-07 12:35:03.890478583 -0800 +@@ -1,24 +1,22 @@ -#DEBUG=1 -ZLIB=1 -prefix=/opt/diet @@ -9,11 +9,10 @@ MANDIR=${prefix}/man man1dir=$(MANDIR)/man1 --TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling \ --pthreadbench cgi +-TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling_nofail \ +-pthreadbench cgi ptlsgatling_nofail -TARGETS2=mktestdata mmapbench manymapbench forkbench forksbench -+TARGETS=gatling dl \ -+cgi ++TARGETS=gatling dl cgi +TARGETS2= +ifdef BENCHMARKS +TARGETS+=httpbench bindbench ioerr bench pthreadbench @@ -33,10 +32,10 @@ -CFLAGS=-pipe -Wall -LDFLAGS= - + #CFLAGS+=-DSTATE_DEBUG -DMOREDEBUG -DDEBUG_EVENTS -DSMDEBUG + path = $(subst :, ,$(PATH)) - diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) - ifeq ($(strip $(diet_path)),) -@@ -34,15 +33,11 @@ +@@ -36,15 +34,11 @@ # to build without diet libc support, use $ make DIET= # see http://www.fefe.de/dietlibc/ for details about the diet libc @@ -54,7 +53,7 @@ endif LDLIBS=-lowfat -@@ -68,7 +63,7 @@ +@@ -70,7 +64,7 @@ CC:=$(DIET) $(CC) pthreadbench: pthreadbench.o @@ -63,7 +62,7 @@ forksbench: forkbench.o $(CC) -static -o $@ forkbench.o $(LDFLAGS) $(LDLIBS) -@@ -121,11 +116,13 @@ +@@ -136,11 +130,13 @@ rm -f trysocket libiconv: tryiconv.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212100652.qBA6qU2J045541>