From 9d36311405701761725ff4eeea7683aaa0ed3892 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mon, 14 Jun 2021 13:22:27 +0000
Subject: [PATCH] import vdo-6.2.5.41-14.el8

---
 .gitignore     |  2 +-
 .vdo.metadata  |  2 +-
 SPECS/vdo.spec | 20 ++++++++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4beed2..24e8a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/vdo-9c5c694.tar.gz
+SOURCES/vdo-b08e17e.tar.gz
diff --git a/.vdo.metadata b/.vdo.metadata
index 235c0c5..33208e2 100644
--- a/.vdo.metadata
+++ b/.vdo.metadata
@@ -1 +1 @@
-597074d275565939091122474c0b047bd4a02bab SOURCES/vdo-9c5c694.tar.gz
+21d1f1af604f8758fd08737ec1d31885bd2fc38e SOURCES/vdo-b08e17e.tar.gz
diff --git a/SPECS/vdo.spec b/SPECS/vdo.spec
index 5160886..e933186 100644
--- a/SPECS/vdo.spec
+++ b/SPECS/vdo.spec
@@ -1,5 +1,5 @@
-%global commit           9c5c6946411e51ab27a63641a1e37c7dae610ec9
-%global gittag           6.2.5.11
+%global commit           b08e17e9542fabc23631cf75bda67ad06018892c
+%global gittag           6.2.5.41
 %global shortcommit      %(c=%{commit}; echo ${c:0:7})
 
 %define spec_release 14
@@ -83,6 +83,8 @@ done
 %{_bindir}/vdoforcerebuild
 %{_bindir}/vdoformat
 %{_bindir}/vdosetuuid
+%{_bindir}/vdo2lvm
+%{_mandir}/man8/vdo2lvm.8.gz
 %dir %{python3_sitelib}/%{name}
 %{python3_sitelib}/%{name}/__init__.py
 %{python3_sitelib}/%{name}/__pycache__/__init__.cpython-36.opt-1.pyc
@@ -237,6 +239,20 @@ This package provides the user-space support tools for VDO.
 %{_mandir}/man8/vdoregenerategeometry.8.gz
 
 %changelog
+
+* Tue Jun 01 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.41-14
+- Integrated the vdo to lvm conversion tool into the vdo management script
+  and modified the tool itself to correctly convert the UDS index so that
+  dedupe information is not lost by conversion.
+- Resolves: rhbz#1928284
+
+* Thu May 20 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.21-14
+- Added a tool for converting a VDO volume from the vdo management script
+  to LVM. The tool can be invoked from the new vdo convert command.
+- Related: rhbz#1928284
+- Fixed a (relatively harmless) buffer overflow in vdo userspace tools.
+- Resolves: rhbz#1927938
+
 * Thu May 13 2021 - Andy Walsh <awalsh@redhat.com> - 6.2.5.11-14
 - Introduced new memory size parameter values for UDS indexes which have
   been converted from vdo script management to LVM.