From owner-svn-ports-all@freebsd.org Mon Feb 13 20:24:17 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC737CDDF28; Mon, 13 Feb 2017 20:24:17 +0000 (UTC) (envelope-from lx@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B48FA1810; Mon, 13 Feb 2017 20:24:17 +0000 (UTC) (envelope-from lx@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1DKOGnI033933; Mon, 13 Feb 2017 20:24:16 GMT (envelope-from lx@FreeBSD.org) Received: (from lx@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1DKOGUi033930; Mon, 13 Feb 2017 20:24:16 GMT (envelope-from lx@FreeBSD.org) Message-Id: <201702132024.v1DKOGUi033930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lx set sender to lx@FreeBSD.org using -f From: David Thiel Date: Mon, 13 Feb 2017 20:24:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434051 - in head/www/gatling: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2017 20:24:18 -0000 Author: lx Date: Mon Feb 13 20:24:16 2017 New Revision: 434051 URL: https://svnweb.freebsd.org/changeset/ports/434051 Log: Update to 0.15, fixing security issues. PR: 217064 Reported by: Jan Bramkamp MFH: 2017Q1 Security: File descriptor leakage and use after free bugs 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 Feb 13 20:15:36 2017 (r434050) +++ head/www/gatling/Makefile Mon Feb 13 20:24:16 2017 (r434051) @@ -2,19 +2,18 @@ # $FreeBSD$ PORTNAME= gatling -PORTVERSION= 0.13 -PORTREVISION= 1 +PORTVERSION= 0.15 CATEGORIES= www benchmarks ftp ipv6 -MASTER_SITES= http://dl.fefe.de/ +MASTER_SITES= http://www.fefe.de/gatling/ MAINTAINER= coco@executive-computing.de COMMENT= High performance webserver with scalability benchmark tools LICENSE= GPLv2 -BUILD_DEPENDS= libowfat>=0.29:devel/libowfat +BUILD_DEPENDS= libowfat>=0.31:devel/libowfat -USES= gmake ssl tar:bzip2 +USES= gmake ssl tar:xz USE_RC_SUBR= gatling CFLAGS+= -I${LOCALBASE}/include/libowfat -I${OPENSSLINC} -I${LOCALBASE}/include @@ -87,19 +86,19 @@ post-patch: ${WRKSRC}/GNUmakefile pre-install: - @cd ${WRKSRC} && ${CP} gatling.1 gatling.8 + cd ${WRKSRC} && ${CP} gatling.1 gatling.8 do-install: - @cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${STAGEDIR}${PREFIX}/bin - @cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${STAGEDIR}${PREFIX}/sbin - @${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_PROGRAM} ${bin} ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_PROGRAM} ${sbin} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${FILESDIR}/gatling_wrapper ${STAGEDIR}${PREFIX}/sbin + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} .if !empty(BENCH1) - @cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1 + cd ${WRKSRC} && ${INSTALL_MAN} ${BENCH1} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endif - @cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_MAN} ${GATLING8} ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/gatling/distinfo ============================================================================== --- head/www/gatling/distinfo Mon Feb 13 20:15:36 2017 (r434050) +++ head/www/gatling/distinfo Mon Feb 13 20:24:16 2017 (r434051) @@ -1,2 +1,3 @@ -SHA256 (gatling-0.13.tar.bz2) = b42145fdf7b66602fa8bc64661c2762172f6d33dbd9d53efebf821cd81e89245 -SIZE (gatling-0.13.tar.bz2) = 108128 +TIMESTAMP = 1487014927 +SHA256 (gatling-0.15.tar.xz) = 6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4 +SIZE (gatling-0.15.tar.xz) = 121804 Modified: head/www/gatling/files/patch-GNUmakefile ============================================================================== --- head/www/gatling/files/patch-GNUmakefile Mon Feb 13 20:15:36 2017 (r434050) +++ head/www/gatling/files/patch-GNUmakefile Mon Feb 13 20:24:16 2017 (r434051) @@ -1,5 +1,5 @@ ---- GNUmakefile.orig 2012-12-07 12:27:09.595489622 -0800 -+++ GNUmakefile 2012-12-07 12:35:03.890478583 -0800 +--- /tmp/GNUmakefile 2017-02-13 11:43:57.882750000 -0800 ++++ GNUmakefile 2017-02-13 11:56:19.109139000 -0800 @@ -1,24 +1,22 @@ -#DEBUG=1 -ZLIB=1 @@ -42,7 +42,7 @@ +DIET= + ifneq ($(DEBUG),) - CFLAGS+=-g + CFLAGS+=-g -Og LDFLAGS+=-g -else -CFLAGS+=-O2 -fomit-frame-pointer -I/usr/local/include