From owner-svn-ports-head@FreeBSD.ORG Wed Aug 13 14:14:37 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 47B49293; Wed, 13 Aug 2014 14:14:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A7EF2CCC; Wed, 13 Aug 2014 14:14:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DEEbqJ053338; Wed, 13 Aug 2014 14:14:37 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7DEEZ8Q053329; Wed, 13 Aug 2014 14:14:35 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <201408131414.s7DEEZ8Q053329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Wed, 13 Aug 2014 14:14:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364787 - in head/sysutils/dd_rescue: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2014 14:14:37 -0000 Author: nobutaka Date: Wed Aug 13 14:14:35 2014 New Revision: 364787 URL: http://svnweb.freebsd.org/changeset/ports/364787 QAT: https://qat.redports.org/buildarchive/r364787/ Log: Update to 1.46. Added: head/sysutils/dd_rescue/files/patch-libddr_MD5.c (contents, props changed) Modified: head/sysutils/dd_rescue/Makefile head/sysutils/dd_rescue/distinfo head/sysutils/dd_rescue/files/patch-ffs.h head/sysutils/dd_rescue/files/patch-libddr_null.c head/sysutils/dd_rescue/files/patch-sha512.c Modified: head/sysutils/dd_rescue/Makefile ============================================================================== --- head/sysutils/dd_rescue/Makefile Wed Aug 13 14:09:42 2014 (r364786) +++ head/sysutils/dd_rescue/Makefile Wed Aug 13 14:14:35 2014 (r364787) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dd_rescue -PORTVERSION= 1.45 +PORTVERSION= 1.46 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 Wed Aug 13 14:09:42 2014 (r364786) +++ head/sysutils/dd_rescue/distinfo Wed Aug 13 14:14:35 2014 (r364787) @@ -1,2 +1,2 @@ -SHA256 (dd_rescue-1.45.tar.gz) = 2626fa2842916f6861b4e1ce72284c81e1b6e7323a842911aad4082bdaa4f663 -SIZE (dd_rescue-1.45.tar.gz) = 121426 +SHA256 (dd_rescue-1.46.tar.gz) = 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba +SIZE (dd_rescue-1.46.tar.gz) = 126790 Modified: head/sysutils/dd_rescue/files/patch-ffs.h ============================================================================== --- head/sysutils/dd_rescue/files/patch-ffs.h Wed Aug 13 14:09:42 2014 (r364786) +++ head/sysutils/dd_rescue/files/patch-ffs.h Wed Aug 13 14:14:35 2014 (r364787) @@ -1,15 +1,22 @@ --- ffs.h.orig 2014-02-22 05:39:33.000000000 +0900 -+++ ffs.h 2014-06-29 01:21:32.000000000 +0900 -@@ -27,7 +27,7 @@ ++++ ffs.h 2014-08-13 22:46:51.000000000 +0900 +@@ -27,7 +27,15 @@ #ifdef HAVE_ENDIAN_H #include #endif -- +#include ++#ifndef __WORDSIZE ++#if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX) ++#define __WORDSIZE 64 ++#else ++#define __WORDSIZE 32 ++#endif ++#endif + #ifdef HAVE_FFS # define myffs(x) ffs(x) -@@ -50,7 +50,7 @@ +@@ -50,12 +58,9 @@ # define myffsl(x) myffsl_c(x) #endif @@ -17,8 +24,13 @@ +#ifndef BYTE_ORDER # error Need to define __BYTE_ORDER #endif - #ifndef __WORDSIZE -@@ -88,7 +88,7 @@ +-#ifndef __WORDSIZE +-# error Need to define __WORDSIZE +-#endif + + #ifndef HAVE_FFS + /** Find first (lowest) bit set in word val, returns a val b/w 1 and __WORDSIZE, 0 if no bit is set */ +@@ -88,7 +93,7 @@ } #endif @@ -27,7 +39,7 @@ /** 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) { -@@ -117,6 +117,8 @@ +@@ -117,6 +122,8 @@ } return res; } Added: head/sysutils/dd_rescue/files/patch-libddr_MD5.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/dd_rescue/files/patch-libddr_MD5.c Wed Aug 13 14:14:35 2014 (r364787) @@ -0,0 +1,19 @@ +--- libddr_MD5.c.orig 2014-08-10 03:38:53.000000000 +0900 ++++ libddr_MD5.c 2014-08-13 23:02:10.000000000 +0900 +@@ -21,6 +21,7 @@ + #include "sha256.h" + #include "sha512.h" + #include "sha1.h" ++#include "ffs.h" + + #include + #include +@@ -36,7 +37,7 @@ + #endif + + #include /* For ntohl/htonl */ +-#include ++#include + + // TODO: pass at runtime rather than compile time + #define HASH_DEBUG(x) if (state->debug) x Modified: head/sysutils/dd_rescue/files/patch-libddr_null.c ============================================================================== --- head/sysutils/dd_rescue/files/patch-libddr_null.c Wed Aug 13 14:09:42 2014 (r364786) +++ head/sysutils/dd_rescue/files/patch-libddr_null.c Wed Aug 13 14:14:35 2014 (r364787) @@ -1,7 +1,10 @@ ---- libddr_null.c.orig 2014-06-29 00:55:34.000000000 +0900 -+++ libddr_null.c 2014-06-29 00:56:42.000000000 +0900 -@@ -10,6 +10,7 @@ +--- libddr_null.c.orig 2014-05-26 17:30:19.000000000 +0900 ++++ libddr_null.c 2014-08-13 22:57:16.000000000 +0900 +@@ -8,8 +8,10 @@ + + #include "ddr_plugin.h" #include "ddr_ctrl.h" ++#include "ffs.h" #include #include +#include Modified: head/sysutils/dd_rescue/files/patch-sha512.c ============================================================================== --- head/sysutils/dd_rescue/files/patch-sha512.c Wed Aug 13 14:09:42 2014 (r364786) +++ head/sysutils/dd_rescue/files/patch-sha512.c Wed Aug 13 14:14:35 2014 (r364787) @@ -1,6 +1,13 @@ ---- sha512.c.orig 2014-06-29 00:54:18.000000000 +0900 -+++ sha512.c 2014-06-29 00:54:36.000000000 +0900 -@@ -19,7 +19,7 @@ +--- sha512.c.orig 2014-08-07 02:38:59.000000000 +0900 ++++ sha512.c 2014-08-13 23:04:15.000000000 +0900 +@@ -13,13 +13,14 @@ + #endif + + #include "sha512.h" ++#include "ffs.h" + #include + #include + #include #include #include #include