Date: Mon, 15 Mar 2021 05:46:19 +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: r568429 - in head/sysutils/dd_rescue: . files Message-ID: <202103150546.12F5kJ4K092858@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Mon Mar 15 05:46:19 2021 New Revision: 568429 URL: https://svnweb.freebsd.org/changeset/ports/568429 Log: Update to 1.99.10. Modified: head/sysutils/dd_rescue/Makefile head/sysutils/dd_rescue/distinfo head/sysutils/dd_rescue/files/patch-Makefile head/sysutils/dd_rescue/files/patch-dd_rescue.c head/sysutils/dd_rescue/files/patch-ffs.h Modified: head/sysutils/dd_rescue/Makefile ============================================================================== --- head/sysutils/dd_rescue/Makefile Mon Mar 15 04:46:47 2021 (r568428) +++ head/sysutils/dd_rescue/Makefile Mon Mar 15 05:46:19 2021 (r568429) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dd_rescue -PORTVERSION= 1.99.8 -PORTREVISION= 1 +PORTVERSION= 1.99.10 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 Mon Mar 15 04:46:47 2021 (r568428) +++ head/sysutils/dd_rescue/distinfo Mon Mar 15 05:46:19 2021 (r568429) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529856127 -SHA256 (dd_rescue-1.99.8.tar.bz2) = 90db76716af6a6a2370d9726804ff26cc63e61109af9967078a5eb941faa7dbd -SIZE (dd_rescue-1.99.8.tar.bz2) = 174594 +TIMESTAMP = 1615785193 +SHA256 (dd_rescue-1.99.10.tar.bz2) = 100fceb65b073a2c6e4f1a6b6e2e58e5d51235a4e85162f098b03d9ff0e65c16 +SIZE (dd_rescue-1.99.10.tar.bz2) = 176603 Modified: head/sysutils/dd_rescue/files/patch-Makefile ============================================================================== --- head/sysutils/dd_rescue/files/patch-Makefile Mon Mar 15 04:46:47 2021 (r568428) +++ head/sysutils/dd_rescue/files/patch-Makefile Mon Mar 15 05:46:19 2021 (r568429) @@ -1,18 +1,18 @@ ---- Makefile.orig 2017-12-03 21:01:05 UTC +--- Makefile.orig 2021-03-08 07:47:42 UTC +++ Makefile -@@ -7,10 +7,7 @@ VERSION = 1.99.8 +@@ -7,10 +7,7 @@ VERSION = 1.99.10 DESTDIR = SRCDIR = . --CC = gcc --RPM_OPT_FLAGS = -Os -Wall -g -D_FORTIFY_SOURCE=2 +-CC ?= gcc +-RPM_OPT_FLAGS ?= -Os -Wall -g -D_FORTIFY_SOURCE=2 -CFLAGS = $(RPM_OPT_FLAGS) $(EXTRA_CFLAGS) -DHAVE_CONFIG_H -I . -CFLAGS_OPT = $(CFLAGS) -O3 +CFLAGS_OPT = $(CFLAGS) -DHAVE_CONFIG_H - INSTALL = install + INSTALL ?= install INSTALLFLAGS = -s prefix = $(DESTDIR)/usr -@@ -34,7 +31,7 @@ LIB = lib +@@ -35,7 +32,7 @@ LIB = lib LIBDIR = /usr/$(LIB) COMPILER = $(shell $(CC) --version | head -n1) ID = $(shell git describe --tags || cat REL-ID) @@ -21,8 +21,8 @@ OUT = -o dd_rescue PIC = -fPIC PIE = -fPIE -@@ -63,19 +60,13 @@ else - HAVE_OPENSSL=0 +@@ -70,19 +67,13 @@ else + HAVE_XATTR=0 endif -ifeq ($(CC),wcl386) @@ -42,7 +42,7 @@ ISX86 := 1 LIB = lib64 endif -@@ -243,7 +234,7 @@ libddr_MD5.so: libddr_hash.so +@@ -261,7 +252,7 @@ libddr_MD5.so: libddr_hash.so ln -sf $< $@ libddr_lzo.so: libddr_lzo.po @@ -51,7 +51,7 @@ libddr_null.so: libddr_null.po $(CC) -shared -o $@ $^ -@@ -306,7 +297,7 @@ libfalloc-static: $(SRCDIR)/dd_rescue.c +@@ -324,7 +315,7 @@ libfalloc-static: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) # This is the default built dd_rescue: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) $(OBJECTS) $(OBJECTS2) Modified: head/sysutils/dd_rescue/files/patch-dd_rescue.c ============================================================================== --- head/sysutils/dd_rescue/files/patch-dd_rescue.c Mon Mar 15 04:46:47 2021 (r568428) +++ head/sysutils/dd_rescue/files/patch-dd_rescue.c Mon Mar 15 05:46:19 2021 (r568429) @@ -1,6 +1,6 @@ ---- dd_rescue.c.orig 2017-11-02 11:28:14 UTC +--- dd_rescue.c.orig 2021-03-07 06:46:37 UTC +++ dd_rescue.c -@@ -117,6 +117,7 @@ +@@ -116,6 +116,7 @@ #include "list.h" #include "fmt_no.h" #include "find_nonzero.h" @@ -8,7 +8,7 @@ #include "fstrim.h" -@@ -2712,7 +2713,9 @@ int is_filename(char* arg) +@@ -2725,7 +2726,9 @@ int is_filename(char* arg) const char* retstrdupcat3(const char* dir, char dirsep, const char* inm) { @@ -19,7 +19,7 @@ const int dlen = strlen(dir) + (dirsep>0? 1: dirsep); char* ret = (char*)malloc(dlen + strlen(inm) + 1); strcpy(ret, dir); -@@ -2731,7 +2734,9 @@ const char* dirappfile(const char* onm, +@@ -2744,7 +2747,9 @@ const char* dirappfile(const char* onm, opt_t *op) { size_t oln = strlen(onm); if (!strcmp(onm, ".")) { Modified: head/sysutils/dd_rescue/files/patch-ffs.h ============================================================================== --- head/sysutils/dd_rescue/files/patch-ffs.h Mon Mar 15 04:46:47 2021 (r568428) +++ head/sysutils/dd_rescue/files/patch-ffs.h Mon Mar 15 05:46:19 2021 (r568429) @@ -1,4 +1,4 @@ ---- ffs.h.orig 2015-08-27 15:45:57 UTC +--- ffs.h.orig 2021-03-07 06:41:24 UTC +++ ffs.h @@ -27,7 +27,15 @@ #ifdef HAVE_ENDIAN_H @@ -39,10 +39,10 @@ /** Find last (highest) bit set in word val, returns a val b/w __WORDSIZE and 1, 0 if no bit is set */ static int myflsl(unsigned long val) { -@@ -132,6 +137,8 @@ static int myflsl(unsigned long val) - return res; - #endif +@@ -134,6 +139,8 @@ static int myflsl(unsigned long val) } + int myffs_sse42(unsigned long); + int myffsl_sse42(unsigned long); +#else +# define myflsl(x) flsl(x) #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103150546.12F5kJ4K092858>