Date: Sun, 19 Jan 2014 01:12:23 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340225 - in head/sysutils/dd_rescue: . files Message-ID: <201401190112.s0J1CNM6037070@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Sun Jan 19 01:12:23 2014 New Revision: 340225 URL: http://svnweb.freebsd.org/changeset/ports/340225 QAT: https://qat.redports.org/buildarchive/r340225/ Log: Update to 1.40. Added: head/sysutils/dd_rescue/files/patch-dd_rescue.c (contents, props changed) head/sysutils/dd_rescue/files/patch-find_nonzero.h (contents, props changed) Modified: head/sysutils/dd_rescue/Makefile head/sysutils/dd_rescue/distinfo head/sysutils/dd_rescue/files/patch-Makefile Modified: head/sysutils/dd_rescue/Makefile ============================================================================== --- head/sysutils/dd_rescue/Makefile Sun Jan 19 00:09:37 2014 (r340224) +++ head/sysutils/dd_rescue/Makefile Sun Jan 19 01:12:23 2014 (r340225) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dd_rescue -PORTVERSION= 1.32 +PORTVERSION= 1.40 CATEGORIES= sysutils MASTER_SITES= http://www.garloff.de/kurt/linux/ddrescue/ \ http://fossies.org/unix/privat/ Modified: head/sysutils/dd_rescue/distinfo ============================================================================== --- head/sysutils/dd_rescue/distinfo Sun Jan 19 00:09:37 2014 (r340224) +++ head/sysutils/dd_rescue/distinfo Sun Jan 19 01:12:23 2014 (r340225) @@ -1,2 +1,2 @@ -SHA256 (dd_rescue-1.32.tar.gz) = 9e57d9b1a37d417ea5e2e0ae4de3b742d2370496034bc3a1133147dd9b400dbd -SIZE (dd_rescue-1.32.tar.gz) = 28968 +SHA256 (dd_rescue-1.40.tar.gz) = 54545ebbe2be00597d8c9ba3d51abcfdd7ba89f17d51974629e612c2619730ff +SIZE (dd_rescue-1.40.tar.gz) = 47107 Modified: head/sysutils/dd_rescue/files/patch-Makefile ============================================================================== --- head/sysutils/dd_rescue/files/patch-Makefile Sun Jan 19 00:09:37 2014 (r340224) +++ head/sysutils/dd_rescue/files/patch-Makefile Sun Jan 19 01:12:23 2014 (r340225) @@ -1,19 +1,23 @@ ---- Makefile.orig 2013-01-25 15:02:54.000000000 +0900 -+++ Makefile 2013-01-27 02:37:02.000000000 +0900 +--- Makefile.orig 2013-08-13 06:29:50.000000000 +0900 ++++ Makefile 2014-01-18 17:48:01.000000000 +0900 @@ -6,10 +6,6 @@ DESTDIR = -CC = gcc -RPM_OPT_FLAGS = -Os -Wall -g --CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS) +-CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS) -DHAVE_CONFIG_H -CFLAGS_OPT = $(CFLAGS) -O3 INSTALL = install INSTALLFLAGS = -s prefix = $(DESTDIR)/usr -@@ -26,12 +22,6 @@ - DEFINES = -DVERSION=\"$(VERSION)\" -D__COMPILER__="\"$(COMPILER)\"" - OUT = -o $@ +@@ -26,15 +22,9 @@ + INSTASROOT = -o root -g root + LIBDIR = /usr/lib + COMPILER = $(shell $(CC) --version | head -n1) +-DEFINES = -DVERSION=\"$(VERSION)\" -D__COMPILER__="\"$(COMPILER)\"" ++DEFINES = -DVERSION=\"$(VERSION)\" -D__COMPILER__="\"$(COMPILER)\"" -DHAVE_CONFIG_H + OUT = -o dd_rescue -ifeq ($(CC),wcl386) - CFLAGS = "-ox -wx $(EXTRA_CFLAGS)" @@ -21,6 +25,15 @@ - OUT = "" -endif - - default: $(TARGETS) + MACH := $(shell uname -m | tr A-Z a-z | sed 's/i[3456]86/i386/') + + ifeq ($(MACH),i386) +@@ -75,7 +65,7 @@ + $(CC) $(CFLAGS) -DNO_LIBDL $(DEFINES) $< $(OUT) $(OBJECTS) $(LIBDIR)/libfallocate.a + + dd_rescue: dd_rescue.c $(HEADERS) $(OBJECTS) +- $(CC) $(CFLAGS) $(DEFINES) $< $(OUT) $(OBJECTS) -ldl ++ $(CC) $(CFLAGS) $(DEFINES) $< $(OUT) $(OBJECTS) + + libfalloc-dl: dd_rescue - frandom.o: frandom.c Added: head/sysutils/dd_rescue/files/patch-dd_rescue.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/dd_rescue/files/patch-dd_rescue.c Sun Jan 19 01:12:23 2014 (r340225) @@ -0,0 +1,24 @@ +--- dd_rescue.c.orig 2014-01-18 19:02:26.000000000 +0900 ++++ dd_rescue.c 2014-01-18 19:02:39.000000000 +0900 +@@ -1848,7 +1848,9 @@ + + const char* retstrdupcat3(const char* dir, char dirsep, const char* inm) + { +- char* ibase = basename(strdupa(inm)); ++ char* str = alloca(strlen(inm) + 1); ++ strcpy(str, inm); ++ char* ibase = basename(str); + const int dlen = strlen(dir) + (dirsep>0? 1: dirsep); + char* ret = (char*)malloc(dlen + strlen(inm) + 1); + strcpy(ret, dir); +@@ -1867,7 +1869,9 @@ + { + size_t oln = strlen(onm); + if (!strcmp(onm, ".")) { +- char* ret = strdup(basename(strdupa(iname))); ++ char* str = alloca(strlen(iname) + 1); ++ strcpy(str, iname); ++ char* ret = strdup(basename(str)); + LISTAPPEND(freenames, ret, charp); + return ret; + } Added: head/sysutils/dd_rescue/files/patch-find_nonzero.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/dd_rescue/files/patch-find_nonzero.h Sun Jan 19 01:12:23 2014 (r340225) @@ -0,0 +1,10 @@ +--- find_nonzero.h.orig 2014-01-18 17:32:44.000000000 +0900 ++++ find_nonzero.h 2014-01-18 17:33:03.000000000 +0900 +@@ -12,6 +12,7 @@ + + #include <string.h> + #include <sys/types.h> ++#include <stdint.h> + + #ifdef HAVE_FFS + # define myffs(x) ffs(x)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401190112.s0J1CNM6037070>