From 7d940d6bd5ef31430c6e103f8b21d1b5d651f703 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Fri, 22 Sep 2017 09:05:47 +0200 Subject: [PATCH] New upstream release v0.7.2 --- .gitignore | 1 + ...re-and-cache_metadata_size-man-pages.patch | 116 ------------------ ...e-mapper-persistent-data-avoid-strip.patch | 14 ++- ...data-document-clear-needs-check-flag.patch | 15 --- device-mapper-persistent-data.spec | 32 ++--- sources | 2 +- 6 files changed, 28 insertions(+), 152 deletions(-) delete mode 100644 device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch delete mode 100644 device-mapper-persistent-data-document-clear-needs-check-flag.patch diff --git a/.gitignore b/.gitignore index 2ba1d7e..2a5ff51 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /thin-provisioning-tools-0.7.0-rc4.tar.gz /thin-provisioning-tools-0.7.0-rc5.tar.gz /thin-provisioning-tools-0.7.0-rc6.tar.gz +/v0.7.2.tar.gz diff --git a/device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch b/device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch deleted file mode 100644 index ac2e687..0000000 --- a/device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- thin-provisioning-tools-0.4.1/man8/era_restore.8.orig 2014-10-28 14:24:43.356272471 +0100 -+++ thin-provisioning-tools-0.4.1/man8/era_restore.8 2014-10-28 14:28:56.358133852 +0100 -@@ -0,0 +1,63 @@ -+.TH ERA_RESTORE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- -+.SH NAME -+era_restore \- restore era metadata file to device or file -+ -+.SH SYNOPSIS -+.B era_restore -+.RB [ options ] -+.RB -i -+.I {device|file} -+.RB -o -+.I {device|file} -+ -+.SH DESCRIPTION -+.B era_restore -+restores binary era metadata created by the -+respective device-mapper target dumped into an XML formatted (see -+.BR era_dump(8) ) -+.I file -+, which optionally can be preprocessed before the restore to another -+.I device -+or -+.I file. -+If restored to a metadata -+.I device -+, the metadata can be processed by the device-mapper target. -+ -+.IP "\fB\-q, \-\-quiet\fP" -+Suppress output messages, return only exit code. -+ -+.IP "\fB\-i, \-\-input\fP \fI{device|file}\fP" -+Input file or device with metadata. -+ -+.IP "\fB\-o, \-\-output\fP \fI{device|file}\fP" -+Output file or device. -+ -+.IP "\fB\-h, \-\-help\fP" -+Print help and exit. -+ -+.IP "\fB\-V, \-\-version\fP" -+Output version information and exit. -+ -+.SH EXAMPLE -+Restores the XML formatted era metadata on file -+.B metadata -+to logical volume /dev/vg/metadata for further processing by the -+respective device-mapper target: -+.sp -+.B era_restore -i metadata -o /dev/vg/metadata -+ -+.SH DIAGNOSTICS -+.B era_restore -+returns an exit code of 0 for success or 1 for error. -+ -+.SH SEE ALSO -+.B era_check(8) -+.B era_dump(8) -+.B era_invaidate(8) -+.B era_restore(8) -+ -+.SH AUTHOR -+Joe Thornber -+.br -+Heinz Mauelshagen ---- thin-provisioning-tools-0.4.1/man8/cache_metadata_size.8.orig 2014-10-28 14:31:49.116087709 +0100 -+++ thin-provisioning-tools-0.4.1/man8/cache_metadata_size.8 2014-10-28 14:50:29.337238755 +0100 -@@ -0,0 +1,47 @@ -+.TH CACHE_METADATA_SIZE 8 "Thin Provisioning Tools" "Red Hat, Inc." \" -*- nroff -*- -+.SH NAME -+cache_metadata_size \- cache metadata device/file size calculator. -+ -+.SH SYNOPSIS -+.B cache_metadata_size -+.RB [ options ] -+ -+.SH DESCRIPTION -+.B cache_metadata_size -+calculates the size of the cache metadata based on the block size -+of the cache device and the cache block size. -+All relates to the size of the fast device (eg, SSD), rather -+than the whole cached (i.e. origin) device. -+ -+.IP "\fB\\-\-block\-size \fP -+Block size of cache in units of sectors. -+ -+.IP "\fB\\-\-device\-size \fP -+Device size of the cache device in units of sectors. -+ -+.IP "\fB\\-\-nr\-blocks \fP -+Capacity of the cache in number of blocks. -+ -+.IP "\fB\-h, \-\-help\fP" -+Print help and exit. -+ -+.IP "\fB\-V, \-\-version\fP" -+Output version information and exit. -+ -+.SH EXAMPLES -+Calculates the cache metadata device size for block size 256 sectors.and device size of 2GiB -+.sp -+.B cache_metadata_size --block-size 256 --device-size $((2*1024*1024)) -+ -+.SH DIAGNOSTICS -+.B cache_metadata_size -+returns an exit code of 0 for success or 1 for error. -+ -+.SH SEE ALSO -+.B cache_check(8) -+.B cache_dump(8) -+.B cache_repair(8) -+.B cache_restore(8) -+ -+.SH AUTHOR -+Heinz Mauelshagen diff --git a/device-mapper-persistent-data-avoid-strip.patch b/device-mapper-persistent-data-avoid-strip.patch index 3b7379a..6b3410e 100644 --- a/device-mapper-persistent-data-avoid-strip.patch +++ b/device-mapper-persistent-data-avoid-strip.patch @@ -1,8 +1,12 @@ -diff -purN thin-provisioning-tools-0.6.0.orig/Makefile.in thin-provisioning-tools-0.6.0.new/Makefile.in ---- thin-provisioning-tools-0.6.0.orig/Makefile.in 2016-01-20 16:43:21.000000000 +0100 -+++ thin-provisioning-tools-0.6.0.new/Makefile.in 2016-01-20 17:26:11.943664295 +0100 -@@ -174,7 +174,6 @@ distclean: clean - install: bin/pdata_tools + 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 diff --git a/device-mapper-persistent-data-document-clear-needs-check-flag.patch b/device-mapper-persistent-data-document-clear-needs-check-flag.patch deleted file mode 100644 index 6fa4163..0000000 --- a/device-mapper-persistent-data-document-clear-needs-check-flag.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- thin-provisioning-tools-0.4.1/man8/thin_check.8.orig 2014-10-28 14:19:02.800420873 +0100 -+++ thin-provisioning-tools-0.4.1/man8/thin_check.8 2014-10-28 14:19:47.335924554 +0100 -@@ -25,6 +25,12 @@ - .IP "\fB\-V, \-\-version\fP" - Output version information and exit. - -+.IP "\fB\-\-clear\-needs\-check\-flag\fP" -+Clear the needs-check-flag in case the check of the thin pool metadata succeeded. -+If the metadata check failed, the flag is not cleared and a thin_repair run is -+needed to fix any issues. -+After thin_repair succeeded, you may run thin_check again. -+ - .IP "\fB\-\-super\-block\-only\fP" - Only check the superblock is present. - diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 8b98696..161bf44 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -2,21 +2,16 @@ # Copyright (C) 2011-2017 Red Hat, Inc # -%define pre_release_upstream -rc6 -%define pre_release rc6 - Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data -Version: 0.7.0 -Release: 0.6.%{pre_release}%{?dist} +Version: 0.7.2 +Release: 1%{?dist} License: GPLv3+ Group: System Environment/Base URL: https://github.com/jthornber/thin-provisioning-tools -Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-%{version}%{pre_release_upstream}.tar.gz -# Source1: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz -Patch0: device-mapper-persistent-data-document-clear-needs-check-flag.patch -Patch1: device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch -Patch2: device-mapper-persistent-data-avoid-strip.patch +#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}.tar.gz +Patch0: device-mapper-persistent-data-avoid-strip.patch BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel Requires: expat @@ -30,10 +25,8 @@ are included and era check, dump, restore and invalidate to manage snapshot eras %prep -%setup -q -n thin-provisioning-tools-%{version}%{pre_release_upstream} -%patch0 -p1 -b .clear_needs_check_flag -%patch1 -p1 -b .man_pages -%patch2 -p1 -b .avoid_strip +%setup -q -n thin-provisioning-tools-%{version} +%patch0 -p1 -b .avoid_strip echo %{version}-%{release} > VERSION %build @@ -50,12 +43,14 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %doc COPYING README.md %{_mandir}/man8/cache_check.8.gz %{_mandir}/man8/cache_dump.8.gz +%{_mandir}/man8/cache_metadata_size.8.gz %{_mandir}/man8/cache_repair.8.gz %{_mandir}/man8/cache_restore.8.gz %{_mandir}/man8/cache_writeback.8.gz %{_mandir}/man8/era_check.8.gz %{_mandir}/man8/era_dump.8.gz %{_mandir}/man8/era_invalidate.8.gz +%{_mandir}/man8/era_restore.8.gz %{_mandir}/man8/thin_check.8.gz %{_mandir}/man8/thin_delta.8.gz %{_mandir}/man8/thin_dump.8.gz @@ -85,9 +80,16 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_sbindir}/thin_restore %{_sbindir}/thin_rmap %{_sbindir}/thin_trim -%{_sbindir}/thin_show_duplicates +#% {_sbindir}/thin_show_duplicates %changelog +* Fri Sep 22 2017 Marian Csontos - 0.7.2-1 +- Update to latest upstream release including various bug fixes and new features. +- Fix segfault when dump tools are given a tiny metadata file. +- Fix -V exiting with 1. +- Fix thin_check when running on XML dump instead of binary data. +- Speed up free block searching. + * Wed Aug 02 2017 Fedora Release Engineering - 0.7.0-0.6.rc6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index f993efa..a51eaac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thin-provisioning-tools-0.7.0-rc6.tar.gz) = bac97828ec1951b301743149f65e146608a98919d1a3ec9b25631bdb0ea901cc81d6cfd4a9143ffb71f89fe5895eb4e9d29921c4d2730f249dbc443eb3b58a2a +SHA512 (v0.7.2.tar.gz) = 563363842ab0b92f563ac7fcaedb18b8fca70b0894ff30d55cc40487d53b035c32d3ef711adb7102ef1a55b26a75510239da2542b791d850a5cbccf1ddf1acdd