From c71a27a935c463225b64685fa0199cf69191e37e Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 11 Jan 2016 10:22:05 +0000 Subject: [PATCH] Update to siege 3.1.3. Note that due to a mishap in Makefile/patches the config dif was previously /etc/siege/siege/* - this has been fixed to be /etc/siege/* as expected, so you might have to adapt your install. ok sthen@ --- benchmarks/siege/Makefile | 6 ++---- benchmarks/siege/distinfo | 4 ++-- benchmarks/siege/patches/patch-configure | 10 +++++----- benchmarks/siege/patches/patch-doc_Makefile_in | 10 +++++----- benchmarks/siege/patches/patch-src_init_c | 13 ------------- 5 files changed, 14 insertions(+), 29 deletions(-) delete mode 100644 benchmarks/siege/patches/patch-src_init_c diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile index dffc5cbce72..54ba1463978 100644 --- a/benchmarks/siege/Makefile +++ b/benchmarks/siege/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2015/06/23 15:28:58 bentley Exp $ +# $OpenBSD: Makefile,v 1.10 2016/01/11 10:22:05 landry Exp $ COMMENT = multi-threaded HTTP benchmark and regression tester -DISTNAME = siege-2.70 -REVISION = 1 +DISTNAME = siege-3.1.3 CATEGORIES = benchmarks www @@ -19,7 +18,6 @@ MASTER_SITES = http://download.joedog.org/siege/ MAKE_FLAGS = localstatedir=${LOCALSTATEDIR} LOCALSTATEDIR= ${BASELOCALSTATEDIR}/log/siege -SYSCONFDIR= ${BASESYSCONFDIR}/siege CONFIGURE_STYLE = gnu diff --git a/benchmarks/siege/distinfo b/benchmarks/siege/distinfo index e2deb16f5d7..1090bb80fab 100644 --- a/benchmarks/siege/distinfo +++ b/benchmarks/siege/distinfo @@ -1,2 +1,2 @@ -SHA256 (siege-2.70.tar.gz) = PLS8tSpL7ps1prSHSSw6jrINkR12Ex4Sg8pzrF113ZE= -SIZE (siege-2.70.tar.gz) = 484608 +SHA256 (siege-3.1.3.tar.gz) = TTky6iPL9tHSLffH7m56a8n1kbYEq1gjk+62Lzk/WjM= +SIZE (siege-3.1.3.tar.gz) = 527862 diff --git a/benchmarks/siege/patches/patch-configure b/benchmarks/siege/patches/patch-configure index 7107b7a35c2..4d15b192894 100644 --- a/benchmarks/siege/patches/patch-configure +++ b/benchmarks/siege/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2012/08/19 18:55:08 jasper Exp $ ---- configure.orig Fri Jul 16 15:52:42 2010 -+++ configure Wed Sep 15 10:40:56 2010 -@@ -27006,8 +27006,8 @@ done +$OpenBSD: patch-configure,v 1.4 2016/01/11 10:22:05 landry Exp $ +--- configure.orig Mon Nov 2 14:19:57 2015 ++++ configure Fri Jan 8 14:55:25 2016 +@@ -29474,8 +29474,8 @@ $as_echo "$as_me: error: cannot create directory $as_d #define JOEPATH_H #define SIEGE_HOME "$prefix" @@ -10,5 +10,5 @@ $OpenBSD: patch-configure,v 1.3 2012/08/19 18:55:08 jasper Exp $ +#define URL_FILE "$sysconfdir/siege/urls.txt" +#define CNF_FILE "$sysconfdir/siege/siegerc" #define LOG_FILE "$localstatedir/siege.log" - + #define PLATFORM "$platform" diff --git a/benchmarks/siege/patches/patch-doc_Makefile_in b/benchmarks/siege/patches/patch-doc_Makefile_in index d613c437de8..c7d89cb0e7c 100644 --- a/benchmarks/siege/patches/patch-doc_Makefile_in +++ b/benchmarks/siege/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$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 \ +$OpenBSD: patch-doc_Makefile_in,v 1.3 2016/01/11 10:22:05 landry Exp $ +--- doc/Makefile.in.orig Mon Nov 2 14:19:56 2015 ++++ doc/Makefile.in Fri Jan 8 14:55:25 2016 +@@ -220,8 +220,8 @@ urls.txt \ siegerc.in DISTCLEANFILES = siegerc $(man_MANS) @@ -12,7 +12,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 2010/09/15 09:59:39 sthen Exp $ all: all-am .SUFFIXES: -@@ -415,7 +415,7 @@ install-exec: install-exec-am +@@ -437,7 +437,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 deleted file mode 100644 index 84981db8596..00000000000 --- a/benchmarks/siege/patches/patch-src_init_c +++ /dev/null @@ -1,13 +0,0 @@ -$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){ -- strcpy( my.file, SIEGE_HOME ); -- strcat( my.file, "/etc/urls.txt" ); -+ strcpy( my.file, CNF_FILE ); - } - - if(strlen(my.uagent) < 1)