Update to version 1.0.12

This commit is contained in:
Marian Csontos 2024-02-27 10:42:12 +01:00
commit e10017f376
6 changed files with 81 additions and 11 deletions

2
.gitignore vendored
View file

@ -51,3 +51,5 @@
/dmpd109-vendor.tar.gz
/v1.0.11.tar.gz
/dmpd1011-vendor.tar.gz
/v1.0.12.tar.gz
/dmpd1012-vendor.tar.gz

View file

@ -1,4 +1,4 @@
From d7c6150c644a299bb8667a3d5a01b0e03449e996 Mon Sep 17 00:00:00 2001
From 2a3a7ffa38a2e8ed7f9e89920deabd797ed961d5 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
@ -6,19 +6,17 @@ 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 23b46193..b33b7418 100644
index b33b0a4b..2a87e432 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,8 @@ quick-xml = "0.31"
@@ -33,7 +33,8 @@ quick-xml = "0.31"
rand = "0.8"
rangemap = "1.4"
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 }

View file

@ -0,0 +1,25 @@
From 9e55217135b7543f13a5801aafda0fe0a1fb363a Mon Sep 17 00:00:00 2001
From: Ming-Hung Tsai <mtsai@redhat.com>
Date: Mon, 26 Feb 2024 21:11:27 +0800
Subject: [PATCH] [tests] Explicitly set the pipe size for triggering EPIPE
(cherry picked from commit 0b3c80efd7c627ce7d75397452f496b6329a90c0)
---
tests/thin_dump.rs | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/thin_dump.rs b/tests/thin_dump.rs
index 81982188..9eade06e 100644
--- a/tests/thin_dump.rs
+++ b/tests/thin_dump.rs
@@ -154,6 +154,7 @@ fn test_no_stderr_on_broken_pipe(extra_args: &[&std::ffi::OsStr]) -> Result<()>
let mut pipefd = [0i32; 2];
unsafe {
ensure!(libc::pipe2(pipefd.as_mut_slice().as_mut_ptr(), libc::O_CLOEXEC) == 0);
+ ensure!(libc::fcntl(pipefd[0], libc::F_SETPIPE_SZ, 65536) == 65536);
}
let mut args = args![&md].to_vec();
--
2.43.0

View file

@ -0,0 +1,40 @@
From 54e7eaf002a2b07cd5571b5d3374eb760d727381 Mon Sep 17 00:00:00 2001
From: Ming-Hung Tsai <mtsai@redhat.com>
Date: Tue, 27 Feb 2024 01:24:01 +0800
Subject: [PATCH] [tests] Fix closing the pipe fd twice
The duct::Expression::stdout_file() takes the ownership of the
passed-in file descriptor, thus the caller doesn't need to close
the fd afterward. Closing a fd twice in tests might inadvertently
closing the fd recently opened by other test threads, leading to
unexpected bugs.
(cherry picked from commit 3b378b0e39a7ae111a81d394f8721bae89f9ca37)
---
tests/thin_dump.rs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/thin_dump.rs b/tests/thin_dump.rs
index 9eade06e..caae31ef 100644
--- a/tests/thin_dump.rs
+++ b/tests/thin_dump.rs
@@ -161,7 +161,7 @@ fn test_no_stderr_on_broken_pipe(extra_args: &[&std::ffi::OsStr]) -> Result<()>
args.extend_from_slice(extra_args);
let cmd = thin_dump_cmd(args)
.to_expr()
- .stdout_file(pipefd[1])
+ .stdout_file(pipefd[1]) // this transfers ownership of the fd
.stderr_capture();
let handle = cmd.unchecked().start()?;
@@ -169,7 +169,6 @@ fn test_no_stderr_on_broken_pipe(extra_args: &[&std::ffi::OsStr]) -> Result<()>
std::thread::sleep(std::time::Duration::from_millis(1000));
unsafe {
- libc::close(pipefd[1]); // close the unused write-end
libc::close(pipefd[0]); // causing broken pipe
}
--
2.43.0

View file

@ -9,16 +9,18 @@
Summary: Device-mapper Persistent Data Tools
Name: device-mapper-persistent-data
Version: 1.0.11
Release: 3%{?dist}%{?release_suffix}
Version: 1.0.12
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: dmpd1011-vendor.tar.gz
Source1: dmpd1012-vendor.tar.gz
Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
Patch2: 0002-tests-Explicitly-set-the-pipe-size-for-triggering-EP.patch
Patch3: 0003-tests-Fix-closing-the-pipe-fd-twice.patch
%if %{defined rhel}
BuildRequires: rust-toolset
@ -112,6 +114,9 @@ echo %{version}-%{release} > VERSION
#% {_sbindir}/thin_show_duplicates
%changelog
* Tue Feb 27 2024 Marian Csontos <mcsontos@redhat.com> - 1.0.12-1
- Update to latest upstream release 1.0.12.
* Tue Feb 13 2024 Marian Csontos <mcsontos@redhat.com> - 1.0.11-4
- Add licenses for statically linked libraries.

View file

@ -1,2 +1,2 @@
SHA512 (v1.0.11.tar.gz) = e1adacea2a1d6b07fea288080c0d0c24c99f5e6908ac9ac623b86e068991ceb9ae8967cd253a8ee7bf329ab3d4cf9f57d472438a0b0ffa486f7f8939cf9c10db
SHA512 (dmpd1011-vendor.tar.gz) = 67a9753cf4e488ff37a116dd9232c8dbe2d91047fffd2735025aaa26f804150b5de9324e29a5240af75f1591f518913b7831f980871a4f3175f5a05a56893e9d
SHA512 (v1.0.12.tar.gz) = 2e960e5a0d11016c1131ed48678a44c54164b43811f8efaa7172d9df7f433b185fa4b2f8d3d430affff19ced672f74a1f17614efd00287f2c310a6a3745ff8e5
SHA512 (dmpd1012-vendor.tar.gz) = 02c0015545f05ac71c427f734a766e75a0f5a17a7edddae57abbb0d1277c0d91c6e26d59dd91aef2f2050aee6aef2e118478ca15183c36348e93185ebad3c1e0