From owner-freebsd-ports Thu Aug 24 23:30:19 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 727B737B440 for ; Thu, 24 Aug 2000 23:30:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id XAA09398; Thu, 24 Aug 2000 23:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from porter.sauber.net (adsl-209-233-30-232.dsl.snfc21.pacbell.net [209.233.30.232]) by hub.freebsd.org (Postfix) with ESMTP id 8E01737B423 for ; Thu, 24 Aug 2000 23:27:07 -0700 (PDT) Received: (from sauber@localhost) by porter.sauber.net (8.9.3/8.9.3) id XAA02806; Thu, 24 Aug 2000 23:27:06 -0700 (PDT) (envelope-from sauber) Message-Id: <200008250627.XAA02806@porter.sauber.net> Date: Thu, 24 Aug 2000 23:27:06 -0700 (PDT) From: sauber@netcom.com Reply-To: sauber@netcom.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/20832: port update Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20832 >Category: ports >Synopsis: webstone port updated to version 2.5 >Confidential: yes >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Aug 24 23:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Soren Dossing >Release: FreeBSD 4.0-RELEASE i386 >Organization: >Environment: >Description: Port for webstone updated to version 2.5. No files removed or added. >How-To-Repeat: >Fix: diff -ruN webstone.bak/Makefile webstone/Makefile --- webstone.bak/Makefile Mon Aug 30 19:43:30 1999 +++ webstone/Makefile Sun Aug 20 16:01:43 2000 @@ -1,35 +1,43 @@ # New ports collection makefile for: webstone -# Version required: 2.0 # Date created: 25 March 1997 # Whom: Soren Dossing # -# $FreeBSD: ports/www/webstone/Makefile,v 1.4 1999/08/31 02:43:30 peter Exp $ +# $FreeBSD: ports/www/webstone/Makefile,v 1.6 2000/07/05 17:43:22 asami Exp $ # -DISTNAME= WebStone-2.0 -PKGNAME= webstone-2.0.1 -CATEGORIES= www benchmarks -#WebStone no longer distributed by SGi -#MASTER_SITES= http://www.sgi.com/Products/WebFORCE/WebStone/ +PORTNAME= webstone +PORTVERSION= 2.5 +CATEGORIES= www benchmarks +MASTER_SITES= ftp://ftp.mindcraft.com/webstone/ \ + ftp://ftp.mindcraft.com/anonymous/webstone/ \ + ftp://ftp.mindcraft.com/pub/webstone/ +DISTNAME= ws25_src +EXTRACT_SUFX= .tgz -MAINTAINER= sauber@netcom.com +MAINTAINER= sauber@netcom.com -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/WebStone/src -ALL_TARGET= install -NO_INSTALL_MANPAGES=yes - -post-extract: - ( cd ${WRKSRC}; make clobber ) +GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/WebStone2.5/src +ALL_TARGET= install +NO_INSTALL_MANPAGES= yes do-install: + @${RM} ${WRKSRC}/../bin/runs/keepme + @${RMDIR} ${WRKSRC}/../bin/runs @${MKDIR} ${PREFIX}/webstone/bin @${MKDIR} ${PREFIX}/webstone/conf + @${MKDIR} ${PREFIX}/webstone/lgm ${INSTALL_SCRIPT} ${WRKSRC}/../bin/* ${PREFIX}/webstone/bin + ${INSTALL_SCRIPT} ${WRKSRC}/../lgm/* ${PREFIX}/webstone/lgm ${INSTALL_DATA} ${WRKSRC}/../conf/* ${PREFIX}/webstone/conf ${INSTALL_SCRIPT} ${WRKSRC}/../webstone ${PREFIX}/webstone + @${MKDIR} ${WRKSRC}/../bin/runs + @${TOUCH} ${WRKSRC}/../bin/runs/keepme .for file in webclient webmaster genrand strip ${PREFIX}/webstone/bin/${file} +.endfor +.for file in ws20_cgi ws25_cgi + strip ${PREFIX}/webstone/lgm/${file} .endfor post-install: diff -ruN webstone.bak/README.html webstone/README.html --- webstone.bak/README.html Sat Mar 18 03:24:42 2000 +++ webstone/README.html Wed Dec 31 16:00:00 1969 @@ -1,30 +0,0 @@ - - The FreeBSD Ports Collection (www/webstone) -

The FreeBSD Ports Collection ("www/webstone")

- - -

You are now in the directory for the port "www/webstone" (package name "webstone-2.0.1"). - -

This is the one-line description for this port: - -

-World wide web server benchmarking -

- -

Please read the file "pkg/DESCR" for a -longer description. - -

Go to the top of the ports tree for -a summary on how to use the ports collection. - -

- -

- - -

- Go up one level -| - Go to top of ports tree - - diff -ruN webstone.bak/files/md5 webstone/files/md5 --- webstone.bak/files/md5 Tue Jun 3 22:47:00 1997 +++ webstone/files/md5 Sun Aug 20 14:34:16 2000 @@ -1 +1 @@ -MD5 (WebStone-2.0.tar.gz) = d607b43a55de9a5b40b3ff2b5ec7dc5f +MD5 (ws25_src.tgz) = 07477db19663d4397ce9d6fe5e1be9e6 diff -ruN webstone.bak/patches/patch-aa webstone/patches/patch-aa --- webstone.bak/patches/patch-aa Tue Jun 3 22:47:00 1997 +++ webstone/patches/patch-aa Sun Aug 20 14:54:46 2000 @@ -1,203 +1,14 @@ -diff -u -r ../../../orig/WebStone/bin/WebStone-common.pl ../bin/WebStone-common.pl ---- ../../../orig/WebStone/bin/WebStone-common.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/WebStone-common.pl Tue Mar 25 14:53:57 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # +--- Makefile.in.orig Sun Aug 20 14:09:48 2000 ++++ Makefile.in Sun Aug 20 14:10:32 2000 +@@ -64,9 +64,9 @@ + .SUFFIXES: + .SUFFIXES: .c .o + +-all: $(TARGETS) cgi api ++all: $(TARGETS) cgi + +-install: all install-api install-cgi ++install: all install-cgi + $(CP) $(TARGETS) $(BINDIR) - 1; -diff -u -r ../../../orig/WebStone/bin/WebStone-manage.pl ../bin/WebStone-manage.pl ---- ../../../orig/WebStone/bin/WebStone-manage.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/WebStone-manage.pl Tue Mar 25 14:54:11 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - push(@INC, "$wd/bin"); -diff -u -r ../../../orig/WebStone/bin/WebStone-run.pl ../bin/WebStone-run.pl ---- ../../../orig/WebStone/bin/WebStone-run.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/WebStone-run.pl Tue Mar 25 14:54:21 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - $testbed = "conf/testbed"; -diff -u -r ../../../orig/WebStone/bin/WebStone-setup.pl ../bin/WebStone-setup.pl ---- ../../../orig/WebStone/bin/WebStone-setup.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/WebStone-setup.pl Tue Mar 25 14:54:33 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - push(@INC, "$wd/bin"); -diff -u -r ../../../orig/WebStone/bin/genfiles ../bin/genfiles ---- ../../../orig/WebStone/bin/genfiles Tue Jun 4 19:24:25 1996 -+++ ../bin/genfiles Thu Mar 6 17:41:15 1997 -@@ -5,7 +5,7 @@ - . $WEBSTONEROOT/conf/testbed - - cat $WEBSTONEROOT/conf/fileset | --nawk ' -+awk ' - ($1 ~ /^[0-9][0-9]*[kK][bB]*$/) { - sub(/[kK][bB]*/, "", $1); - cmd = "$WEBSTONEROOT/bin/genrand " $1*1024 " " $2 -diff -u -r ../../../orig/WebStone/bin/killbench.pl ../bin/killbench.pl ---- ../../../orig/WebStone/bin/killbench.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/killbench.pl Tue Mar 25 14:55:11 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - push(@INC, "$wd/bin"); -diff -u -r ../../../orig/WebStone/bin/mine-logs.pl ../bin/mine-logs.pl ---- ../../../orig/WebStone/bin/mine-logs.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/mine-logs.pl Tue Mar 25 14:57:26 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl -+#!/usr/local/bin/perl - # - # mine-logs.pl: - # script to transform access logs into WebStone workload -diff -u -r ../../../orig/WebStone/bin/move-filelist.pl ../bin/move-filelist.pl ---- ../../../orig/WebStone/bin/move-filelist.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/move-filelist.pl Tue Mar 25 14:57:39 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - push(@INC, "$wd/bin"); -diff -u -r ../../../orig/WebStone/bin/move-runs.pl ../bin/move-runs.pl ---- ../../../orig/WebStone/bin/move-runs.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/move-runs.pl Tue Mar 25 14:57:50 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - push(@INC, "$wd/bin"); -diff -u -r ../../../orig/WebStone/bin/runbench.pl ../bin/runbench.pl ---- ../../../orig/WebStone/bin/runbench.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/runbench.pl Tue Mar 25 14:58:02 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - - push(@INC, "$wd/bin"); -diff -u -r ../../../orig/WebStone/bin/view-results.pl ../bin/view-results.pl ---- ../../../orig/WebStone/bin/view-results.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/view-results.pl Tue Mar 25 14:58:29 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - push(@INC, "$wd/bin"); - require('WebStone-common.pl'); -diff -u -r ../../../orig/WebStone/bin/webstone-gui.pl ../bin/webstone-gui.pl ---- ../../../orig/WebStone/bin/webstone-gui.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/webstone-gui.pl Tue Mar 25 14:58:42 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - - require 'conf/paths.pl'; - -diff -u -r ../../../orig/WebStone/bin/write-testbed.pl ../bin/write-testbed.pl ---- ../../../orig/WebStone/bin/write-testbed.pl Tue Jun 4 19:24:25 1996 -+++ ../bin/write-testbed.pl Tue Mar 25 14:59:10 1997 -@@ -1,4 +1,4 @@ --#!/bin/perl5 -+#!/usr/local/bin/perl - # - # write new values from form to $wd/conf/testbed, and run WebStone - # -diff -u -r ../../../orig/WebStone/bin/wscollect.pl ../bin/wscollect.pl ---- ../../../orig/WebStone/bin/wscollect.pl Tue Jun 4 19:24:26 1996 -+++ ../bin/wscollect.pl Tue Mar 25 14:59:42 1997 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl5 -+#!/usr/local/bin/perl - # $Header: /disk6/WebStone-2.0/bin/RCS/wscollect.pl,v 1.3 1996/05/03 22:53:37 schan Exp schan $ - # updated version of the old wscollect script which goes through - # webstone run directories and summarizes the output in tabular -diff -u -r ../../../orig/WebStone/conf/filelist ../conf/filelist ---- ../../../orig/WebStone/conf/filelist Tue Jun 4 19:24:26 1996 -+++ ../conf/filelist Wed Mar 26 12:06:32 1997 -@@ -1,2 +1,6 @@ --# home page /index.html only --/index.html -+# Sample filelist, abstracted from access logs -+/file500.html 350 #500 -+/file5k.html 500 #5125 -+/file50k.html 140 #51250 -+/file500k.html 9 #512500 -+/file5m.html 1 #5248000 -Only in ../conf: filelist.index -diff -u -r ../../../orig/WebStone/conf/testbed ../conf/testbed ---- ../../../orig/WebStone/conf/testbed Tue Jun 4 19:24:26 1996 -+++ ../conf/testbed Tue Mar 25 15:37:20 1997 -@@ -9,18 +9,18 @@ - PROXYSERVER= - SERVER="www" - PORTNO=80 --SERVERINFO=hinv --OSTUNINGFILES="/var/sysgen/master.d/bsd" --WEBSERVERDIR="/usr/ns-home" --WEBDOCDIR="$WEBSERVERDIR/docs" --WEBSERVERTUNINGFILES="$WEBSERVERDIR/httpd-80/config/magnus.conf $WEBSERVERDIR/httpd-80/config/obj.conf" -+SERVERINFO="/etc/sysconfig" -+OSTUNINGFILES="" -+WEBSERVERDIR="/usr/local/www" -+WEBDOCDIR="$WEBSERVERDIR/data" -+WEBSERVERTUNINGFILES="" - - # WE NEED AN ACCOUNT WITH A FIXED PASSWORD, SO WE CAN REXEC - # THE WEBSTONE CLIENTS - CLIENTS="webstone1 webstone2 webstone3 webstone4 webstone5" - CLIENTACCOUNT=guest - CLIENTPASSWORD=guest --CLIENTINFO=hinv -+CLIENTINFO="/etc/sysconfig" - TMPDIR=/tmp - - # Possibly system-specific -diff -u -r ../../../orig/WebStone/src/get.c ../src/get.c ---- ../../../orig/WebStone/src/get.c Tue Jun 4 19:24:27 1996 -+++ ../src/get.c Tue Mar 25 15:11:23 1997 -@@ -82,7 +82,7 @@ - - /*#define ABORTIVE_CLOSE 1*/ - #ifdef ABORTIVE_CLOSE --#error don't enable this option -+#error do not enable this option - struct linger { - int l_onoff; - int l_linger; -@@ -112,7 +112,7 @@ - } - - #ifdef ABORTIVE_CLOSE --#error don't enable this option -+#error do not enable this option - /* set up for abortive close */ - linger_opt.l_onoff = 1; - linger_opt.l_linger = 0; -diff -u -r ../../../orig/WebStone/src/sysdep.h ../src/sysdep.h ---- ../../../orig/WebStone/src/sysdep.h Tue Jun 4 19:24:27 1996 -+++ ../src/sysdep.h Tue Mar 25 15:11:55 1997 -@@ -45,7 +45,7 @@ - #define S_ADDR S_un.S_addr - - #ifdef USE_TIMEZONE --#error NT gettimeofday() doesn't support USE_TIMEZONE (yet) -+#error NT gettimeofday() does not support USE_TIMEZONE (yet) - #else - #define GETTIMEOFDAY(timeval, tz) gettimeofday(timeval) - #endif /* USE_TIMEZONE */ + pure: all diff -ruN webstone.bak/pkg/DESCR webstone/pkg/DESCR --- webstone.bak/pkg/DESCR Sun May 2 21:42:05 1999 +++ webstone/pkg/DESCR Sun Aug 20 15:12:27 2000 @@ -1,21 +1,19 @@ -WebStone is an open benchmark proposal to the server industry. It is -designed to measure the performance of HTTP servers under multiple -scenarios which reflect different Web site profiles. +The WebStone benchmark tests were originally developed by Silicon Graphics +to measure the performance of Web server software and hardware products. +WebStone 2.0.1 is a more portable version of the original WebStone +benchmark which added support to use Windows NT systems as client test +systems. -The original WebStone benchmark was released in March, 1995. The original -white paper describing this benchmark is available from -http://www.sgi.com/Products/WebFORCE/WebStone/. - -WebStone is not a proprietary benchmark - it is an open benchmark. The -source code is freely available, and anyone can examine it. By design, -WebStone does not unfairly favor SGI, Netscape, or any other company - it -is simply a performance measurement tool. +Mindcraft, Inc. has acquired the rights to WebStone from Silicon Graphics. +WebStone 2.5 is Mindcraft's enhancement to WebStone 2.0.1 to improve +reliability and portability as well as to make tests more reproducible. +WebStone 2.5 also offers new workloads for CGI and API tests (see below +for more details). WebStone 2.5 provides performance-identical test +results with WebStone 2.0.1 when using the same workloads This FreeBSD port rely on rsh and rcp being allowed for the user proces running webstone between the web server and web clients. This is not enable per default in FreeBSD, and root is never allowed to do it without -entering password for each operation. +entering password for each operation. -- Soren Dossing -sauber@netcom.com -WWW: http://www.sgi.com/Products/WebFORCE/WebStone/ +WWW: http://www.mindcraft.com/webstone/ diff -ruN webstone.bak/pkg/PLIST webstone/pkg/PLIST --- webstone.bak/pkg/PLIST Tue Jun 3 22:47:00 1997 +++ webstone/pkg/PLIST Sun Aug 20 16:02:29 2000 @@ -1,40 +1,53 @@ webstone/bin/WebStone-common.pl -webstone/bin/WebStone-manage.pl -webstone/bin/WebStone-run.pl -webstone/bin/WebStone-setup.pl +webstone/bin/WebStone-filelist.wpl +webstone/bin/WebStone-help.wpl +webstone/bin/WebStone-manage.wpl +webstone/bin/WebStone-run.wpl +webstone/bin/WebStone-testbed.wpl webstone/bin/checkfilelist webstone/bin/genfiles webstone/bin/genfiles-from-filelist.sh +webstone/bin/genfiles.pl webstone/bin/genrand webstone/bin/gui-configure webstone/bin/killbench -webstone/bin/killbench.pl -webstone/bin/mine-logs.pl -webstone/bin/move-filelist.pl -webstone/bin/move-runs.pl -webstone/bin/rebootall +webstone/bin/killbench.wpl +webstone/bin/mine-logs.wpl +webstone/bin/move-filelist.wpl +webstone/bin/move-runs.wpl webstone/bin/runbench webstone/bin/runbench.pl -webstone/bin/runbench~ +webstone/bin/runbench.wpl webstone/bin/tabs2html -webstone/bin/view-results.pl +webstone/bin/view-results.wpl webstone/bin/webclient webstone/bin/webmaster webstone/bin/webstone-gui.pl -webstone/bin/write-testbed.pl +webstone/bin/write-testbed.wpl +webstone/bin/ws-utils.pl +webstone/bin/wscollect webstone/bin/wscollect.pl -webstone/conf/filelist -webstone/conf/filelist.cgi-heavy -webstone/conf/filelist.dynamic-heavy -webstone/conf/filelist.dynamic-light -webstone/conf/filelist.dynamic-medium +webstone/conf/README +webstone/conf/filelist-dyn-cgi-ws20 +webstone/conf/filelist-dyn-cgi-ws20-win +webstone/conf/filelist-dyn-cgi-ws25 +webstone/conf/filelist-dyn-cgi-ws25-win +webstone/conf/filelist-dyn-ws20-iis +webstone/conf/filelist-dyn-ws20-ns +webstone/conf/filelist-dyn-ws25-iis +webstone/conf/filelist-dyn-ws25-ns webstone/conf/filelist.homepage -webstone/conf/filelist.sample +webstone/conf/filelist.manyfiles webstone/conf/filelist.standard webstone/conf/fileset webstone/conf/paths.pl -webstone/conf/paths.sh webstone/conf/testbed +webstone/conf/testbed.nt +webstone/lgm/ws20_cgi +webstone/lgm/ws25_cgi +webstone/lgm/keepme +webstone/webstone @dirrm webstone/bin @dirrm webstone/conf +@dirrm webstone/lgm @dirrm webstone >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message