From 5b66094e8690342260cfa1b6710b542334e41b59 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 27 Jul 2023 11:51:30 +0200
Subject: [PATCH] Update dmpd to upstream version 1.0.5

Resolves: #2175198
---
 .gitignore                                     |  2 ++
 ...go.toml-to-work-with-vendor-directory.patch | 18 +++++++++---------
 device-mapper-persistent-data.spec             |  7 +++++--
 sources                                        |  4 ++--
 tests/functions_test/Makefile                  |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b9709c..ad36491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@
 /dmpd090-vendor3.tar.gz
 /v1.0.4.tar.gz
 /dmpd104-vendor.tar.gz
+/v1.0.5.tar.gz
+/dmpd105-vendor.tar.gz
diff --git a/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch b/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
index ae2234b..4d10720 100644
--- a/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
+++ b/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
@@ -1,6 +1,6 @@
-From a6afd3ee7c9b5a6ab2906c827464acceb75123b2 Mon Sep 17 00:00:00 2001
+From 8b3609298420f5984ac3a2c74cb2ac4f94897eb0 Mon Sep 17 00:00:00 2001
 From: Marian Csontos <mcsontos@redhat.com>
-Date: Wed, 22 Mar 2023 09:42:15 +0100
+Date: Thu, 27 Jul 2023 11:37:01 +0200
 Subject: [PATCH] Tweak cargo.toml to work with vendor directory
 
 Mock works offline, cargo would try to download the files from github.
@@ -11,22 +11,22 @@ make mock happy.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 135ba5f8..cbb73ec1 100644
+index 8be49a52..b9b05ce6 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -11,7 +11,8 @@ anyhow = "1.0"
- base64 = "0.20"
+ base64 = "0.21"
  byteorder = "1.4"
- clap = "3.2"
+ clap = { version = "4.3", default-features = false, features = ["std", "help", "usage", "error-context", "suggestions"] }
 -crc32c = { git = "https://github.com/zowens/crc32c", branch = "master" }
 +#crc32c = { git = "https://github.com/zowens/crc32c", branch = "master" }
 +crc32c = "0.6"
- data-encoding = "2.3"
+ data-encoding = "2.4"
  exitcode = "1.1.2"
  fixedbitset = "0.4"
-@@ -28,7 +29,8 @@ quick-xml = "0.23.1"
+@@ -27,7 +28,8 @@ quick-xml = "0.29"
  rand = "0.8"
- rangemap = "1.1"
+ rangemap = "1.3"
  roaring = "0.10"
 -rio = { git = "https://github.com/jthornber/rio", branch = "master", optional = true }
 +#rio = { git = "https://github.com/jthornber/rio", branch = "master", optional = true }
@@ -35,5 +35,5 @@ index 135ba5f8..cbb73ec1 100644
  threadpool = "1.8"
  thiserror = "1.0"
 -- 
-2.40.1
+2.41.0
 
diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec
index 01fe28f..40f1205 100644
--- a/device-mapper-persistent-data.spec
+++ b/device-mapper-persistent-data.spec
@@ -9,13 +9,13 @@
 
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}%{?release_suffix}
 License: GPLv3+
 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}%{?version_suffix}.tar.gz
-Source1: dmpd104-vendor.tar.gz
+Source1: dmpd105-vendor.tar.gz
 Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
 
 BuildRequires: rust-packaging
@@ -108,6 +108,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 #% {_sbindir}/thin_show_duplicates
 
 %changelog
+* Thu Jul 27 2023 Marian Csontos <mcsontos@redhat.com> - 1.0.5-1
+- Update to latest upstream release 1.0.5.
+
 * Fri Apr 28 2023 Marian Csontos <mcsontos@redhat.com> - 1.0.4-1
 - Update to latest upstream release 1.0.4.
 
diff --git a/sources b/sources
index dbf8c9f..5d2a63d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.0.4.tar.gz) = a6700ea26dd24e8285d85e58f9016dccca071d21b20650f8a39e523e6f0394891e57615caaad4c16290961e170fe4ab4bec9ae38bc06dcc9ddac9114a0374034
-SHA512 (dmpd104-vendor.tar.gz) = d14a10fdbe1535b64c1911878da1be8dce3ce5e89c66fc0648e2a9c3e5e27b4874a99eee17175bf88e2d0c7dfa68382ba6746de3563feb28d6e070beae394f65
+SHA512 (v1.0.5.tar.gz) = 1ba305770caf65fbba45ea4795bc7edf0dff06d72633f5293750051426c37a4ba44fffd71e2c57415af4683d8f3a8293b08eca0cdce45fd718b6699b7c419f2e
+SHA512 (dmpd105-vendor.tar.gz) = 3641ec72048dcc2bd68fcdc43429652991822642fc599287ccd016531dd20f24efcae969ea5dcbcbd5a4712e5a80512621caf9f8e67736397d6ed08397c4a962
diff --git a/tests/functions_test/Makefile b/tests/functions_test/Makefile
index d9e7f97..6b14a2f 100644
--- a/tests/functions_test/Makefile
+++ b/tests/functions_test/Makefile
@@ -72,4 +72,4 @@ $(METADATA): Makefile
 	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
 	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
 
-	rhts-lint $(METADATA)
\ No newline at end of file
+	rhts-lint $(METADATA)