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

Update to latest uptream 1.99.5.

OBS-URL: https://build.opensuse.org/request/show/448202
OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=31
This commit is contained in:
Kurt Garloff 2017-01-02 06:58:54 +00:00 committed by Git OBS Bridge
parent c8c00d0199
commit d714d912a3
9 changed files with 45 additions and 67 deletions

View File

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

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABAgAGBQJVafo3AAoJEN5PGzor/8W/4lQP/335NyLO7Kbbvm+1a1D2kjak
MrWTKOTtMloJSZuFf1dTME2r8wl0HOblFRZeuz7bMATHRVDJNE7jNk5+YKCJmQJC
NKhmb7hQxPQnZ5uAS4/JBRwraT1ZVFkO/FcaLBvlYETaLPDsg/Kuvjb4ynyXfiNz
PlDypCte/4Ksh69568d0NTBAJmiSXFHDKiO7tOwjNl79ZIGBGFENtVm+WVNNZ+0M
oxZjUg+NXQXSYYC90NDIdzLxb9IVxHNVo0VDE4xgDf5biX4Qc+IdFwH4AC0dJFQG
hLtdOpXRsWZw3B06/+XqRWyi0G64vYnF/m/BHqnRGIIzC/skRdS3XMtleg8pcPcC
NNodh/5MuUOnL+z9C9AziQAkpgDH8llGGcJRIuLVF9lSeAiTfYdR53+eyFfA9GjL
fmOOscPEA2I+muxcCxlLZF1rx52lrL45aNfTG/37hApVrSMyelrZUOIgDHzMDlv0
29DJZsIQQgUtrHNuGlrACf8muk02NWwtExgHJ/iqBjWlpnav4NeS9fcil1iqVhOR
dLELOHDBv+K5AEIGD5Cv/WQCEw7crW/lV9IBn+s3+mMv3twX4zoY90DXc4WkHZww
jcrE1XuklU7+i384HTOwvclqsKM2IsPHuofyIQGcRXAFr1LFl+88CavA3xXEcohw
4Ory7Yk1V6aHLr7CFI4q
=irlk
-----END PGP SIGNATURE-----

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

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

View File

@ -0,0 +1,17 @@
-----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-----

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Dec 29 22:27:17 CET 2016 - kurt@garloff.de
- Update to dd_rescue-1.99.5:
* Merge the two gcc7 patches from Martin Liska.
* Better transfer length estimate (thus better progress report)
* Optional ratecontrol (throttle transfer speed)
* fmt_no was unsafe against undetermined length (pre=0) and
visible digit grouping characters, resulting in memory
corruption when using a -b logfile. Thanks to Marc Thomas
for reporting and debugging!
* A few more minor cleanups and bugfixes.
* Fix segfault with graph in reverse direction with
too large transfer limit.
* Fix build with AES but not AVX2 support.
- Update to dd_rescue-1.99:
* ddr_crypt plugin: Add support for ARMv8 aes hardware acceleration
(works as well in 32bit mode).
* ddr_crypt: Fix CTR iv initialization.
* ddr_crypt: Support for openSSL Salted__ header.
* Support ranges in fault injection.
* Clean up write retry logic.
* Improved documentation, Makefiles and test coverage.
-------------------------------------------------------------------
Fri Dec 23 09:26:20 UTC 2016 - mliska@suse.cz

Binary file not shown.

View File

@ -17,7 +17,7 @@
Name: dd_rescue
Version: 1.98
Version: 1.99.5
Release: 0
Summary: Data Copying in the Presence of I/O Errors
License: GPL-2.0 or GPL-3.0
@ -28,10 +28,6 @@ Source1: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2
Source2: %{name}.keyring
Source99: %{name}.changes
# PATCH-FIX-OPENSUSE gcc7-static-inline.patch - Add 'static' to inlined fns
Patch1: gcc7-static-inline.patch
# PATCH-FIX-OPENSUSE gcc7-fix-htonl.patch - Fix HTONL macro
Patch2: gcc7-fix-htonl.patch
BuildRequires: autoconf
BuildRequires: libattr-devel
BuildRequires: lzo-devel
@ -120,8 +116,6 @@ data to the decompressor; the plugin is still young and might expose bugs.
%prep
%setup -q
%patch1
%patch2
./autogen.sh
# Remove build time references so build-compare can do its work

View File

@ -1,14 +0,0 @@
--- libddr_lzo.c 2015-04-15 22:44:15.000000000 +0200
+++ libddr_lzo.c 2016-12-23 10:20:40.268227806 +0100
@@ -784,7 +784,10 @@
#if __BYTE_ORDER == __BIG_ENDIAN
#define HTONL(x) x
#else
-#define HTONL(x) ((x<<24)&0xff000000) | ((x<<8)&0x00ff0000) | ((x>>8)&0x0000ff00) | ((x>>24)&0x000000ff)
+#define HTONL(n) (((((n) & 0xFF)) << 24) | \
+ ((((n) & 0xFF00)) << 8) | \
+ ((((n) & 0xFF0000)) >> 8) | \
+ ((((n) & 0xFF000000)) >> 24))
#endif
unsigned char* lzo_search_hdr(fstate_t *fst, unsigned char* bf, int *towr,

View File

@ -1,26 +0,0 @@
--- /tmp/dd_rescue.c 2016-12-09 12:49:49.868777805 +0100
+++ dd_rescue.c 2016-12-09 12:49:57.680925114 +0100
@@ -315,12 +315,12 @@
}
#endif
-inline char* fmt_kiB(loff_t no, char col)
+static inline char* fmt_kiB(loff_t no, char col)
{
return fmt_int(0, 1, 1024, no, (col? BOLD: ""), (col? NORM: ""), 1);
}
-inline float difftimetv(const struct timeval* const t2,
+static inline float difftimetv(const struct timeval* const t2,
const struct timeval* const t1)
{
return (float) (t2->tv_sec - t1->tv_sec ) +
@@ -724,7 +724,7 @@
}
/** Calc position in graph */
-inline int gpos(loff_t off, loff_t len)
+static inline int gpos(loff_t off, loff_t len)
{
static const int glen = 40; //strlen(graph) - 2;
return 1+(glen*off/len);