Update to version 1.1.0
This commit is contained in:
Marian Csontos
parent
4bace50fd1
commit
a540c7b432
6 changed files with 26 additions and 78 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -53,3 +53,5 @@
|
|||
/dmpd1011-vendor.tar.gz
|
||||
/v1.0.12.tar.gz
|
||||
/dmpd1012-vendor.tar.gz
|
||||
/v1.1.0.tar.gz
|
||||
/dmpd110-vendor.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 2a3a7ffa38a2e8ed7f9e89920deabd797ed961d5 Mon Sep 17 00:00:00 2001
|
||||
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
|
||||
|
|
@ -6,15 +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 b33b0a4b..2a87e432 100644
|
||||
index 47703bfc..4c605a54 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -33,7 +33,8 @@ quick-xml = "0.31"
|
||||
@@ -34,7 +34,8 @@ quick-xml = "0.36"
|
||||
rand = "0.8"
|
||||
rangemap = "1.5"
|
||||
roaring = "0.10"
|
||||
|
|
@ -25,5 +27,5 @@ index b33b0a4b..2a87e432 100644
|
|||
threadpool = "1.8"
|
||||
thiserror = "1.0"
|
||||
--
|
||||
2.43.0
|
||||
2.46.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -2,25 +2,23 @@
|
|||
# Copyright (C) 2011-2017 Red Hat, Inc
|
||||
#
|
||||
%bcond_without check
|
||||
%global debug_package %{nil}
|
||||
#%%global debug_package %%{nil}
|
||||
|
||||
#%%global version_suffix -rc2
|
||||
#%%global release_suffix .test3
|
||||
|
||||
Summary: Device-mapper Persistent Data Tools
|
||||
Name: device-mapper-persistent-data
|
||||
Version: 1.0.12
|
||||
Release: 3%{?dist}%{?release_suffix}
|
||||
Version: 1.1.0
|
||||
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: dmpd1012-vendor.tar.gz
|
||||
Source1: dmpd110-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
|
||||
|
|
@ -30,6 +28,12 @@ BuildRequires: rust >= 1.35
|
|||
BuildRequires: cargo
|
||||
%endif
|
||||
BuildRequires: make
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: clang-libs
|
||||
BuildRequires: glibc-static
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: clang
|
||||
#BuildRequires: gcc
|
||||
|
||||
%description
|
||||
thin-provisioning-tools contains check,dump,restore,repair,rmap
|
||||
|
|
@ -55,7 +59,7 @@ echo %{version}-%{release} > VERSION
|
|||
|
||||
%install
|
||||
# TODO: Check that MANDIR is unused and remove
|
||||
%make_install MANDIR=%{_mandir} BINDIR=%{buildroot}%{_sbindir}
|
||||
%make_install STRIP=true MANDIR=%{_mandir} BINDIR=%{buildroot}%{_sbindir}
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
|
|
@ -83,6 +87,7 @@ echo %{version}-%{release} > VERSION
|
|||
%{_mandir}/man8/thin_dump.8.gz
|
||||
%{_mandir}/man8/thin_ls.8.gz
|
||||
%{_mandir}/man8/thin_metadata_size.8.gz
|
||||
%{_mandir}/man8/thin_migrate.8.gz
|
||||
%{_mandir}/man8/thin_repair.8.gz
|
||||
%{_mandir}/man8/thin_restore.8.gz
|
||||
%{_mandir}/man8/thin_rmap.8.gz
|
||||
|
|
@ -105,6 +110,7 @@ echo %{version}-%{release} > VERSION
|
|||
%{_sbindir}/thin_dump
|
||||
%{_sbindir}/thin_ls
|
||||
%{_sbindir}/thin_metadata_size
|
||||
%{_sbindir}/thin_migrate
|
||||
%{_sbindir}/thin_repair
|
||||
%{_sbindir}/thin_restore
|
||||
%{_sbindir}/thin_rmap
|
||||
|
|
@ -114,6 +120,9 @@ echo %{version}-%{release} > VERSION
|
|||
#% {_sbindir}/thin_show_duplicates
|
||||
|
||||
%changelog
|
||||
* Mon Sep 02 2024 Marian Csontos <mcsontos@redhat.com> - 1.1.0-1
|
||||
- Update to latest upstream release 1.1.0.
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (v1.0.12.tar.gz) = 2e960e5a0d11016c1131ed48678a44c54164b43811f8efaa7172d9df7f433b185fa4b2f8d3d430affff19ced672f74a1f17614efd00287f2c310a6a3745ff8e5
|
||||
SHA512 (dmpd1012-vendor.tar.gz) = 02c0015545f05ac71c427f734a766e75a0f5a17a7edddae57abbb0d1277c0d91c6e26d59dd91aef2f2050aee6aef2e118478ca15183c36348e93185ebad3c1e0
|
||||
SHA512 (v1.1.0.tar.gz) = 8cf3953743334b5a34504695757fa2de5a5fb5bdb8c7aed859995154fc004f52c3ef041558d307a2309c2de8dcdcbd8a0537bd3408fd78c7ff2f641f28944c1e
|
||||
SHA512 (dmpd110-vendor.tar.gz) = 05c32ade894331eb11239c88d702d20ac463745b51d2c8b71d5aed75ce443ab160d94cd33bdbf021982fe3edc21c630e5bd5dba66d890b352bb6636d09667077
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue