[pkgsrc/pkgsrc-2006Q1]: pkgsrc/benchmarks/bonnie Pullup ticket 1500 - request...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4de328dc6b5
branches:  pkgsrc-2006Q1
changeset: 510245:a4de328dc6b5
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue May 02 15:54:56 2006 +0000

description:
Pullup ticket 1500 - requested by simonb
bonnie runtime fix

Revisions pulled up:
- pkgsrc/benchmarks/bonnie/Makefile             1.27
- pkgsrc/benchmarks/bonnie/distinfo             1.7
- pkgsrc/benchmarks/bonnie/patches/patch-ac     1.3

   Module Name:         pkgsrc
   Committed By:        drochner
   Date:                Wed Apr 12 10:55:49 UTC 2006

   Modified Files:

        pkgsrc/benchmarks/bonnie: Makefile distinfo
        pkgsrc/benchmarks/bonnie/patches: patch-ac

   Log Message:

   The patch in PR pkg/21421 had a bug: The memory allocated for "Chunk"
   was too short. This made the program die from EFAULT randomly.
   Found by Konrad Schroder.
   Apply his fix that and bump PKGREVISION.

diffstat:

 benchmarks/bonnie/Makefile         |  4 ++--
 benchmarks/bonnie/distinfo         |  4 ++--
 benchmarks/bonnie/patches/patch-ac |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 847f595de830 -r a4de328dc6b5 benchmarks/bonnie/Makefile
--- a/benchmarks/bonnie/Makefile        Mon May 01 21:56:36 2006 +0000
+++ b/benchmarks/bonnie/Makefile        Tue May 02 15:54:56 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/10/31 17:03:02 tv Exp $
+# $NetBSD: Makefile,v 1.26.4.1 2006/05/02 15:54:56 salo Exp $
 
 DISTNAME=       bonnie
 PKGNAME=       bonnie-2.06
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    benchmarks
 MASTER_SITES=   http://www.textuality.com/bonnie/
 
diff -r 847f595de830 -r a4de328dc6b5 benchmarks/bonnie/distinfo
--- a/benchmarks/bonnie/distinfo        Mon May 01 21:56:36 2006 +0000
+++ b/benchmarks/bonnie/distinfo        Tue May 02 15:54:56 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/03/03 08:58:27 garbled Exp $
+$NetBSD: distinfo,v 1.6.10.1 2006/05/02 15:54:56 salo Exp $
 
 SHA1 (bonnie.tar.gz) = f435ae56903883c8e3e011eb989783c8410f5ee3
 RMD160 (bonnie.tar.gz) = 677446fde3f53e2afc2b5f1d76af2555a4779d88
 Size (bonnie.tar.gz) = 7140 bytes
 SHA1 (patch-aa) = 33ac03e1c70bba2aedf0482e23c16cf19956b47e
 SHA1 (patch-ab) = 927415c66b7c03897aa4cbee07cd54c242272148
-SHA1 (patch-ac) = 40ef6b029df4c287943bcc9dda22c54b64571445
+SHA1 (patch-ac) = 355c9bbb4f13cf8b2d092c17f0cb4f7bc0a31a9e
diff -r 847f595de830 -r a4de328dc6b5 benchmarks/bonnie/patches/patch-ac
--- a/benchmarks/bonnie/patches/patch-ac        Mon May 01 21:56:36 2006 +0000
+++ b/benchmarks/bonnie/patches/patch-ac        Tue May 02 15:54:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2005/03/03 08:58:27 garbled Exp $
+$NetBSD: patch-ac,v 1.2.10.1 2006/05/02 15:54:56 salo Exp $
 
 --- bonnie.c.orig      Wed Aug 28 12:23:49 1996
 +++ bonnie.c   Tue Apr 29 23:22:39 2003
@@ -45,7 +45,7 @@
 -  fprintf(stderr, "File '%s', size: %ld\n", name, size);
 +  fprintf(stderr, "File '%s', size: %qu\n", name, (u_quad_t) size);
 +
-+  if (!(buf = (int *) malloc(Chunk / IntSize))) {
++  if (!(buf = (int *) malloc(Chunk))) {
 +    fprintf(stderr, "Error allocating buffer memory: %s\n", strerror(errno));
 +    exit(1);
 +  }