!7 upgrade package version to 0.8.5

Merge pull request !7 from 刘波/upgrade

0001-build-Fix-static-build-by-including-contrib-Makefile.patch

@@ -1,47 +0,0 @@
-From 2c9ee45c8c7836674194739a2bcc4bb4db08d27e Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Tue, 9 Apr 2019 21:27:36 +0800
-Subject: [PATCH 1/4] [build] Fix static build by including contrib/Makefile
- early (#100) Closes: #99
-
----
- Makefile.in | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index df590b4..5e9f30a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -29,6 +29,8 @@ endif
- .PHONY: all
- all: $(PROGRAMS) $(TESTLIBS)
- 
-+include contrib/Makefile
-+
- SOURCE=\
- 	base/output_file_requirements.cc \
- 	base/application.cc \
-@@ -140,10 +142,8 @@ CXX:=@CXX@
- STRIP:=@STRIP@
- OBJECTS:=$(subst .cc,.o,$(SOURCE))
- 
--# FIXME EMITTERS += $(PLUGIN_LIBS) doesn't work, probably because it's empty at
--# the time of use?
- ifeq ("@STATIC@", "yes")
--EMITTERS += contrib/*.a
-+EMITTERS += $(PLUGIN_LIBS)
- endif
- 
- TOP_DIR:=@top_srcdir@
-@@ -318,8 +318,6 @@ endif
- 
- .PHONY: install
- 
--include contrib/Makefile
--
- ifeq ("@TESTING@", "yes")
- include unit-tests/Makefile
- 
--- 
-2.19.1
-

0002-restore_emitter-squash-a-strncpy-warning.patch

@@ -1,25 +0,0 @@
-From 9b1acc658fdf5b066a2afc5324de8e3067fa5912 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Tue, 9 Apr 2019 21:29:33 +0800
-Subject: [PATCH 2/4] [restore_emitter] squash a strncpy warning
-
----
- caching/restore_emitter.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/caching/restore_emitter.cc b/caching/restore_emitter.cc
-index b7a573f..5c30b9f 100644
---- a/caching/restore_emitter.cc
-+++ b/caching/restore_emitter.cc
-@@ -26,7 +26,7 @@ namespace {
- 
- 			superblock &sb = md_->sb_;
- 			sb.version = metadata_version_;
--			strncpy((char *) sb.policy_name, policy.c_str(), sizeof(sb.policy_name));
-+			strncpy((char *) sb.policy_name, policy.c_str(), sizeof(sb.policy_name) - 1);
- 			memset(sb.policy_version, 0, sizeof(sb.policy_version)); // FIXME: should come from xml
- 			sb.policy_hint_size = hint_width;
- 			md_->setup_hint_array(hint_width);
--- 
-2.19.1
-

0003-run_set-fix-invalid-iterator-operations-113.patch

@@ -1,34 +0,0 @@
-From 5276bce4b8bca71cad36f48b309bdef23fac1134 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Tue, 9 Apr 2019 21:33:29 +0800
-Subject: [PATCH 3/4] [run_set] fix invalid iterator operations (#113)
-
----
- persistent-data/run_set.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/persistent-data/run_set.h b/persistent-data/run_set.h
-index 68a5f46..6c23dc1 100644
---- a/persistent-data/run_set.h
-+++ b/persistent-data/run_set.h
-@@ -64,13 +64,13 @@ namespace base {
- 
- 			typename rset::const_iterator it = runs_.lower_bound(run<T>(v));
- 
--			if (it->begin_ == v)
-+			if (it != runs_.end() && it->begin_ == v)
- 				return true;
- 
--			it--;
--
--			if (it != runs_.end())
-+			if (it != runs_.begin()) {
-+				it--;
- 				return it->contains(v);
-+			}
- 
- 			return false;
- 		}
--- 
-2.19.1
-

0004-space-map-disk-fix-the-search-range-117.patch

@@ -1,26 +0,0 @@
-From 529a7cf3f5d5780d5e44c8508d2d42903672f7e8 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Tue, 9 Apr 2019 21:36:22 +0800
-Subject: [PATCH 4/4] [space-map-disk] fix the search range (#117)
-
----
- persistent-data/space-maps/disk.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/persistent-data/space-maps/disk.cc b/persistent-data/space-maps/disk.cc
-index ce6a42c..d8db76f 100644
---- a/persistent-data/space-maps/disk.cc
-+++ b/persistent-data/space-maps/disk.cc
-@@ -390,7 +390,8 @@ namespace {
- 
- 					bitmap bm(tm_, ie, bitmap_validator_);
- 					unsigned bit_begin = (index == begin_index) ? (begin % ENTRIES_PER_BLOCK) : 0;
--					unsigned bit_end = (index == end_index - 1) ? (end % ENTRIES_PER_BLOCK) : ENTRIES_PER_BLOCK;
-+					unsigned bit_end = (index == end_index - 1) ?
-+								(end - ENTRIES_PER_BLOCK * index) : ENTRIES_PER_BLOCK;
- 
- 					boost::optional<unsigned> maybe_b = bm.find_free(bit_begin, bit_end);
- 					if (maybe_b) {
--- 
-2.19.1
-

thin-provisioning-tools.spec

@@ -1,15 +1,11 @@
 Name:    thin-provisioning-tools
-Version: 0.7.6
-Release: 7
+Version: 0.8.5
+Release: 1
 Summary: Tools for manipulating Device-mapper metadata
 License: GPLv3+
 URL:     https://github.com/jthornber/thin-provisioning-tools
 Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
-Patch0:  0000-device-mapper-persistent-data-avoid-strip.patch
-Patch1:  0001-build-Fix-static-build-by-including-contrib-Makefile.patch
-Patch2:  0002-restore_emitter-squash-a-strncpy-warning.patch
-Patch3:  0003-run_set-fix-invalid-iterator-operations-113.patch
-Patch4:  0004-space-map-disk-fix-the-search-range-117.patch
+Patch1:  0001-device-mapper-persistent-data-avoid-strip.patch
 
 BuildRequires: autoconf, expat-devel
 BuildRequires: libaio-devel, libstdc++-devel
@@ -53,6 +49,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_mandir}/man*/*
 
 %changelog
+* Wed July 15 2020 Liu Bo <liubo254@huawei.com> - 0.8.5-1
+- upgrade package to 0.8.5
+
 * Sun Jul 5 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 0.7.6-7
 - remove useless readme files.