diff --git a/0001-device-mapper-persistent-data-avoid-strip.patch b/0001-device-mapper-persistent-data-avoid-strip.patch deleted file mode 100644 index 6b3410e15406285ee905d6f16dc9970271cd0ae2..0000000000000000000000000000000000000000 --- a/0001-device-mapper-persistent-data-avoid-strip.patch +++ /dev/null @@ -1,15 +0,0 @@ - Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 0aa9401..0f4f7cb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -262,7 +262,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) - install: bin/pdata_tools $(MANPAGES) - $(INSTALL_DIR) $(BINDIR) - $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) -- $(STRIP) $(BINDIR)/pdata_tools - ln -s -f pdata_tools $(BINDIR)/cache_check - ln -s -f pdata_tools $(BINDIR)/cache_dump - ln -s -f pdata_tools $(BINDIR)/cache_metadata_size diff --git a/0002-build-remove-lboost_iostreams-linker-flag.patch b/0002-build-remove-lboost_iostreams-linker-flag.patch deleted file mode 100644 index e992beefb9a4c4fd4dfe17f4bb074c197e012b72..0000000000000000000000000000000000000000 --- a/0002-build-remove-lboost_iostreams-linker-flag.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6b7e66d8f9257c09052586baad692ecae89aaa68 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -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 diff --git a/0003-thin_ll_dump-Fix-potential-segfault-while-reading-in.patch b/0003-thin_ll_dump-Fix-potential-segfault-while-reading-in.patch deleted file mode 100644 index b46c0029590c6932c193b8aafe5e339e6b40270e..0000000000000000000000000000000000000000 --- a/0003-thin_ll_dump-Fix-potential-segfault-while-reading-in.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f3c2ade90acbd1ac9a9391ff8e09fbe252a63b45 Mon Sep 17 00:00:00 2001 -From: Ming-Hung Tsai -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 n = btree_detail::to_node(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 - diff --git a/thin-provisioning-tools.spec b/thin-provisioning-tools.spec index f0f1044e8cc6be27f47a9dd59e6cdd02e5343ce1..5403dbc6992ffae5206009b6736a61eb953e5432 100644 --- a/thin-provisioning-tools.spec +++ b/thin-provisioning-tools.spec @@ -1,17 +1,17 @@ +%global debug_package %{nil} + Name: thin-provisioning-tools -Version: 0.9.0 -Release: 4 +Version: 1.0.12 +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: expat-devel BuildRequires: libaio-devel, libstdc++-devel BuildRequires: boost-devel, gcc-c++ +BuildRequires: cargo Requires: expat Recommends: %{name}-help = %{version}-%{release} Provides: device-mapper-persistent-data @@ -35,9 +35,7 @@ This contains man files for the using of thin-provisioning-tools echo %{version}-%{release} > VERSION %build -autoconf -%configure --with-optimisation= -%make_build V= +cargo build %install make DESTDIR=%{buildroot} MANDIR=%{_mandir} install @@ -52,6 +50,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_mandir}/man*/* %changelog +* Mon Feb 26 2024 liweigang - 1.0.12-1 +- update to version 1.0.12 + * Fri Nov 4 2022 wuguanghao - 0.9.0-4 - backport bugfix patch from community @@ -67,7 +68,7 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install * Thu Jul 30 2020 lixiaokeng - 0.8.5-2 - remove thin-provisioning-tools.yaml -* Wed July 15 2020 Liu Bo - 0.8.5-1 +* Wed Jul 15 2020 Liu Bo - 0.8.5-1 - upgrade package to 0.8.5 * Sun Jul 5 2020 Zhiqiang Liu - 0.7.6-7 diff --git a/v0.9.0.tar.gz b/v0.9.0.tar.gz deleted file mode 100644 index 15c3278cce086c7751e30059a32fb0d2728b89a3..0000000000000000000000000000000000000000 Binary files a/v0.9.0.tar.gz and /dev/null differ diff --git a/v1.0.12.tar.gz b/v1.0.12.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5c0bd33c754115ce76fc3422045146c02b07e862 Binary files /dev/null and b/v1.0.12.tar.gz differ