From 1c7ab8c04d2b766705c6ca1bfcec929fdc86e08a Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 12 Apr 2006 10:55:49 +0000 Subject: 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. --- benchmarks/bonnie/Makefile | 4 ++-- benchmarks/bonnie/distinfo | 4 ++-- benchmarks/bonnie/patches/patch-ac | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'benchmarks') diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile index c35344a0d34..747adf3bb40 100644 --- a/benchmarks/bonnie/Makefile +++ b/benchmarks/bonnie/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2005/10/31 17:03:02 tv Exp $ +# $NetBSD: Makefile,v 1.27 2006/04/12 10:55:49 drochner Exp $ DISTNAME= bonnie PKGNAME= bonnie-2.06 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= benchmarks MASTER_SITES= http://www.textuality.com/bonnie/ diff --git a/benchmarks/bonnie/distinfo b/benchmarks/bonnie/distinfo index a5f73ac86db..d232cda87f2 100644 --- a/benchmarks/bonnie/distinfo +++ b/benchmarks/bonnie/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/03/03 08:58:27 garbled Exp $ +$NetBSD: distinfo,v 1.7 2006/04/12 10:55:49 drochner 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 --git a/benchmarks/bonnie/patches/patch-ac b/benchmarks/bonnie/patches/patch-ac index f851e82bfbd..9cc5276dce3 100644 --- a/benchmarks/bonnie/patches/patch-ac +++ b/benchmarks/bonnie/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2005/03/03 08:58:27 garbled Exp $ +$NetBSD: patch-ac,v 1.3 2006/04/12 10:55:49 drochner Exp $ --- bonnie.c.orig Wed Aug 28 12:23:49 1996 +++ bonnie.c Tue Apr 29 23:22:39 2003 @@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/03 08:58:27 garbled Exp $ - 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); + } -- cgit v1.2.3