From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 27 12:50:23 2003 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 EC64916A4CE for ; Thu, 27 Nov 2003 12:50:22 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC07443FE9 for ; Thu, 27 Nov 2003 12:50:18 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hARKoIFY028356 for ; Thu, 27 Nov 2003 12:50:18 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hARKoIuO028355; Thu, 27 Nov 2003 12:50:18 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 27 Nov 2003 12:50:18 -0800 (PST) Resent-Message-Id: <200311272050.hARKoIuO028355@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, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D38316A4CE for ; Thu, 27 Nov 2003 12:49:06 -0800 (PST) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id E66D443FAF for ; Thu, 27 Nov 2003 12:49:03 -0800 (PST) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 80056 invoked by uid 85); 27 Nov 2003 21:49:02 +0100 Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 ( Clear:RC:1:. Processed in 0.042662 secs); 27 Nov 2003 20:49:02 -0000 Received: from unknown (HELO lucifer.cultdeadsheep.org) (192.168.0.2) by goofy.cultdeadsheep.org with SMTP; 27 Nov 2003 21:49:01 +0100 Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Thu, 27 Nov 2003 21:49:31 +0100 Message-Id: <20031127204903.E66D443FAF@mx1.FreeBSD.org> Date: Thu, 27 Nov 2003 21:49:31 +0100 From: "Clement Laforet" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/59738: [update orphaned port] benchmarks/siege: update to 2.57 and take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2003 20:50:23 -0000 >Number: 59738 >Category: ports >Synopsis: [update orphaned port] benchmarks/siege: update to 2.57 and take maintainership >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: Thu Nov 27 12:50:18 PST 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.2-BETA i386 >Organization: cotds.orf >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.2-BETA FreeBSD 5.2-BETA #0: Sat Nov 22 21:09:27 CET 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: - Update siege to 2.57 - Add patch to avoid segfault when concurency user is set to 0 (or default) - Replace bug siege.config script - and install default siegerc file - Take maintainership New files: files/siege.config.in files/patch-src::main.c files/patch-src::hash.h Tested on -CURRENT and -STABLE >How-To-Repeat: N/A >Fix: --- siege.diff begins here --- Index: siege/Makefile =================================================================== RCS file: /WORK/REPO/FreeBSD/ports/benchmarks/siege/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- siege/Makefile 24 Sep 2003 08:37:35 -0000 1.14 +++ siege/Makefile 27 Nov 2003 20:44:01 -0000 @@ -6,29 +6,33 @@ # PORTNAME= siege -PORTVERSION= 2.56 +PORTVERSION= 2.57 CATEGORIES= benchmarks MASTER_SITES= ftp://sid.joedog.org/pub/siege/ \ http://www.cus.org.uk/~dom/distfiles/siege/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= A http regression testing and benchmarking utility -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ssl=/usr --disable-shared -MAN1= siege.1 siege.config.1 layingsiege.1 urls_txt.1 bombardment.1 \ - siege2csv.1 +USE_OPENSSL= YES + +CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE} --disable-shared + +MAN1= siege.1 siege.config.1 layingsiege.1 urls_txt.1 bombardment.1 \ + siege2csv.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/siege ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/utils/bombardment ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/utils/siege.config ${PREFIX}/bin - @${MV} ${WRKSRC}/utils/siege2csv.pl ${WRKSRC}/utils/siege2csv - ${INSTALL_SCRIPT} ${WRKSRC}/utils/siege2csv ${PREFIX}/bin -.for F in bombardment.1 layingsiege.1 siege.1 siege.config.1 \ - siege2csv.1 urls_txt.1 - ${INSTALL_MAN} ${WRKSRC}/doc/${F} ${PREFIX}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/src/siege ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/utils/bombardment ${PREFIX}/bin + @${CP} ${WRKSRC}/utils/siege2csv.pl ${WRKSRC}/utils/siege2csv + @${INSTALL_SCRIPT} ${WRKSRC}/utils/siege2csv ${PREFIX}/bin +.for F in ${MAN1} + @${INSTALL_MAN} ${WRKSRC}/doc/${F} ${PREFIX}/man/man1 .endfor + @${MKDIR} ${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/doc/siegerc ${DATADIR} + @${SED} -e "s,%%DATADIR%%,${DATADIR}," ${FILESDIR}/siege.config.in > ${PREFIX}/bin/siege.config + @${CHMOD} 555 ${PREFIX}/bin/siege.config .include Index: siege/distinfo =================================================================== RCS file: /WORK/REPO/FreeBSD/ports/benchmarks/siege/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- siege/distinfo 3 Jan 2003 20:11:04 -0000 1.9 +++ siege/distinfo 27 Nov 2003 20:42:46 -0000 @@ -1 +1 @@ -MD5 (siege-2.56.tar.gz) = 65b309582e95f334be70b62705135457 +MD5 (siege-2.57.tar.gz) = c197450e97405bae3b1592979cb493ba Index: siege/pkg-plist =================================================================== RCS file: /WORK/REPO/FreeBSD/ports/benchmarks/siege/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- siege/pkg-plist 3 Jun 2002 11:36:04 -0000 1.2 +++ siege/pkg-plist 27 Nov 2003 20:42:46 -0000 @@ -2,3 +2,5 @@ bin/bombardment bin/siege2csv bin/siege.config +%%DATADIR%%/siegerc +@dirrm %%DATADIR%% Index: siege/files/patch-src::hash.h =================================================================== RCS file: siege/files/patch-src::hash.h diff -N siege/files/patch-src::hash.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ siege/files/patch-src::hash.h 27 Nov 2003 20:43:04 -0000 @@ -0,0 +1,10 @@ +--- src/hash.h.orig Thu Nov 27 00:33:32 2003 ++++ src/hash.h Thu Nov 27 00:35:25 2003 +@@ -23,6 +23,7 @@ + #define HASH_H + + #include ++#include + + typedef struct HASH_T *HASH; + Index: siege/files/patch-src::main.c =================================================================== RCS file: siege/files/patch-src::main.c diff -N siege/files/patch-src::main.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ siege/files/patch-src::main.c 27 Nov 2003 20:43:04 -0000 @@ -0,0 +1,15 @@ +--- src/main.c.orig Thu Jul 17 21:50:43 2003 ++++ src/main.c Thu Nov 27 01:27:55 2003 +@@ -301,6 +301,12 @@ + */ + fprintf( stderr, "** " ); + display_version( FALSE ); ++ /* prevents from segfaulting */ ++ if ( my.cusers == 0) { ++ fprintf(stderr, "\nERROR: concurrent users is not set or set to 0.\n"); ++ display_help(); ++ exit (EXIT_FAILURE); ++ }; + fprintf( stderr, "** Preparing %d concurrent users for battle.\n", my.cusers ); + fprintf( stderr, "The server is now under siege..." ); + if( my.verbose ){ fprintf( stderr, "\n" ); } Index: siege/files/siege.config.in =================================================================== RCS file: siege/files/siege.config.in diff -N siege/files/siege.config.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ siege/files/siege.config.in 27 Nov 2003 20:43:04 -0000 @@ -0,0 +1,27 @@ +#!/bin/sh +# SCRIPT: siege.config +# AUTHOR: Jeffrey Fulmer +# DATE: Mon May 28 11:40:28 EDT 2001 +# SYNOP: This script generates an $HOME/.siegerc +# file from the doc/siegerc.in template. +# Its contents are added to this script by +# configure. The siegerc file template is +# maintained once in $(top_srcdir)/doc. + +rcfile="$HOME/.siegerc" + +if test -f $rcfile; then + echo "siege.config" + echo "usage: siege.config [no arguments]" + echo "----------------------------------" + echo "Resource file already install as $rcfile" + echo "Use your favorite editor to change your configuration by" + echo "editing the values in that file." + echo "" + exit +fi +cp %%DATADIR%%/siegerc ${rcfile} +echo "New configuration template added to $rcfile" +echo "Run siege -C to view the current settings in that file" +exit + --- siege.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: