Update to version 1.3.1

Describe Cargo.toml patching.
And explain the notes to greater detail.

.gitignore

@@ -55,3 +55,9 @@
 /dmpd1012-vendor.tar.gz
 /v1.1.0.tar.gz
 /dmpd110-vendor.tar.gz
+/v1.2.1.tar.gz
+/dmpd121-vendor.tar.gz
+/v1.3.0.tar.gz
+/dmpd130-vendor.tar.gz
+/v1.3.1.tar.gz
+/dmpd131-vendor.tar.gz

0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch

@@ -1,31 +0,0 @@
-From b0b04e59eb381859f3858120d535cc24059fbc08 Mon Sep 17 00:00:00 2001
-From: Marian Csontos <mcsontos@redhat.com>
-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.
-So cargo vendor has to be run first, and then change the Cargo.toml to
-make mock happy.
-
-(cherry picked from commit 0d5347bd771e960294cd0c2f083d96448613ab9c)
----
- Cargo.toml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 47703bfc..4c605a54 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -34,7 +34,8 @@ quick-xml = "0.36"
- rand = "0.8"
- rangemap = "1.5"
- 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 }
-+rio = { version = "0.9.4", optional = true }
- safemem = "0.3"
- threadpool = "1.8"
- thiserror = "1.0"
--- 
-2.46.0
-

README.md

@@ -1,24 +1,54 @@
-# Packaging dmpd
+# Packaging device-mapper-persitent-data (AKA dmpd)
 
-This is mostly regular package except recent addition of rust to used languages.
+This is rust package using *vendor* file for dependencies. (Vendor file is an archive of dependencies' sources.)
 
-## rust-tools
+For most of simple fixes, there is nothing special,
+to add a patches simply add them to dist-git,
+add a corresponding `PatchN: 000N-...` lines,
+increase `Release:` or `release_suffix` for Z-stream (or for test build use suffix like `.bzNNNNNN`),
+add to `%changelog`,
+commit,
+push,
+and build the package using `fedpkg build`.
 
-To build the rust-tools (`make rust-tools`) one needs:
+Alternatively before committing anything use `fedpkg srpm` and `fedpkg scratch-build --srpm $SRPM [--arches x86_64]` to create a scratch build.
 
-- rust >= 1.35
-- cargo with vendor subcommand (now upstream, included in latest Fedora and RHEL8)
+However when building a new version of dmpd or when updating a dependency is
+needed (e.g. because of CVE in the dependency) vendor file
+has to be regenerated.
 
-### cargo vendpr
+## Updating vendor file
 
-- run `cargo vendor` in the disrectory with sources
-- run `tar czf device-mapper-persistent-data-vendor-$VERSION.tar.gz ./vendor`
-- copy the file (if version changed) and run the *fedpkg new-sources* command:
+To build a new version of the package following tooling is needed:
+
+- `rust >= 1.35`
+- `cargo` providing vendor subcommand (now upstream, included in latest Fedora and RHEL8+)
+
+To create the vendor file:
+
+In the upstream directory:
+
+1. Run `cargo vendor` in the directory with upstream sources to create *vendor*
+   directory with sources.
+    - TODO: There is a *cargo-vendor-filterer* project used by *stratisd* to
+      filter out unnecessary dependencies for other operating systems.
+2. Run `tar czf device-mapper-persistent-data-vendor-$VERSION.tar.gz ./vendor` to create a tarball.
+3. Copy the vendor file to dist git directory.
+
+In the dist-git directory:
+
+1. Get the upstream tarball `wget https://github.com/jthornber/thin-provisioning-tools/archive/v$VERSION.tar.gz`
+    - NOTE: Migration to `https://github.com/device-mapper-utils/thin-provisioning-tools` is coming.
+2. Update *Source0* and *Source1* to correct values.
+3. Add the tarballs to koji/brew lookaside:
     - `fedpkg new-sources v$VERSION.tar.gz device-mapper-persistent-data-vendor-$VERSION.tar.gz`
 
 ## TODO/NOTES
 
-Some of the dependencies may be already packaged by Fedora. Can we instruct *cargo vendor* to include only those which are not provided by Fedora?
+Some of the dependencies are already packaged by Fedora. Can we instruct *cargo vendor* to include only those which are not provided by Fedora?
+It would be possible to include these as submodules, and the rest could be used from Fedora.
+For RHEL and CentOS Stream using vendor file is the recommended way.
 
-*%cargo_install* installs by defualt in */usr/bin* but the package expects */usr/sbin*. For now I run *make install-rust-tools*.
+*%cargo_install* installs by default in */usr/bin* but the package expects */usr/sbin*. For now I run *make install-rust-tools*.
+Now Fedora unified the */usr/sbin* and */usr/bin* directories, to this can be "fixed" in Fedora and later in CentOS Stream.
 

device-mapper-persistent-data.spec

@@ -9,16 +9,15 @@
 
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 1.1.0
-Release: 3%{?dist}%{?release_suffix}
+Version: 1.3.1
+Release: 1%{?dist}%{?release_suffix}
 License: GPL-3.0-only AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
 
 #ExcludeArch: %%{ix86}
 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: dmpd110-vendor.tar.gz
-Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
+Source1: dmpd131-vendor.tar.gz
 
 %if %{defined rhel}
 BuildRequires: rust-toolset
@@ -46,6 +45,18 @@ snapshot eras
 %prep
 %autosetup -p1 -n thin-provisioning-tools-%{version}%{?version_suffix} -a1
 %cargo_prep -v vendor
+
+# NOTE: Following could replace Cargo.toml patching, but some macros are not working well with it
+# Notably at least one of cargo_license_summary, cargo_license_summary, or cargo_vendor_manifest
+#cat >> .cargo/config.toml << EOF
+#
+#[source."git+https://github.com/jthornber/rio?branch=master"]
+#git = "https://github.com/jthornber/rio"
+#branch = "master"
+#replace-with = "vendored-sources"
+#
+#EOF
+
 echo %{version}-%{release} > VERSION
 
 %generate_buildrequires
@@ -120,6 +131,18 @@ echo %{version}-%{release} > VERSION
 #% {_sbindir}/thin_show_duplicates
 
 %changelog
+* Tue Dec 02 2025 Marian Csontos <mcsontos@redhat.com> - 1.3.1-1
+- Update to latest upstream release 1.3.1.
+
+* Wed Oct 22 2025 Marian Csontos <mcsontos@redhat.com> - 1.3.0-1
+- Update to latest upstream release 1.3.0.
+
+* Thu Sep 04 2025 Marian Csontos <mcsontos@redhat.com> - 1.2.1-1
+- Update to latest upstream release 1.2.1.
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (v1.1.0.tar.gz) = 8cf3953743334b5a34504695757fa2de5a5fb5bdb8c7aed859995154fc004f52c3ef041558d307a2309c2de8dcdcbd8a0537bd3408fd78c7ff2f641f28944c1e
-SHA512 (dmpd110-vendor.tar.gz) = 05c32ade894331eb11239c88d702d20ac463745b51d2c8b71d5aed75ce443ab160d94cd33bdbf021982fe3edc21c630e5bd5dba66d890b352bb6636d09667077
+SHA512 (v1.3.1.tar.gz) = ff0758b21b50702568cad88522ee4c2b6b4433cec0a5f5074c9d1791c13e630e5c516601d7a68c51ac34e036091fc82fe831dbe51e6776737571d90ed266878e
+SHA512 (dmpd131-vendor.tar.gz) = 0e1b8e501e330b64415c9097c94dfc1f1b43d2900a66258e40b6c8f28c51fd61247d60495f594f14550fb349ed4ad435f8959a8808fea1d363a206c5ead7db1e