diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2013-01-26 18:03:42 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2013-01-26 18:03:42 +0000 |
| commit | 4d93d9cc3646125ff6efa17a24c5996b780a1457 (patch) | |
| tree | 6647604307b44b1b8acbc692c4254ec0e750497d /sysutils | |
| parent | Update to 0.19. (diff) | |
Update to 1.30.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dd_rescue/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/dd_rescue/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/dd_rescue/files/patch-Makefile | 20 | ||||
| -rw-r--r-- | sysutils/dd_rescue/files/patch-dd_rescue.c | 16 | ||||
| -rw-r--r-- | sysutils/dd_rescue/files/patch-frandom.c | 11 |
5 files changed, 22 insertions, 33 deletions
diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile index f6f37a228997..447afe4b8483 100644 --- a/sysutils/dd_rescue/Makefile +++ b/sysutils/dd_rescue/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dd_rescue -PORTVERSION= 1.28 +PORTVERSION= 1.30 CATEGORIES= sysutils MASTER_SITES= http://www.garloff.de/kurt/linux/ddrescue/ @@ -16,6 +16,8 @@ COMMENT= A dd tool suitable for rescuing data from a medium with errors LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +USE_GMAKE= yes + WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= default diff --git a/sysutils/dd_rescue/distinfo b/sysutils/dd_rescue/distinfo index aedaaa485a7a..03a4720900fb 100644 --- a/sysutils/dd_rescue/distinfo +++ b/sysutils/dd_rescue/distinfo @@ -1,2 +1,2 @@ -SHA256 (dd_rescue-1.28.tar.gz) = 4adcc368a1d4ad62577eaf8609809be1678335d54ef565a5a0fa6e1210489f03 -SIZE (dd_rescue-1.28.tar.gz) = 22093 +SHA256 (dd_rescue-1.30.tar.gz) = f4e59c5e669b758c7063bd69dc86f18d380ee3d3551f3da23a2b2a24da4bfa3b +SIZE (dd_rescue-1.30.tar.gz) = 25253 diff --git a/sysutils/dd_rescue/files/patch-Makefile b/sysutils/dd_rescue/files/patch-Makefile index 49ea54b0836c..4cca0e9eb74a 100644 --- a/sysutils/dd_rescue/files/patch-Makefile +++ b/sysutils/dd_rescue/files/patch-Makefile @@ -1,16 +1,17 @@ ---- Makefile.orig 2012-01-22 22:48:54.000000000 +0900 -+++ Makefile 2012-02-12 23:57:39.000000000 +0900 -@@ -6,9 +6,6 @@ +--- Makefile.orig 2013-01-25 15:02:54.000000000 +0900 ++++ Makefile 2013-01-27 02:37:02.000000000 +0900 +@@ -6,10 +6,6 @@ DESTDIR = -CC = gcc -RPM_OPT_FLAGS = -Os -Wall -g -CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS) +-CFLAGS_OPT = $(CFLAGS) -O3 INSTALL = install INSTALLFLAGS = -s prefix = $(DESTDIR)/usr -@@ -25,12 +22,6 @@ +@@ -26,12 +22,6 @@ DEFINES = -DVERSION=\"$(VERSION)\" -D__COMPILER__="\"$(COMPILER)\"" OUT = -o $@ @@ -22,13 +23,4 @@ - default: $(TARGETS) - libfalloc: dd_rescue.c -@@ -43,7 +34,7 @@ - $(CC) $(CFLAGS) -DHAVE_FALLOCATE=1 $(DEFINES) $< -o dd_rescue - - dd_rescue: dd_rescue.c -- $(CC) $(CFLAGS) $(DEFINES) $< $(OUT) -+ $(CC) $(CFLAGS) $(DEFINES) $(LIBS) $< $(OUT) - - strip: dd_rescue - strip -S $< + frandom.o: frandom.c diff --git a/sysutils/dd_rescue/files/patch-dd_rescue.c b/sysutils/dd_rescue/files/patch-dd_rescue.c deleted file mode 100644 index 3d619647b7a4..000000000000 --- a/sysutils/dd_rescue/files/patch-dd_rescue.c +++ /dev/null @@ -1,16 +0,0 @@ ---- dd_rescue.c.orig 2012-05-20 05:46:14.000000000 +0900 -+++ dd_rescue.c 2012-06-02 22:24:44.000000000 +0900 -@@ -1194,11 +1194,11 @@ - ipos = 0; - - #ifdef O_DIRECT -- if (posix_memalign(&mp, pagesize, softbs)) { -+ buf = malloc(softbs); -+ if (!buf) { - fplog(stderr, "dd_rescue: (fatal): allocation of aligned buffer failed!\n"); - cleanup(); exit(18); - } -- buf = mp; - #else - buf = malloc(softbs); - if (!buf) { diff --git a/sysutils/dd_rescue/files/patch-frandom.c b/sysutils/dd_rescue/files/patch-frandom.c new file mode 100644 index 000000000000..b03b6382253b --- /dev/null +++ b/sysutils/dd_rescue/files/patch-frandom.c @@ -0,0 +1,11 @@ +--- frandom.c.orig 2013-01-27 02:43:19.000000000 +0900 ++++ frandom.c 2013-01-27 02:43:29.000000000 +0900 +@@ -16,7 +16,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +-#include <asm/errno.h> ++#include <sys/errno.h> + #include <unistd.h> + #include <time.h> + |