From 090d42e8beaeb48c1d5b9ef270afb380259e7eab Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 11:05:36 +0000
Subject: import device-mapper-persistent-data-0.8.5-1.el7


---

diff --git a/.device-mapper-persistent-data.metadata b/.device-mapper-persistent-data.metadata
index 49d0282..066bcba 100644
--- a/.device-mapper-persistent-data.metadata
+++ b/.device-mapper-persistent-data.metadata
@@ -1 +1 @@
-7739e03d525aaac3f5c8d86db01c2b1610f5790e SOURCES/v0.7.3.tar.gz
+250ac419422b2eb36a3de4af44d8d0a99aad8e69 SOURCES/v0.8.5.tar.gz
diff --git a/.gitignore b/.gitignore
index 600a64e..281b0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v0.7.3.tar.gz
+SOURCES/v0.8.5.tar.gz
diff --git a/SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch b/SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch
deleted file mode 100644
index 278b07d..0000000
--- a/SOURCES/device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/caching/metadata.cc b/caching/metadata.cc
-index 91806f4..7b150be 100644
---- a/caching/metadata.cc
-+++ b/caching/metadata.cc
-@@ -128,6 +128,10 @@ void
- metadata::commit_mappings()
- {
- 	sb_.mapping_root = mappings_->get_root();
-+	if (sb_.version >= 2) {
-+		dirty_bits_->flush();
-+		sb_.dirty_root = dirty_bits_->get_root();
-+	}
- }
- 
- void
diff --git a/SOURCES/dmpd-space-map-noop-explicit-option-return.patch b/SOURCES/dmpd-space-map-noop-explicit-option-return.patch
new file mode 100644
index 0000000..7133b77
--- /dev/null
+++ b/SOURCES/dmpd-space-map-noop-explicit-option-return.patch
@@ -0,0 +1,28 @@
+From 2d45ae3ca1dbd6ab04b8b99f627555c0092e7d4e Mon Sep 17 00:00:00 2001
+From: Joe Thornber <ejt@redhat.com>
+Date: Wed, 5 Jun 2019 11:07:28 +0100
+Subject: [PATCH] [space-map/noop] Be explicit about returning an optional
+
+Needed for older version of g++
+
+(cherry picked from commit 5e5409f48b5403d2c6dffd9919b35ad77d6fb7b4)
+---
+ persistent-data/space-maps/noop.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/persistent-data/space-maps/noop.h b/persistent-data/space-maps/noop.h
+index 500dae8..6f71290 100644
+--- a/persistent-data/space-maps/noop.h
++++ b/persistent-data/space-maps/noop.h
+@@ -61,7 +61,7 @@ namespace persistent_data {
+ 
+ 		maybe_block find_free(span_iterator &it) {
+ 			fail();
+-			return 0;
++			return boost::optional<block_address>(0);
+ 		}
+ 
+ 		bool count_possibly_greater_than_one(block_address b) const {
+-- 
+1.8.3.1
+
diff --git a/SPECS/device-mapper-persistent-data.spec b/SPECS/device-mapper-persistent-data.spec
index d321824..ae1c352 100644
--- a/SPECS/device-mapper-persistent-data.spec
+++ b/SPECS/device-mapper-persistent-data.spec
@@ -4,15 +4,15 @@
 
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 0.7.3
-Release: 3%{?dist}
+Version: 0.8.5
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: https://github.com/jthornber/thin-provisioning-tools
 #Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-% {version}.tar.gz
 Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
 Patch0: device-mapper-persistent-data-avoid-strip.patch
-Patch1: device-mapper-persistent-data-cache_restore-v2-dirty-bitset.patch
+Patch1: dmpd-space-map-noop-explicit-option-return.patch
 
 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel
 Requires: expat
@@ -28,7 +28,7 @@ snapshot eras
 %prep
 %setup -q -n thin-provisioning-tools-%{version}
 %patch0 -p1 -b .avoid_strip
-%patch1 -p1 -b .v2_dirty_bitset
+%patch1 -p1 -b .explicit_option_return
 echo %{version}-%{release} > VERSION
 
 %build
@@ -84,6 +84,15 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_sbindir}/thin_trim
 
 %changelog
+* Mon Jun 10 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.5-1
+- Additional fixes for thin_dump and thin_repair.
+
+* Mon May 27 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.2-1
+- Fix tools requiring additional --repair option.
+
+* Sat May 04 2019 Marian Csontos <mcsontos@redhat.com> - 0.8.1-1
+- Update to latest upstream release including various bug fixes.
+
 * Tue Nov 14 2017 Marian Csontos <mcsontos@redhat.com> - 0.7.3-3
 - Fix version 2 metadata corruption in cache_restore.