pool/dd_rescue
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1202366 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1202366
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dd_rescue?expand=0&rev=61
This commit is contained in:
Ana Guerrero 2024-09-23 13:18:49 +00:00 committed by Git OBS Bridge
commit 9897586e92
9 changed files with 63 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dd_rescue-1.99.13.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f40fe9c770ff5d27d323297ee73d0bbed332d3eafac4e4732e542eadb1c5c1e8
size 182574

16
dd_rescue-1.99.13.tar.bz2.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEZmn3NA0x6V7FVlSQ3k8bOiv/xb8FAmQUG7oACgkQ3k8bOiv/
xb84QA//QaYmz3mugFQJbyktEQ8KVbR5sKIqxLcMsjw3OOo33rq37J3dXYKo1uf5
pCnbk97L+X8D5NXKWjxLvSXA8Nbx9J5N/OduEfAMGWA1mTQKJs9bwX8RLyZ56yt1
V5lvDGRNoL0j/bIeHxx9u/nBcPqpQSt2sq7g/BvMSoYVcg/qBhJGRV+mzDuB4NX+
q0EvyQVofdfE9qLJ532j6SssBVu0xJ/eHniUcmwr/H8Od5TQLDTMPKOQwgG2R1iR
aJLzoxBYBbzhrbhEe6Qw4k33I/rs3Uu1g3J+RZSh0cVn5ojiFGGn6ZXNicHYzVo2
LBAOahlR/p12OxWiFlYQcKwGBURFmlwwty0X1ZtRiE+GyUPRkZmxZ8w+Je+VMtIk
nbZVD26IinWK/Jx8XyX2jZkc+0+GIPvnwelzP+OBH1Sn4btuEJ9oAnuSx3kuLDBw
DdUW/GkuRTSwPIoKz22kCsaPq+9Tx1qxw41wBXn1MDjn0C3qL1mN4Kmy1GvjoPiB
0k2WeVmxiia5397SI8n90EJ/iyJCQuBysaGvvo2FOBCOcHbkqLbz+tscowkoy3kJ
gQYkOtpnRB21w4+zt41iOKojfkm/7u3BKriQU7zw+FUYGbTeungIeRiXHRVhVrRx
f+L1NaITRJduIK8EMIK5ah5OeFYyMcELjHKlbEdxrxFaaMo3hrM=
=T6nE
-----END PGP SIGNATURE-----

3
dd_rescue-1.99.15.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83936f24fbb9ff70722b55f69cd0dff71bc4a4aabfcf9b56b5128f98bfe16f89
size 184905

16
dd_rescue-1.99.15.tar.bz2.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEZmn3NA0x6V7FVlSQ3k8bOiv/xb8FAmbpg30ACgkQ3k8bOiv/
xb/PJg/+IKNN7vkJSsYRCoC0Lj2NDWvCvmFrjqG+oLD8CUMQUrc00gMx+4qoALvx
LDGFX21+W86vOmtwcM4k7DhBKuhc50rXbo/UFaxeQLd45gHkmXbxav1qX3D3oduB
WMggBuUnazIAhuVxqyw0cPS/OH6UNUY5xsB7FpNtWTQ1dkBlVKXybgnVRmaol1hs
yT/kKetCBjKvY1fgJLKszzJhMdnSRo6HpHG1TFQXdl7hxIC3aEjTnbfz8kGYM2M4
FoGddif3okgkZPKUA51JYsgyDhTW86IQ4w1zdmiAgDu0qIcCao7CAdJEz6v9BFw1
7GC8eyRpHI1Vk2A5MVXk3ikswjBNRDZb39eK4chmhXFd/LY4iMXB5+hHzDfJ6V0T
QdlRWGTCAeGop3ZKw363WDMwyYmzuIu3al/PaiPkh07KjWmsNCdiSUMT9bkSAxge
/RY/u+k/Szfem+/0J+fjLKP6QvDxjqmexy2hJa8XRFY2hpFkaxfJrUCZ7U0tYFJ/
cmc+3616hZsfojrS8VV/IDSMATg5IBuSA+a94JL8+Sd2RVt8Yq0wTJOUJM94MUgO
xeBichIrpHU32cQxakjqUJKx7vXBHzcqum8E/lkhKj01G92MEIOxd4t83nLoOnLl
oEoNAHe0oUKjVD3REGxO8Dmtv+9v/3IVP0HBwUVxUIRo5xE+Vgs=
=YcCw
-----END PGP SIGNATURE-----

44
dd_rescue-md5-unaligned-armv7.diff
View File

@ -1,44 +0,0 @@
commit 19da344403f9d340d7343e99df6ec3e4b79684d9
Author: Kurt Garloff <kurt@garloff.de>
Date: Sun Mar 3 21:53:21 2024 +0100
Trouble is that we don't detect that ARMv7 requires extra buffering
is md5 input is not properly aligned. gcc-12 apparently is clever enough
to handle unlaigned memory access for us, which makes us succeed in the
testcase. It's not clever enough to also succeed in md5_64() :-O
Signed-off-by: Kurt Garloff <kurt@garloff.de>
diff --git a/configure.ac b/configure.ac
index d99387c..7a7dccf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
AC_DEFINE_UNQUOTED([HAVE_REP_NOP], 1,
[check whether asm rep nop works])
],[
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(no)
],[
AC_MSG_RESULT(no -- cross compiling)
])
@@ -79,7 +79,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
AC_DEFINE_UNQUOTED([HAVE_LFENCE], 1,
[check whether asm lfence works])
],[
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(no)
],[
AC_MSG_RESULT(no -- cross compiling)
])
@@ -171,6 +171,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
fprintf(stderr, "Debug: Off %i, Ptr %08lx\n", off, (unsigned long)ptr);
copy((int*)b2, (const int*)ptr, 4);
fprintf(stderr, "Ints: %08x %08x %08x %08x\n", *(int*)b2, *(int*)(b2+4), *(int*)(b2+8), *(int*)(b2+12));
+ /* HACK: Somehow this test does no longer trigger with gcc-12 on armhf, but it should */
+ #ifdef __arm__
+ return 1;
+ #endif
return 0;
}
]])],[

26
dd_rescue-ossl3-evpcipherctx.diff
View File

@ -1,26 +0,0 @@
commit ce925927fdcc5e41f1a8975f31405f913a6583d1
Author: Kurt Garloff <kurt@garloff.de>
Date: Wed Feb 28 22:49:18 2024 +0100
Adjust struct _evp_cipher_ctx_st to openssl-3.0.6+.
This is only done if the version is indeed >= 3.0.6.
It's only relevant on 32bit, as the alignment rules on 64bit
do hide this difference.
Signed-off-by: Kurt Garloff <kurt@garloff.de>
diff --git a/aes_ossl11.c b/aes_ossl11.c
index 2fa4468..e450f4e 100644
--- a/aes_ossl11.c
+++ b/aes_ossl11.c
@@ -45,6 +45,9 @@ struct _evp_cipher_ctx_st {
/* FIXME: Should this even exist? It appears unused */
void *app_data; /* application stuff */
int key_len; /* May change for variable length cipher */
+#if OPENSSL_VERSION_MAJOR >= 3 && (OPENSSL_VERSION_MINOR > 0 || OPENSSL_VERSION_PATCH >= 6)
+ int iv_len; /* IV length */
+#endif
unsigned long flags; /* Various flags */
void *cipher_data; /* per EVP data */
int final_used;

21
dd_rescue-u-emptyout-segfault.diff
View File

@ -1,21 +0,0 @@
commit 250bf8baf8d7a59d09a8ef48d966019972d3ee5a
Author: Kurt Garloff <kurt@garloff.de>
Date: Mon Aug 12 15:19:09 2024 +0200
Prevent segfault with -u and empty output filename.
Signed-off-by: Kurt Garloff <kurt@garloff.de>
diff --git a/dd_rescue.c b/dd_rescue.c
index 92f81d0..2d32084 100644
--- a/dd_rescue.c
+++ b/dd_rescue.c
@@ -1466,7 +1466,7 @@ int real_cleanup(opt_t *op, fstate_t *fst, progress_t *prg,
copyxattr(op->iname, op->oname);
copytimes(op->iname, op->oname);
}
- if (op->rmvtrim)
+ if (op->rmvtrim && op->oname)
remove_and_trim(op->oname, op);
LISTFOREACH(ofiles, of) {
if (op->preserve) {

43
dd_rescue.changes
View File

@ -1,3 +1,46 @@
-------------------------------------------------------------------
Tue Sep 17 15:28:10 CEST 2024 - kurt@garloff.de
- Update to dd_rescue-1.99.15:
* Build issue: Detect pread64() and pwrite64() support separately
and provide individual replacement functions.
Thanks to David Geiger for reporting (Mageia).
* Bugfix: printstatus() would not be called with odd offsets,
resulting in missing progress report and missing sync (-y) and
write throttling (-C).
* Optimization: Some unrolling for the hash functions gives up to
10% better performance (on Zen4).
* Optimization: Rationalize prefetching for hash functions and
clear memory after using (avoid cleartext data on the stack).
* Optimization: Save function calls for fault injection and for
graph updates when unneeded.
* Usability: Better handle progress update frequency.
* Build improvement: Add -target linux-aarch64/arm-android28
automatically where needed.
* Drop: ddr-autoconf-no-fortify.diff (included upstream).
-------------------------------------------------------------------
Thu Aug 22 22:12:51 CEST 2024 - kurt@garloff.de
- Avoid setting _FORTIFY_SOURCE in configure script, it may
conflict with flags passed in otherwise (e.g. rpmbuild).
-------------------------------------------------------------------
Thu Aug 22 20:31:00 CEST 2024 - kurt@garloff.de
- Update to dd_rescue-1.99.14:
* Drop patches dd_rescue-u-emptyout-segfault.diff:,
dd_rescue-fuzz-test-more-err.diff:,
dd_rescue-md5-unaligned-armv7.diff:,
dd_rescue-ossl3-evpcipherctx.diff: All integrated upstream.
* Fix detection of LFS function availability for musl.
* Include headers and settings to make it work on musl.
* Replaced basename() with mybasename.h.
* Prefetch lookup table for sha hashing.
* Fix verbose output when falling back to small blocksize.
* Fix clearing of errno (unaligned writes at EOF on musl)
- Final tarball with fixes for Android Makefiles.
-------------------------------------------------------------------
Mon Aug 12 15:52:05 CEST 2024 - kurt@garloff.de

5
dd_rescue.spec
View File

@ -21,7 +21,7 @@
%define _lto_cflags %{nil}
%endif
Name: dd_rescue
Version: 1.99.13
Version: 1.99.15
Release: 0
Summary: Data copying in the presence of I/O Errors
License: GPL-2.0-only OR GPL-3.0-only
@ -31,9 +31,6 @@ Source0: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2
Source1: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2.asc
Source2: %{name}.keyring
Source99: %{name}.changes
Patch1: dd_rescue-ossl3-evpcipherctx.diff
Patch2: dd_rescue-md5-unaligned-armv7.diff
Patch3: dd_rescue-u-emptyout-segfault.diff
# PATCH-FIX-UPSTREAM no-python2.patch sf#ddrescue#4 mcepl@suse.com
# Remove dependency on python2
BuildRequires: autoconf