9 files changed, 36 insertions, 36 deletions

diff --git a/benchmarks/bonnie++/files/patch-Makefile.in b/benchmarks/bonnie++/files/patch-Makefile.in
index ccf166eea47b..c64dfe7748d0 100644
--- a/benchmarks/bonnie++/files/patch-Makefile.in
+++ b/benchmarks/bonnie++/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-12-30 22:04:25.000000000 +0100
-+++ Makefile.in	2013-11-05 05:59:48.000000000 +0100
-@@ -9,7 +9,7 @@
+--- Makefile.in.orig	2008-12-30 21:04:25 UTC
++++ Makefile.in
+@@ -9,7 +9,7 @@ prefix=@prefix@
  eprefix=@exec_prefix@
  #MORE_WARNINGS=-Weffc++
  WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
@@ -9,7 +9,7 @@
  CXX=@CXX@ $(CFLAGS)
  LINK=@CXX@
  THREAD_LFLAGS=@thread_ldflags@
-@@ -52,15 +52,15 @@
+@@ -52,15 +52,15 @@ generate_randfile: generate_randfile.o
  	$(LINK) generate_randfile.o -o generate_randfile
  
  install-bin: $(EXE) $(EXES)
diff --git a/benchmarks/bonnie++/files/patch-bonnie++.cpp b/benchmarks/bonnie++/files/patch-bonnie++.cpp
index dc434a16759a..2d0cb9272723 100644
--- a/benchmarks/bonnie++/files/patch-bonnie++.cpp
+++ b/benchmarks/bonnie++/files/patch-bonnie++.cpp
@@ -1,6 +1,6 @@
---- bonnie++.cpp.orig	2009-07-03 04:38:14.000000000 +0200
-+++ bonnie++.cpp	2014-05-10 12:04:25.000000000 +0200
-@@ -73,7 +73,7 @@
+--- bonnie++.cpp.orig	2009-07-03 02:38:14 UTC
++++ bonnie++.cpp
+@@ -73,7 +73,7 @@ public:
    void set_io_chunk_size(int size)
      { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
    void set_file_chunk_size(int size)
@@ -9,7 +9,7 @@
  
    // Return the page-aligned version of the local buffer
    char *buf() { return m_buf_pa; }
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ CGlobalItems::CGlobalItems(bool *exitFla
   , m_buf(NULL)
   , m_buf_pa(NULL)
  {
@@ -18,7 +18,7 @@
    SetName(".");
  }
  
-@@ -294,11 +294,7 @@
+@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
        {
          char *sbuf = _strdup(optarg);
          char *size = strtok(sbuf, ":");
@@ -30,7 +30,7 @@
          size = strtok(NULL, "");
          if(size)
          {
-@@ -384,17 +380,8 @@
+@@ -384,17 +380,8 @@ int main(int argc, char *argv[])
      if(file_size % 1024 > 512)
        file_size = file_size + 1024 - (file_size % 1024);
    }
@@ -50,7 +50,7 @@
  
    if(machine == NULL)
    {
-@@ -465,14 +452,6 @@
+@@ -465,14 +452,6 @@ int main(int argc, char *argv[])
       && (directory_max_size < directory_min_size || directory_max_size < 0
       || directory_min_size < 0) )
      usage();
diff --git a/benchmarks/bonnie++/files/patch-bonnie.h.in b/benchmarks/bonnie++/files/patch-bonnie.h.in
index de7547755d19..d6b9d5e1759e 100644
--- a/benchmarks/bonnie++/files/patch-bonnie.h.in
+++ b/benchmarks/bonnie++/files/patch-bonnie.h.in
@@ -1,5 +1,5 @@
---- bonnie.h.in.orig    2009-08-21 18:45:50.068536643 +0000
-+++ bonnie.h.in 2009-08-21 18:45:58.564755017 +0000
+--- bonnie.h.in.orig	2009-07-03 03:39:33 UTC
++++ bonnie.h.in
 @@ -1,8 +1,6 @@
  #ifndef BONNIE
  #define BONNIE
@@ -9,7 +9,7 @@
  #define BON_VERSION "@version@"
  #define CSV_VERSION "@csv_version@"
  
-@@ -12,6 +10,8 @@
+@@ -12,6 +10,8 @@ using namespace std;
  #include <sys/stat.h>
  #include <fcntl.h>
  
diff --git a/benchmarks/bonnie++/files/patch-duration.cpp b/benchmarks/bonnie++/files/patch-duration.cpp
index c728a21af411..7ba96bc261ed 100644
--- a/benchmarks/bonnie++/files/patch-duration.cpp
+++ b/benchmarks/bonnie++/files/patch-duration.cpp
@@ -1,12 +1,12 @@
---- duration.cpp.orig	2008-12-23 23:26:42.000000000 +0100
-+++ duration.cpp	2014-05-10 12:04:40.000000000 +0200
+--- duration.cpp.orig	2008-12-23 22:26:42 UTC
++++ duration.cpp
 @@ -1,5 +1,3 @@
 -using namespace std;
 -
  #include <stdlib.h>
  
  #include "duration.h"
-@@ -20,6 +18,8 @@
+@@ -20,6 +18,8 @@ using namespace std;
  #endif
  #endif
  
@@ -15,7 +15,7 @@
  Duration_Base::Duration_Base()
   : m_start(0.0)
   , m_max(0.0)
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ double Duration_Base::stop()
    getTime(&tv);
    double ret;
    ret = tv - m_start;
diff --git a/benchmarks/bonnie++/files/patch-port.h.in b/benchmarks/bonnie++/files/patch-port.h.in
index 9806a6c78164..c9ec73421e9b 100644
--- a/benchmarks/bonnie++/files/patch-port.h.in
+++ b/benchmarks/bonnie++/files/patch-port.h.in
@@ -1,5 +1,5 @@
---- port.h.in.orig	2008-12-24 01:16:16.000000000 +0100
-+++ port.h.in	2014-05-10 12:05:20.000000000 +0200
+--- port.h.in.orig	2008-12-24 00:16:16 UTC
++++ port.h.in
 @@ -4,12 +4,12 @@
  #include "conf.h"
  
@@ -33,7 +33,7 @@
  
  #if @true_false@
  #define false 0
-@@ -49,8 +42,6 @@
+@@ -49,8 +42,6 @@ typedef struct timeval TIMEVAL_TYPE;
  #endif
  
  typedef int FILE_TYPE;
diff --git a/benchmarks/bonnie++/files/patch-rand.h b/benchmarks/bonnie++/files/patch-rand.h
index 9d411036e6bb..59753d937b43 100644
--- a/benchmarks/bonnie++/files/patch-rand.h
+++ b/benchmarks/bonnie++/files/patch-rand.h
@@ -1,5 +1,5 @@
---- rand.h.orig 2009-08-21 18:45:50.068536643 +0000
-+++ rand.h      2009-08-21 18:45:58.564755017 +0000
+--- rand.h.orig	2003-01-08 19:52:53 UTC
++++ rand.h
 @@ -1,11 +1,11 @@
  #ifndef RAND_H
  #define RAND_H
diff --git a/benchmarks/bonnie++/files/patch-zcav.8 b/benchmarks/bonnie++/files/patch-zcav.8
index a7b9598d104c..6634e57522af 100644
--- a/benchmarks/bonnie++/files/patch-zcav.8
+++ b/benchmarks/bonnie++/files/patch-zcav.8
@@ -1,6 +1,6 @@
---- 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 @@
+--- zcav.8.orig	2012-11-23 07:27:16 UTC
++++ zcav.8
+@@ -95,6 +95,9 @@ programs.
  .B \-w
  write zero blocks to the disk instead of reading from the disk - will destroy data!
  
diff --git a/benchmarks/bonnie++/files/patch-zcav.cpp b/benchmarks/bonnie++/files/patch-zcav.cpp
index a0ebecfe2e23..ca604297fb73 100644
--- a/benchmarks/bonnie++/files/patch-zcav.cpp
+++ b/benchmarks/bonnie++/files/patch-zcav.cpp
@@ -1,6 +1,6 @@
---- 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 @@
+--- zcav.cpp.orig	2012-11-23 07:26:19 UTC
++++ zcav.cpp
+@@ -15,9 +15,7 @@ void usage()
         , "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"
@@ -10,7 +10,7 @@
           "            [-l log-file] [-f] file-name\n"
           "            [-l log-file [-f] file-name]...\n"
           "\n"
-@@ -186,9 +184,7 @@
+@@ -186,9 +184,7 @@ int main(int argc, char *argv[])
    const char *log = "-";
    const char *file = "";
    while(-1 != (c = getopt(argc, argv, "-c:b:f:l:r:w"
@@ -20,7 +20,7 @@
                                       "u:g:")) )
    {
      switch(char(c))
-@@ -225,11 +221,9 @@
+@@ -225,11 +221,9 @@ int main(int argc, char *argv[])
          }
        }
        break;
diff --git a/benchmarks/bonnie++/files/patch-zcav_io.cpp b/benchmarks/bonnie++/files/patch-zcav__io.cpp
index 69dce29e122f..797fd7191ec0 100644
--- a/benchmarks/bonnie++/files/patch-zcav_io.cpp
+++ b/benchmarks/bonnie++/files/patch-zcav__io.cpp
@@ -1,6 +1,6 @@
---- 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 @@
+--- zcav_io.cpp.orig	2012-11-23 07:34:43 UTC
++++ zcav_io.cpp
+@@ -83,7 +83,6 @@ int ZcavRead::Read(int max_loops, int ma
    for(int loops = 0; !exiting && loops < max_loops; loops++)
    {
      int i = 0;
@@ -8,7 +8,7 @@
      if(start_offset)
      {
        OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
-@@ -96,7 +95,6 @@
+@@ -96,7 +95,6 @@ int ZcavRead::Read(int max_loops, int ma
        i = start_offset;
      }
      else
@@ -16,7 +16,7 @@
      if(lseek(m_fd, 0, SEEK_SET))
      {
        fprintf(stderr, "Can't lseek().\n");
-@@ -224,14 +222,12 @@
+@@ -224,14 +222,12 @@ ssize_t ZcavRead::access_all(int count)
  // Read/write a block of data
  double ZcavRead::access_data(int skip)
  {