- Update to 138132

PR:		138132
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com> (maintainer)

6 files changed, 93 insertions, 29 deletions

diff --git a/benchmarks/bonnie++/files/patch-bonnie++.8 b/benchmarks/bonnie++/files/patch-bonnie++.8
deleted file mode 100644
index 5c5b40f5e3ae..000000000000
--- a/benchmarks/bonnie++/files/patch-bonnie++.8
+++ /dev/null
@@ -1,9 +0,0 @@
---- bonnie++.8.orig	Sun Sep  9 16:25:02 2001
-+++ bonnie++.8	Sun Sep  9 16:25:43 2001
-@@ -194,4 +194,5 @@
- 
- .SH "SEE ALSO"
- .BR bon_csv2html (1),
--.BR bon_csv2txt (1)
-+.BR bon_csv2txt (1) ,
-+.BR zcav (8)
diff --git a/benchmarks/bonnie++/files/patch-getc_putc.cpp b/benchmarks/bonnie++/files/patch-getc_putc.cpp
deleted file mode 100644
index bad9550b0938..000000000000
--- a/benchmarks/bonnie++/files/patch-getc_putc.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- getc_putc.cpp.orig	Sun Dec  9 06:50:24 2001
-+++ getc_putc.cpp	Wed Mar  5 14:32:58 2003
-@@ -17,6 +17,12 @@
- #include "duration.h"
- #include "getc_putc.h"
- 
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
-+/* Work around for: line 168, no matching function for call to `min(long unsigned int, unsigned int)' */
-+#include <sys/param.h>
-+#define min MIN
-+#endif
-+
- static void usage()
- {
-   fprintf(stderr, "usage:\n"
diff --git a/benchmarks/bonnie++/files/patch-port.h.in b/benchmarks/bonnie++/files/patch-port.h.in
new file mode 100644
index 000000000000..cce0fa045dc7
--- /dev/null
+++ b/benchmarks/bonnie++/files/patch-port.h.in
@@ -0,0 +1,21 @@
+--- port.h.in.orig	2009-08-21 18:45:50.068536643 +0000
++++ port.h.in	2009-08-21 18:45:58.564755017 +0000
+@@ -3,18 +3,8 @@
+ 
+ #include "conf.h"
+ 
+-#ifndef HAVE_MIN_MAX
+-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
+-#ifdef HAVE_ALGO
+-#include <algo>
+-#else
+-#include <algo.h>
+-#endif
+-#else
+ #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
+ #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
+-#endif
+-#endif
+ 
+ @semun@
+ @bool@
diff --git a/benchmarks/bonnie++/files/patch-zcav.8 b/benchmarks/bonnie++/files/patch-zcav.8
index 3dc4edbd7476..a7b9598d104c 100644
--- a/benchmarks/bonnie++/files/patch-zcav.8
+++ b/benchmarks/bonnie++/files/patch-zcav.8
@@ -1,8 +1,8 @@
---- zcav.8.orig	Sun Sep  9 16:26:11 2001
-+++ zcav.8	Sun Sep  9 16:26:33 2001
-@@ -72,6 +72,9 @@
- parameter, just a different way to specify it for compatibility with other
- programs.
+--- zcav.8.orig	2009-08-21 07:13:21.319089995 +0000
++++ zcav.8	2009-08-21 07:14:03.189181585 +0000
+@@ -95,6 +95,9 @@
+ .B \-w
+ write zero blocks to the disk instead of reading from the disk - will destroy data!
  
 +.SH "SEE ALSO"
 +.BR bonnie++ (8)
diff --git a/benchmarks/bonnie++/files/patch-zcav.cpp b/benchmarks/bonnie++/files/patch-zcav.cpp
new file mode 100644
index 000000000000..a0ebecfe2e23
--- /dev/null
+++ b/benchmarks/bonnie++/files/patch-zcav.cpp
@@ -0,0 +1,34 @@
+--- zcav.cpp.orig	2009-08-24 07:31:32.060913886 +0000
++++ zcav.cpp	2009-08-24 07:33:16.257389975 +0000
+@@ -15,9 +15,7 @@
+        , "Usage: zcav [-b block-size[:chunk-size]] [-c count]\n"
+          "            [-r [start offset:]end offset] [-w]\n"
+          "            [-u uid-to-use:gid-to-use] [-g gid-to-use]\n"
+-#ifdef _LARGEFILE64_SOURCE
+          "            [-s skip rate]\n"
+-#endif
+          "            [-l log-file] [-f] file-name\n"
+          "            [-l log-file [-f] file-name]...\n"
+          "\n"
+@@ -186,9 +184,7 @@
+   const char *log = "-";
+   const char *file = "";
+   while(-1 != (c = getopt(argc, argv, "-c:b:f:l:r:w"
+-#ifdef _LARGEFILE64_SOURCE
+ 				     "s:"
+-#endif
+                                      "u:g:")) )
+   {
+     switch(char(c))
+@@ -225,11 +221,9 @@
+         }
+       }
+       break;
+-#ifdef _LARGEFILE64_SOURCE
+       case 's':
+         mz.setSkipRate(atoi(optarg));
+       break;
+-#endif
+       case 'g':
+         if(groupName)
+           usage();
diff --git a/benchmarks/bonnie++/files/patch-zcav_io.cpp b/benchmarks/bonnie++/files/patch-zcav_io.cpp
new file mode 100644
index 000000000000..69dce29e122f
--- /dev/null
+++ b/benchmarks/bonnie++/files/patch-zcav_io.cpp
@@ -0,0 +1,33 @@
+--- zcav_io.cpp.orig	2009-08-24 07:36:02.677798155 +0000
++++ zcav_io.cpp	2009-08-24 07:36:40.688614055 +0000
+@@ -83,7 +83,6 @@
+   for(int loops = 0; !exiting && loops < max_loops; loops++)
+   {
+     int i = 0;
+-#ifdef _LARGEFILE64_SOURCE
+     if(start_offset)
+     {
+       OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
+@@ -96,7 +95,6 @@
+       i = start_offset;
+     }
+     else
+-#endif
+     if(lseek(m_fd, 0, SEEK_SET))
+     {
+       fprintf(stderr, "Can't lseek().\n");
+@@ -224,14 +222,12 @@
+ // Read/write a block of data
+ double ZcavRead::access_data(int skip)
+ {
+-#ifdef _LARGEFILE64_SOURCE
+   if(skip)
+   {
+     OFF_TYPE real_offset = OFF_TYPE(skip) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
+     if(file_lseek(m_fd, real_offset, SEEK_CUR) == OFF_TYPE(-1))
+       return -1.0;
+   }
+-#endif
+ 
+   m_dur.start();
+   for(int i = 0; i < m_block_size; i+= m_chunk_size)