From nobody Sat Feb 17 15:36:36 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TcXw44HGLz5BJx7; Sat, 17 Feb 2024 15:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TcXw43dlLz4hZn; Sat, 17 Feb 2024 15:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708184196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOPRS5NudD0pspMr43DF7jlLlqr81lL95k4HuNLyVJY=; b=lo5kihktsH7f+F/jLoITihF01BzVU44Ek7+/VLl4GGQiq73gMdrtffznhyzQyiQMQ3sDbX AZ159L8k3Sw5R7V+1UBfgtDa5x82G2w80V/tojaZ9aaS71ZNC0LcNZsQ25ziU0Bzw0JT8z k3RjGDovwFyS3UnbHpvAUUN+M0mSMB4oFWwQfh6m9oe8Bx/FeMpCV6eYqTTDVBwFsfNO/4 JgqZI2mjbAL3nHv/uK/gh5I8ZDN4WeTaOiwu8nqlVyQXtJNDb4G0L8+D2C5wmL/wERm+Gq 9MHIDJ3hvdUTPwsM+bjyBzgvEuA+oJlAkyvaJ/4hyNMrqfaY9uuDtElxU0KBcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708184196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tOPRS5NudD0pspMr43DF7jlLlqr81lL95k4HuNLyVJY=; b=BYT87gZ4Utxa5HISakbcwpxulj9itIZgbRJV9VgfrjuQm3PcB3i8cx9b0xET5EgSZDBwR2 8PrByrof6hgVRaGqwTY+kExOb3bmvzZi91l7k6WYxO9zaVBBJ4ulWYNgMvhQtS97vFc6J2 MOGEqZRiepISyeOOCt9c2Gqj9WXka8nDgYvuiLKjbAk+sXbVVjkD6H4P8JrfVm1qWuTkAD 6t4NHIgfyiKpYnMk+u7waxa13fMtSo280oW1NqEpdxH0PrsWO414g7z1Vhif5G0f9G7iaQ GzmPVCSjPxp9h4hELau3P/eIyN7WmdVz4GaZLLTuhiQSfHgbWn2CSCvFiWgoVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708184196; a=rsa-sha256; cv=none; b=TBoFXLa2XeDZv93gUkFmPfEra+Y7X/wzF0kDRkZIgP4vOUghrCLzuUN1T2jzGkgefGKafW 3bkjSeSoOAp7wkeYFdjtObuz/REDtEUthkcQKuUNSjkOPH5Lv5OHB9vJb9W9vg0jBQS32k S3VkNCJZI5xQSZLnZZ03krtqf13Cm5p+aNp5Kr1AfglTwPk+0LLUoXhYkUsKMixbuBRcPZ 1AMX3ruVf6L/7iKZpTQSOKW8+CQpLMlOB3OnZBhhBuYHkhpMMSO/jN5zeZzZpXsqKy1hmo 9QbC+j/zqGZxwCFV017MoZwdOlUqbDb4zIUuAmuuFxLwR9goSFgme9hyxmDq7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TcXw42Llcz1Cqy; Sat, 17 Feb 2024 15:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41HFaaO3014472; Sat, 17 Feb 2024 15:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HFaaWs014469; Sat, 17 Feb 2024 15:36:36 GMT (envelope-from git) Date: Sat, 17 Feb 2024 15:36:36 GMT Message-Id: <202402171536.41HFaaWs014469@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: MANTANI Nobutaka Subject: git: f891e9c0fda7 - main - sysutils/dd_rescue: Update to 1.99.13 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f891e9c0fda700509c22315c90e59bc0bc94110b Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=f891e9c0fda700509c22315c90e59bc0bc94110b commit f891e9c0fda700509c22315c90e59bc0bc94110b Author: MANTANI Nobutaka AuthorDate: 2024-02-17 15:35:38 +0000 Commit: MANTANI Nobutaka CommitDate: 2024-02-17 15:36:13 +0000 sysutils/dd_rescue: Update to 1.99.13 --- sysutils/dd_rescue/Makefile | 2 +- sysutils/dd_rescue/distinfo | 6 +++--- sysutils/dd_rescue/files/patch-Makefile | 12 ++++++------ sysutils/dd_rescue/files/patch-dd_rescue.c | 6 +++--- sysutils/dd_rescue/files/patch-ffs.h | 8 ++++---- sysutils/dd_rescue/files/patch-frandom.c | 4 ++-- sysutils/dd_rescue/files/patch-sha256.c | 20 ++++++++++++++++++++ sysutils/dd_rescue/files/patch-sha512.c | 20 +++++++++++++++++++- 8 files changed, 58 insertions(+), 20 deletions(-) diff --git a/sysutils/dd_rescue/Makefile b/sysutils/dd_rescue/Makefile index 5ed83bad6439..ad04d493018f 100644 --- a/sysutils/dd_rescue/Makefile +++ b/sysutils/dd_rescue/Makefile @@ -1,5 +1,5 @@ PORTNAME= dd_rescue -PORTVERSION= 1.99.12 +PORTVERSION= 1.99.13 CATEGORIES= sysutils MASTER_SITES= http://www.garloff.de/kurt/linux/ddrescue/ \ http://fossies.org/unix/privat/ diff --git a/sysutils/dd_rescue/distinfo b/sysutils/dd_rescue/distinfo index f8764c73cf70..a51d818b1531 100644 --- a/sysutils/dd_rescue/distinfo +++ b/sysutils/dd_rescue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659154970 -SHA256 (dd_rescue-1.99.12.tar.bz2) = f304750aecf2b04a4798b26373a66483cf075e0a8e4619e78dc307e8f794c895 -SIZE (dd_rescue-1.99.12.tar.bz2) = 181798 +TIMESTAMP = 1708181857 +SHA256 (dd_rescue-1.99.13.tar.bz2) = f40fe9c770ff5d27d323297ee73d0bbed332d3eafac4e4732e542eadb1c5c1e8 +SIZE (dd_rescue-1.99.13.tar.bz2) = 182574 diff --git a/sysutils/dd_rescue/files/patch-Makefile b/sysutils/dd_rescue/files/patch-Makefile index 11fba0d58a69..5c4884d86f2a 100644 --- a/sysutils/dd_rescue/files/patch-Makefile +++ b/sysutils/dd_rescue/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-07-26 13:31:58 UTC +--- Makefile.orig 2023-02-24 08:28:08 UTC +++ Makefile -@@ -7,11 +7,7 @@ VERSION = 1.99.12 +@@ -7,11 +7,7 @@ SRCDIR ?= . DESTDIR = SRCDIR ?= . @@ -13,7 +13,7 @@ INSTALL ?= install INSTALLFLAGS = -s prefix = $(DESTDIR)/usr -@@ -39,7 +35,7 @@ LIB = lib +@@ -39,7 +35,7 @@ ID = $(shell git describe --tags || cat REL-ID) LIBDIR = /usr/$(LIB) COMPILER = $(shell $(CC) --version | head -n1) ID = $(shell git describe --tags || cat REL-ID) @@ -22,7 +22,7 @@ OUT = -o dd_rescue PIC = -fPIC PIE = -fPIE -@@ -74,19 +70,13 @@ else +@@ -75,19 +71,13 @@ endif HAVE_XATTR=0 endif @@ -43,7 +43,7 @@ ISX86 := 1 LIB = lib64 endif -@@ -292,7 +282,7 @@ libddr_MD5.so: libddr_hash.so +@@ -296,7 +286,7 @@ libddr_lzo.so: libddr_lzo.po ln -sf $< $@ libddr_lzo.so: libddr_lzo.po @@ -52,7 +52,7 @@ libddr_null.so: libddr_null.po $(CC) -shared -o $@ $^ -@@ -363,7 +353,7 @@ libfalloc-static: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) +@@ -367,7 +357,7 @@ dd_rescue: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) $(OBJE # This is the default built dd_rescue: $(SRCDIR)/dd_rescue.c $(DDR_HEADERS) $(OBJECTS) $(OBJECTS2) diff --git a/sysutils/dd_rescue/files/patch-dd_rescue.c b/sysutils/dd_rescue/files/patch-dd_rescue.c index 7508cb37bd3d..e9dfbb8812e4 100644 --- a/sysutils/dd_rescue/files/patch-dd_rescue.c +++ b/sysutils/dd_rescue/files/patch-dd_rescue.c @@ -1,4 +1,4 @@ ---- dd_rescue.c.orig 2022-01-09 17:27:45 UTC +--- dd_rescue.c.orig 2023-02-23 21:51:27 UTC +++ dd_rescue.c @@ -116,6 +116,7 @@ #include "list.h" @@ -8,7 +8,7 @@ #include "fstrim.h" -@@ -2728,7 +2729,9 @@ int is_filename(char* arg) +@@ -2730,7 +2731,9 @@ const char* retstrdupcat3(const char* dir, char dirsep 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); -@@ -2747,7 +2750,9 @@ const char* dirappfile(const char* onm, opt_t *op) +@@ -2749,7 +2752,9 @@ const char* dirappfile(const char* onm, opt_t *op) { size_t oln = strlen(onm); if (!strcmp(onm, ".")) { diff --git a/sysutils/dd_rescue/files/patch-ffs.h b/sysutils/dd_rescue/files/patch-ffs.h index 9909441ac00f..409612b88d65 100644 --- a/sysutils/dd_rescue/files/patch-ffs.h +++ b/sysutils/dd_rescue/files/patch-ffs.h @@ -1,4 +1,4 @@ ---- ffs.h.orig 2021-03-07 06:41:24 UTC +--- ffs.h.orig 2023-02-23 21:51:27 UTC +++ ffs.h @@ -27,7 +27,15 @@ #ifdef HAVE_ENDIAN_H @@ -39,12 +39,12 @@ /** 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) { -@@ -134,6 +139,8 @@ static int myflsl(unsigned long val) - } +@@ -138,6 +143,8 @@ void probe_sse42(); int myffs_sse42(unsigned long); int myffsl_sse42(unsigned long); + void probe_sse42(); +#else +# define myflsl(x) flsl(x) #endif - void probe_sse42(); + #endif /* _FFS_H */ diff --git a/sysutils/dd_rescue/files/patch-frandom.c b/sysutils/dd_rescue/files/patch-frandom.c index a5a0bc6965a6..b56bf20bdc23 100644 --- a/sysutils/dd_rescue/files/patch-frandom.c +++ b/sysutils/dd_rescue/files/patch-frandom.c @@ -1,4 +1,4 @@ ---- frandom.c.orig 2016-12-28 21:17:50 UTC +--- frandom.c.orig 2023-02-23 21:51:27 UTC +++ frandom.c @@ -16,7 +16,7 @@ #include @@ -7,5 +7,5 @@ -#include +#include #include + //#include - #ifdef HAVE_CONFIG_H diff --git a/sysutils/dd_rescue/files/patch-sha256.c b/sysutils/dd_rescue/files/patch-sha256.c new file mode 100644 index 000000000000..6c85d9dfa7a8 --- /dev/null +++ b/sysutils/dd_rescue/files/patch-sha256.c @@ -0,0 +1,20 @@ +--- sha256.c.orig 2024-02-17 15:17:02 UTC ++++ sha256.c +@@ -108,7 +108,7 @@ void sha256_64(const uint8_t* msg, hash_t* ctx) + #endif + #endif + /* Extend the first 16 words into the remaining 48 words w[16..63] of the message schedule array: */ +- for (int i = 16; i < 64; ++i) { ++ for (i = 16; i < 64; ++i) { + const uint32_t s0 = RIGHTROTATE(w[i-15], 7) ^ RIGHTROTATE(w[i-15], 18) ^ (w[i-15] >> 3); + const uint32_t s1 = RIGHTROTATE(w[i-2], 17) ^ RIGHTROTATE(w[i-2] , 19) ^ (w[i-2] >> 10); + w[i] = w[i-16] + s0 + w[i-7] + s1; +@@ -117,7 +117,7 @@ void sha256_64(const uint8_t* msg, hash_t* ctx) + uint32_t a = ctx->sha256_h[0], b = ctx->sha256_h[1], c = ctx->sha256_h[2], d = ctx->sha256_h[3]; + uint32_t e = ctx->sha256_h[4], f = ctx->sha256_h[5], g = ctx->sha256_h[6], h = ctx->sha256_h[7]; + /* Compression function main loop: */ +- for (int i = 0; i < 64; ++i) { ++ for (i = 0; i < 64; ++i) { + const uint32_t S1 = RIGHTROTATE(e, 6) ^ RIGHTROTATE(e, 11) ^ RIGHTROTATE(e, 25); + //const uint32_t ch = (e & f) ^ ((~e) & g); + const uint32_t ch = g ^ (e & (f ^ g)); diff --git a/sysutils/dd_rescue/files/patch-sha512.c b/sysutils/dd_rescue/files/patch-sha512.c index ab96fe6a329e..de3a96290e4a 100644 --- a/sysutils/dd_rescue/files/patch-sha512.c +++ b/sysutils/dd_rescue/files/patch-sha512.c @@ -1,4 +1,4 @@ ---- sha512.c.orig 2016-12-28 21:17:50 UTC +--- sha512.c.orig 2023-02-23 21:51:27 UTC +++ sha512.c @@ -13,13 +13,14 @@ #endif @@ -16,3 +16,21 @@ /* Note 1: All variables are 64 bit unsigned integers and addition is calculated modulo 2^64 +@@ -138,7 +139,7 @@ void sha512_128(const uint8_t* msg, hash_t* ctx) + #endif + #endif + /* Extend the first 16 words into the remaining 48 words w[16..63] of the message schedule array: */ +- for (int i = 16; i < 80; ++i) { ++ for (i = 16; i < 80; ++i) { + const uint64_t s0 = RIGHTROTATE(w[i-15], 1) ^ RIGHTROTATE(w[i-15], 8) ^ (w[i-15] >> 7); + const uint64_t s1 = RIGHTROTATE(w[i-2], 19) ^ RIGHTROTATE(w[i-2] ,61) ^ (w[i-2] >> 6); + w[i] = w[i-16] + s0 + w[i-7] + s1; +@@ -147,7 +148,7 @@ void sha512_128(const uint8_t* msg, hash_t* ctx) + uint64_t a = ctx->sha512_h[0], b = ctx->sha512_h[1], c = ctx->sha512_h[2], d = ctx->sha512_h[3]; + uint64_t e = ctx->sha512_h[4], f = ctx->sha512_h[5], g = ctx->sha512_h[6], h = ctx->sha512_h[7]; + /* Compression function main loop: */ +- for (int i = 0; i < 80; ++i) { ++ for (i = 0; i < 80; ++i) { + const uint64_t S1 = RIGHTROTATE(e, 14) ^ RIGHTROTATE(e, 18) ^ RIGHTROTATE(e, 41); + //const uint64_t ch = (e & f) ^ ((~e) & g); + const uint64_t ch = g ^ (e & (f ^ g));