From 52a922e102d55027b2651b05171d9efa129ad79f Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 15 Sep 2010 09:59:39 +0000 Subject: [PATCH] update siege to 2.70 --- benchmarks/siege/Makefile | 6 +++--- benchmarks/siege/distinfo | 10 +++++----- benchmarks/siege/patches/patch-configure | 20 ++++++++++--------- .../siege/patches/patch-doc_Makefile_in | 19 ++++++++++++++---- benchmarks/siege/patches/patch-src_init_c | 8 ++++---- benchmarks/siege/pkg/PLIST | 7 ++++--- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile index f4abe1d431d..112cc7dab8a 100644 --- a/benchmarks/siege/Makefile +++ b/benchmarks/siege/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2010/09/15 09:59:39 sthen Exp $ COMMENT = multi-threaded HTTP benchmark and regression tester -DISTNAME = siege-2.67 +DISTNAME = siege-2.70 CATEGORIES = benchmarks www @@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB += c crypto pthread ssl -# main distribution site is broken for EPSV/EPRT as of 20090409 +# main distribution site is broken for EPSV/EPRT as of 20100915 MASTER_SITES = http://spacehopper.org/mirrors/ \ ftp://ftp.joedog.org/pub/siege/ diff --git a/benchmarks/siege/distinfo b/benchmarks/siege/distinfo index 5cbc5fda981..0a5da81d2a5 100644 --- a/benchmarks/siege/distinfo +++ b/benchmarks/siege/distinfo @@ -1,5 +1,5 @@ -MD5 (siege-2.67.tar.gz) = 6nsHtDI8KuE6Bw6F+tGLvg== -RMD160 (siege-2.67.tar.gz) = Sh5lpdULw89SQ70ZEr/J07eH/ak= -SHA1 (siege-2.67.tar.gz) = i+s3oKLdUlOuJTSQPSb+K3808/s= -SHA256 (siege-2.67.tar.gz) = CmWwxLxEndJiSQ+usF9nTtg1nZlx+vTFqQWhyFdS2sY= -SIZE (siege-2.67.tar.gz) = 524276 +MD5 (siege-2.70.tar.gz) = g1x6BgaFE1fr8DCE/1RjEA== +RMD160 (siege-2.70.tar.gz) = PD54Ds6S7ktbmNSQNHzfYSNxU2s= +SHA1 (siege-2.70.tar.gz) = 7goMOp5lWc+MuvcXZJ9mhLDZZDo= +SHA256 (siege-2.70.tar.gz) = PLS8tSpL7ps1prSHSSw6jrINkR12Ex4Sg8pzrF113ZE= +SIZE (siege-2.70.tar.gz) = 484608 diff --git a/benchmarks/siege/patches/patch-configure b/benchmarks/siege/patches/patch-configure index e723deecab9..89b158403bd 100644 --- a/benchmarks/siege/patches/patch-configure +++ b/benchmarks/siege/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ ---- configure.orig Fri Apr 11 18:24:35 2008 -+++ configure Wed Feb 18 11:24:43 2009 -@@ -24860,13 +24860,13 @@ PTHREAD_CFLAGS=error +$OpenBSD: patch-configure,v 1.2 2010/09/15 09:59:39 sthen Exp $ +--- configure.orig Fri Jul 16 15:52:42 2010 ++++ configure Wed Sep 15 10:40:56 2010 +@@ -25178,13 +25178,13 @@ PTHREAD_CFLAGS=error PTHREAD_LDFLAGS=error if test "x$PTHREAD_LDFLAGS" = xerror; then @@ -16,9 +16,9 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ -@@ -24916,8 +24916,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthre + _ACEOF +@@ -25244,8 +25244,8 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthre echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6 if test $ac_cv_lib_pthread_pthread_attr_init = yes; then @@ -29,12 +29,14 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ fi fi -@@ -26506,7 +26506,7 @@ done +@@ -27006,8 +27006,8 @@ done #define JOEPATH_H #define SIEGE_HOME "$prefix" --#define CNF_FILE "$sysconfdir/urls.txt" -+#define CNF_FILE "$sysconfdir/siege/urls.txt" +-#define URL_FILE "$sysconfdir/urls.txt" +-#define CNF_FILE "$sysconfdir/siegerc" ++#define URL_FILE "$sysconfdir/siege/urls.txt" ++#define CNF_FILE "$sysconfdir/siege/siegerc" #define LOG_FILE "$localstatedir/siege.log" diff --git a/benchmarks/siege/patches/patch-doc_Makefile_in b/benchmarks/siege/patches/patch-doc_Makefile_in index a85add85255..d613c437de8 100644 --- a/benchmarks/siege/patches/patch-doc_Makefile_in +++ b/benchmarks/siege/patches/patch-doc_Makefile_in @@ -1,7 +1,18 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ ---- doc/Makefile.in.orig Wed Feb 18 11:05:55 2009 -+++ doc/Makefile.in Wed Feb 18 11:06:07 2009 -@@ -335,7 +335,7 @@ install-exec: install-exec-am +$OpenBSD: patch-doc_Makefile_in,v 1.2 2010/09/15 09:59:39 sthen Exp $ +--- doc/Makefile.in.orig Fri Jul 16 15:52:41 2010 ++++ doc/Makefile.in Wed Sep 15 10:42:30 2010 +@@ -190,8 +190,8 @@ urls.txt \ + siegerc.in + + DISTCLEANFILES = siegerc $(man_MANS) +-SIEGERC = $(sysconfdir)/siegerc +-URLSTXT = $(sysconfdir)/urls.txt ++SIEGERC = $(sysconfdir)/siege/siegerc ++URLSTXT = $(sysconfdir)/siege/urls.txt + all: all-am + + .SUFFIXES: +@@ -415,7 +415,7 @@ install-exec: install-exec-am install-data: install-data-am install-am: all-am diff --git a/benchmarks/siege/patches/patch-src_init_c b/benchmarks/siege/patches/patch-src_init_c index 1585636bc3c..84981db8596 100644 --- a/benchmarks/siege/patches/patch-src_init_c +++ b/benchmarks/siege/patches/patch-src_init_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_init_c,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ ---- src/init.c.orig Wed Feb 18 11:22:30 2009 -+++ src/init.c Wed Feb 18 11:23:45 2009 -@@ -90,8 +90,7 @@ init_config( void ) +$OpenBSD: patch-src_init_c,v 1.2 2010/09/15 09:59:39 sthen Exp $ +--- src/init.c.orig Sat May 8 15:52:47 2010 ++++ src/init.c Wed Sep 15 10:40:02 2010 +@@ -99,8 +99,7 @@ init_config( void ) } if(strlen(my.file) < 1){ diff --git a/benchmarks/siege/pkg/PLIST b/benchmarks/siege/pkg/PLIST index d4287118799..2077fd2a0c5 100644 --- a/benchmarks/siege/pkg/PLIST +++ b/benchmarks/siege/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/09 00:19:14 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.2 2010/09/15 09:59:39 sthen Exp $ bin/bombardment @bin bin/siege bin/siege.config @@ -10,9 +10,10 @@ bin/siege2csv.pl @man man/man5/urls_txt.5 @man man/man7/layingsiege.7 share/examples/siege/ -share/examples/siege/siegerc -share/examples/siege/urls.txt @sample ${SYSCONFDIR}/siege/ +share/examples/siege/siegerc +@sample ${SYSCONFDIR}/siege/siegerc +share/examples/siege/urls.txt @sample ${SYSCONFDIR}/siege/urls.txt @mode 775 @sample /var/log/siege/