Bump dd_rescue Version 1.23 to 1.33

-------------------------
Version 1.33, released 2013-03-30.
  It brings long options, a new double overwrite mode (-2) and
  a man page.

Version 1.32
  has a new option -x to append to the output file
  and you can specify -Y (multiple times if you wish so) to
  write the same data to secondary output files.

Version 1.31 (2013-02-03)
  brought a few tiny improvements in the output (such as
  displaying the total elapsed time in the summary as opposed to
  ETA of 0, and the amount of data really written with option
  -W). But importantly, it has the new mode of triple
  overwriting of data (options -3 and -4), with random numbers,
  inverse random numbers, new random numbers (only for -4) and
  zeros, this way allowing paranoia-safe deletion of
  information.

Version 1.30 (2013-01-25)
  brought a fix for outputting data to stdout and a fix for a
  possible double free operation (introduced in 1.29). The
  message formatting has been streamlined a bit. The PRNG can
  now be initialized from a file (e.g. -Z /dev/urandom). The
  program now can also avoid writing to a target block if the
  target block already has the same data (option -W). Think of
  SSDs or other devices where you want to avoid writes.

In Version 1.29 (2013-01-22)
  a bug was fixed, where the last bytes where not copied
  corrected if hardbs == softbs. 1.29 also brings a number of
  new features; the ability to write the same (softbs sized)
  block again and again (option -R, automatically set if infile
  is /dev/zero), the ability to limit transfer size such that
  the outfile won't be enlarged (-M) and the possibility to use
  userspace random numbers (libc/frandom) to fill files with
  random data (options -z and -Z). Last not least, OBS also
  builds .deb binaries for Ubu12.04 / Deb6 now.

Version is 1.28 (released 2012-05-19)
  uses better defaults for hard and softblock sizes (4k/64k
  for buffered I/O, 512/1M for direct IO), as suggested by Jan
  Kara. Also the copying of access times with the option -p
  was fixed.

Version 1.27
  allowed to do 512b direct IO (which is possible in latest
  Linux kernels) -- idea and patch from Jan Kara. Change
  posix_memalign() variable assignment. It has a number of
  fixes from Valentin Lab; most importantly, when exiting
  because of an error, it updates the variables that are
  output. dd_rescue now avoid specal characters in the
  logfile. It handles situations gracefully, where wrong
  positions resulted in the progress graph causing
  faults. Some come from illegal input (negative offset ...),
  which is nw detected.

Version 1.25
  contains a fix for spurious "Success" messages that resulted
  from overwritten (cleared) errno. Bad blocks are formatted
  in a way that they are not overwritten on screen and block
  numbers are output as unsigned.

Version 1.24
  contains a compile fix for Linux versions that contain the
  splice syscall but not the other definitions. I also allows
  for specifying a directory (such as ".") as output filename
  in which case dd_rescue just appends the input file basename
  to it, just like cp does. Maybe most importantly, the RPM
  now contains the latest version of dd_rhelp (0.1.2).
VS: ----------------------------------------------------------------------

5 files changed, 50 insertions, 28 deletions

diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile
index 26805864826..31094f459ad 100644
--- a/sysutils/dd_rescue/Makefile
+++ b/sysutils/dd_rescue/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2013/04/06 03:45:24 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/04 00:47:46 mef Exp $
 
-DISTNAME=	dd_rescue-1.23
+DISTNAME=	dd_rescue-1.33
 CATEGORIES=	sysutils
 MASTER_SITES=	${HOMEPAGE:Q}
 
diff --git a/sysutils/dd_rescue/distinfo b/sysutils/dd_rescue/distinfo
index 404a2cda71d..f4087d87886 100644
--- a/sysutils/dd_rescue/distinfo
+++ b/sysutils/dd_rescue/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2010/11/05 08:32:19 ghen Exp $
+$NetBSD: distinfo,v 1.7 2013/06/04 00:47:46 mef Exp $
 
-SHA1 (dd_rescue-1.23.tar.gz) = c62fbdf083e75c5cf82c31951cd1445779cf14ba
-RMD160 (dd_rescue-1.23.tar.gz) = a5c576f078ecfad2bd764cc20feeb33c21111ae9
-Size (dd_rescue-1.23.tar.gz) = 30234 bytes
-SHA1 (patch-aa) = 1f847d2aafa0c1aa7e5412dc67afe2a3f812fcd1
-SHA1 (patch-ab) = 1d223edabbff9e18b996c3b75956c9078e03540d
+SHA1 (dd_rescue-1.33.tar.gz) = cb21524fec919d32b7263b7999e2c8b26e7273cd
+RMD160 (dd_rescue-1.33.tar.gz) = ed39efddcf3fa6708926cb31c9b32020e0d59208
+Size (dd_rescue-1.33.tar.gz) = 36923 bytes
+SHA1 (patch-aa) = ae11e96371b3b815b066a2dcedd869c90d4b89ff
+SHA1 (patch-ab) = 4ff83cbe0528f8d3db0c0af4d1e135ebad055561
+SHA1 (patch-frandom_c) = dd3c300df7a2f6cee6c981507c1dd17b39c47fb2
diff --git a/sysutils/dd_rescue/patches/patch-aa b/sysutils/dd_rescue/patches/patch-aa
index 373dd0e0022..92301b998df 100644
--- a/sysutils/dd_rescue/patches/patch-aa
+++ b/sysutils/dd_rescue/patches/patch-aa
@@ -1,14 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2010/11/05 08:32:19 ghen Exp $
+$NetBSD: patch-aa,v 1.3 2013/06/04 00:47:46 mef Exp $
 
---- Makefile.orig	2010-10-11 09:37:37.000000000 +0000
-+++ Makefile
-@@ -6,9 +6,6 @@ VERSION = 1.23
+Make it portable.
+
+--- Makefile.orig	2013-03-31 04:33:15.000000000 +0900
++++ Makefile	2013-04-08 16:56:38.000000000 +0900
+@@ -6,9 +6,6 @@ VERSION = 1.33
  
  DESTDIR = 
  
 -CC = gcc
--RPM_OPT_FLAGS = -O2 -Wall -g
+-RPM_OPT_FLAGS = -Os -Wall -g
 -CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS)
+ CFLAGS_OPT = $(CFLAGS) -O3
  INSTALL = install
  INSTALLFLAGS = -s
- prefix = $(DESTDIR)/usr
diff --git a/sysutils/dd_rescue/patches/patch-ab b/sysutils/dd_rescue/patches/patch-ab
index 91993952704..a21100af61e 100644
--- a/sysutils/dd_rescue/patches/patch-ab
+++ b/sysutils/dd_rescue/patches/patch-ab
@@ -1,28 +1,30 @@
-$NetBSD: patch-ab,v 1.5 2010/11/05 08:32:19 ghen Exp $
+$NetBSD: patch-ab,v 1.6 2013/06/04 00:47:46 mef Exp $
 
---- dd_rescue.c.orig	2010-10-11 09:50:32.000000000 +0000
-+++ dd_rescue.c
-@@ -87,6 +87,9 @@ _syscall6(long, splice, int, fdin, loff_
+See http://gnats.netbsd.org/38620
+dd_rescue: (fatal): allocation of aligned buffer failed!
+
+--- dd_rescue.c.orig	2013-03-31 04:24:34.000000000 +0900
++++ dd_rescue.c	2013-04-08 17:03:27.000000000 +0900
+@@ -121,6 +121,10 @@ _syscall6(long, splice, int, fdin, loff_
  # endif
  #endif
  
 +#ifdef __DragonFly__
 +#undef O_DIRECT
 +#endif
++
+ /* fwd decls */
+ int cleanup();
  
- int softbs, hardbs, syncfreq;
- int maxerr, nrerr, reverse, dotrunc, abwrerr, sparse, nosparse;
-@@ -1127,7 +1130,12 @@ int main(int argc, char* argv[])
- 		ipos = 0;
- 
+@@ -1452,6 +1456,11 @@ unsigned char* zalloc_buf(unsigned int b
+ 	unsigned char *ptr;
  #ifdef O_DIRECT
--	if (posix_memalign(mp, sysconf(_SC_PAGESIZE), softbs)) {
+ 	void *mp;
 +#ifdef linux
-+#define my_valloc(a, b, c)	posix_memalign((a), (b), (c))
++#define my_valloc(a, b, c)     posix_memalign((a), (b), (c))
 +#else
-+#define my_valloc(a, b, c)	!(*(a) = valloc((c)))
++#define my_valloc(a, b, c)     !(*(a) = valloc((c)))
 +#endif
-+	if (my_valloc(mp, sysconf(_SC_PAGESIZE), softbs)) {
+ 	if (posix_memalign(&mp, pagesize, bs)) {
  		fplog(stderr, "dd_rescue: (fatal): allocation of aligned buffer failed!\n");
  		cleanup(); exit(18);
- 	}
diff --git a/sysutils/dd_rescue/patches/patch-frandom_c b/sysutils/dd_rescue/patches/patch-frandom_c
new file mode 100644
index 00000000000..efefe7059dd
--- /dev/null
+++ b/sysutils/dd_rescue/patches/patch-frandom_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-frandom_c,v 1.1 2013/06/04 00:47:46 mef Exp $
+
+frandom.c:19:23: fatal error: asm/errno.h: No such file or directory
+compilation terminated.
+
+--- frandom.c.orig	2013-02-10 17:06:41.000000000 +0900
++++ frandom.c	2013-04-08 17:18:43.000000000 +0900
+@@ -16,7 +16,8 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <asm/errno.h>
++/* #include <asm/errno.h> */
++#define ENOMEM 12	/* Out of memory */ 
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/time.h>