thin-provisioning-tools: 0.6.3 -> 0.7.4

5 files changed, 51 insertions, 7 deletions

diff --git a/thin-provisioning-tools/.footprint b/thin-provisioning-tools/.footprint
index 5ac0c633e..fdcb53c02 100644
--- a/thin-provisioning-tools/.footprint
+++ b/thin-provisioning-tools/.footprint
@@ -5,6 +5,7 @@ lrwxrwxrwx	root/root	usr/sbin/cache_dump -> pdata_tools
 lrwxrwxrwx	root/root	usr/sbin/cache_metadata_size -> pdata_tools
 lrwxrwxrwx	root/root	usr/sbin/cache_repair -> pdata_tools
 lrwxrwxrwx	root/root	usr/sbin/cache_restore -> pdata_tools
+lrwxrwxrwx	root/root	usr/sbin/cache_writeback -> pdata_tools
 lrwxrwxrwx	root/root	usr/sbin/era_check -> pdata_tools
 lrwxrwxrwx	root/root	usr/sbin/era_dump -> pdata_tools
 lrwxrwxrwx	root/root	usr/sbin/era_invalidate -> pdata_tools
@@ -24,11 +25,14 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/cache_check.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cache_dump.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/cache_metadata_size.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cache_repair.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/cache_restore.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/cache_writeback.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/era_check.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/era_dump.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/era_invalidate.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/era_restore.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/thin_check.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/thin_delta.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/thin_dump.8.gz
diff --git a/thin-provisioning-tools/.md5sum b/thin-provisioning-tools/.md5sum
index 33cc8134f..36cad67ea 100644
--- a/thin-provisioning-tools/.md5sum
+++ b/thin-provisioning-tools/.md5sum
@@ -1 +1,2 @@
-28b352363ea7eb6698ad2efcd7d8c2ae  v0.6.3.tar.gz
+ba8fe139a151e403c88c75e2a78d703c  0001-fix-build-with-testing-disabled.patch
+b4d6129f37fd7ea4d663a876e0fa8bc7  v0.7.4.tar.gz
diff --git a/thin-provisioning-tools/.signature b/thin-provisioning-tools/.signature
index ae231990e..ac4d666df 100644
--- a/thin-provisioning-tools/.signature
+++ b/thin-provisioning-tools/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38D2202NrKC7XHjWg9xBcffFULqksCtcQ7xX/cl0EgNkdE2t36fb+Q8HYs1ic6eIYJrzubisqWOIwv848Lh+AgI=
-SHA256 (Pkgfile) = fe491710ac7f0e5eeccfd75bca3ed84844fd08e37a7d56dadf3e5ef4021bbe4b
-SHA256 (.footprint) = a2bb1fee32f3762dec477186a957516a5eefd527bdee0cda0f4056d1c7eec91a
-SHA256 (v0.6.3.tar.gz) = 52d808c29dcaa83c142ceb2b418d01e9423811b082eff63fa0336bb7f0590c45
+RWSagIOpLGJF39mdMfNO2v3exvEN68GW/F2QA8oSRvFdcI8Dbu5k+lDX4oyNybbJoSnhU5EkvC6TC7CgFe5uLvcd0dURZFHmeQ0=
+SHA256 (Pkgfile) = 7ac33eee4a06ebf686af6b01565571332d6aa527a94403e88c6e6f85130b9fe0
+SHA256 (.footprint) = ee613c17160229defea0d615a32d162e3af47786c70d6bb18599f8ef5824ef9d
+SHA256 (v0.7.4.tar.gz) = f65f84e653e182480dacad77c611e13cd6de1c354e02fb4b96db4d2f328c3904
+SHA256 (0001-fix-build-with-testing-disabled.patch) = 8f59d9076ed23d593f8671792804cbfeb8bdae5c996200e1269f27fa49a6b873
diff --git a/thin-provisioning-tools/0001-fix-build-with-testing-disabled.patch b/thin-provisioning-tools/0001-fix-build-with-testing-disabled.patch
new file mode 100644
index 000000000..4c1c1db3d
--- /dev/null
+++ b/thin-provisioning-tools/0001-fix-build-with-testing-disabled.patch
@@ -0,0 +1,35 @@
+From 8d75be81120b9cf172c95d0153c5f845ed804234 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats-github@offog.org>
+Date: Mon, 16 Oct 2017 13:07:36 +0100
+Subject: [functional-tests] fix build with testing disabled (#88)
+
+The rule for lib/libft.so is only enabled with --enable-testing,
+so the default target shouldn't depend unconditionally on it.
+With the default configure options, the build failed with:
+make: *** No rule to make target 'lib/libft.so', needed by 'all'.  Stop.
+---
+ Makefile.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e745739..02b75dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,8 +21,13 @@ V=@
+ PROGRAMS=\
+ 	bin/pdata_tools
+ 
++ifeq ("@TESTING@", "yes")
++TESTLIBS=\
++	lib/libft.so
++endif
++
+ .PHONY: all
+-all: $(PROGRAMS) lib/libft.so
++all: $(PROGRAMS) $(TESTLIBS)
+ 
+ SOURCE=\
+ 	base/output_file_requirements.cc \
+-- 
+cgit v1.1-22-g1649
+
diff --git a/thin-provisioning-tools/Pkgfile b/thin-provisioning-tools/Pkgfile
index 66afea3a3..75fb97e02 100644
--- a/thin-provisioning-tools/Pkgfile
+++ b/thin-provisioning-tools/Pkgfile
@@ -5,13 +5,16 @@
 # Depends on: boost expat libaio
 
 name=thin-provisioning-tools
-version=0.6.3
+version=0.7.4
 release=1
-source=(https://github.com/jthornber/$name/archive/v$version.tar.gz)
+source=(https://github.com/jthornber/$name/archive/v$version.tar.gz
+	0001-fix-build-with-testing-disabled.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p1 -i $SRC/0001-fix-build-with-testing-disabled.patch
+
 	autoconf
 
 	./configure --prefix=/usr