diff options
| author | taca <taca@pkgsrc.org> | 2007-12-22 04:27:16 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2007-12-22 04:27:16 +0000 |
| commit | 51578274669bde95baafccb930731f15571d1815 (patch) | |
| tree | 7911d8a118a84dde1f98991fe2f8d03652a4dff1 | |
| parent | 0e628135ea8f8582eb5f53918a4ae245fd9d34bb (diff) | |
| download | pkgsrc-51578274669bde95baafccb930731f15571d1815.tar.gz | |
Update dd_rescue to 1.14 and add support for DESTDIR.
Changes from 1.12:
The current version is 1.14, released 2007-08-28.
In version 1.14, a bug is fixed that could lead to a target file not having the
correct size when copied in sparse (-a) mode.
In version 1.13, a bug with read-errors and non-seekable output has been fixed.
| -rw-r--r-- | sysutils/dd_rescue/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/dd_rescue/distinfo | 10 | ||||
| -rw-r--r-- | sysutils/dd_rescue/patches/patch-ab | 20 |
3 files changed, 32 insertions, 12 deletions
diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile index a198cc93dd1..a59be5471d0 100644 --- a/sysutils/dd_rescue/Makefile +++ b/sysutils/dd_rescue/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2006/10/19 07:26:06 ghen Exp $ +# $NetBSD: Makefile,v 1.3 2007/12/22 04:27:16 taca Exp $ -DISTNAME= dd_rescue-1.12 +DISTNAME= dd_rescue-1.14 CATEGORIES= sysutils MASTER_SITES= ${HOMEPAGE} @@ -12,9 +12,13 @@ WRKSRC= ${WRKDIR}/dd_rescue BUILD_TARGET= dd_rescue +INSTALLATION_DIRS= bin share/doc/${PKGBASE} +PKG_DESTDIR_SUPPORT= user-destdir + do-install: - ${INSTALL_PROGRAM} ${WRKSRC:Q}/dd_rescue ${PREFIX:Q}/bin/ - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE} - ${INSTALL_DATA} ${WRKSRC:Q}/README.dd_rescue ${PREFIX}/share/doc/${PKGBASE}/README + ${INSTALL_PROGRAM} ${WRKSRC:Q}/dd_rescue ${DESTDIR}${PREFIX:Q}/bin/ + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} + ${INSTALL_DATA} ${WRKSRC:Q}/README.dd_rescue \ + ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/README .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dd_rescue/distinfo b/sysutils/dd_rescue/distinfo index 1eeb9d1a05c..955a6041d87 100644 --- a/sysutils/dd_rescue/distinfo +++ b/sysutils/dd_rescue/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2006/10/19 07:26:06 ghen Exp $ +$NetBSD: distinfo,v 1.4 2007/12/22 04:27:16 taca Exp $ -SHA1 (dd_rescue-1.12.tar.gz) = fe2889b2bdbc9c9a78cc0613366e2dcef2c7e749 -RMD160 (dd_rescue-1.12.tar.gz) = 9550d17bf5fe8109b97bae89055e4c0401ea2653 -Size (dd_rescue-1.12.tar.gz) = 18123 bytes +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) = daf42ff433d988d1879f4d569c5b7dc1aba1ea5b +SHA1 (patch-ab) = cce3053b74ed5ab72dd2e0cbc46da501e35a6e73 diff --git a/sysutils/dd_rescue/patches/patch-ab b/sysutils/dd_rescue/patches/patch-ab index ce0fab988a3..aff3f18c04e 100644 --- a/sysutils/dd_rescue/patches/patch-ab +++ b/sysutils/dd_rescue/patches/patch-ab @@ -1,5 +1,7 @@ ---- dd_rescue.c.orig 2006-07-23 13:47:50.000000000 +0200 -+++ dd_rescue.c 2006-09-20 20:27:33.000000000 +0200 +$NetBSD: patch-ab,v 1.3 2007/12/22 04:27:17 taca Exp $ + +--- dd_rescue.c.orig 2006-07-23 20:47:50.000000000 +0900 ++++ dd_rescue.c @@ -55,6 +55,10 @@ #include <sys/time.h> #include <sys/stat.h> @@ -11,3 +13,17 @@ 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[]) + ipos = 0; + + #ifdef O_DIRECT +- if (posix_memalign(mp, sysconf(_SC_PAGESIZE), softbs)) { ++#ifdef linux ++#define my_valloc(a, b, c) posix_memalign((a), (b), (c)) ++#else ++#define my_valloc(a, b, c) (*(a) = valloc((c))) ++#endif ++ if (my_valloc(mp, sysconf(_SC_PAGESIZE), softbs)) { + fplog(stderr, "dd_rescue: (fatal): allocation of aligned buffer failed!\n"); + cleanup(); exit(18); + } |