[packages/vdo/DEVEL-8: 11/11] - updated to 8.2.2.2

[qboosh]

commit 478158e0994fb62a864cf80c9a4a1e6f31bc6fad
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 18 19:01:42 2023 +0200

    - updated to 8.2.2.2

 vdo-types.patch | 40 ++++++++++++++++++++++++++++------------
 vdo.spec        |  8 +++++---
 2 files changed, 33 insertions(+), 15 deletions(-)
---
diff --git a/vdo.spec b/vdo.spec
index 70ff8d4..ec82800 100644
--- a/vdo.spec
+++ b/vdo.spec
@@ -1,13 +1,13 @@
 Summary:	Management tools for Virtual Data Optimizer
 Summary(pl.UTF-8):	Narzędzia do zarządzania podsystemem Virtual Data Optimizer
 Name:		vdo
-Version:	8.1.1.360
+Version:	8.2.2.2
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 #Source0Download: https://github.com/dm-vdo/vdo/releases
 Source0:	https://github.com/dm-vdo/vdo/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	b228f789ad7bcc645572129209934096
+# Source0-md5:	36464435c234af7b92c3d02bd76e3d15
 Patch0:		%{name}-x86.patch
 Patch1:		%{name}-types.patch
 URL:		http://github.com/dm-vdo/vdo
@@ -113,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CONTRIBUTORS.txt README.md examples/{ansible,monitor}
+%doc CONTRIBUTORS.txt README.md examples/monitor
 %attr(755,root,root) %{_bindir}/vdodmeventd
 %attr(755,root,root) %{_bindir}/vdodumpconfig
 %attr(755,root,root) %{_bindir}/vdoforcerebuild
@@ -140,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vdodumpmetadata
 %attr(755,root,root) %{_bindir}/vdolistmetadata
 %attr(755,root,root) %{_bindir}/vdoreadonly
+%attr(755,root,root) %{_bindir}/vdorecover
 %attr(755,root,root) %{_bindir}/vdoregenerategeometry
 %{_mandir}/man8/adaptlvm.8*
 %{_mandir}/man8/vdoaudit.8*
@@ -148,4 +149,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vdodumpmetadata.8*
 %{_mandir}/man8/vdolistmetadata.8*
 %{_mandir}/man8/vdoreadonly.8*
+%{_mandir}/man8/vdorecover.8*
 %{_mandir}/man8/vdoregenerategeometry.8*
diff --git a/vdo-types.patch b/vdo-types.patch
index e163f32..c84eff6 100644
--- a/vdo-types.patch
+++ b/vdo-types.patch
@@ -1,16 +1,32 @@
---- vdo-8.1.1.360/utils/uds/indexLayout.c.orig	2022-05-10 20:18:46.864955066 +0200
-+++ vdo-8.1.1.360/utils/uds/indexLayout.c	2022-05-10 20:25:11.562870979 +0200
-@@ -1086,7 +1086,7 @@ reconstruct_index_save(struct index_save
+--- vdo-8.2.2.2/utils/uds/index-layout.c.orig	2023-06-20 23:21:16.000000000 +0200
++++ vdo-8.2.2.2/utils/uds/index-layout.c	2023-09-18 18:22:26.458891054 +0200
+@@ -1990,9 +1990,9 @@ static int create_layout_factory(struct
+ 	writable_size = get_uds_writable_size(factory) & -UDS_BLOCK_SIZE;
+ 	if (writable_size < config->size + config->offset) {
+ 		put_uds_io_factory(factory);
+-		uds_log_error("index storage (%zu) is smaller than the requested size %zu",
++		uds_log_error("index storage (%zu) is smaller than the requested size %"PRIu64,
+ 			      writable_size,
+-			      config->size + config->offset);
++			      (uint64_t)(config->size + config->offset));
+ 		return -ENOSPC;
  	}
- 	if (iter.next_region != iter.last_region) {
- 		return uds_log_error_strerror(UDS_UNEXPECTED_RESULT,
--					      "expected %ld additional regions",
-+					      "expected %td additional regions",
- 					      iter.last_region - iter.next_region);
- 	}
- 	if (iter.next_block !=
---- vdo-8.1.1.360/utils/vdo/fileLayer.c.orig	2022-05-10 20:28:20.068516423 +0200
-+++ vdo-8.1.1.360/utils/vdo/fileLayer.c	2022-05-10 20:28:23.371831860 +0200
+ 
+--- vdo-8.2.2.2/utils/vdo/fileLayer.c.orig	2023-09-18 18:22:44.048795761 +0200
++++ vdo-8.2.2.2/utils/vdo/fileLayer.c	2023-09-18 18:26:50.834125477 +0200
+@@ -138,10 +138,10 @@ static int performIO(FileLayer
+       if (n == 0) {
+         errno = VDO_UNEXPECTED_EOF;
+       }
+-      return uds_log_error_strerror(errno, "p%s %s @%zd",
++      return uds_log_error_strerror(errno, "p%s %s @%"PRId64,
+                                     (read ? "read" : "write"),
+                                     layer->name,
+-                                    offset);
++                                    (int64_t)offset);
+     }
+ 
+     offset += n;
 @@ -359,8 +359,8 @@ static int setupFileLayer(const char
      layer->blockCount = deviceBlocks;
    } else if (layer->blockCount != deviceBlocks) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vdo.git/commitdiff/478158e0994fb62a864cf80c9a4a1e6f31bc6fad