Update to dd_rescue 1.23. Changelog:

In version 1.23, the default to not sync every 512 soft blocks is now really
changed to only sync at the end (documented for 1.18, but mostly ineffective,
ouch). More importantly, a short read because of EOF is now not considered an
error any more and thus neither triggers messages (with quiet) nor does it
cause a confusing exit code any more.
Version 1.22 contains a number of little improvements: Display of compiler,
compile time, enabled options, don't repeat copy attempts if hardbs == softbs,
fix FPE in progress bar for non-seekable input reverse copy, and make the code
more digestable for non-GCC compilers, optional fallbacks for strsignal, pread,
pwrite. Last not least, the documentation has a few notes on the goodies now.
Version 1.21 issues warnings when writing in a sparse mode into existing files
or to block devices.
In version 1.20, there's also a progress estimation if input file size is
unknown, but transfer size is limited with -m.
Version 1.19 brings the support for fallocate.
In version 1.18, we have changed the default to -y0 (no fsync), the avg. speed
is calculated in a meaningful way nevertheless now.
In version 1.17, a progress bar, completion percentage and ETA has been added.
In version 1.16, the work was done to determine and display the total amount of
data that will be copied.
Version 1.15 brings support for the Linux splice() mechanism to avoid copying
data to a userspace bugffer.

5 files changed, 22 insertions, 21 deletions

diff --git a/sysutils/dd_rescue/DESCR b/sysutils/dd_rescue/DESCR
index 5b5fab4bbf3..931210efdb6 100644
--- a/sysutils/dd_rescue/DESCR
+++ b/sysutils/dd_rescue/DESCR
@@ -12,3 +12,4 @@ There are several differences:
 * It uses two block sizes, a large (soft) block size and a small (hard) block
   size. In case of errors, the size falls back to the small one and is
   promoted again after a while without errors.
+* It does not (yet) support non-seekable in- or output.
diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile
index 55bc9381db0..a9cc943daa4 100644
--- a/sysutils/dd_rescue/Makefile
+++ b/sysutils/dd_rescue/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/11/05 08:23:27 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/05 08:32:19 ghen Exp $
 
-DISTNAME=	dd_rescue-1.14
-PKGREVISION=	1
+DISTNAME=	dd_rescue-1.23
 CATEGORIES=	sysutils
 MASTER_SITES=	${HOMEPAGE:Q}
 
@@ -14,6 +13,8 @@ WRKSRC=		${WRKDIR}/dd_rescue
 
 BUILD_TARGET=	dd_rescue
 
+USE_TOOLS+=	gmake
+
 INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/sysutils/dd_rescue/distinfo b/sysutils/dd_rescue/distinfo
index ac897304b31..404a2cda71d 100644
--- a/sysutils/dd_rescue/distinfo
+++ b/sysutils/dd_rescue/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/11/05 08:20:00 ghen Exp $
+$NetBSD: distinfo,v 1.6 2010/11/05 08:32:19 ghen Exp $
 
-SHA1 (dd_rescue-1.14.tar.gz) = 0a9c06a9679f50294f7b2968bf026944c808315a
-RMD160 (dd_rescue-1.14.tar.gz) = e6e12c460c29845912c2e456ac88160009341dcf
-Size (dd_rescue-1.14.tar.gz) = 17754 bytes
-SHA1 (patch-aa) = fbb0fce59b038bad269379ca46592eab4f7929bd
-SHA1 (patch-ab) = 9972011a1dba2702c8af1c9013321ea13b67b3a7
+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
diff --git a/sysutils/dd_rescue/patches/patch-aa b/sysutils/dd_rescue/patches/patch-aa
index a39f37cb995..373dd0e0022 100644
--- a/sysutils/dd_rescue/patches/patch-aa
+++ b/sysutils/dd_rescue/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/03/08 08:42:04 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/05 08:32:19 ghen Exp $
 
---- Makefile.orig	2006-03-08 09:29:43.000000000 +0100
+--- Makefile.orig	2010-10-11 09:37:37.000000000 +0000
 +++ Makefile
-@@ -6,9 +6,6 @@ VERSION = 1.11
+@@ -6,9 +6,6 @@ VERSION = 1.23
  
  DESTDIR = 
  
 -CC = gcc
 -RPM_OPT_FLAGS = -O2 -Wall -g
 -CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS)
- DEFINES = -DVERSION=\"$(VERSION)\"
  INSTALL = install
  INSTALLFLAGS = -s
+ prefix = $(DESTDIR)/usr
diff --git a/sysutils/dd_rescue/patches/patch-ab b/sysutils/dd_rescue/patches/patch-ab
index 789c24b4eab..91993952704 100644
--- a/sysutils/dd_rescue/patches/patch-ab
+++ b/sysutils/dd_rescue/patches/patch-ab
@@ -1,19 +1,18 @@
-$NetBSD: patch-ab,v 1.4 2010/11/05 08:20:00 ghen Exp $
+$NetBSD: patch-ab,v 1.5 2010/11/05 08:32:19 ghen Exp $
 
---- dd_rescue.c.orig	2006-07-23 20:47:50.000000000 +0900
+--- dd_rescue.c.orig	2010-10-11 09:50:32.000000000 +0000
 +++ dd_rescue.c
-@@ -55,6 +55,10 @@
- #include <sys/time.h>
- #include <sys/stat.h>
+@@ -87,6 +87,9 @@ _syscall6(long, splice, int, fdin, loff_
+ # endif
+ #endif
  
 +#ifdef __DragonFly__
 +#undef O_DIRECT
 +#endif
-+
+ 
  int softbs, hardbs, syncfreq;
  int maxerr, nrerr, reverse, dotrunc, abwrerr, sparse, nosparse;
- int verbose, quiet, interact, force;
-@@ -742,7 +746,12 @@ int main(int argc, char* argv[])
+@@ -1127,7 +1130,12 @@ int main(int argc, char* argv[])
  		ipos = 0;
  
  #ifdef O_DIRECT