Compare commits

..

No commits in common. "c855736318ac30572870973f61850cd102beffc3" and "37ebf650121ff326b5916df46a497cb253351ae8" have entirely different histories.

4 changed files with 4 additions and 91 deletions

View File

@ -1,26 +0,0 @@
From 6b7e66d8f9257c09052586baad692ecae89aaa68 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 22 Jun 2021 21:23:52 +0100
Subject: [PATCH] [build] Remove -lboost_iostreams linker flag
This was previously needed for thin-provisioning/thin_metadata_pack.cc
but that file was rewritten in Rust and no longer needs Boost. The flag
causes every binary to have a completely redundant depedency on
libboost_iostream.so, which is an issue for RHEL packaging.
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index b29551d9..ec665ca0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -190,7 +190,7 @@ CXXFLAGS+=@CXX_STRERROR_FLAG@
CXXFLAGS+=@CXX_STRERROR_FLAG@
CXXFLAGS+=@LFS_FLAGS@
INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning
-LIBS:=-laio -lexpat -lboost_iostreams -ldl
+LIBS:=-laio -lexpat -ldl
ifeq ("@DEVTOOLS@", "yes")
LIBS+=-lncurses

View File

@ -1,44 +0,0 @@
From f3c2ade90acbd1ac9a9391ff8e09fbe252a63b45 Mon Sep 17 00:00:00 2001
From: Ming-Hung Tsai <mtsai@redhat.com>
Date: Tue, 12 Oct 2021 23:19:00 +0800
Subject: [PATCH] [thin_ll_dump] Fix potential segfault while reading invalid
subtree roots
---
thin-provisioning/thin_ll_dump.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/thin-provisioning/thin_ll_dump.cc b/thin-provisioning/thin_ll_dump.cc
index e6048d0..9207cd2 100644
--- a/thin-provisioning/thin_ll_dump.cc
+++ b/thin-provisioning/thin_ll_dump.cc
@@ -135,7 +135,9 @@ namespace {
public:
ll_mapping_tree_emitter(block_manager::ptr bm,
indented_stream &out)
- : bm_(bm), out_(out) {
+ : bm_(bm),
+ nv_(create_btree_node_validator()),
+ out_(out) {
}
void visit(btree_path const &path, block_address tree_root) {
@@ -147,6 +149,7 @@ namespace {
try {
block_manager::read_ref rr = bm_->read_lock(tree_root);
node_ref<uint64_traits> n = btree_detail::to_node<uint64_traits>(rr);
+ nv_->check(n.raw(), tree_root);
node_info ni;
convert_to_node_info(n, ni);
output_node_info(out_, ni);
@@ -160,6 +163,7 @@ namespace {
}
private:
block_manager::ptr bm_;
+ bcache::validator::ptr nv_;
indented_stream& out_;
};
--
2.33.0

View File

@ -1,19 +1,16 @@
Name: thin-provisioning-tools
Version: 0.9.0
Release: 4
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
Patch1: 0001-device-mapper-persistent-data-avoid-strip.patch
Patch2: 0002-build-remove-lboost_iostreams-linker-flag.patch
Patch3: 0003-thin_ll_dump-Fix-potential-segfault-while-reading-in.patch
BuildRequires: autoconf, expat-devel
BuildRequires: libaio-devel, libstdc++-devel
BuildRequires: boost-devel, gcc-c++
Requires: expat
Recommends: %{name}-help = %{version}-%{release}
Requires: expat, boost-iostreams
Provides: device-mapper-persistent-data
Obsoletes: device-mapper-persistent-data
@ -52,19 +49,10 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
%{_mandir}/man*/*
%changelog
* Fri Nov 4 2022 wuguanghao <wuguanghao3@huawei.com> - 0.9.0-4
- backport bugfix patch from community
* Wed Sep 15 2021 Liu Zixian <liuzixian4@huawei.com> - 0.9.0-3
- Remove redundant dependency
* Thu Dec 17 2020 yanglongkang <yanglongkang@huawei.com> - 0.9.0-2
- Set help package as install require
* Tue Aug 25 2020 lixiaokeng <lixiaokeng@huawei.com> - 0.9.0-1
* Thu Aug 25 2020 lixiaokeng <lixiaokeng@huawei.com> - 0.9.0-1
- upgrade package to 0.9.0
* Thu Jul 30 2020 lixiaokeng <lixiaokeng@huawei.com> - 0.8.5-2
* Thu July 30 2020 lixiaokeng <lixiaokeng@huawei.com> - 0.8.5-2
- remove thin-provisioning-tools.yaml
* Wed July 15 2020 Liu Bo <liubo254@huawei.com> - 0.8.5-1

View File

@ -1,5 +0,0 @@
version_control: git
src_repo: https://github.com/jthornber/thin-provisioning-tools.git
tag_prefix: "^v"
seperator: "."