From 5b2cbfcf787ffa9c1e44a16ad5f61d59f2505433bd683cfc8f6f636c25acdd3d Mon Sep 17 00:00:00 2001 From: Kurt Garloff Date: Tue, 29 Aug 2017 22:28:56 +0000 Subject: [PATCH] Accepting request 518757 from home:garloff:branches:Base:System - Update to dd_rescue-1.99.6: * Merge previous SSE2 detection patch from Michael Matz. * Support calculating and validating checksums in the S3 multipart format. OBS-URL: https://build.opensuse.org/request/show/518757 OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=34 --- dd_rescue-1.99.5.tar.bz2 | 3 --- dd_rescue-1.99.5.tar.bz2.asc | 17 ----------------- dd_rescue-1.99.6.tar.bz2 | 3 +++ dd_rescue-1.99.6.tar.bz2.asc | 17 +++++++++++++++++ dd_rescue-i586-sse2.diff | 31 ------------------------------- dd_rescue.changes | 8 ++++++++ dd_rescue.spec | 4 +--- 7 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 dd_rescue-1.99.5.tar.bz2 delete mode 100644 dd_rescue-1.99.5.tar.bz2.asc create mode 100644 dd_rescue-1.99.6.tar.bz2 create mode 100644 dd_rescue-1.99.6.tar.bz2.asc delete mode 100644 dd_rescue-i586-sse2.diff diff --git a/dd_rescue-1.99.5.tar.bz2 b/dd_rescue-1.99.5.tar.bz2 deleted file mode 100644 index b1ec494..0000000 --- a/dd_rescue-1.99.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935 -size 170712 diff --git a/dd_rescue-1.99.5.tar.bz2.asc b/dd_rescue-1.99.5.tar.bz2.asc deleted file mode 100644 index ccef5ae..0000000 --- a/dd_rescue-1.99.5.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIVAwUAWGU/vN5PGzor/8W/AQi0nxAAg1kee3LKnfI9AOGguXUAiWMRe4IkyjbX -x+5Rh3TWuBNvSGQeLPVC2NMgxYC6ejM2PXkiUNZpxyZyW2j4gHEiLzu3VeX+Arn5 -LBVkX8ilTzX0R/2SLDhtjOLpmWfxt6MC1BEwnbXfhLT/4EwDH2dCWzv+7gcAMw0F -9v2p7u386FH9XZI7UYdfM0w5DWqXZp9HxMWDZC2edMaor/G/nrK+BTw7gBXZlTGJ -1m7Mgv489F33Kf1ff8CNtnk26IpqK9DXyYoJt0seXysTjP0gUVjdqzKUMybkOXXY -MpIrk30xg2hstLpKePJx4n+3cpBcndKpZ4+wYfvYSKDWlM2q/vAn3gWmREkhz0Ng -+QR5VO3UmCEhs1MlNZZpIwGqxGCTDegk72FVzlQdWQRKoBsbWsbW+HTVnGysM6Kx -t0H6Kzcau53vaN4djVwYSE6ZslUbcjovHIeN7ow9YO2EGQwsbpRW1CJs6UZg73WM -tPmb+aQQsCAsDGmCev7jMbMOGMLNww3X4FYSArE83+tuhlhjeoh1Hy0pD1bXli0I -Bwz16L/Hgo0UQGcQRTTKAQRprNWC/FfJQ/UmfKPKAZj+N4HGWfITtpKJEKeTT4F8 -0+h3OjBN9t+/nFw+r2DLN67S7yf5o87KYDVCIbB3btnoGIXas4oy8FFwWsRLWpkZ -zEviZeRf4vc= -=31j7 ------END PGP SIGNATURE----- diff --git a/dd_rescue-1.99.6.tar.bz2 b/dd_rescue-1.99.6.tar.bz2 new file mode 100644 index 0000000..9af3862 --- /dev/null +++ b/dd_rescue-1.99.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92b72d8b6962cfbff23b1360a1d401ae6946123be2d0c901cb585aa383b0b4f8 +size 171621 diff --git a/dd_rescue-1.99.6.tar.bz2.asc b/dd_rescue-1.99.6.tar.bz2.asc new file mode 100644 index 0000000..829bb35 --- /dev/null +++ b/dd_rescue-1.99.6.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIVAwUAWaAjpt5PGzor/8W/AQgt7g/+PH7b5peEe+1vX9nKZgE9R0ssqczGAnND +3YBLYIXdjvMEPBOFu8D9rrZL4Us2oRVv0YfQ6CNaFe2q+AWoJ+TOsv5GI1YdT/my +by6RGkn+t8OCCOaYy3peprb6T0EyiYXOwGwNeq5oPyl7/IeQ7T79z2n456c+M8Mc +Z6Ha75QUV7Mz81Nsb7m01EYd0D4b0al9RYc74/oqqcAfyL1fp31W+hHQ2ovDOYRM +olnj96dggz3nXqtupOSaSD+GR/ZA2G8PDhL5N2d27xOjbmCAZD4evbSAvXDkdFmu +VhYegyW1KuGjJgRndStaNnLz/JauYklO2Vyz5BKO4d8kuRyhzlQYuVs6ibU/uga2 +Yu8E9OOWD8WgiCaW4BNy5a/upOCG9NNwdOkrJY55btbKyUmqv3PfPlweoKJ7iHWJ +EOhBwD1qAkJmacZTqPaAWs41dGoKMwetHJzy62uQfeYLre1ouwLjOp1lHm3IRUe9 +RfKbl0dP5cUQX/V/zYz6PqroaQZzXGO6WJroDfYFammmeqQEgi9686K+g7RbPwhp +gZMWIFK5QDBxDM0L+j/WtkZm8Qi4kkfjSGlkL89tSBPS+IqqYHszIZ2O6Bb8/zdm +b84OSU9yvZyLAUEQprvhhggMSmBwop9dx4uFEq2ce7Go2/RYzS0pHqFloD0X3baP +vjoBA1NSoRQ= +=bmLD +-----END PGP SIGNATURE----- diff --git a/dd_rescue-i586-sse2.diff b/dd_rescue-i586-sse2.diff deleted file mode 100644 index 8f2f694..0000000 --- a/dd_rescue-i586-sse2.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- find_nonzero.c.mm 2016-12-28 21:17:50.000000000 +0000 -+++ find_nonzero.c 2017-08-10 15:15:27.000000000 +0000 -@@ -137,8 +137,8 @@ size_t find_nonzero_rep(const unsigned c - #define TEST_SIMD2(a,b,c,d) TESTC(a,b,c*2,d) - #define TEST2_SIMD2(a,b,c,d) TEST2C(a,b,c*2,d) - #else --#define TEST_SIMD2(a,b,c,d) if (have_simd) { TESTC(a,b,c*2,d); } --#define TEST2_SIMD2(a,b,c,d) if (have_simd) { TEST2C(a,b,c*2,d); } -+#define TEST_SIMD2(a,b,c,d) if (have_sse2) { TESTC(a,b,c*2,d); } -+#define TEST2_SIMD2(a,b,c,d) if (have_sse2) { TEST2C(a,b,c*2,d); } - #endif - #else - #define TEST_SIMD2(a,b,c,d) do {} while (0) ---- libddr_hash.c.mm 2015-05-26 08:52:40.000000000 +0000 -+++ libddr_hash.c 2017-08-10 15:55:43.000000000 +0000 -@@ -108,7 +108,14 @@ int do_pbkdf2(hash_state *state, char* p - int hash_plug_init(void **stat, char* param, int seq, const opt_t *opt) - { - int err = 0; -- hash_state *state = (hash_state*)malloc(sizeof(hash_state)); -+ void *buf = 0; -+ hash_state *state; /* = (hash_state*)malloc(sizeof(hash_state));*/ -+ if (posix_memalign(&buf, 64, sizeof(hash_state))) { -+ FPLOG(FATAL, "No enough memory for hash state!\n"); -+ --err; -+ return err; -+ } -+ state = (hash_state*)buf; - *stat = (void*)state; - memset(state, 0, sizeof(hash_state)); - state->seq = seq; diff --git a/dd_rescue.changes b/dd_rescue.changes index cb0b84f..a9b4dee 100644 --- a/dd_rescue.changes +++ b/dd_rescue.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 25 15:19:24 CEST 2017 - kurt@garloff.de + +- Update to dd_rescue-1.99.6: + * Merge previous SSE2 detection patch from Michael Matz. + * Support calculating and validating checksums in the S3 + multipart format. + ------------------------------------------------------------------- Thu Aug 10 16:05:11 UTC 2017 - matz@suse.com diff --git a/dd_rescue.spec b/dd_rescue.spec index 115c457..443a7e1 100644 --- a/dd_rescue.spec +++ b/dd_rescue.spec @@ -17,7 +17,7 @@ Name: dd_rescue -Version: 1.99.5 +Version: 1.99.6 Release: 0 Summary: Data copying in the presence of I/O Errors License: GPL-2.0 or GPL-3.0 @@ -27,7 +27,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 -Patch0: dd_rescue-i586-sse2.diff BuildRequires: autoconf BuildRequires: libattr-devel BuildRequires: libfallocate-devel @@ -113,7 +112,6 @@ data to the decompressor; the plugin is still young and might expose bugs. %prep %setup -q -%patch0 # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE99} '+%%H:%%M')