(pkgsrc)

  - update MASTER_SITES
(upstream)
  - Update 1.0 to 1.1
-----------------
* Version 1.1:
Fix off-by-one that sometimes resulted in crashes.

5 files changed, 64 insertions, 57 deletions

diff --git a/benchmarks/blogbench/Makefile b/benchmarks/blogbench/Makefile
index 180911c7d0c..a43ce681e1b 100644
--- a/benchmarks/blogbench/Makefile
+++ b/benchmarks/blogbench/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2012/09/11 22:37:11 asau Exp $
+# $NetBSD: Makefile,v 1.8 2015/08/16 06:08:57 mef Exp $
 #
 
-DISTNAME=	blogbench-1.0
-PKGREVISION=	1
+DISTNAME=	blogbench-1.1
 CATEGORIES=	benchmarks
-MASTER_SITES=	ftp://ftp.uvsq.fr/pub/networking/ftp/pure-ftpd/misc/blogbench/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://download.pureftpd.org/pub/blogbench/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://blogbench.pureftpd.org/
diff --git a/benchmarks/blogbench/distinfo b/benchmarks/blogbench/distinfo
index 85a3f8c3d5a..b4e5e44a1a2 100644
--- a/benchmarks/blogbench/distinfo
+++ b/benchmarks/blogbench/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2006/10/22 04:36:12 rillig Exp $
+$NetBSD: distinfo,v 1.5 2015/08/16 06:08:57 mef Exp $
 
-SHA1 (blogbench-1.0.tar.bz2) = 3e667bc9ebfee8751c28508a1840a10b9bdfc099
-RMD160 (blogbench-1.0.tar.bz2) = b688e83c06d45986d592a4fc6a6f5f59ade3da7a
-Size (blogbench-1.0.tar.bz2) = 103355 bytes
+SHA1 (blogbench-1.1.tar.gz) = a53747336ec990701e216f3280179f5949b7da44
+RMD160 (blogbench-1.1.tar.gz) = e9e58a61f78a8ebb41797cfe0bc4a7ef6bf61136
+Size (blogbench-1.1.tar.gz) = 137664 bytes
 SHA1 (patch-aa) = 77c48f0e50aeeec341d7d127564839f526a86e1f
 SHA1 (patch-ab) = 9db1070408e2afd12272e01a62d5ea8f2802c1df
-SHA1 (patch-ac) = 72ce26dc25b1c2adf9b6d8835852c6ff7ddc1d84
-SHA1 (patch-ad) = dab09cd5e678cc5ccce62ffac365b6a61df14ee6
+SHA1 (patch-ac) = b850202ad3aca50f645ebf3028bca4ea25c8fb44
+SHA1 (patch-ad) = fc6cf7ca0b62deec5a805af34827f8c8f876f57a
 SHA1 (patch-ae) = 01b8dcb0641941d70dd056ae2026b83fb16be954
-SHA1 (patch-af) = 8c16af43c281d28446dc2b976662c64b02cf3269
+SHA1 (patch-af) = 4cea6ee154466af88f996f1aa2a90b27269a1ad4
diff --git a/benchmarks/blogbench/patches/patch-ac b/benchmarks/blogbench/patches/patch-ac
index bcd1ba778bd..c3334485e5e 100644
--- a/benchmarks/blogbench/patches/patch-ac
+++ b/benchmarks/blogbench/patches/patch-ac
@@ -1,22 +1,25 @@
-$NetBSD: patch-ac,v 1.1 2006/10/15 12:53:04 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2015/08/16 06:08:57 mef Exp $
 
---- src/blogbench.c.orig	2006-10-15 13:09:33.000000000 +0200
-+++ src/blogbench.c	2006-10-15 13:10:39.000000000 +0200
-@@ -19,6 +19,7 @@
- 	  "--rewriters=<n> (-W <n>): number of rewriters\n"
- 	  "--sleep=<secs> (-s <secs>): delay after every iteration\n"
- 	  "--writers=<n> (-w <n>): number of writers\n"
-+	  "--directio (-o): enable Direct I/O\n"
- 	  "\n"
- 	  "Sample usage:\n"
- 	  "\n"
-@@ -56,6 +57,9 @@
- 	case 'i':
- 	    stats_iterations = (unsigned int) strtoul(optarg, NULL, 10);
- 	    break;
-+	case 'o':
-+	    do_directio = 1;
-+	    break;
- 	case 'r':
- 	    nb_readers = (unsigned int) strtoul(optarg, NULL, 10);
- 	    break;
+Add --directio option on help and alias as o
+
+--- src/blogbench.c.orig	2010-07-08 18:59:41.000000000 +0900
++++ src/blogbench.c	2015-08-16 14:56:27.000000000 +0900
+@@ -18,7 +18,7 @@ static void usage(void)
+           "--readers=<n> (-r <n>): number of writers\n"
+           "--rewriters=<n> (-W <n>): number of rewriters\n"
+           "--sleep=<secs> (-s <secs>): delay after every iteration\n"
+-          "--writers=<n> (-w <n>): number of writers\n"
++          "--directio (-o): enable Direct I/O\n"
+           "\n"
+           "Sample usage:\n"
+           "\n"
+@@ -56,6 +56,9 @@ int main(int argc, char *argv[])
+         case 'i':
+             stats_iterations = (unsigned int) strtoul(optarg, NULL, 10);
+             break;
++        case 'o':
++            do_directio = 1;
++            break;
+         case 'r':
+             nb_readers = (unsigned int) strtoul(optarg, NULL, 10);
+             break;
diff --git a/benchmarks/blogbench/patches/patch-ad b/benchmarks/blogbench/patches/patch-ad
index 11cf2a720ee..ddb89785bb0 100644
--- a/benchmarks/blogbench/patches/patch-ad
+++ b/benchmarks/blogbench/patches/patch-ad
@@ -1,28 +1,34 @@
-$NetBSD: patch-ad,v 1.2 2006/10/22 04:36:12 rillig Exp $
+$NetBSD: patch-ad,v 1.3 2015/08/16 06:08:57 mef Exp $
 
---- src/helpers.c.orig	2005-02-11 15:46:26.000000000 +0100
-+++ src/helpers.c	2006-10-22 06:33:08.000000000 +0200
-@@ -48,9 +48,20 @@ int create_dummy_file(const char * const
+ 			     
+--- src/helpers.c~	2015-08-16 14:59:03.000000000 +0900
++++ src/helpers.c	2015-08-16 14:59:14.000000000 +0900
+@@ -46,12 +46,24 @@ int create_dummy_file(const char * const
+ {
+     static char garbage[WRITE_CHUNK_SIZE];
      size_t towrite;
-     ssize_t written;    
+-    ssize_t written;    
++    ssize_t written;
      int fd;
--    
--    if ((fd = open(file_name, O_CREAT | O_TRUNC | O_WRONLY,
--		   (mode_t) 0600)) == -1) {
 +    mode_t m;
+     
+-    if ((fd = open(file_name, O_CREAT | O_TRUNC | O_WRONLY,
+-                   (mode_t) 0600)) == -1) {
+-        if (errno != ENOENT) {      
 +
 +#if defined(O_DIRECT)
 +    m = O_CREAT|O_TRUNC|O_WRONLY|(do_directio ? O_DIRECT : 0);
 +#else
 +    if (do_directio) {
-+	reentrant_printf("open: O_DIRECT is not supported on this system.\n");
-+	return -1;
++        reentrant_printf("open: O_DIRECT is not supported on this system.\n");
++        return -1;
 +    }
 +    m = O_CREAT|O_TRUNC|O_WRONLY;
 +#endif
 +
 +    fd = open(file_name, m, (mode_t)0600);
-+    if (fd == -1) {
- 	if (errno != ENOENT) {	    
- 	    reentrant_printf("open(\"%s\"): %s\n",
- 			     file_name, strerror(errno));
++    if (fd == -1) { 
++        if (errno != ENOENT) {
+             reentrant_printf("open(\"%s\"): %s\n",
+                              file_name, strerror(errno));
+         }
diff --git a/benchmarks/blogbench/patches/patch-af b/benchmarks/blogbench/patches/patch-af
index 524f20d6861..cb4af29ccf7 100644
--- a/benchmarks/blogbench/patches/patch-af
+++ b/benchmarks/blogbench/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2006/10/15 12:53:04 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2015/08/16 06:08:57 mef Exp $
 
---- src/process.c.orig	2005-02-11 22:32:46.000000000 +0100
-+++ src/process.c	2006-10-15 14:44:32.000000000 +0200
-@@ -138,6 +138,8 @@
- 		     "Frequency = %u secs\n"
- 		     "Scratch dir = [%s]\n",
- 		     sleep_stats, scratch_dir);
-+    reentrant_printf("Direct I/O: %s\n", do_directio ? "enabled" : "disabled");
+--- src/process.c~	2015-08-16 15:00:37.000000000 +0900
++++ src/process.c	2015-08-16 15:01:10.000000000 +0900
+@@ -146,6 +146,8 @@ int process(void)
+                      "Frequency = %u secs\n"
+                      "Scratch dir = [%s]\n",
+                      sleep_stats, scratch_dir);
++     reentrant_printf("Direct I/O: %s\n", do_directio ? "enabled" : "disabled");
 +
      if (chdir(scratch_dir) != 0) {
- 	reentrant_printf("Unable to enter the scratch dir [%s]: [%s]\n",
- 			 scratch_dir, strerror(errno));
+         reentrant_printf("Unable to enter the scratch dir [%s]: [%s]\n",
+                          scratch_dir, strerror(errno));