Accepting request 991298 from home:garloff:branches:Base:System

- Update to dd_rescue-1.99.12:
  * Works with openssl-3.0 now (using EVP_Cipher_Init to set IV).
  * openssl-1.1 performs significantly better so we keep building
    against it if available.
  * nosalthdr option for libddr_crypt for compatibility with
    openssl-3, no longer writing header when salt is passed.
  * ARMv7 crypto support successfully compiles with clang now.
- Drop no-python2.patch (included in dd_rescue-1.99.12).

OBS-URL: https://build.opensuse.org/request/show/991298
OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=66

dd_rescue-1.99.11.tar.bz2

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

dd_rescue-1.99.11.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEZmn3NA0x6V7FVlSQ3k8bOiv/xb8FAmCKgVsACgkQ3k8bOiv/
-xb+o3w/8CEIbniRg5APx/qgqoapYzFpwSoueY6QE/HshW1QKbLiV90ErW5qzdXLL
-mcqU/3I9nx2VHfgSXGpKQ30ZlNpJovHPhDon16R0olX9v8p/eGNCJPGydIqyT5SM
-2JcHoYB1WBOU6qNg++7ZmY8WbfPBgVovDPHsBD/RYTxzqQqgI6RyplN4X8NzEx5W
-g+epD2MzKml6Qh88Etm/IQJ+LZh50LQxzQKTO/pSnnpWPQDQmNiJPlSubT57I1vo
-QEiQgcBQAI6F5Wt6F6HUQ6Mn3f3EtP5ewGdoU4SBr8QZr06/+9sZwWL1yTcffhel
-ZJbytbdp6PENltPojyh2Ett1pZV4Deqy2tUNR7LZArxkIA10r+FjdCE6e4jYl6Xk
-tjLeZJ/lAJSsivVM0xxRW67+O/y4s9uFxxDfm4QPVPauEHfziqvIQ5CTf5PWmyVS
-FD2v2Nvh1DlC16P9GNGpnzqILMKSGVDd8abidtHzNaObUYFxVYF6xHrqaSlXN+MJ
-KLmKIAN8ZCjBJBKcuFMmCy/b7GuxEUdhuQPUlItXlxlCQ5rzbfJan6uAx2nxL3Vs
-LVkb22mNqMZVIgmWtAqv8ZRL0/p/M2u/xQF9YK3gxKwd2X03Vq7bgSSyl9vi7SpX
-d873R/F/oT1gV7Fl21/eZinEZrNurAdf0IPlW+9ZnhflCtRZSfU=
-=mAWr
------END PGP SIGNATURE-----

dd_rescue-1.99.12.tar.bz2

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

dd_rescue-1.99.12.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEZmn3NA0x6V7FVlSQ3k8bOiv/xb8FAmLgFA4ACgkQ3k8bOiv/
+xb+TWA/+O2JH+LAazgHmb52oLHsNrMLJsrjbpt8SzHD3K20QHgR5GcLMmRR0i+vQ
+Lyaia0iLtwSlhE5N2Q4UNoy8jzWVwed8ZCMENp+8teNIKTc5SC+au3R4LXTn6TY2
+TlJBfvTJB5KLXGdhimTxhla3+94A0XeR86IiFmYxn1d8V9z286TOs3FhbTB53iSU
+nqL64Gty49GavYCKPeFgXExKU2/3Ij+p/vM/UNCddfYSMT49FhsGY3Ho2TOadIyu
+dlxAJDdVItP7k9szJC0+SMDgq3zdh64UQ9F5m3aYy79FWncmudH/NSDk3LRZ9uw4
+F0YrqIfCMcZEJMZ5sj9xNyFb7u27G+fujnDhXPfpZ6xmjL9cTIb+ja4dW6kOqoON
+IHVtMJp25F6MFgaGX9eKI5aBj6JU1AzO1AodCRPp29AsY5aOANuTDbV9bhPoPE8N
+a6sU5Xvwz2pb1sDnNy67bzZxNqVnqvjx2rBsTig77tvtWDgb/7lGl0uVcGSoUy5s
+O89NaW67SgEiKY0cUDUJP/FziI5EbPYRAJme75iXCpousMY2vkbzxI1jogvKABeC
+K+5KO9Wjto42/NyIAQg9RxMZoeFVqAgJC4/gFDmE3LVwnKdygg6DyfpEQD9xnHIH
+OkYBLbL1b8VGE92J/7RnW08HZwr+n3VvzxvcZ7eKtTo4/QTXteI=
+=/tyl
+-----END PGP SIGNATURE-----

dd_rescue.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Jul 26 19:55:25 CEST 2022 - kurt@garloff.de
+
+- Update to dd_rescue-1.99.12:
+  * Works with openssl-3.0 now (using EVP_Cipher_Init to set IV).
+  * openssl-1.1 performs significantly better so we keep building
+    against it if available.
+  * nosalthdr option for libddr_crypt for compatibility with
+    openssl-3, no longer writing header when salt is passed.
+  * ARMv7 crypto support successfully compiles with clang now.
+- Drop no-python2.patch (included in dd_rescue-1.99.12). 
+
 -------------------------------------------------------------------
 Mon Dec  6 14:21:06 UTC 2021 - Dirk Müller <dmueller@suse.com>
 

dd_rescue.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dd_rescue
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 %define _lto_cflags %{nil}
 %endif
 Name:           dd_rescue
-Version:        1.99.11
+Version:        1.99.12
 Release:        0
 Summary:        Data copying in the presence of I/O Errors
 License:        GPL-2.0-only OR GPL-3.0-only
@@ -33,7 +33,6 @@ Source2:        %{name}.keyring
 Source99:       %{name}.changes
 # PATCH-FIX-UPSTREAM no-python2.patch sf#ddrescue#4 mcepl@suse.com
 # Remove dependency on python2
-Patch0:         no-python2.patch
 BuildRequires:  autoconf
 BuildRequires:  libattr-devel
 # Workaround for bsc#1193438
@@ -113,7 +112,6 @@ data to the decompressor; the plugin is still young and might expose bugs.
 
 %prep
 %setup -q
-%autopatch -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE99} '+%%H:%%M')

no-python2.patch

@@ -1,71 +0,0 @@
----
- calchmac.py |   46 +++++++++++++++++++++-------------------------
- 1 file changed, 21 insertions(+), 25 deletions(-)
-
---- a/calchmac.py
-+++ b/calchmac.py
-@@ -1,43 +1,39 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- import hashlib
- import hmac
- import sys
- 
- if len(sys.argv) < 4:
--	print >>sys.stderr, "Usage: calchmac.py ALG PASS FILE [FILE [..]]"
--	sys.exit(1)
-+    print("Usage: calchmac.py ALG PASS FILE [FILE [..]]", file=sys.stderr)
-+    sys.exit(1)
- 
- algtbl = (("md5", hashlib.md5),
--	  ("sha1", hashlib.sha1),
--	  ("sha256", hashlib.sha256),
--	  ("sha224", hashlib.sha224),
--	  ("sha512", hashlib.sha512),
--	  ("sha384", hashlib.sha384))
-+          ("sha1", hashlib.sha1),
-+          ("sha256", hashlib.sha256),
-+          ("sha224", hashlib.sha224),
-+          ("sha512", hashlib.sha512),
-+          ("sha384", hashlib.sha384))
- 
- 
- alg = sys.argv[1]
- pwd = sys.argv[2]
--#salt1 = salt + "\0\0\0\x01"
-+# salt1 = salt + "\0\0\0\x01"
- algo = None
- 
- for (anm, aob) in algtbl:
--	if alg == anm:
--		algo = aob
--		break
-+    if alg == anm:
-+        algo = aob
-+        break
- 
- if not algo:
--	print >>sys.stderr, "Hash algorithm %s not found!" % alg
--	sys.exit(2)
-+    print("Hash algorithm {} not found!".format(alg), file=sys.stderr)
-+    sys.exit(2)
- 
--#hmf = open("HMACS.%s" % alg, "w")
-+# hmf = open("HMACS.%s" % alg, "w")
- for fnm in sys.argv[3:]:
--	f = file(fnm, "rb")
--	if not f:
--		print >>sys.stderr, "Could not open %s" % fnm
--		sys.exit(3)
--	#print fnm
--	fcont = f.read()
--	hm = hmac.HMAC(pwd, fcont, algo)
--	#print >>hmf, "%s *%s" % (hm.hexdigest(), fnm)
--	print "%s *%s" %(hm.hexdigest(), fnm)
--
-+    with open(fnm, "rb") as f:
-+        # print fnm
-+        fcont = f.read()
-+        hm = hmac.HMAC(pwd, fcont, algo)
-+        # print >>hmf, "%s *%s" % (hm.hexdigest(), fnm)
-+        print("{} *{}".format(hm.hexdigest(), fnm))