From 06eb82a75f8b5102bcafc5f8e190150d6027ba5c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 6 Apr 2018 13:25:43 +0100 Subject: [PATCH 01/41] Move to stable branch version 1.2.0. --- nbdkit.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index eef01c6..28d7a9e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -17,8 +17,8 @@ %endif Name: nbdkit -Version: 1.1.28 -Release: 5%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -617,6 +617,9 @@ popd %changelog +* Fri Apr 6 2018 Richard W.M. Jones - 1.2.0-1 +- Move to stable branch version 1.2.0. + * Fri Feb 09 2018 Igor Gnatenko - 1.1.28-5 - Escape macros in %%changelog diff --git a/sources b/sources index d88f2b0..614d37b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.1.28.tar.gz) = cbf40dffc773575a69d20edc42570bf63bd5f189ec0a3c4beeca7fca518ec969b94a15fdc834762f322c99145a95a015f5aad60edb078ba98c7b805583218fef +SHA512 (nbdkit-1.2.0.tar.gz) = f8faa25b9a3f1c2619f5ec32b2e5e2ea6a8d299e83f844116aeceb66c05ad20a9fea71dea917b1b664f48456a37871acac7164d8229f6609ec1344537dd22595 From cda8370501c941bd3c006fe5aefce2b52e67c58e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 9 Apr 2018 19:29:44 +0100 Subject: [PATCH 02/41] New stable version 1.2.1. --- nbdkit.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 28d7a9e..c2d04a1 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -17,7 +17,7 @@ %endif Name: nbdkit -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: NBD server @@ -617,6 +617,9 @@ popd %changelog +* Mon Apr 9 2018 Richard W.M. Jones - 1.2.1-1 +- New stable version 1.2.1. + * Fri Apr 6 2018 Richard W.M. Jones - 1.2.0-1 - Move to stable branch version 1.2.0. diff --git a/sources b/sources index 614d37b..28b2691 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.2.0.tar.gz) = f8faa25b9a3f1c2619f5ec32b2e5e2ea6a8d299e83f844116aeceb66c05ad20a9fea71dea917b1b664f48456a37871acac7164d8229f6609ec1344537dd22595 +SHA512 (nbdkit-1.2.1.tar.gz) = 04f57d7d1120875fae8ea50795b52131186a4d476bea1ab08060197d3cf1d8830c219801edbe9837e447db60fc99ba180dcfb5cdc4b89e5c52b0567c3655c2d1 From 055d5bb77c09d1ba8192bced038c92b7787a9e30 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 21 Apr 2018 22:15:48 +0100 Subject: [PATCH 03/41] New stable version 1.2.2. --- nbdkit.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index c2d04a1..0f68d6e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -17,7 +17,7 @@ %endif Name: nbdkit -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: NBD server @@ -617,6 +617,9 @@ popd %changelog +* Sat Apr 21 2018 Richard W.M. Jones - 1.2.2-1 +- New stable version 1.2.2. + * Mon Apr 9 2018 Richard W.M. Jones - 1.2.1-1 - New stable version 1.2.1. diff --git a/sources b/sources index 28b2691..2d413b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.2.1.tar.gz) = 04f57d7d1120875fae8ea50795b52131186a4d476bea1ab08060197d3cf1d8830c219801edbe9837e447db60fc99ba180dcfb5cdc4b89e5c52b0567c3655c2d1 +SHA512 (nbdkit-1.2.2.tar.gz) = 295b5844fc99ca40cc29b0bbc2567f7deabc5d1e6010d7a0caa654a6b3a8cb5ae0d04d7e5337d50eb2bd2dda93979ddfaf3bb3d08b34f39bbd1525a8015074da From 7622c61a598ec766b96014095d3737c405b83514 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 13:19:05 +0100 Subject: [PATCH 04/41] New stable version 1.2.3. --- nbdkit.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 0f68d6e..7ea878e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -17,7 +17,7 @@ %endif Name: nbdkit -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: NBD server @@ -617,6 +617,9 @@ popd %changelog +* Wed Jun 6 2018 Richard W.M. Jones - 1.2.3-1 +- New stable version 1.2.3. + * Sat Apr 21 2018 Richard W.M. Jones - 1.2.2-1 - New stable version 1.2.2. diff --git a/sources b/sources index 2d413b5..cd115cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nbdkit-1.2.2.tar.gz) = 295b5844fc99ca40cc29b0bbc2567f7deabc5d1e6010d7a0caa654a6b3a8cb5ae0d04d7e5337d50eb2bd2dda93979ddfaf3bb3d08b34f39bbd1525a8015074da +SHA512 (nbdkit-1.2.3.tar.gz) = e11c04b02e971d06f82cbbb13381b5b917acb5d55117508bf9d1945189190bbf875599cfc98f08eae767ced127a883bba84f8a1bebb6d79699ca486e02cb93ce From c739c90a4a00e420182fa7d66e0411610e18ed63 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 19:34:01 +0100 Subject: [PATCH 05/41] Add patch to work around libvirt problem with relative socket paths. (cherry picked from commit 4bcef61e81837d23ee73b3258c4e5d445fa89699) --- ...ide-full-path-to-Unix-domain-sockets.patch | 57 +++++++++++++++++++ nbdkit.spec | 3 + 2 files changed, 60 insertions(+) create mode 100644 0001-tests-Provide-full-path-to-Unix-domain-sockets.patch diff --git a/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch b/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch new file mode 100644 index 0000000..1180deb --- /dev/null +++ b/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch @@ -0,0 +1,57 @@ +From 06adc3dbfa162074a3cf20c58b8949f447b37ae5 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 6 Jun 2018 19:29:35 +0100 +Subject: [PATCH] tests: Provide full path to Unix domain sockets. + +Maybe a bug in libvirt? +https://www.redhat.com/archives/libvir-list/2018-June/msg00490.html +--- + tests/test-cache.sh | 3 ++- + tests/test-cow.sh | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/test-cache.sh b/tests/test-cache.sh +index e5e9e82..ac99ce2 100755 +--- a/tests/test-cache.sh ++++ b/tests/test-cache.sh +@@ -32,6 +32,7 @@ + # SUCH DAMAGE. + + set -e ++set -x + + files="cache.img cache.sock cache.pid" + rm -f $files +@@ -69,7 +70,7 @@ cleanup () + trap cleanup INT QUIT TERM EXIT ERR + + # Open the overlay and perform some operations. +-guestfish --format=raw -a 'nbd://?socket=cache.sock' <<'EOF' ++guestfish --format=raw -a "nbd://?socket=`pwd`/cache.sock" <<'EOF' + run + part-disk /dev/sda gpt + mkfs ext4 /dev/sda1 +diff --git a/tests/test-cow.sh b/tests/test-cow.sh +index 443ba38..4b798c8 100755 +--- a/tests/test-cow.sh ++++ b/tests/test-cow.sh +@@ -32,6 +32,7 @@ + # SUCH DAMAGE. + + set -e ++set -x + + files="cow-base.img cow-diff.qcow2 cow.sock cow.pid" + rm -f $files +@@ -70,7 +71,7 @@ cleanup () + trap cleanup INT QUIT TERM EXIT ERR + + # Write some data into the overlay. +-guestfish --format=raw -a 'nbd://?socket=cow.sock' -m /dev/sda1 < - 1.2.3-1 - New stable version 1.2.3. +- Add patch to work around libvirt problem with relative socket paths. * Sat Apr 21 2018 Richard W.M. Jones - 1.2.2-1 - New stable version 1.2.2. From 75e47a783b7c723671aeed275bfc5e516cfd904a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 20:14:31 +0100 Subject: [PATCH 06/41] Add patch to fix the xz plugin test with recent guestfish. (cherry picked from commit ba2c1c3cd198b6b11a6f74b1666b38a76241eb54) --- ...ide-full-path-to-Unix-domain-sockets.patch | 14 ++--- ...-block-size-when-preparing-disk-for-.patch | 52 +++++++++++++++++++ nbdkit.spec | 3 ++ 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 0002-tests-xz-Use-16M-block-size-when-preparing-disk-for-.patch diff --git a/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch b/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch index 1180deb..2d41fee 100644 --- a/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch +++ b/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch @@ -1,9 +1,9 @@ -From 06adc3dbfa162074a3cf20c58b8949f447b37ae5 Mon Sep 17 00:00:00 2001 +From 974f6aba15d71984b5f05dc8b5f10bb7a5cec082 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 19:29:35 +0100 -Subject: [PATCH] tests: Provide full path to Unix domain sockets. +Subject: [PATCH 1/2] tests: Provide full path to Unix domain sockets. -Maybe a bug in libvirt? +See also this thread: https://www.redhat.com/archives/libvir-list/2018-June/msg00490.html --- tests/test-cache.sh | 3 ++- @@ -11,7 +11,7 @@ https://www.redhat.com/archives/libvir-list/2018-June/msg00490.html 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test-cache.sh b/tests/test-cache.sh -index e5e9e82..ac99ce2 100755 +index e5e9e82..c46e7be 100755 --- a/tests/test-cache.sh +++ b/tests/test-cache.sh @@ -32,6 +32,7 @@ @@ -27,12 +27,12 @@ index e5e9e82..ac99ce2 100755 # Open the overlay and perform some operations. -guestfish --format=raw -a 'nbd://?socket=cache.sock' <<'EOF' -+guestfish --format=raw -a "nbd://?socket=`pwd`/cache.sock" <<'EOF' ++guestfish --format=raw -a "nbd://?socket=$PWD/cache.sock" <<'EOF' run part-disk /dev/sda gpt mkfs ext4 /dev/sda1 diff --git a/tests/test-cow.sh b/tests/test-cow.sh -index 443ba38..4b798c8 100755 +index 443ba38..01d2d04 100755 --- a/tests/test-cow.sh +++ b/tests/test-cow.sh @@ -32,6 +32,7 @@ @@ -48,7 +48,7 @@ index 443ba38..4b798c8 100755 # Write some data into the overlay. -guestfish --format=raw -a 'nbd://?socket=cow.sock' -m /dev/sda1 < +Date: Wed, 6 Jun 2018 20:06:39 +0100 +Subject: [PATCH 2/2] tests: xz: Use 16M block size when preparing disk for xz + plugin test. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In a recent commit guestfish changed the default size for disk images +prepared using the -N parameter from 100M to 1G: + + https://github.com/libguestfs/libguestfs/commit/adc23829e4b128562c2c29d984654528bd259644 + +For the xz plugin test we prepared a disk image using guestfish and +then xz-compressing the output, but we did not take our own advice and +use the --block-size parameter to limit the xz block size. Because of +the increased size of the disk as a whole, this pushed the block size +beyond the limit that the xz plugin can handle, and the test would +fail with: + + nbdkit: error: /var/tmp/nbdkit-1.3.1/tests/disk.xz: xz file largest block is bigger than maxblock + Either recompress the xz file with smaller blocks (see nbdkit-xz-plugin(1)) + or make maxblock parameter bigger. + maxblock = 536870912 (bytes) + largest block in xz file = 1073741824 (bytes) + +Simple fix by adding the --block-size parameter. + +Note that to see the effect of this change you will need to ‘make +maintainer-clean’ or remove the files ‘tests/disk’ and ‘tests/disk.xz’ +by hand. +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 4582120..0cc2618 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -328,7 +328,7 @@ test_xz_LDADD = libtest.la $(LIBGUESTFS_LIBS) + + disk.xz: disk + rm -f $@ +- xz --best -c disk > $@ ++ xz --best --block-size=16777216 -c disk > $@ + + endif HAVE_GUESTFISH + endif HAVE_LIBLZMA +-- +2.16.2 + diff --git a/nbdkit.spec b/nbdkit.spec index acec213..38c4223 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -26,7 +26,9 @@ URL: https://github.com/libguestfs/nbdkit Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz +# Upstream patches to fix the tests. Patch1: 0001-tests-Provide-full-path-to-Unix-domain-sockets.patch +Patch2: 0002-tests-xz-Use-16M-block-size-when-preparing-disk-for-.patch %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and @@ -622,6 +624,7 @@ popd * Wed Jun 6 2018 Richard W.M. Jones - 1.2.3-1 - New stable version 1.2.3. - Add patch to work around libvirt problem with relative socket paths. +- Add patch to fix the xz plugin test with recent guestfish. * Sat Apr 21 2018 Richard W.M. Jones - 1.2.2-1 - New stable version 1.2.2. From 2b58f2e7f50eea431d6456ae7ec047a85646cb8e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 20:18:15 +0100 Subject: [PATCH 07/41] Exclude HAVE_GUESTFISH code on incomplete test arches. (cherry picked from commit e04cb2ed897c8edfed44c81101ec7367cc7305c9) --- nbdkit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nbdkit.spec b/nbdkit.spec index 38c4223..2737bcb 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -374,6 +374,7 @@ plugins for %{name}. %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am +sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am autoreconf -i %endif From 78e81666e0100f00aeeadad7e420f21c3d31b0ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 20:55:34 +0100 Subject: [PATCH 08/41] BR automake unconditionally because we touch tests/Makefile.am in a patch. (cherry picked from commit c7e1810498aa4fc7d0d6a3b3649b8eb8226fb40a) --- nbdkit.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nbdkit.spec b/nbdkit.spec index 2737bcb..fd8ca24 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -29,6 +29,8 @@ Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz # Upstream patches to fix the tests. Patch1: 0001-tests-Provide-full-path-to-Unix-domain-sockets.patch Patch2: 0002-tests-xz-Use-16M-block-size-when-preparing-disk-for-.patch +# Temporarily because patch2 touches Makefile.am. +BuildRequires: autoconf, automake, libtool %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and From ee3fd0e5ef3bdbe0c1393fc1cbf3e70acc75fb56 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 6 Jun 2018 21:04:07 +0100 Subject: [PATCH 09/41] I hate automake, updates previous commit. (cherry picked from commit 8c8e65fbc920eda70c1c57dc690cdd03649444ad) --- nbdkit.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nbdkit.spec b/nbdkit.spec index fd8ca24..9a974b8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -372,6 +372,8 @@ plugins for %{name}. %prep %setup -q %autopatch -p1 +# Temporarily because patch2 touches Makefile.am. +autoreconf -i %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. From cd71d8d33adffaef7ea8cea1d9788a05a503e11b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 14:37:24 +0100 Subject: [PATCH 10/41] New stable version 1.2.4. Remove upstream patches. --- .gitignore | 1 + ...ide-full-path-to-Unix-domain-sockets.patch | 57 ------------------- ...-block-size-when-preparing-disk-for-.patch | 52 ----------------- nbdkit.spec | 14 ++--- sources | 3 +- 5 files changed, 8 insertions(+), 119 deletions(-) delete mode 100644 0001-tests-Provide-full-path-to-Unix-domain-sockets.patch delete mode 100644 0002-tests-xz-Use-16M-block-size-when-preparing-disk-for-.patch diff --git a/.gitignore b/.gitignore index 410cff4..ab37f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clog /nbdkit-*.tar.gz +/nbdkit-1.2.4.tar.gz.sig diff --git a/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch b/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch deleted file mode 100644 index 2d41fee..0000000 --- a/0001-tests-Provide-full-path-to-Unix-domain-sockets.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 974f6aba15d71984b5f05dc8b5f10bb7a5cec082 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 6 Jun 2018 19:29:35 +0100 -Subject: [PATCH 1/2] tests: Provide full path to Unix domain sockets. - -See also this thread: -https://www.redhat.com/archives/libvir-list/2018-June/msg00490.html ---- - tests/test-cache.sh | 3 ++- - tests/test-cow.sh | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/test-cache.sh b/tests/test-cache.sh -index e5e9e82..c46e7be 100755 ---- a/tests/test-cache.sh -+++ b/tests/test-cache.sh -@@ -32,6 +32,7 @@ - # SUCH DAMAGE. - - set -e -+set -x - - files="cache.img cache.sock cache.pid" - rm -f $files -@@ -69,7 +70,7 @@ cleanup () - trap cleanup INT QUIT TERM EXIT ERR - - # Open the overlay and perform some operations. --guestfish --format=raw -a 'nbd://?socket=cache.sock' <<'EOF' -+guestfish --format=raw -a "nbd://?socket=$PWD/cache.sock" <<'EOF' - run - part-disk /dev/sda gpt - mkfs ext4 /dev/sda1 -diff --git a/tests/test-cow.sh b/tests/test-cow.sh -index 443ba38..01d2d04 100755 ---- a/tests/test-cow.sh -+++ b/tests/test-cow.sh -@@ -32,6 +32,7 @@ - # SUCH DAMAGE. - - set -e -+set -x - - files="cow-base.img cow-diff.qcow2 cow.sock cow.pid" - rm -f $files -@@ -70,7 +71,7 @@ cleanup () - trap cleanup INT QUIT TERM EXIT ERR - - # Write some data into the overlay. --guestfish --format=raw -a 'nbd://?socket=cow.sock' -m /dev/sda1 < -Date: Wed, 6 Jun 2018 20:06:39 +0100 -Subject: [PATCH 2/2] tests: xz: Use 16M block size when preparing disk for xz - plugin test. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In a recent commit guestfish changed the default size for disk images -prepared using the -N parameter from 100M to 1G: - - https://github.com/libguestfs/libguestfs/commit/adc23829e4b128562c2c29d984654528bd259644 - -For the xz plugin test we prepared a disk image using guestfish and -then xz-compressing the output, but we did not take our own advice and -use the --block-size parameter to limit the xz block size. Because of -the increased size of the disk as a whole, this pushed the block size -beyond the limit that the xz plugin can handle, and the test would -fail with: - - nbdkit: error: /var/tmp/nbdkit-1.3.1/tests/disk.xz: xz file largest block is bigger than maxblock - Either recompress the xz file with smaller blocks (see nbdkit-xz-plugin(1)) - or make maxblock parameter bigger. - maxblock = 536870912 (bytes) - largest block in xz file = 1073741824 (bytes) - -Simple fix by adding the --block-size parameter. - -Note that to see the effect of this change you will need to ‘make -maintainer-clean’ or remove the files ‘tests/disk’ and ‘tests/disk.xz’ -by hand. ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4582120..0cc2618 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -328,7 +328,7 @@ test_xz_LDADD = libtest.la $(LIBGUESTFS_LIBS) - - disk.xz: disk - rm -f $@ -- xz --best -c disk > $@ -+ xz --best --block-size=16777216 -c disk > $@ - - endif HAVE_GUESTFISH - endif HAVE_LIBLZMA --- -2.16.2 - diff --git a/nbdkit.spec b/nbdkit.spec index 9a974b8..e8e10c5 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -17,7 +17,7 @@ %endif Name: nbdkit -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: NBD server @@ -26,12 +26,6 @@ URL: https://github.com/libguestfs/nbdkit Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz -# Upstream patches to fix the tests. -Patch1: 0001-tests-Provide-full-path-to-Unix-domain-sockets.patch -Patch2: 0002-tests-xz-Use-16M-block-size-when-preparing-disk-for-.patch -# Temporarily because patch2 touches Makefile.am. -BuildRequires: autoconf, automake, libtool - %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and # libguestfs was not shipped on POWER (fixed in 7.5). We could in @@ -372,8 +366,6 @@ plugins for %{name}. %prep %setup -q %autopatch -p1 -# Temporarily because patch2 touches Makefile.am. -autoreconf -i %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. @@ -626,6 +618,10 @@ popd %changelog +* Sat Jun 9 2018 Richard W.M. Jones - 1.2.4-1 +- New stable version 1.2.4. +- Remove upstream patches. + * Wed Jun 6 2018 Richard W.M. Jones - 1.2.3-1 - New stable version 1.2.3. - Add patch to work around libvirt problem with relative socket paths. diff --git a/sources b/sources index cd115cb..454e016 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (nbdkit-1.2.3.tar.gz) = e11c04b02e971d06f82cbbb13381b5b917acb5d55117508bf9d1945189190bbf875599cfc98f08eae767ced127a883bba84f8a1bebb6d79699ca486e02cb93ce +SHA512 (nbdkit-1.2.4.tar.gz) = 5f5f74e9223ed05cb0e9f36f7adea6980192bd23e3b900aaf1d045f135855e8fbbb7ff33df88a87a5b857d26635a4924b13c263cfac28b6206e26802731cab81 +SHA512 (nbdkit-1.2.4.tar.gz.sig) = bfe4d8fb913a08228ebaa44ca5966ef37f4919dff9b6049a5eeada78984745d80eafeac9751f5f0784d75c62e4d8a03eeddf803fcac3406542fea50c4d59048f From 451663e6acaba21a379c91e49fb869fe84037f68 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 14:33:06 +0100 Subject: [PATCH 11/41] Enable tarball signing. (cherry picked from commit 70cec0a4511265fb16ba7a87800f539c134fd862) --- .gitignore | 2 +- libguestfs.keyring | Bin 0 -> 2823 bytes nbdkit.spec | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 libguestfs.keyring diff --git a/.gitignore b/.gitignore index ab37f1a..4bd7ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /clog /nbdkit-*.tar.gz -/nbdkit-1.2.4.tar.gz.sig +/nbdkit-*.tar.gz.sig diff --git a/libguestfs.keyring b/libguestfs.keyring new file mode 100644 index 0000000000000000000000000000000000000000..bb3eb5537b7c398a10b7e2b26ca00af011d1a73e GIT binary patch literal 2823 zcma*o_cI%g0s!zNh@cv+7)4sDC~4KE_7;1u)D}doT2(9drl?iaDypbGOYOv{*;+Ne z_NqOjH0s^=-MxG7-Mt^)|M0o{WP+$kwNm-IfHZ)i6Laf8iDHZe#RnxvK!O)6rq(SO z@nx&>aN10t6koV0fbtX7ACWsLI0FyJ@Pfu|=B(A~m#PuweNW!6ZNw+iE3ku-=2jTl z-R1Kp&IJO$u+0}F)tr1faEy{Y7^AhU)R~C@f;L|U(;bZA7XFYV$_df=Lk(rcmOkB; z)S!`^x0lVz=h?HQMv1soy+K~IC@;3ib@n&WJo)^vM=e&012y5w5lC{1Vr$%-f)DP% zG8>+0I6T|x0-c17DN0oD5G)GJ#Tv0QA`_&1YxON$_gR+nsxWeR@+*U|;ZLu`<~ZZL zb}lAl0+}{y9KH#`dC0F=fKw4mK4tiq#hTXnNO|A2&LnCbl}J*`J=P6P2w)t%_#~Ni z<5CX?FlaaK45s4fc+`zxL=1ZQlr;uF8MB%kfJe&QF}FTU2GrLW zqJoL`^QF5~7La|K*qp<&i|iiuwuG5-c+Y`9hLqVU0-*=rT}zW^h4{n!24-?!w5B5L zJDHd~YR;~9RmRo6SXRVZTVuupiWE+tcT#U?Vt3D|Yd`JQml+mOs0ksk06veG>Pp2z z#$gwujCGqx!3oGYFjf5`VZ%40WH@#DMU8px4r`anayTMxVa8S98{78$W{Y!;Tf&rt zSzNbt%vP(LA0kH72+RFIT%0S@6L1R%0M>KpIoe{ZJ&?|OTt7orQ0hH2yK~J}8JshZ@W!LI z-M4NO3G6uuXK5#0R%+aih%MZ^WFL9}_K$Qbehiq7*6e-`(+o69#+mu^SL`>(PjE?$ z9v&ppPtvAeurx2;DNmz|ZRT#yC%{HfUf3#G4T^=Mjr9Px1o2T4nR zZ1pdjh{60h=v?i`kcvw;`D)ye0%1PQ9?@pTf4x9Uy*qWbcDF?m^#|U=sZiOQBTv2Y z(~KQ*e#|T6$(d4Ts2j0br{Rses!aL;(crmXCLY4B&~}|^F%LvR>xZ{aykw4w)kp)G z4Osxb<}R=Iv!|oBc|z)k#uVLs?9`AhKe_lhLRpA)6F3r*Zqo3lPHe9ol81_qi|G6E z4o8p3JOnWhHo?+waZ$Tpb-(8=hsu=04#-d2e^N!szo*8Pi~oqA#cCE_@*SO{6sje$ z@TI6RMbo~Lb#1F(g%6Q&6{ zGhr{7C@+l6doz=%hN^mxA)?LclnP^x9TpX)wspTkY{ZP}b>$Zd6`^l+ApCE`-U~Y0 z8dQ_!`=HxQOf%|&`*eUUp8m%S1qlC9x|sX|LVV>m!3iJpL3q~u?Yr_&_bqw@GMgtb zN3h@AXg%lu6!!dYX|f)6XpFTNudSQQe-nF3_5TuMQ>Fowak8uAJT7I5#M21UX135g zGs~4Rv<`522?`g~<~erUc;O#Fw;!L^bk+?M%vhK)dA(f}R;1HN;I3iF(sri&RGg#@ zmLH6Hvl@qcHG3@}a7PDlc*>8}W{`e__2>^mdZUqS>0?4cjI;Dtk!{ zw(y-Wq;TG}(Orqzk!Z%c%|qPg+y}T~ejB&}4bg}GSaRBuhJ5&ZtU(q$-2TO%x?bKn zU1C)(Zk#(Ue^|~mKr$>J`z}2l$uKQrztdude9E`_5nY=j(7beJO!_Lu=p~Umx*Bbe zaaXv_>XI}z5OKTqMuad$__xSPg7-(2T1z6Buf*FzTSBfhvZQ;&s%lAiRiC1qU!;#{ z?a-99*ww>gj$}coPZCZ=kn2x>W_Sm-wW8Tnxif_54<1wj?Yww`ghQ!<%2;(ex~CZS zA?P=)tdq7Dkzqb|PG;C0ai!-2Q}RaDC$I}%efl;L=XIxts=E7olcp#We%A3nmv>An zB(K#6d`=!EO{bI5n@^pN{57JI|8!|wis(l^Y83K&k&{mbs*Sg0F_LnBTp6U0nhVFs zKNtCW5Kw~{od{S8=fq-k&tLtin0=hH{bySx^qNerUuEu@8K=ce1hl}X`QND>DbTX&E$#Fqr>x8dD+%_ia%sA& z-@-E*k_;lOcEc%6!hgZXyKo9HW@$loJcll?W#7v3av>4)xk)$5uW9Xl12{vPP#z`m zs2LrYwcDJ&HuK}b>kIRTnf*>e6iy|jj4e6UTDs}z{H{%;>o`28AchP`#1vkm9%H*S zoU>DWN;;Bf(C({v%Oa!+`GzIYlq}nbB@yDgTO{;r`S7a>(eUJc9dp#8x&m$~?E>Xu zQZmBuyhnH{K?-A&Xb*XP+gLf1SLt4Z^c%7G#xO1hI(zGmafx@1gQYru<*%)iZ_dBb z|Bb1aek=H z10)q1$4)>Do*ODQWg)QV#uOR!W%mWq@$ijmO%<)Dw`_}VtiAD7H5t~=RB~bQs5ra` z{QU>pG`sAB!wj<-$;hilBy>4_~OJ z%0_>c24yng-j6e{8;$K_c_|KG(_0Vgl=ucn~i1=x; zm1?xq_{fi_!ESgT8TSC6zV8=KU~}{8(Uba&{@Aa*HUiPNuMfwx8iMynCX$p_SHS1q z?H$wO+UHHDDFVH{JO$}0dbDQ~KlwK(d(_iUCGf`Lc9V*IhQhxeD>9vpy|`)~+um=D zg<8_$!w*H}5~0!TlT&@NLjHT=7oM!nTRWd6X`@!!wmnL&U!>jUUx&4}yFY={wB8Nh zA0w#m_%Uc5ra3z_s6d+}gYQb!bB$suWZS)^%eRI~!J$G4-{nibYcoyw$8F-)9GhwL zf^`wukA9opp_kHg$rT81yy?ZwxKcCuY&Q-Tgt#e|=%fp}c+1aw|3(R~opy=CE+z?b z(>ZkYs>9)myz%Pn7-DP|f|$$RG@K;3*Nl@9ueJ1h%e-Y|PoG^3Zj$gJ#i&h}JG=F9 zm>>;qK4MTXwg%V0Aa!hzB$@>;3Lj>+*kFFI<>e{edDH)+`)Mn$^g1(hKL{1kC+A_C zjW|_`i^xn9b9DCEvrOrD6cpeXE)tMl%g%g8133|+O&aU#Vo9Kcq= 4.02.2 %endif BuildRequires: ruby-devel +%if 0%{verify_tarball_signature} +BuildRequires: gnupg2 +%endif # Only for running the test suite: BuildRequires: /usr/bin/certtool @@ -364,6 +375,10 @@ plugins for %{name}. %prep +%if 0%{verify_tarball_signature} +tmphome="$(mktemp -d)" +gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%endif %setup -q %autopatch -p1 @@ -621,6 +636,7 @@ popd * Sat Jun 9 2018 Richard W.M. Jones - 1.2.4-1 - New stable version 1.2.4. - Remove upstream patches. +- Enable tarball signatures. * Wed Jun 6 2018 Richard W.M. Jones - 1.2.3-1 - New stable version 1.2.3. From 2f7d85fd8582d1c67f3ac1d551b89545e1b15ddd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 14:58:58 +0100 Subject: [PATCH 12/41] Add upstream patch to fix tests when guestfish not available. (cherry picked from commit 322c5a6b3609ae2098a130fcd64b10eb616ad456) --- ...sh-isn-t-available-disk-is-not-creat.patch | 54 +++++++++++++++++++ nbdkit.spec | 8 +++ 2 files changed, 62 insertions(+) create mode 100644 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch diff --git a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch new file mode 100644 index 0000000..67d662d --- /dev/null +++ b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch @@ -0,0 +1,54 @@ +From 07ecff1613b73f32b5954bd3a3d46bef6a39e396 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 9 Jun 2018 14:56:13 +0100 +Subject: [PATCH] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available,=20?= + =?UTF-8?q?=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable=20te?= + =?UTF-8?q?sts=20which=20need=20it.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes commit 02f27adc50ed5b83021df4edc84f4dbf8b03a0e3. +--- + tests/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 850240b..64a758e 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -279,6 +279,7 @@ test_file_LDADD = libtest.la $(LIBGUESTFS_LIBS) + + # gzip plugin test. + if HAVE_ZLIB ++if HAVE_GUESTFISH + + LIBGUESTFS_TESTS += test-gzip + check_DATA += disk.gz +@@ -292,6 +293,7 @@ disk.gz: disk + rm -f $@ + gzip -9 -c disk > $@ + ++endif HAVE_GUESTFISH + endif HAVE_ZLIB + + # memory plugin test. +@@ -347,6 +349,7 @@ test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) + + # xz plugin test. + if HAVE_LIBLZMA ++if HAVE_GUESTFISH + + LIBGUESTFS_TESTS += test-xz + check_DATA += disk.xz +@@ -360,6 +363,7 @@ disk.xz: disk + rm -f $@ + xz --best --block-size=16777216 -c disk > $@ + ++endif HAVE_GUESTFISH + endif HAVE_LIBLZMA + + #---------------------------------------------------------------------- +-- +2.16.2 + diff --git a/nbdkit.spec b/nbdkit.spec index 2fdfe05..7d70f1a 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -34,6 +34,11 @@ Source1: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz. Source2: libguestfs.keyring %endif +# Upstream patch to fix tests. Touches tests/Makefile.am so we +# need autotools temporarily. +Patch1: 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch +BuildRequires: autoconf, automake, libtool + %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and # libguestfs was not shipped on POWER (fixed in 7.5). We could in @@ -381,6 +386,8 @@ gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %endif %setup -q %autopatch -p1 +# Temporarily while patch1 touches autotools files. +autoreconf -i %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. @@ -637,6 +644,7 @@ popd - New stable version 1.2.4. - Remove upstream patches. - Enable tarball signatures. +- Add upstream patch to fix tests when guestfish not available. * Wed Jun 6 2018 Richard W.M. Jones - 1.2.3-1 - New stable version 1.2.3. From fffade3981d32c6351cea21eeceddd6cb6de6e57 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 11 Jun 2018 13:19:25 +0100 Subject: [PATCH 13/41] Disable complete test suite on aarch64. It was taking longer than a day to run the test suite on aarch64, although it didn't seem to be hanging or failing, just being very very slow. (cherry picked from commit 622aabfee2e35d24f98879051a154246f35484a7) --- nbdkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbdkit.spec b/nbdkit.spec index 7d70f1a..d9e1f2f 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -9,7 +9,7 @@ # On all other architectures, a simpler test suite must pass. This # omits any tests that run full qemu, since running qemu under TCG is # often broken on non-x86_64 arches. -%global complete_test_arches aarch64 x86_64 +%global complete_test_arches x86_64 # Currently everything has Python 2. RHEL 7 doesn't have Python 3. %if 0%{?rhel} != 7 From 3130f5ec4b63f85ea46b3b3b7e8eb4674e870412 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Jun 2018 13:58:54 +0100 Subject: [PATCH 14/41] Add all upstream patches since 1.2.4 was released. --- ...sh-isn-t-available-disk-is-not-creat.patch | 20 ++++--- ...cs-Fix-separators-in-list-of-plugins.patch | 32 +++++++++++ ...ng-PKG_CHECK_VAR-to-substitute-plugi.patch | 49 ++++++++++++++++ ...e4-and-tar-plugins-conditional-on-en.patch | 57 +++++++++++++++++++ nbdkit.spec | 8 ++- 5 files changed, 156 insertions(+), 10 deletions(-) create mode 100644 0002-docs-Fix-separators-in-list-of-plugins.patch create mode 100644 0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch create mode 100644 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch diff --git a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch index 67d662d..672384d 100644 --- a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch +++ b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch @@ -1,23 +1,25 @@ -From 07ecff1613b73f32b5954bd3a3d46bef6a39e396 Mon Sep 17 00:00:00 2001 +From 9dc5dba35b3af9eaa98f97d8eb83a39435574230 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 14:56:13 +0100 -Subject: [PATCH] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available,=20?= - =?UTF-8?q?=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable=20te?= - =?UTF-8?q?sts=20which=20need=20it.?= +Subject: [PATCH 1/4] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available?= + =?UTF-8?q?,=20=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable?= + =?UTF-8?q?=20tests=20which=20need=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes commit 02f27adc50ed5b83021df4edc84f4dbf8b03a0e3. + +(cherry picked from commit 07ecff1613b73f32b5954bd3a3d46bef6a39e396) --- tests/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 850240b..64a758e 100644 +index ff51120..53b2d8a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -279,6 +279,7 @@ test_file_LDADD = libtest.la $(LIBGUESTFS_LIBS) +@@ -251,6 +251,7 @@ test_file_LDADD = libtest.la $(LIBGUESTFS_LIBS) # gzip plugin test. if HAVE_ZLIB @@ -25,7 +27,7 @@ index 850240b..64a758e 100644 LIBGUESTFS_TESTS += test-gzip check_DATA += disk.gz -@@ -292,6 +293,7 @@ disk.gz: disk +@@ -264,6 +265,7 @@ disk.gz: disk rm -f $@ gzip -9 -c disk > $@ @@ -33,7 +35,7 @@ index 850240b..64a758e 100644 endif HAVE_ZLIB # memory plugin test. -@@ -347,6 +349,7 @@ test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) +@@ -319,6 +321,7 @@ test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) # xz plugin test. if HAVE_LIBLZMA @@ -41,7 +43,7 @@ index 850240b..64a758e 100644 LIBGUESTFS_TESTS += test-xz check_DATA += disk.xz -@@ -360,6 +363,7 @@ disk.xz: disk +@@ -332,6 +335,7 @@ disk.xz: disk rm -f $@ xz --best --block-size=16777216 -c disk > $@ diff --git a/0002-docs-Fix-separators-in-list-of-plugins.patch b/0002-docs-Fix-separators-in-list-of-plugins.patch new file mode 100644 index 0000000..1618ed9 --- /dev/null +++ b/0002-docs-Fix-separators-in-list-of-plugins.patch @@ -0,0 +1,32 @@ +From 69b77654bd1244c187c5cbdecc362be1d4f587a5 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 9 Jun 2018 18:29:43 +0100 +Subject: [PATCH 2/4] docs: Fix separators in list of plugins (. -> ,) + +(cherry picked from commit 4c4ebb955e9504503f2b950344529fa1a4222715) +--- + docs/nbdkit.pod | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod +index 1a0c005..2802b73 100644 +--- a/docs/nbdkit.pod ++++ b/docs/nbdkit.pod +@@ -925,10 +925,10 @@ L, + L, + L, + L, +-L. +-L. +-L. +-L. ++L, ++L, ++L, ++L, + L. + + Filters: +-- +2.16.2 + diff --git a/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch new file mode 100644 index 0000000..d7645ce --- /dev/null +++ b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch @@ -0,0 +1,49 @@ +From 5558eb0633a48325970baa647b9e8f4ac9eb4520 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 10 Jun 2018 20:33:12 +0100 +Subject: [PATCH 3/4] docs: Suggest using PKG_CHECK_VAR to substitute plugindir + and filterdir. + +(cherry picked from commit fcd05424c819e433543030373a7f4136b511ddc6) +--- + docs/nbdkit-filter.pod | 6 ++++++ + docs/nbdkit-plugin.pod | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/docs/nbdkit-filter.pod b/docs/nbdkit-filter.pod +index 7105a1d..2e23a8e 100644 +--- a/docs/nbdkit-filter.pod ++++ b/docs/nbdkit-filter.pod +@@ -463,6 +463,12 @@ You can also run pkg-config/pkgconf directly, for example: + exit 1 + fi + ++You can also substitute the filterdir variable by doing: ++ ++ PKG_CHECK_VAR([NBDKIT_FILTERDIR], [nbdkit], [filterdir]) ++ ++which defines C<$(NBDKIT_FILTERDIR)> in automake-generated Makefiles. ++ + =head1 SEE ALSO + + L, +diff --git a/docs/nbdkit-plugin.pod b/docs/nbdkit-plugin.pod +index 695e588..a393be9 100644 +--- a/docs/nbdkit-plugin.pod ++++ b/docs/nbdkit-plugin.pod +@@ -668,6 +668,12 @@ You can also run pkg-config/pkgconf directly, for example: + exit 1 + fi + ++You can also substitute the plugindir variable by doing: ++ ++ PKG_CHECK_VAR([NBDKIT_PLUGINDIR], [nbdkit], [plugindir]) ++ ++which defines C<$(NBDKIT_PLUGINDIR)> in automake-generated Makefiles. ++ + =head1 WRITING PLUGINS IN OTHER PROGRAMMING LANGUAGES + + You can also write nbdkit plugins in OCaml, Perl, Python or Ruby. +-- +2.16.2 + diff --git a/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch new file mode 100644 index 0000000..3f18f86 --- /dev/null +++ b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch @@ -0,0 +1,57 @@ +From e25e1bf830cc0252ef3374a3a1d391142726cf75 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 11 Jun 2018 11:48:08 +0100 +Subject: [PATCH 4/4] perl: Make example4 and tar plugins conditional on + --enable-perl. + +If you configured with --disable-perl then these plugins are still +built and installed. However they cannot work without the Perl +plugin, thus it is right to disable them. + +(cherry picked from commit a6aa7d50afa7a6a41865e9814428d3c1b8295167) +--- + plugins/example4/Makefile.am | 4 ++++ + plugins/tar/Makefile.am | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/plugins/example4/Makefile.am b/plugins/example4/Makefile.am +index abbda92..374b483 100644 +--- a/plugins/example4/Makefile.am ++++ b/plugins/example4/Makefile.am +@@ -39,6 +39,8 @@ CLEANFILES = *~ + + plugindir = $(libdir)/nbdkit/plugins + ++if HAVE_PERL ++ + plugin_SCRIPTS = nbdkit-example4-plugin + + # We have to do the rewriting here to avoid stupid exec_prefix. +@@ -59,3 +61,5 @@ nbdkit-example4-plugin.1: $(source) + mv $@.t $@ + + endif ++ ++endif +diff --git a/plugins/tar/Makefile.am b/plugins/tar/Makefile.am +index 57d1026..016ffef 100644 +--- a/plugins/tar/Makefile.am ++++ b/plugins/tar/Makefile.am +@@ -39,6 +39,8 @@ CLEANFILES = *~ + + plugindir = $(libdir)/nbdkit/plugins + ++if HAVE_PERL ++ + plugin_SCRIPTS = nbdkit-tar-plugin + + # We have to do the rewriting here to avoid stupid exec_prefix. +@@ -59,3 +61,5 @@ nbdkit-tar-plugin.1: $(source) + mv $@.t $@ + + endif ++ ++endif +-- +2.16.2 + diff --git a/nbdkit.spec b/nbdkit.spec index d9e1f2f..e3b7b5b 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -37,7 +37,10 @@ Source2: libguestfs.keyring # Upstream patch to fix tests. Touches tests/Makefile.am so we # need autotools temporarily. Patch1: 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch -BuildRequires: autoconf, automake, libtool +Patch2: 0002-docs-Fix-separators-in-list-of-plugins.patch +Patch3: 0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch +Patch4: 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch +BuildRequires: autoconf, automake, libtool %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and @@ -640,6 +643,9 @@ popd %changelog +* Tue Jun 12 2018 Richard W.M. Jones - 1.2.4-2 +- Add all upstream patches since 1.2.4 was released. + * Sat Jun 9 2018 Richard W.M. Jones - 1.2.4-1 - New stable version 1.2.4. - Remove upstream patches. From 95070b5f7624154f0242a6858da447ab44a5c776 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Jun 2018 14:06:55 +0100 Subject: [PATCH 15/41] Forgot to update Release field in previous commit. --- nbdkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nbdkit.spec b/nbdkit.spec index e3b7b5b..a08bfb1 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -21,7 +21,7 @@ Name: nbdkit Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server License: BSD From a09f2340e1af4877583f9bdc9de37b23e1d72f56 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Jun 2018 14:13:59 +0100 Subject: [PATCH 16/41] Fix Source URLs. Correct the URLs for 1.2-stable branch. --- nbdkit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index a08bfb1..cfcdebf 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -27,9 +27,9 @@ Summary: NBD server License: BSD URL: https://github.com/libguestfs/nbdkit -Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz +Source0: http://libguestfs.org/download/nbdkit/1.2-stable/%{name}-%{version}.tar.gz %if 0%{verify_tarball_signature} -Source1: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz.sig +Source1: http://libguestfs.org/download/nbdkit/1.2-stable/%{name}-%{version}.tar.gz.sig # Keyring used to verify tarball signature. Source2: libguestfs.keyring %endif From 9f07358d79593f0dc6d3f68310a1d05749bd1cf8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 14 Jun 2018 13:45:36 +0100 Subject: [PATCH 17/41] Fix use of autosetup / autopatch macros. See: http://rpm.org/user_doc/autosetup.html (cherry picked from commit 3d5206894f12b8b3b6df832ec927ca482295929c) --- nbdkit.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index cfcdebf..a2ba11c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -387,8 +387,7 @@ plugins for %{name}. tmphome="$(mktemp -d)" gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %endif -%setup -q -%autopatch -p1 +%autosetup -p1 # Temporarily while patch1 touches autotools files. autoreconf -i From cb86460bd238930385db7bc7eb933803ce5a352a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 1 Jul 2018 16:34:57 +0100 Subject: [PATCH 18/41] Add more upstream patches since 1.2.4 was released. --- ...sh-isn-t-available-disk-is-not-creat.patch | 4 +-- ...cs-Fix-separators-in-list-of-plugins.patch | 4 +-- ...ng-PKG_CHECK_VAR-to-substitute-plugi.patch | 4 +-- ...e4-and-tar-plugins-conditional-on-en.patch | 4 +-- ...-nbd-Free-h-handle-along-error-paths.patch | 35 +++++++++++++++++++ ...r-path-when-sending-to-gnutls-socket.patch | 28 +++++++++++++++ ...sing-break-affecting-t-threads-param.patch | 28 +++++++++++++++ nbdkit.spec | 12 +++++-- 8 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 0005-plugins-nbd-Free-h-handle-along-error-paths.patch create mode 100644 0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch create mode 100644 0007-src-main-Add-missing-break-affecting-t-threads-param.patch diff --git a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch index 672384d..25e8ea5 100644 --- a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch +++ b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch @@ -1,7 +1,7 @@ From 9dc5dba35b3af9eaa98f97d8eb83a39435574230 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 14:56:13 +0100 -Subject: [PATCH 1/4] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available?= +Subject: [PATCH 1/7] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available?= =?UTF-8?q?,=20=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable?= =?UTF-8?q?=20tests=20which=20need=20it.?= MIME-Version: 1.0 @@ -52,5 +52,5 @@ index ff51120..53b2d8a 100644 #---------------------------------------------------------------------- -- -2.16.2 +2.17.1 diff --git a/0002-docs-Fix-separators-in-list-of-plugins.patch b/0002-docs-Fix-separators-in-list-of-plugins.patch index 1618ed9..6747543 100644 --- a/0002-docs-Fix-separators-in-list-of-plugins.patch +++ b/0002-docs-Fix-separators-in-list-of-plugins.patch @@ -1,7 +1,7 @@ From 69b77654bd1244c187c5cbdecc362be1d4f587a5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 18:29:43 +0100 -Subject: [PATCH 2/4] docs: Fix separators in list of plugins (. -> ,) +Subject: [PATCH 2/7] docs: Fix separators in list of plugins (. -> ,) (cherry picked from commit 4c4ebb955e9504503f2b950344529fa1a4222715) --- @@ -28,5 +28,5 @@ index 1a0c005..2802b73 100644 Filters: -- -2.16.2 +2.17.1 diff --git a/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch index d7645ce..bd2cac7 100644 --- a/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch +++ b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch @@ -1,7 +1,7 @@ From 5558eb0633a48325970baa647b9e8f4ac9eb4520 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 10 Jun 2018 20:33:12 +0100 -Subject: [PATCH 3/4] docs: Suggest using PKG_CHECK_VAR to substitute plugindir +Subject: [PATCH 3/7] docs: Suggest using PKG_CHECK_VAR to substitute plugindir and filterdir. (cherry picked from commit fcd05424c819e433543030373a7f4136b511ddc6) @@ -45,5 +45,5 @@ index 695e588..a393be9 100644 You can also write nbdkit plugins in OCaml, Perl, Python or Ruby. -- -2.16.2 +2.17.1 diff --git a/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch index 3f18f86..b4eae2c 100644 --- a/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch +++ b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch @@ -1,7 +1,7 @@ From e25e1bf830cc0252ef3374a3a1d391142726cf75 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 11 Jun 2018 11:48:08 +0100 -Subject: [PATCH 4/4] perl: Make example4 and tar plugins conditional on +Subject: [PATCH 4/7] perl: Make example4 and tar plugins conditional on --enable-perl. If you configured with --disable-perl then these plugins are still @@ -53,5 +53,5 @@ index 57d1026..016ffef 100644 + +endif -- -2.16.2 +2.17.1 diff --git a/0005-plugins-nbd-Free-h-handle-along-error-paths.patch b/0005-plugins-nbd-Free-h-handle-along-error-paths.patch new file mode 100644 index 0000000..51fc338 --- /dev/null +++ b/0005-plugins-nbd-Free-h-handle-along-error-paths.patch @@ -0,0 +1,35 @@ +From 8f56ed3f954de2377536bc79fb751db19537b0af Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 14 Jun 2018 14:18:34 +0100 +Subject: [PATCH 5/7] plugins: nbd: Free h (handle) along error paths. + +Found by Coverity. + +(cherry picked from commit aa61206225e9594e348c3cfd9e1210ae614e87db) +--- + plugins/nbd/nbd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/nbd/nbd.c b/plugins/nbd/nbd.c +index 1695d9a..d50671a 100644 +--- a/plugins/nbd/nbd.c ++++ b/plugins/nbd/nbd.c +@@ -463,6 +463,7 @@ nbd_open (int readonly) + h->fd = socket (AF_UNIX, SOCK_STREAM, 0); + if (h->fd < 0) { + nbdkit_error ("socket: %m"); ++ free (h); + return NULL; + } + /* We already validated length during nbd_config_complete */ +@@ -557,6 +558,7 @@ nbd_open (int readonly) + + err: + close (h->fd); ++ free (h); + return NULL; + } + +-- +2.17.1 + diff --git a/0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch b/0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch new file mode 100644 index 0000000..9e2c564 --- /dev/null +++ b/0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch @@ -0,0 +1,28 @@ +From 5ae135e6e98f55140ae078c3dee43376fe0673d1 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 14 Jun 2018 14:25:35 +0100 +Subject: [PATCH 6/7] crypto: Fix error path when sending to gnutls socket. + +Found by Coverity. + +(cherry picked from commit 92f637817a7838337ba99e72e6d8e5543694e360) +--- + src/crypto.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/crypto.c b/src/crypto.c +index 17a667b..23c5c8f 100644 +--- a/src/crypto.c ++++ b/src/crypto.c +@@ -294,7 +294,7 @@ crypto_send (struct connection *conn, const void *vbuf, size_t len) + + while (len > 0) { + r = gnutls_record_send (*session, buf, len); +- if (r == -1) { ++ if (r < 0) { + if (r == GNUTLS_E_INTERRUPTED || r == GNUTLS_E_AGAIN) + continue; + return -1; +-- +2.17.1 + diff --git a/0007-src-main-Add-missing-break-affecting-t-threads-param.patch b/0007-src-main-Add-missing-break-affecting-t-threads-param.patch new file mode 100644 index 0000000..882b887 --- /dev/null +++ b/0007-src-main-Add-missing-break-affecting-t-threads-param.patch @@ -0,0 +1,28 @@ +From 9a628abe3df087f7fa68dfb89bc9a325d27c3f5e Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 1 Jul 2018 15:47:56 +0100 +Subject: [PATCH 7/7] src/main: Add missing break affecting '-t/--threads' + parameter. + +Fixes commit e9516a147ace4e302d7eec0a2a81ddad1c5bfb00. + +(cherry picked from commit d530742708086854cc18dc7bf2b58a1a10af17f7) +--- + src/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.c b/src/main.c +index e5d9093..a878bd5 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -380,6 +380,7 @@ main (int argc, char *argv[]) + } + /* XXX Worth a maximimum limit on threads? */ + } ++ break; + + case 'U': + if (socket_activation) { +-- +2.17.1 + diff --git a/nbdkit.spec b/nbdkit.spec index a2ba11c..f932922 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -21,7 +21,7 @@ Name: nbdkit Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD server License: BSD @@ -34,12 +34,15 @@ Source1: http://libguestfs.org/download/nbdkit/1.2-stable/%{name}-%{versi Source2: libguestfs.keyring %endif -# Upstream patch to fix tests. Touches tests/Makefile.am so we -# need autotools temporarily. +# Upstream patches since 1.2.4 was released. These touch +# tests/Makefile.am so we need autotools temporarily. Patch1: 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch Patch2: 0002-docs-Fix-separators-in-list-of-plugins.patch Patch3: 0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch Patch4: 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch +Patch5: 0005-plugins-nbd-Free-h-handle-along-error-paths.patch +Patch6: 0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch +Patch7: 0007-src-main-Add-missing-break-affecting-t-threads-param.patch BuildRequires: autoconf, automake, libtool %if 0%{?rhel} == 7 @@ -642,6 +645,9 @@ popd %changelog +* Sun Jul 1 2018 Richard W.M. Jones - 1.2.4-3 +- Add all upstream patches since 1.2.4 was released. + * Tue Jun 12 2018 Richard W.M. Jones - 1.2.4-2 - Add all upstream patches since 1.2.4 was released. From 6856676bd4de956b30cc3dc9abffae775492e8c8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 1 Jul 2018 16:35:07 +0100 Subject: [PATCH 19/41] Add generic patches_touch_autotools mechanism for running autoreconf. (cherry picked from commit 64dbc2987484ce845ac868bedb1d68ed460c47ba) --- nbdkit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nbdkit.spec b/nbdkit.spec index f932922..0f28ea9 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -43,7 +43,10 @@ Patch4: 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch Patch5: 0005-plugins-nbd-Free-h-handle-along-error-paths.patch Patch6: 0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch Patch7: 0007-src-main-Add-missing-break-affecting-t-threads-param.patch +%global patches_touch_autotools 1 +%if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool +%endif %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and @@ -391,8 +394,9 @@ tmphome="$(mktemp -d)" gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %endif %autosetup -p1 -# Temporarily while patch1 touches autotools files. +%if 0%{patches_touch_autotools} autoreconf -i +%endif %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. From 442c62b8e5dec190d518c15fb8beba97e5bb9285 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 6 Jul 2018 12:47:26 +0100 Subject: [PATCH 20/41] New upstream version 1.4.0. Add support for Tcl plugins. New plugins: ext2, random, tcl, zero. New filters: blocksize, fua, log, nozero. New bash tab completion subpackage. --- nbdkit.spec | 127 +++++++++++++++++++++++++++++++++++++++++++++------- sources | 4 +- 2 files changed, 112 insertions(+), 19 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 0f28ea9..23a0fd8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -20,30 +20,21 @@ %global verify_tarball_signature 1 Name: nbdkit -Version: 1.2.4 -Release: 3%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: NBD server License: BSD URL: https://github.com/libguestfs/nbdkit -Source0: http://libguestfs.org/download/nbdkit/1.2-stable/%{name}-%{version}.tar.gz +Source0: http://libguestfs.org/download/nbdkit/1.4-stable/%{name}-%{version}.tar.gz %if 0%{verify_tarball_signature} -Source1: http://libguestfs.org/download/nbdkit/1.2-stable/%{name}-%{version}.tar.gz.sig +Source1: http://libguestfs.org/download/nbdkit/1.4-stable/%{name}-%{version}.tar.gz.sig # Keyring used to verify tarball signature. Source2: libguestfs.keyring %endif -# Upstream patches since 1.2.4 was released. These touch -# tests/Makefile.am so we need autotools temporarily. -Patch1: 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch -Patch2: 0002-docs-Fix-separators-in-list-of-plugins.patch -Patch3: 0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch -Patch4: 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch -Patch5: 0005-plugins-nbd-Free-h-handle-along-error-paths.patch -Patch6: 0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch -Patch7: 0007-src-main-Add-missing-break-affecting-t-threads-param.patch -%global patches_touch_autotools 1 +%global patches_touch_autotools 0 %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -69,6 +60,8 @@ BuildRequires: libvirt-devel BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: libcurl-devel +BuildRequires: e2fsprogs-devel +BuildRequires: bash-completion BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) BuildRequires: python2-devel @@ -81,8 +74,9 @@ BuildRequires: python3-devel BuildRequires: ocaml >= 4.02.2 %endif BuildRequires: ruby-devel +BuildRequires: tcl-devel %if 0%{verify_tarball_signature} -BuildRequires: gnupg2 +BuildRequires: gnupg2 %endif # Only for running the test suite: @@ -152,6 +146,10 @@ trivial dependencies. A null (bitbucket) plugin. +* nbdkit-random-plugin + + Random content plugin for testing. + * nbdkit-split-plugin Concatenate one or more files into a single virtual disk. @@ -160,6 +158,10 @@ trivial dependencies. A streaming file serving plugin. +* nbdkit-zero-plugin + + Zero-length plugin for testing. + %package example-plugins Summary: Example plugins for %{name} @@ -189,6 +191,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains cURL (HTTP/FTP/SSH) support for %{name}. +%package plugin-ext2 +Summary: ext2, ext3 and ext4 filesystem support for %{name} +License: BSD + +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description plugin-ext2 +This package contains ext2, ext3 and ext4 filesystem support for +%{name}. + + %if 0%{?have_libguestfs} %package plugin-guestfs Summary: libguestfs plugin for %{name} @@ -331,6 +345,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package is a tar archive plugin for %{name}. +%package plugin-tcl +Summary: Tcl plugin for %{name} +License: BSD + +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description plugin-tcl +This package lets you write Tcl plugins for %{name}. + + %package plugin-xz Summary: XZ file serving plugin for %{name} License: BSD @@ -353,6 +378,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains some basic filters for %{name} which have only trivial dependencies. +* nbdkit-blocksize-filter + + Adjust block size of requests sent to plugins. + * nbdkit-cache-filter Server-side cache. @@ -365,10 +394,22 @@ trivial dependencies. Inject read and write delays. +* nbdkit-fua-filter + + Modify flush behaviour in plugins. + +* nbdkit-log-filter + + Log all transactions to a file. + * nbdkit-offset-filter Serve an offset and range. +* nbdkit-nozero-filter + + Adjust handling of zero requests by plugins. + * nbdkit-partition-filter Serve a single partition. @@ -388,6 +429,18 @@ for %{name}. Install this package if you want to develop plugins for %{name}. +%package bash-completion +Summary: Bash tab-completion for %{name} +BuildArch: noarch +Requires: bash-completion >= 2.0 +Requires: %{name} = %{version}-%{release} + + +%description bash-completion +Install this package if you want intelligent bash tab-completion +for %{name}. + + %prep %if 0%{verify_tarball_signature} tmphome="$(mktemp -d)" @@ -423,7 +476,7 @@ make %{?_smp_mflags} %if 0%{?have_python3} pushd python3 export PYTHON=%{_bindir}/python3 -%configure --disable-static --disable-perl --disable-ocaml --disable-ruby +%configure --disable-static --disable-perl --disable-ocaml --disable-ruby --disable-tcl # Verify that it picked the correct version of Python # to avoid RHBZ#1404631 happening again silently. grep '^PYTHON_VERSION = 3' Makefile @@ -478,7 +531,7 @@ make check -j1 || { %if 0%{?have_libguestfs} %if 0%{?have_python3} pushd python3 -make check -j1 TESTS=test-python || { +make check -j1 -C tests TESTS=test-python || { cat tests/test-suite.log exit 1 } @@ -510,14 +563,18 @@ popd %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so %{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so %{_libdir}/%{name}/plugins/nbdkit-null-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-random-plugin.so %{_libdir}/%{name}/plugins/nbdkit-split-plugin.so %{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-zero-plugin.so %{_mandir}/man1/nbdkit-file-plugin.1* %{_mandir}/man1/nbdkit-memory-plugin.1* %{_mandir}/man1/nbdkit-nbd-plugin.1* %{_mandir}/man1/nbdkit-null-plugin.1* +%{_mandir}/man1/nbdkit-random-plugin.1* %{_mandir}/man1/nbdkit-split-plugin.1* %{_mandir}/man1/nbdkit-streaming-plugin.1* +%{_mandir}/man1/nbdkit-zero-plugin.1* %files example-plugins @@ -535,6 +592,13 @@ popd %{_mandir}/man1/nbdkit-curl-plugin.1* +%files plugin-ext2 +%doc README +%license LICENSE +%{_libdir}/%{name}/plugins/nbdkit-ext2-plugin.so +%{_mandir}/man1/nbdkit-ext2-plugin.1* + + %if 0%{?have_libguestfs} %files plugin-guestfs %doc README @@ -609,6 +673,13 @@ popd %{_mandir}/man1/nbdkit-tar-plugin.1* +%files plugin-tcl +%doc README +%license LICENSE +%{_libdir}/%{name}/plugins/nbdkit-tcl-plugin.so +%{_mandir}/man3/nbdkit-tcl-plugin.3* + + %files plugin-xz %doc README %license LICENSE @@ -619,14 +690,22 @@ popd %files basic-filters %doc README %license LICENSE +%{_libdir}/%{name}/filters/nbdkit-blocksize-filter.so %{_libdir}/%{name}/filters/nbdkit-cache-filter.so %{_libdir}/%{name}/filters/nbdkit-cow-filter.so %{_libdir}/%{name}/filters/nbdkit-delay-filter.so +%{_libdir}/%{name}/filters/nbdkit-fua-filter.so +%{_libdir}/%{name}/filters/nbdkit-log-filter.so +%{_libdir}/%{name}/filters/nbdkit-nozero-filter.so %{_libdir}/%{name}/filters/nbdkit-offset-filter.so %{_libdir}/%{name}/filters/nbdkit-partition-filter.so +%{_mandir}/man1/nbdkit-blocksize-filter.1* %{_mandir}/man1/nbdkit-cache-filter.1* %{_mandir}/man1/nbdkit-cow-filter.1* %{_mandir}/man1/nbdkit-delay-filter.1* +%{_mandir}/man1/nbdkit-fua-filter.1* +%{_mandir}/man1/nbdkit-log-filter.1* +%{_mandir}/man1/nbdkit-nozero-filter.1* %{_mandir}/man1/nbdkit-offset-filter.1* %{_mandir}/man1/nbdkit-partition-filter.1* @@ -640,6 +719,7 @@ popd %doc plugins/perl/example.pl %doc plugins/python/example.py %doc plugins/ruby/example.rb +%doc plugins/tcl/example.tcl %{_includedir}/nbdkit-common.h %{_includedir}/nbdkit-filter.h %{_includedir}/nbdkit-plugin.h @@ -648,7 +728,20 @@ popd %{_libdir}/pkgconfig/nbdkit.pc +%files bash-completion +%license LICENSE +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/nbdkit + + %changelog +* Fri Jul 6 2018 Richard W.M. Jones - 1.4.0-1 +- New upstream version 1.4.0. +- Add support for Tcl plugins. +- New plugins: ext2, random, tcl, zero. +- New filters: blocksize, fua, log, nozero. +- New bash tab completion subpackage. + * Sun Jul 1 2018 Richard W.M. Jones - 1.2.4-3 - Add all upstream patches since 1.2.4 was released. diff --git a/sources b/sources index 454e016..eda5482 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.2.4.tar.gz) = 5f5f74e9223ed05cb0e9f36f7adea6980192bd23e3b900aaf1d045f135855e8fbbb7ff33df88a87a5b857d26635a4924b13c263cfac28b6206e26802731cab81 -SHA512 (nbdkit-1.2.4.tar.gz.sig) = bfe4d8fb913a08228ebaa44ca5966ef37f4919dff9b6049a5eeada78984745d80eafeac9751f5f0784d75c62e4d8a03eeddf803fcac3406542fea50c4d59048f +SHA512 (nbdkit-1.4.0.tar.gz) = c9503f074ef767c0d75d9869d2374763494b13a9ce27a0b9d48fe83b6975bd4e81662d967fd20e2212a05621c7899cc40c4056985bb82c1efb9b50fb94b2d168 +SHA512 (nbdkit-1.4.0.tar.gz.sig) = bcd2a7d6e2fa45d93d3b2eec9ab15c52ed1ef1a3aaa5dd7beb1ca3ad52d9621826457ef1513c6166d6173282da42a04b73a1384d32ce0c66398ecac90d39b98a From 7c4f31f5c37201d541f0b82a9b8b9c6cb6a9c889 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 6 Jul 2018 12:47:00 +0100 Subject: [PATCH 21/41] Reorder basic-filters %description alphabetically. (cherry picked from commit f07a27aa88fe39b7680a01b47ddaf7186ffc7876) --- nbdkit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 23a0fd8..4f837da 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -402,14 +402,14 @@ trivial dependencies. Log all transactions to a file. -* nbdkit-offset-filter - - Serve an offset and range. - * nbdkit-nozero-filter Adjust handling of zero requests by plugins. +* nbdkit-offset-filter + + Serve an offset and range. + * nbdkit-partition-filter Serve a single partition. From 31886771cef22860b6cc5b85340621e7fa2fc714 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 6 Jul 2018 12:49:40 +0100 Subject: [PATCH 22/41] Remove patches which are now upstream. Fixes commit 442c62b8e5dec190d518c15fb8beba97e5bb9285. --- ...sh-isn-t-available-disk-is-not-creat.patch | 56 ------------------ ...cs-Fix-separators-in-list-of-plugins.patch | 32 ----------- ...ng-PKG_CHECK_VAR-to-substitute-plugi.patch | 49 ---------------- ...e4-and-tar-plugins-conditional-on-en.patch | 57 ------------------- ...-nbd-Free-h-handle-along-error-paths.patch | 35 ------------ ...r-path-when-sending-to-gnutls-socket.patch | 28 --------- ...sing-break-affecting-t-threads-param.patch | 28 --------- 7 files changed, 285 deletions(-) delete mode 100644 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch delete mode 100644 0002-docs-Fix-separators-in-list-of-plugins.patch delete mode 100644 0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch delete mode 100644 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch delete mode 100644 0005-plugins-nbd-Free-h-handle-along-error-paths.patch delete mode 100644 0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch delete mode 100644 0007-src-main-Add-missing-break-affecting-t-threads-param.patch diff --git a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch deleted file mode 100644 index 25e8ea5..0000000 --- a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9dc5dba35b3af9eaa98f97d8eb83a39435574230 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 9 Jun 2018 14:56:13 +0100 -Subject: [PATCH 1/7] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available?= - =?UTF-8?q?,=20=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable?= - =?UTF-8?q?=20tests=20which=20need=20it.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes commit 02f27adc50ed5b83021df4edc84f4dbf8b03a0e3. - -(cherry picked from commit 07ecff1613b73f32b5954bd3a3d46bef6a39e396) ---- - tests/Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index ff51120..53b2d8a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -251,6 +251,7 @@ test_file_LDADD = libtest.la $(LIBGUESTFS_LIBS) - - # gzip plugin test. - if HAVE_ZLIB -+if HAVE_GUESTFISH - - LIBGUESTFS_TESTS += test-gzip - check_DATA += disk.gz -@@ -264,6 +265,7 @@ disk.gz: disk - rm -f $@ - gzip -9 -c disk > $@ - -+endif HAVE_GUESTFISH - endif HAVE_ZLIB - - # memory plugin test. -@@ -319,6 +321,7 @@ test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) - - # xz plugin test. - if HAVE_LIBLZMA -+if HAVE_GUESTFISH - - LIBGUESTFS_TESTS += test-xz - check_DATA += disk.xz -@@ -332,6 +335,7 @@ disk.xz: disk - rm -f $@ - xz --best --block-size=16777216 -c disk > $@ - -+endif HAVE_GUESTFISH - endif HAVE_LIBLZMA - - #---------------------------------------------------------------------- --- -2.17.1 - diff --git a/0002-docs-Fix-separators-in-list-of-plugins.patch b/0002-docs-Fix-separators-in-list-of-plugins.patch deleted file mode 100644 index 6747543..0000000 --- a/0002-docs-Fix-separators-in-list-of-plugins.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 69b77654bd1244c187c5cbdecc362be1d4f587a5 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 9 Jun 2018 18:29:43 +0100 -Subject: [PATCH 2/7] docs: Fix separators in list of plugins (. -> ,) - -(cherry picked from commit 4c4ebb955e9504503f2b950344529fa1a4222715) ---- - docs/nbdkit.pod | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod -index 1a0c005..2802b73 100644 ---- a/docs/nbdkit.pod -+++ b/docs/nbdkit.pod -@@ -925,10 +925,10 @@ L, - L, - L, - L, --L. --L. --L. --L. -+L, -+L, -+L, -+L, - L. - - Filters: --- -2.17.1 - diff --git a/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch deleted file mode 100644 index bd2cac7..0000000 --- a/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5558eb0633a48325970baa647b9e8f4ac9eb4520 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 10 Jun 2018 20:33:12 +0100 -Subject: [PATCH 3/7] docs: Suggest using PKG_CHECK_VAR to substitute plugindir - and filterdir. - -(cherry picked from commit fcd05424c819e433543030373a7f4136b511ddc6) ---- - docs/nbdkit-filter.pod | 6 ++++++ - docs/nbdkit-plugin.pod | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/docs/nbdkit-filter.pod b/docs/nbdkit-filter.pod -index 7105a1d..2e23a8e 100644 ---- a/docs/nbdkit-filter.pod -+++ b/docs/nbdkit-filter.pod -@@ -463,6 +463,12 @@ You can also run pkg-config/pkgconf directly, for example: - exit 1 - fi - -+You can also substitute the filterdir variable by doing: -+ -+ PKG_CHECK_VAR([NBDKIT_FILTERDIR], [nbdkit], [filterdir]) -+ -+which defines C<$(NBDKIT_FILTERDIR)> in automake-generated Makefiles. -+ - =head1 SEE ALSO - - L, -diff --git a/docs/nbdkit-plugin.pod b/docs/nbdkit-plugin.pod -index 695e588..a393be9 100644 ---- a/docs/nbdkit-plugin.pod -+++ b/docs/nbdkit-plugin.pod -@@ -668,6 +668,12 @@ You can also run pkg-config/pkgconf directly, for example: - exit 1 - fi - -+You can also substitute the plugindir variable by doing: -+ -+ PKG_CHECK_VAR([NBDKIT_PLUGINDIR], [nbdkit], [plugindir]) -+ -+which defines C<$(NBDKIT_PLUGINDIR)> in automake-generated Makefiles. -+ - =head1 WRITING PLUGINS IN OTHER PROGRAMMING LANGUAGES - - You can also write nbdkit plugins in OCaml, Perl, Python or Ruby. --- -2.17.1 - diff --git a/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch deleted file mode 100644 index b4eae2c..0000000 --- a/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e25e1bf830cc0252ef3374a3a1d391142726cf75 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Mon, 11 Jun 2018 11:48:08 +0100 -Subject: [PATCH 4/7] perl: Make example4 and tar plugins conditional on - --enable-perl. - -If you configured with --disable-perl then these plugins are still -built and installed. However they cannot work without the Perl -plugin, thus it is right to disable them. - -(cherry picked from commit a6aa7d50afa7a6a41865e9814428d3c1b8295167) ---- - plugins/example4/Makefile.am | 4 ++++ - plugins/tar/Makefile.am | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/plugins/example4/Makefile.am b/plugins/example4/Makefile.am -index abbda92..374b483 100644 ---- a/plugins/example4/Makefile.am -+++ b/plugins/example4/Makefile.am -@@ -39,6 +39,8 @@ CLEANFILES = *~ - - plugindir = $(libdir)/nbdkit/plugins - -+if HAVE_PERL -+ - plugin_SCRIPTS = nbdkit-example4-plugin - - # We have to do the rewriting here to avoid stupid exec_prefix. -@@ -59,3 +61,5 @@ nbdkit-example4-plugin.1: $(source) - mv $@.t $@ - - endif -+ -+endif -diff --git a/plugins/tar/Makefile.am b/plugins/tar/Makefile.am -index 57d1026..016ffef 100644 ---- a/plugins/tar/Makefile.am -+++ b/plugins/tar/Makefile.am -@@ -39,6 +39,8 @@ CLEANFILES = *~ - - plugindir = $(libdir)/nbdkit/plugins - -+if HAVE_PERL -+ - plugin_SCRIPTS = nbdkit-tar-plugin - - # We have to do the rewriting here to avoid stupid exec_prefix. -@@ -59,3 +61,5 @@ nbdkit-tar-plugin.1: $(source) - mv $@.t $@ - - endif -+ -+endif --- -2.17.1 - diff --git a/0005-plugins-nbd-Free-h-handle-along-error-paths.patch b/0005-plugins-nbd-Free-h-handle-along-error-paths.patch deleted file mode 100644 index 51fc338..0000000 --- a/0005-plugins-nbd-Free-h-handle-along-error-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8f56ed3f954de2377536bc79fb751db19537b0af Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 14 Jun 2018 14:18:34 +0100 -Subject: [PATCH 5/7] plugins: nbd: Free h (handle) along error paths. - -Found by Coverity. - -(cherry picked from commit aa61206225e9594e348c3cfd9e1210ae614e87db) ---- - plugins/nbd/nbd.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/nbd/nbd.c b/plugins/nbd/nbd.c -index 1695d9a..d50671a 100644 ---- a/plugins/nbd/nbd.c -+++ b/plugins/nbd/nbd.c -@@ -463,6 +463,7 @@ nbd_open (int readonly) - h->fd = socket (AF_UNIX, SOCK_STREAM, 0); - if (h->fd < 0) { - nbdkit_error ("socket: %m"); -+ free (h); - return NULL; - } - /* We already validated length during nbd_config_complete */ -@@ -557,6 +558,7 @@ nbd_open (int readonly) - - err: - close (h->fd); -+ free (h); - return NULL; - } - --- -2.17.1 - diff --git a/0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch b/0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch deleted file mode 100644 index 9e2c564..0000000 --- a/0006-crypto-Fix-error-path-when-sending-to-gnutls-socket.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5ae135e6e98f55140ae078c3dee43376fe0673d1 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 14 Jun 2018 14:25:35 +0100 -Subject: [PATCH 6/7] crypto: Fix error path when sending to gnutls socket. - -Found by Coverity. - -(cherry picked from commit 92f637817a7838337ba99e72e6d8e5543694e360) ---- - src/crypto.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/crypto.c b/src/crypto.c -index 17a667b..23c5c8f 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -294,7 +294,7 @@ crypto_send (struct connection *conn, const void *vbuf, size_t len) - - while (len > 0) { - r = gnutls_record_send (*session, buf, len); -- if (r == -1) { -+ if (r < 0) { - if (r == GNUTLS_E_INTERRUPTED || r == GNUTLS_E_AGAIN) - continue; - return -1; --- -2.17.1 - diff --git a/0007-src-main-Add-missing-break-affecting-t-threads-param.patch b/0007-src-main-Add-missing-break-affecting-t-threads-param.patch deleted file mode 100644 index 882b887..0000000 --- a/0007-src-main-Add-missing-break-affecting-t-threads-param.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9a628abe3df087f7fa68dfb89bc9a325d27c3f5e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 1 Jul 2018 15:47:56 +0100 -Subject: [PATCH 7/7] src/main: Add missing break affecting '-t/--threads' - parameter. - -Fixes commit e9516a147ace4e302d7eec0a2a81ddad1c5bfb00. - -(cherry picked from commit d530742708086854cc18dc7bf2b58a1a10af17f7) ---- - src/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/main.c b/src/main.c -index e5d9093..a878bd5 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -380,6 +380,7 @@ main (int argc, char *argv[]) - } - /* XXX Worth a maximimum limit on threads? */ - } -+ break; - - case 'U': - if (socket_activation) { --- -2.17.1 - From d1bd233f4aa5fcaef36a06631c30b0ed76c16ec2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Jul 2018 14:53:14 +0100 Subject: [PATCH 23/41] Small refactorings in the spec file. (cherry picked from commit 948daff1f0225e3af40652b1057fb7adf7d6168d) --- nbdkit.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 4f837da..b0421e9 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -19,6 +19,12 @@ # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 +# If there are patches which touch autotools files, set this to 1. +%global patches_touch_autotools %{nil} + +# The source directory. +%global source_directory 1.4-stable + Name: nbdkit Version: 1.4.0 Release: 1%{?dist} @@ -27,14 +33,13 @@ Summary: NBD server License: BSD URL: https://github.com/libguestfs/nbdkit -Source0: http://libguestfs.org/download/nbdkit/1.4-stable/%{name}-%{version}.tar.gz +Source0: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz %if 0%{verify_tarball_signature} -Source1: http://libguestfs.org/download/nbdkit/1.4-stable/%{name}-%{version}.tar.gz.sig +Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz.sig # Keyring used to verify tarball signature. Source2: libguestfs.keyring %endif -%global patches_touch_autotools 0 %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -735,6 +740,8 @@ popd %changelog +- Small refactorings in the spec file. + * Fri Jul 6 2018 Richard W.M. Jones - 1.4.0-1 - New upstream version 1.4.0. - Add support for Tcl plugins. From 2037933f88852dc1e40026f4b6d490df83c1e900 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Jul 2018 14:58:35 +0100 Subject: [PATCH 24/41] New upstream version 1.4.1. Small refactorings in the spec file. --- nbdkit.spec | 4 +++- sources | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index b0421e9..ff603b6 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -26,7 +26,7 @@ %global source_directory 1.4-stable Name: nbdkit -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: NBD server @@ -740,6 +740,8 @@ popd %changelog +* Fri Jul 20 2018 Richard W.M. Jones - 1.4.1-1 +- New upstream version 1.4.1. - Small refactorings in the spec file. * Fri Jul 6 2018 Richard W.M. Jones - 1.4.0-1 diff --git a/sources b/sources index eda5482..9e76be8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.4.0.tar.gz) = c9503f074ef767c0d75d9869d2374763494b13a9ce27a0b9d48fe83b6975bd4e81662d967fd20e2212a05621c7899cc40c4056985bb82c1efb9b50fb94b2d168 -SHA512 (nbdkit-1.4.0.tar.gz.sig) = bcd2a7d6e2fa45d93d3b2eec9ab15c52ed1ef1a3aaa5dd7beb1ca3ad52d9621826457ef1513c6166d6173282da42a04b73a1384d32ce0c66398ecac90d39b98a +SHA512 (nbdkit-1.4.1.tar.gz) = 4b4af058cfbaacdb17c5d8a3623a8d09b07c73a152ba83cabe32a361d3ca4c04930cfd8a69da6549fb86a33d807caaa594b86e64d9a52e750e8f1e54c878a0fd +SHA512 (nbdkit-1.4.1.tar.gz.sig) = 400b9cfff2d78cf46856ef0807b4efabe0e0f2ba80b8927a536aa14be971ce71601b41aa76a9fb12e1313f73c67ea8bad8cf816d6f5f7cf4df8c0ef319f9a447 From 43bacc08c3ce4fdf8e3124395fee0b5075fae2ed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 1 Aug 2018 18:17:47 +0100 Subject: [PATCH 25/41] New upstream version 1.4.2. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ff603b6..7cc6896 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -26,7 +26,7 @@ %global source_directory 1.4-stable Name: nbdkit -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: NBD server @@ -740,6 +740,9 @@ popd %changelog +* Wed Aug 1 2018 Richard W.M. Jones - 1.4.2-1 +- New upstream version 1.4.2. + * Fri Jul 20 2018 Richard W.M. Jones - 1.4.1-1 - New upstream version 1.4.1. - Small refactorings in the spec file. diff --git a/sources b/sources index 9e76be8..397cf61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.4.1.tar.gz) = 4b4af058cfbaacdb17c5d8a3623a8d09b07c73a152ba83cabe32a361d3ca4c04930cfd8a69da6549fb86a33d807caaa594b86e64d9a52e750e8f1e54c878a0fd -SHA512 (nbdkit-1.4.1.tar.gz.sig) = 400b9cfff2d78cf46856ef0807b4efabe0e0f2ba80b8927a536aa14be971ce71601b41aa76a9fb12e1313f73c67ea8bad8cf816d6f5f7cf4df8c0ef319f9a447 +SHA512 (nbdkit-1.4.2.tar.gz) = aea6dc3921403b957f9a06695af0bf7d4aee80bc1fe8e95f9eacbda6d15f3dae3f50d1daa945d4adbd3505639d985507b1e3f0368e2ff4b3cfb4c38c2665f16b +SHA512 (nbdkit-1.4.2.tar.gz.sig) = db451997801c10f58566fa7a34656a8fdc7898891e6ac990b6889e39624826828892b812f9bbe257b96b0f41ce99816da2365687de11a7d3acce9bea614e6886 From 559f31a60397b197e1670106960775a4fedc1cfd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 6 Aug 2018 20:48:06 +0100 Subject: [PATCH 26/41] Make nbdkit-plugin-tar require nbdkit-plugin-perl. The tar plugin is written in Perl and so won't work unless the Perl plugin is also installed. This dependency should be generated automatically, but for now we add it manually. (cherry picked from commit eb867f6953f28eb95f66c8031b65b3c7dd56d767) --- nbdkit.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nbdkit.spec b/nbdkit.spec index 7cc6896..b6f4a01 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -344,6 +344,8 @@ Summary: Tar archive plugin for %{name} License: BSD Requires: %{name}%{?_isa} = %{version}-%{release} +# XXX This dependency should be autogenerated. +Requires: %{name}-plugin-perl %description plugin-tar From 7d41ebdfad1c124704a13bb491fd44a4bfa6044a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Aug 2018 11:23:54 +0100 Subject: [PATCH 27/41] New upstream version 1.4.3. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index b6f4a01..46a18f9 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -26,7 +26,7 @@ %global source_directory 1.4-stable Name: nbdkit -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Summary: NBD server @@ -742,6 +742,9 @@ popd %changelog +* Sun Aug 19 2018 Richard W.M. Jones - 1.4.3-1 +- New upstream version 1.4.3. + * Wed Aug 1 2018 Richard W.M. Jones - 1.4.2-1 - New upstream version 1.4.2. diff --git a/sources b/sources index 397cf61..eab0291 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.4.2.tar.gz) = aea6dc3921403b957f9a06695af0bf7d4aee80bc1fe8e95f9eacbda6d15f3dae3f50d1daa945d4adbd3505639d985507b1e3f0368e2ff4b3cfb4c38c2665f16b -SHA512 (nbdkit-1.4.2.tar.gz.sig) = db451997801c10f58566fa7a34656a8fdc7898891e6ac990b6889e39624826828892b812f9bbe257b96b0f41ce99816da2365687de11a7d3acce9bea614e6886 +SHA512 (nbdkit-1.4.3.tar.gz) = 052d0eb96e1c7ee2d5c5dcb84532bcb64e3442e2e3c759601ab05742dab5ffa1d2ae371d1bae979175d77961b326bf382a50da30e2d1e7e30b8fd662f5a82b94 +SHA512 (nbdkit-1.4.3.tar.gz.sig) = eac783ca7a90bde4eb034cd65ec3745590d5289f751007aa15b9af17a608ca9a6472eeca619fba824dac57bb32e13bcae15691b3ecf04964fdf20d18836f3583 From dd850f548b0eff5c0323c1a1c51f8a6b301be40f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 8 Sep 2018 10:47:13 +0100 Subject: [PATCH 28/41] New upstream version 1.6.1. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 1141d30..4e54016 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.6-stable Name: nbdkit -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?dist} Summary: NBD server @@ -950,6 +950,9 @@ popd %changelog +* Sat Sep 08 2018 Richard W.M. Jones - 1.6.1-1 +- New upstream version 1.6.1. + * Tue Aug 28 2018 Richard W.M. Jones - 1.6.0-1 - New upstream version 1.6.0, stable branch. diff --git a/sources b/sources index 5e391a4..689119d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.6.0.tar.gz) = d395e1b62a370b6ba66768b866534c4341210b77e47ff4b120b00722bda63e2c317573f9d0a1a85ee8c3dd6f7d1f0726bcacdebf3bf34f36272eea4baa047916 -SHA512 (nbdkit-1.6.0.tar.gz.sig) = 89b14d8a70752642268fdbd06236d603b2716a930739d5d1e037f195153ab8d70b38c379c1bffeec65f78d391c2204a6f171920b74684fb02fd3c5996c1040a4 +SHA512 (nbdkit-1.6.1.tar.gz) = dc42d8be90469fc0bdc8132e78c7da3c7f13b57b6b531b9756f3b289db98f3af052c2ac86c0997f06134cef3bc3f82268db4824b33cf84f247b1a99b49b5f9dd +SHA512 (nbdkit-1.6.1.tar.gz.sig) = 6c5dd742700cba265255299b6483effba81414b8fe08a2c927471ae06f06c96b9f83599f1fc084bf9db03d843af3f30859d1e63464b9606b722e6da450c4e6b1 From 0d304537b04321d3c6dc55928c8247e2064ed677 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Sep 2018 23:43:42 +0100 Subject: [PATCH 29/41] New upstream version 1.6.2. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 4e54016..cdbf6f5 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.6-stable Name: nbdkit -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: NBD server @@ -950,6 +950,9 @@ popd %changelog +* Tue Sep 18 2018 Richard W.M. Jones - 1.6.2-1 +- New upstream version 1.6.2. + * Sat Sep 08 2018 Richard W.M. Jones - 1.6.1-1 - New upstream version 1.6.1. diff --git a/sources b/sources index 689119d..490c861 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.6.1.tar.gz) = dc42d8be90469fc0bdc8132e78c7da3c7f13b57b6b531b9756f3b289db98f3af052c2ac86c0997f06134cef3bc3f82268db4824b33cf84f247b1a99b49b5f9dd -SHA512 (nbdkit-1.6.1.tar.gz.sig) = 6c5dd742700cba265255299b6483effba81414b8fe08a2c927471ae06f06c96b9f83599f1fc084bf9db03d843af3f30859d1e63464b9606b722e6da450c4e6b1 +SHA512 (nbdkit-1.6.2.tar.gz) = b6fcc846b19645663044a0601d4d5beb34a6aee28088b5ea58f41f329599c9ae8de5e8d6aea119d9a2a9e961c00a8ddfe30e39560f06e2315379c82d7df6563b +SHA512 (nbdkit-1.6.2.tar.gz.sig) = 8bdaa14b95caf23cbafb49d2a6c3a2731336a126e384f006db5358a26803f822a688a547db71869709c7b6b34e94b0c4d978301cd1df9ef39707d21725de30a7 From 8d3bd5336c56547b661df2ef2d3282b5c5e97c6b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Nov 2018 19:45:05 +0000 Subject: [PATCH 30/41] New upstream version 1.6.3. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index cdbf6f5..ffcee69 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.6-stable Name: nbdkit -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} Summary: NBD server @@ -950,6 +950,9 @@ popd %changelog +* Tue Nov 06 2018 Richard W.M. Jones - 1.6.3-1 +- New upstream version 1.6.3. + * Tue Sep 18 2018 Richard W.M. Jones - 1.6.2-1 - New upstream version 1.6.2. diff --git a/sources b/sources index 490c861..9a8cffb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.6.2.tar.gz) = b6fcc846b19645663044a0601d4d5beb34a6aee28088b5ea58f41f329599c9ae8de5e8d6aea119d9a2a9e961c00a8ddfe30e39560f06e2315379c82d7df6563b -SHA512 (nbdkit-1.6.2.tar.gz.sig) = 8bdaa14b95caf23cbafb49d2a6c3a2731336a126e384f006db5358a26803f822a688a547db71869709c7b6b34e94b0c4d978301cd1df9ef39707d21725de30a7 +SHA512 (nbdkit-1.6.3.tar.gz) = 5be6755099b526bff0214f818864b01a8ca21c7880dea20ff18ac90ac785237acf3bc258c4ec4b382c965fc4322fb3f294127596f8c9856212e994897c1f2536 +SHA512 (nbdkit-1.6.3.tar.gz.sig) = 0a0ffe976dc96764a88e580f353c7775e5b5b3882bae67405f4f6094d3858bb42aaf472662b720c5942eac0b432a0d9ef5b9abcf7aec2b09274c9795b9abfb2e From 445543b1411d17ffaf9b51b5736d64736c12ba7a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 6 Nov 2018 21:34:28 +0000 Subject: [PATCH 31/41] nbdkit metapackage should depend on versioned -server subpackage etc. Fixes commit b772c3dfaeabfdfd61591b3e416e1721dcc8fb25. (cherry picked from commit bc6a311564b95de41dc2548564d1ac83c4509089) --- nbdkit.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ffcee69..e5b2531 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -32,7 +32,7 @@ Name: nbdkit Version: 1.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server License: BSD @@ -103,9 +103,9 @@ BuildRequires: /usr/sbin/ss # nbdkit is a metapackage pulling the server and a useful subset # of the plugins and filters. -Requires: nbdkit-server -Requires: nbdkit-basic-plugins -Requires: nbdkit-basic-filters +Requires: nbdkit-server%{?_isa} = %{version}-%{release} +Requires: nbdkit-basic-plugins%{?_isa} = %{version}-%{release} +Requires: nbdkit-basic-filters%{?_isa} = %{version}-%{release} %description @@ -950,6 +950,9 @@ popd %changelog +* Tue Nov 06 2018 Richard W.M. Jones - 1.6.3-2 +- nbdkit metapackage should depend on versioned -server subpackage etc. + * Tue Nov 06 2018 Richard W.M. Jones - 1.6.3-1 - New upstream version 1.6.3. From fe95877cec859aac19208198f2ada93f113b5d67 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 12 Nov 2018 21:08:22 +0000 Subject: [PATCH 32/41] Rebase to new stable version 1.8.0. --- nbdkit.spec | 139 +++++++++++++++++++++++++--------------------------- sources | 4 +- 2 files changed, 68 insertions(+), 75 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index e5b2531..8426ee4 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -28,11 +28,11 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.6-stable +%global source_directory 1.8-stable Name: nbdkit -Version: 1.6.3 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -73,6 +73,7 @@ BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: libcurl-devel BuildRequires: e2fsprogs-devel +BuildRequires: genisoimage BuildRequires: bash-completion BuildRequires: perl-devel BuildRequires: perl(ExtUtils::Embed) @@ -112,18 +113,24 @@ Requires: nbdkit-basic-filters%{?_isa} = %{version}-%{release} NBD is a protocol for accessing block devices (hard disks and disk-like things) over the network. -'nbdkit' is a toolkit for creating NBD servers. +nbdkit is a toolkit for creating NBD servers. The key features are: * Multithreaded NBD server written in C with good performance. -* Well-documented, simple plugin API with a stable ABI guarantee. - Allows you to export "unconventional" block devices easily. +* Minimal dependencies for the basic server. * Liberal license (BSD) allows nbdkit to be linked to proprietary libraries or included in proprietary code. +* Well-documented, simple plugin API with a stable ABI guarantee. + Lets you to export "unconventional" block devices easily. + +* You can write plugins in C or many other languages. + +* Filters can be stacked in front of plugins to transform the output. + In Fedora, '%{name}' is a meta-package which pulls in the core server and a useful subset of plugins and filters. @@ -158,52 +165,31 @@ Obsoletes: %{name}-plugin-streaming < 1.1.19-1 This package contains some basic plugins for %{name} which have only trivial dependencies. -* nbdkit-data-plugin +nbdkit-data-plugin Serve small amounts of data from the command line. - Serve small files directly from the command line. +nbdkit-file-plugin The normal file plugin for serving files. -* nbdkit-file-plugin +nbdkit-floppy-plugin Create a virtual floppy disk from a directory. - A file serving plugin. +nbdkit-memory-plugin A virtual memory plugin. -* nbdkit-memory-plugin +nbdkit-nbd-plugin An NBD forwarding plugin. - A virtual memory plugin. +nbdkit-null-plugin A null (bitbucket) plugin. -* nbdkit-nbd-plugin +nbdkit-pattern-plugin Fixed test pattern. - An NBD forwarding plugin. +nbdkit-partitioning-plugin Create virtual disks from partitions. - It provides an NBD server that forwards all traffic as a client to - another existing NBD server. A primary usage of this setup is to - alter the set of features available to the ultimate end client, - without having to change the original server (for example, to - convert between oldstyle and newtyle, or to add TLS support where - the original server lacks it). +nbdkit-random-plugin Random content plugin for testing. -* nbdkit-null-plugin +nbdkit-sh-plugin Write plugins as shell scripts or executables. - A null (bitbucket) plugin. +nbdkit-split-plugin Concatenate one or more files. -* nbdkit-pattern-plugin +nbdkit-streaming-plugin A streaming file serving plugin. - Fixed test pattern. - -* nbdkit-random-plugin - - Random content plugin for testing. - -* nbdkit-split-plugin - - Concatenate one or more files into a single virtual disk. - -* nbdkit-streaming-plugin - - A streaming file serving plugin. - -* nbdkit-zero-plugin - - Zero-length plugin for testing. +nbdkit-zero-plugin Zero-length plugin for testing. %package example-plugins @@ -286,6 +272,18 @@ Obsoletes: %{name}-plugin-gzip <= %{version}-%{release} This package is a gzip file serving plugin for %{name}. +%package iso-plugin +Summary: Virtual ISO 9660 plugin for %{name} +License: BSD + +Requires: %{name}-server%{?_isa} = %{version}-%{release} +Requires: genisoimage + + +%description iso-plugin +This package is a virtual ISO 9660 (CD-ROM) plugin for %{name}. + + %if 0%{?have_libvirt} %package libvirt-plugin Summary: Libvirt plugin for %{name} @@ -519,49 +517,27 @@ Requires: %{name}-server%{?_isa} = %{version}-%{release} This package contains some basic filters for %{name} which have only trivial dependencies. -* nbdkit-blocksize-filter +nbdkit-blocksize-filter Adjust block size of requests sent to plugins. - Adjust block size of requests sent to plugins. +nbdkit-cache-filter Server-side cache. -* nbdkit-cache-filter +nbdkit-cow-filter Copy-on-write overlay for read-only plugins. - Server-side cache. +nbdkit-delay-filter Inject read and write delays. -* nbdkig-cow-filter +nbdkit-error-filter Inject errors. - Copy-on-write overlay for read-only plugins. +nbdkit-fua-filter Modify flush behaviour in plugins. -* nbdkit-delay-filter +nbdkit-log-filter Log all transactions to a file. - Inject read and write delays. +nbdkit-nozero-filter Adjust handling of zero requests by plugins. -* nbdkit-error-filter +nbdkit-offset-filter Serve an offset and range. - Inject errors. +nbdkit-partition-filter Serve a single partition. -* nbdkit-fua-filter - - Modify flush behaviour in plugins. - -* nbdkit-log-filter - - Log all transactions to a file. - -* nbdkit-nozero-filter - - Adjust handling of zero requests by plugins. - -* nbdkit-offset-filter - - Serve an offset and range. - -* nbdkit-partition-filter - - Serve a single partition. - -* nbdkit-truncate-filter - - Truncate, expand, round up or round down a plugin size. +nbdkit-truncate-filter Truncate, expand, round up or round down size. %package devel @@ -749,21 +725,27 @@ popd %license LICENSE %{_libdir}/%{name}/plugins/nbdkit-data-plugin.so %{_libdir}/%{name}/plugins/nbdkit-file-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-floppy-plugin.so %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so %{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so %{_libdir}/%{name}/plugins/nbdkit-null-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-partitioning-plugin.so %{_libdir}/%{name}/plugins/nbdkit-pattern-plugin.so %{_libdir}/%{name}/plugins/nbdkit-random-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-sh-plugin.so %{_libdir}/%{name}/plugins/nbdkit-split-plugin.so %{_libdir}/%{name}/plugins/nbdkit-streaming-plugin.so %{_libdir}/%{name}/plugins/nbdkit-zero-plugin.so %{_mandir}/man1/nbdkit-data-plugin.1* %{_mandir}/man1/nbdkit-file-plugin.1* +%{_mandir}/man1/nbdkit-floppy-plugin.1* %{_mandir}/man1/nbdkit-memory-plugin.1* %{_mandir}/man1/nbdkit-nbd-plugin.1* %{_mandir}/man1/nbdkit-null-plugin.1* +%{_mandir}/man1/nbdkit-partitioning-plugin.1* %{_mandir}/man1/nbdkit-pattern-plugin.1* %{_mandir}/man1/nbdkit-random-plugin.1* +%{_mandir}/man3/nbdkit-sh-plugin.3* %{_mandir}/man1/nbdkit-split-plugin.1* %{_mandir}/man1/nbdkit-streaming-plugin.1* %{_mandir}/man1/nbdkit-zero-plugin.1* @@ -807,6 +789,13 @@ popd %{_mandir}/man1/nbdkit-gzip-plugin.1* +%files iso-plugin +%doc README +%license LICENSE +%{_libdir}/%{name}/plugins/nbdkit-iso-plugin.so +%{_mandir}/man1/nbdkit-iso-plugin.1* + + %if 0%{?have_libvirt} %files libvirt-plugin %doc README @@ -934,6 +923,7 @@ popd %doc plugins/perl/example.pl %doc plugins/python/example.py %doc plugins/ruby/example.rb +%doc plugins/sh/example.sh %doc plugins/tcl/example.tcl %{_includedir}/nbdkit-common.h %{_includedir}/nbdkit-filter.h @@ -950,6 +940,9 @@ popd %changelog +* Mon Nov 12 2018 Richard W.M. Jones - 1.8.0-1 +- Rebase to new stable version 1.8.0. + * Tue Nov 06 2018 Richard W.M. Jones - 1.6.3-2 - nbdkit metapackage should depend on versioned -server subpackage etc. diff --git a/sources b/sources index 9a8cffb..2b622d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.6.3.tar.gz) = 5be6755099b526bff0214f818864b01a8ca21c7880dea20ff18ac90ac785237acf3bc258c4ec4b382c965fc4322fb3f294127596f8c9856212e994897c1f2536 -SHA512 (nbdkit-1.6.3.tar.gz.sig) = 0a0ffe976dc96764a88e580f353c7775e5b5b3882bae67405f4f6094d3858bb42aaf472662b720c5942eac0b432a0d9ef5b9abcf7aec2b09274c9795b9abfb2e +SHA512 (nbdkit-1.8.0.tar.gz) = 961af6dad446a2ad3ad1fbd0fae5644ef60e07024b0f79ffe9b29ed04c21d995d2cc515afe7a88954d7bbe0dcf9682306547454facf25dd32e8562e2090d66c9 +SHA512 (nbdkit-1.8.0.tar.gz.sig) = a360ea34609c747784ce79c717aaa2cc7006ea01b3acd23653b8f1d52c40b972e128c582c416b6c07ada0e99773ad3ddcc8b4bd927f7fb66bb036e39b52a1123 From 78cf7a5bf219124a7cf45538aff6d2798c48f7bb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 18 Nov 2018 10:35:12 +0000 Subject: [PATCH 33/41] New upstream version 1.8.1. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 8426ee4..5b8bae3 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.8-stable Name: nbdkit -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: NBD server @@ -940,6 +940,9 @@ popd %changelog +* Sun Nov 18 2018 Richard W.M. Jones - 1.8.1-1 +- New upstream version 1.8.1. + * Mon Nov 12 2018 Richard W.M. Jones - 1.8.0-1 - Rebase to new stable version 1.8.0. diff --git a/sources b/sources index 2b622d3..d45d1b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.8.0.tar.gz) = 961af6dad446a2ad3ad1fbd0fae5644ef60e07024b0f79ffe9b29ed04c21d995d2cc515afe7a88954d7bbe0dcf9682306547454facf25dd32e8562e2090d66c9 -SHA512 (nbdkit-1.8.0.tar.gz.sig) = a360ea34609c747784ce79c717aaa2cc7006ea01b3acd23653b8f1d52c40b972e128c582c416b6c07ada0e99773ad3ddcc8b4bd927f7fb66bb036e39b52a1123 +SHA512 (nbdkit-1.8.1.tar.gz) = 86feb6dadb5e12b25ae9f2869f7932c04e4c85634f1b2a6343215c5c15cce1803546c1c1649a5620d08c465c0c749a5ce632f013b25e233ec5102169256d912e +SHA512 (nbdkit-1.8.1.tar.gz.sig) = cdf305937b0dfb918fa3ca80a11ad993eebe6b32ec960734719367274687d6763debadcbb4d5c2d7d18ca98763cbfced1fd5a254c5527b5e2c31c1e84ba85b10 From f00f703ad908e0b4dbd789a14260f308352d5d6c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Dec 2018 10:29:34 +0000 Subject: [PATCH 34/41] New upstream version 1.4.4. Fix low priority security issue with TLS: https://www.redhat.com/archives/libguestfs/2018-December/msg00047.html --- nbdkit.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 46a18f9..fa0a152 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -26,7 +26,7 @@ %global source_directory 1.4-stable Name: nbdkit -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: NBD server @@ -742,6 +742,11 @@ popd %changelog +* Tue Dec 04 2018 Richard W.M. Jones - 1.4.4-1 +- New upstream version 1.4.4. +- Fix low priority security issue with TLS: + https://www.redhat.com/archives/libguestfs/2018-December/msg00047.html + * Sun Aug 19 2018 Richard W.M. Jones - 1.4.3-1 - New upstream version 1.4.3. diff --git a/sources b/sources index eab0291..75c307d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.4.3.tar.gz) = 052d0eb96e1c7ee2d5c5dcb84532bcb64e3442e2e3c759601ab05742dab5ffa1d2ae371d1bae979175d77961b326bf382a50da30e2d1e7e30b8fd662f5a82b94 -SHA512 (nbdkit-1.4.3.tar.gz.sig) = eac783ca7a90bde4eb034cd65ec3745590d5289f751007aa15b9af17a608ca9a6472eeca619fba824dac57bb32e13bcae15691b3ecf04964fdf20d18836f3583 +SHA512 (nbdkit-1.4.4.tar.gz) = ed264f437266c6ada78f87d150cb3594de6ad7b99645738e11d1da05fe69e224daa0fcb33165d62d7366dc74f479ef51391cf3f88d7131648d01b4951bd0e4b2 +SHA512 (nbdkit-1.4.4.tar.gz.sig) = 4fe9343212584edbc4ddf1c3bdce3341a75111ad3a6a066b05d5d80cca863818971e00f8f751a49da15520c489e793e0a9a2de00b7f5d45801d7d2ed733756f8 From 3619f43b96ebe00f46735d8109dbec9753385a30 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Dec 2018 10:31:05 +0000 Subject: [PATCH 35/41] New upstream version 1.8.2. Fix low priority security issue with TLS: https://www.redhat.com/archives/libguestfs/2018-December/msg00047.html --- nbdkit.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 5b8bae3..f0590b8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.8-stable Name: nbdkit -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Summary: NBD server @@ -940,6 +940,11 @@ popd %changelog +* Tue Dec 04 2018 Richard W.M. Jones - 1.8.2-1 +- New upstream version 1.8.2. +- Fix low priority security issue with TLS: + https://www.redhat.com/archives/libguestfs/2018-December/msg00047.html + * Sun Nov 18 2018 Richard W.M. Jones - 1.8.1-1 - New upstream version 1.8.1. diff --git a/sources b/sources index d45d1b1..f411186 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.8.1.tar.gz) = 86feb6dadb5e12b25ae9f2869f7932c04e4c85634f1b2a6343215c5c15cce1803546c1c1649a5620d08c465c0c749a5ce632f013b25e233ec5102169256d912e -SHA512 (nbdkit-1.8.1.tar.gz.sig) = cdf305937b0dfb918fa3ca80a11ad993eebe6b32ec960734719367274687d6763debadcbb4d5c2d7d18ca98763cbfced1fd5a254c5527b5e2c31c1e84ba85b10 +SHA512 (nbdkit-1.8.2.tar.gz) = ee3ef065204e4d6df02d97723fcddf0a7bc0ae764dd2f749be60d70b5eba9e6dd85b94b035e54859cba7618bb166ecc1e63a78d26ad1aef07bc81f73fabc84d3 +SHA512 (nbdkit-1.8.2.tar.gz.sig) = c732c6cf3ce661e22981fd1301a8bee470905b6d142dbf0e7c87e5e2ad6c5dd77e47b42e10b8a1a1c090ff2725324093043abffb224a6e037611458374cdb04d From 9b5201c40fa13a2a29992eddad5314b4f82751c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 7 Jan 2019 10:12:40 +0000 Subject: [PATCH 36/41] New upstream version 1.8.3. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index f0590b8..152565c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.8-stable Name: nbdkit -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: NBD server @@ -940,6 +940,9 @@ popd %changelog +* Mon Jan 7 2019 Richard W.M. Jones - 1.8.3-1 +- New upstream version 1.8.3. + * Tue Dec 04 2018 Richard W.M. Jones - 1.8.2-1 - New upstream version 1.8.2. - Fix low priority security issue with TLS: diff --git a/sources b/sources index f411186..d2c2ffe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.8.2.tar.gz) = ee3ef065204e4d6df02d97723fcddf0a7bc0ae764dd2f749be60d70b5eba9e6dd85b94b035e54859cba7618bb166ecc1e63a78d26ad1aef07bc81f73fabc84d3 -SHA512 (nbdkit-1.8.2.tar.gz.sig) = c732c6cf3ce661e22981fd1301a8bee470905b6d142dbf0e7c87e5e2ad6c5dd77e47b42e10b8a1a1c090ff2725324093043abffb224a6e037611458374cdb04d +SHA512 (nbdkit-1.8.3.tar.gz) = c9cd9e328387b6fb7623a7aeb6cc07ce9e18e5c09c353e67f4218adbc299c5796283aabca761742e85ba0680f14d8a59503366c48027d41323126528f044252e +SHA512 (nbdkit-1.8.3.tar.gz.sig) = e0bd2656051621b71bd9ec4bda1acfa7095708a07933c2537abcce3b7725fbddb3419437c8f0ea6402de20980e2a699470aee715f2df7b59abe3da01d84a36c0 From 12f8665dd9ef5c8cb3beec1f4d78afbd194c7ca7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 18 Jan 2019 15:40:00 +0000 Subject: [PATCH 37/41] New upstream version 1.10.0. Add: nbdkit-full-plugin. Add: nbdkit-xz-filter. Add: nbdkit-loop(1) man page. Remove misguided LDFLAGS hack which removed server hardening. https://bugzilla.redhat.com/show_bug.cgi?id=1624149#c6 --- nbdkit.spec | 42 ++++++++++++++++++++++++++++++++++++------ sources | 4 ++-- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 152565c..50d215e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -28,10 +28,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.8-stable +%global source_directory 1.10-stable Name: nbdkit -Version: 1.8.3 +Version: 1.10.0 Release: 1%{?dist} Summary: NBD server @@ -171,6 +171,8 @@ nbdkit-file-plugin The normal file plugin for serving files. nbdkit-floppy-plugin Create a virtual floppy disk from a directory. +nbdkit-full-plugin A virtual disk that returns ENOSPC errors. + nbdkit-memory-plugin A virtual memory plugin. nbdkit-nbd-plugin An NBD forwarding plugin. @@ -505,6 +507,9 @@ Obsoletes: %{name}-plugin-xz <= %{version}-%{release} %description xz-plugin This package is a xz file serving plugin for %{name}. +This is deprecated and will be removed in %{name} 1.12. You should +start to use %{name}-xz-filter instead. + %package basic-filters Summary: Basic filters for %{name} @@ -540,6 +545,17 @@ nbdkit-partition-filter Serve a single partition. nbdkit-truncate-filter Truncate, expand, round up or round down size. +%package xz-filter +Summary: XZ filter for %{name} +License: BSD + +Requires: %{name}-server%{?_isa} = %{version}-%{release} + + +%description xz-filter +This package is the xz filter for %{name}. + + %package devel Summary: Development files and documentation for %{name} License: BSD @@ -585,10 +601,6 @@ autoreconf -i %build -# Force immediate binding for hardened build for plugins. -# https://bugzilla.redhat.com/show_bug.cgi?id=977446#c13 -export LDFLAGS="$LDFLAGS -Wl,-z,now" - # Build for Python 3 in a separate subdirectory. Upstream does not # support srcdir!=builddir so copy the whole source. copy="$(mktemp -d)" @@ -714,6 +726,7 @@ popd %dir %{_libdir}/%{name}/filters %{_mandir}/man1/nbdkit.1* %{_mandir}/man1/nbdkit-captive.1* +%{_mandir}/man1/nbdkit-loop.1* %{_mandir}/man1/nbdkit-probing.1* %{_mandir}/man1/nbdkit-protocol.1* %{_mandir}/man1/nbdkit-service.1* @@ -726,6 +739,7 @@ popd %{_libdir}/%{name}/plugins/nbdkit-data-plugin.so %{_libdir}/%{name}/plugins/nbdkit-file-plugin.so %{_libdir}/%{name}/plugins/nbdkit-floppy-plugin.so +%{_libdir}/%{name}/plugins/nbdkit-full-plugin.so %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so %{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so %{_libdir}/%{name}/plugins/nbdkit-null-plugin.so @@ -739,6 +753,7 @@ popd %{_mandir}/man1/nbdkit-data-plugin.1* %{_mandir}/man1/nbdkit-file-plugin.1* %{_mandir}/man1/nbdkit-floppy-plugin.1* +%{_mandir}/man1/nbdkit-full-plugin.1* %{_mandir}/man1/nbdkit-memory-plugin.1* %{_mandir}/man1/nbdkit-nbd-plugin.1* %{_mandir}/man1/nbdkit-null-plugin.1* @@ -913,6 +928,13 @@ popd %{_mandir}/man1/nbdkit-truncate-filter.1* +%files xz-filter +%doc README +%license LICENSE +%{_libdir}/%{name}/filters/nbdkit-xz-filter.so +%{_mandir}/man1/nbdkit-xz-filter.1* + + %files devel %doc OTHER_PLUGINS README TODO %license LICENSE @@ -940,6 +962,14 @@ popd %changelog +* Fri Jan 18 2019 Richard W.M. Jones - 1.10.0-1 +- New upstream version 1.10.0. +- Add: nbdkit-full-plugin. +- Add: nbdkit-xz-filter. +- Add: nbdkit-loop(1) man page. +- Remove misguided LDFLAGS hack which removed server hardening. + https://bugzilla.redhat.com/show_bug.cgi?id=1624149#c6 + * Mon Jan 7 2019 Richard W.M. Jones - 1.8.3-1 - New upstream version 1.8.3. diff --git a/sources b/sources index d2c2ffe..57cc36a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.8.3.tar.gz) = c9cd9e328387b6fb7623a7aeb6cc07ce9e18e5c09c353e67f4218adbc299c5796283aabca761742e85ba0680f14d8a59503366c48027d41323126528f044252e -SHA512 (nbdkit-1.8.3.tar.gz.sig) = e0bd2656051621b71bd9ec4bda1acfa7095708a07933c2537abcce3b7725fbddb3419437c8f0ea6402de20980e2a699470aee715f2df7b59abe3da01d84a36c0 +SHA512 (nbdkit-1.10.0.tar.gz) = b07bb88f61ffcd97da1a2eac3808808c44916a19ab8a2566a80b60514dc7a33f55e147163a872ec34586eb789b67dbf7113177a20c26c9ad114674abb952e50f +SHA512 (nbdkit-1.10.0.tar.gz.sig) = 37eefdd6fc16084e01fd6c696530b49aadbf0b9aa3cf96e140d748b98aba053d464af50ac2e8bcff23e88961f1e6f82bd8b46a8b026cdb719cbe8ecc0e2189b5 From 4f96ab3c63ac32d067964eccdd3a121dd2b2a21a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 26 Jan 2019 11:44:19 +0000 Subject: [PATCH 38/41] New upstream version 1.10.1. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 50d215e..fc672d8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.10-stable Name: nbdkit -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} Summary: NBD server @@ -962,6 +962,9 @@ popd %changelog +* Sat Jan 26 2019 Richard W.M. Jones - 1.10.1-1 +- New upstream version 1.10.1. + * Fri Jan 18 2019 Richard W.M. Jones - 1.10.0-1 - New upstream version 1.10.0. - Add: nbdkit-full-plugin. diff --git a/sources b/sources index 57cc36a..56d47f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.10.0.tar.gz) = b07bb88f61ffcd97da1a2eac3808808c44916a19ab8a2566a80b60514dc7a33f55e147163a872ec34586eb789b67dbf7113177a20c26c9ad114674abb952e50f -SHA512 (nbdkit-1.10.0.tar.gz.sig) = 37eefdd6fc16084e01fd6c696530b49aadbf0b9aa3cf96e140d748b98aba053d464af50ac2e8bcff23e88961f1e6f82bd8b46a8b026cdb719cbe8ecc0e2189b5 +SHA512 (nbdkit-1.10.1.tar.gz) = 57e7d3187690055316bb81f32006b947969959df7109623cfc76582154ae1e9f57cad22c15ae13f3578cbd4176d191ba70534b8877b2db5cbff27a3fca5178c2 +SHA512 (nbdkit-1.10.1.tar.gz.sig) = 5a07f907b1aa7e7f9c35737b408dd35991bf1d091cc2308dff0665cf4e47a4c083c54ab7dcd599762c682b30986afd6511afa40374e98af5328e3fa3412deac0 From 4b3e48d1fd3e9fc6c95601ea09c2f26111e399f3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 26 Jan 2019 12:56:33 +0000 Subject: [PATCH 39/41] Skip some tests on Fedora 28 with old qemu-io. --- nbdkit.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nbdkit.spec b/nbdkit.spec index fc672d8..e94c431 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -689,6 +689,12 @@ mkdir -p $HOME/.cache/libvirt export LIBGUESTFS_DEBUG=1 export LIBGUESTFS_TRACE=1 +# On Fedora 28, qemu-io < 3.0.0 does not exit with an error on +# failure, causing these tests to fail. +rm tests/test-error10.sh tests/test-error100.sh +touch tests/test-error10.sh tests/test-error100.sh +chmod +x tests/test-error10.sh tests/test-error100.sh + make check -j1 || { cat tests/test-suite.log exit 1 From 450e6a17464156fcad6860967273170a4502aade Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 28 Jan 2019 14:22:48 +0000 Subject: [PATCH 40/41] New upstream version 1.10.2. (cherry picked from commit 471f880fe0b69d26c16bb09f44a0446b04422efb) --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index e94c431..91d9e8e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.10-stable Name: nbdkit -Version: 1.10.1 +Version: 1.10.2 Release: 1%{?dist} Summary: NBD server @@ -968,6 +968,9 @@ popd %changelog +* Mon Jan 28 2019 Richard W.M. Jones - 1.10.2-1 +- New upstream version 1.10.2. + * Sat Jan 26 2019 Richard W.M. Jones - 1.10.1-1 - New upstream version 1.10.1. diff --git a/sources b/sources index 56d47f4..1999f4e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.10.1.tar.gz) = 57e7d3187690055316bb81f32006b947969959df7109623cfc76582154ae1e9f57cad22c15ae13f3578cbd4176d191ba70534b8877b2db5cbff27a3fca5178c2 -SHA512 (nbdkit-1.10.1.tar.gz.sig) = 5a07f907b1aa7e7f9c35737b408dd35991bf1d091cc2308dff0665cf4e47a4c083c54ab7dcd599762c682b30986afd6511afa40374e98af5328e3fa3412deac0 +SHA512 (nbdkit-1.10.2.tar.gz) = 2a95051aa401353caa594f73dbc12863325c84c90eabc61d49c246d9b83bfa9b05b894feb94aaba877cdf86fbc90da646160e4052f1894a36f25a94f3f59fc96 +SHA512 (nbdkit-1.10.2.tar.gz.sig) = 106839a23e8812475d54b600d00cd675c6901223293ce52b8c01a4f8fc58ef5a72e6fb4378118a3e14fc8b4c2fdef8811cf38bfeabf42589e75c73bb37c42f5d From bbdd157e2a15a1601b936c3efff7b751a4d1b908 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Jan 2019 19:57:27 +0000 Subject: [PATCH 41/41] New upstream version 1.10.3. (cherry picked from commit d99c935aaa91c9bc0a2d6bb35f55c9200c592bed) --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 91d9e8e..f28aafd 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.10-stable Name: nbdkit -Version: 1.10.2 +Version: 1.10.3 Release: 1%{?dist} Summary: NBD server @@ -968,6 +968,9 @@ popd %changelog +* Wed Jan 30 2019 Richard W.M. Jones - 1.10.3-1 +- New upstream version 1.10.3. + * Mon Jan 28 2019 Richard W.M. Jones - 1.10.2-1 - New upstream version 1.10.2. diff --git a/sources b/sources index 1999f4e..f22feaa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.10.2.tar.gz) = 2a95051aa401353caa594f73dbc12863325c84c90eabc61d49c246d9b83bfa9b05b894feb94aaba877cdf86fbc90da646160e4052f1894a36f25a94f3f59fc96 -SHA512 (nbdkit-1.10.2.tar.gz.sig) = 106839a23e8812475d54b600d00cd675c6901223293ce52b8c01a4f8fc58ef5a72e6fb4378118a3e14fc8b4c2fdef8811cf38bfeabf42589e75c73bb37c42f5d +SHA512 (nbdkit-1.10.3.tar.gz) = 8faed51b89c020ed480eb8c1e16ac628471cd62638a2a0ac993bf16f286ad9938532bf73c2d780a7dd0f13cabe38c3ccd2e2647ef88b7163287e02ceb1cc1b41 +SHA512 (nbdkit-1.10.3.tar.gz.sig) = fb4929454b43fb08367972f9a46892e36300f38dc3e02597b2f5e32c91ef626d2f5a4999a8c489077e78e8cdfa73c0ee95ffa3fa47c8689f5838ca97df8b7d59