From 9946ca4ae6b2f05a8f5f2576a0e5e9dd07fdff38 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 7 Mar 2019 07:54:49 +0000 Subject: [PATCH 01/32] Remove workaround for QEMU bug which is fixed in Fedora 30+. Make the tests run in parallel, otherwise they are too slow. (cherry picked from commit 325808dc9d28efd3a7af3e8e0dbeefdc8ac14e0d) --- nbdkit.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index cf54745..6d6d5d3 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -708,16 +708,7 @@ mkdir -p $HOME/.cache/libvirt export LIBGUESTFS_DEBUG=1 export LIBGUESTFS_TRACE=1 -%ifarch %{complete_test_arches} -# qemu in Fedora Rawhide broken: -# https://bugzilla.redhat.com/show_bug.cgi?id=1650975 -make -C tests test-error -rm tests/test-error -touch tests/test-error -chmod +x tests/test-error -%endif - -make check -j1 || { +make %{?_smp_mflags} check || { cat tests/test-suite.log exit 1 } @@ -726,7 +717,7 @@ make check -j1 || { %if 0%{?have_libguestfs} %if 0%{?have_python3} pushd python3 -make check -j1 -C tests TESTS=test-python || { +make %{?_smp_mflags} check -C tests TESTS=test-python || { cat tests/test-suite.log exit 1 } From 6054a9a50ed2c87bf389e9ea67e0cfbb772cb20a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Mar 2019 21:55:13 +0000 Subject: [PATCH 02/32] New upstream version 1.11.8. (cherry picked from commit 53b3645e714bea1a82f364a99f1cc822f8d7df33) --- nbdkit.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 6d6d5d3..d8e7c2c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.7 +Version: 1.11.8 Release: 1%{?dist} Summary: NBD server @@ -997,6 +997,11 @@ popd %changelog +* Tue Mar 12 2019 Richard W.M. Jones - 1.11.8-1 +- New upstream version 1.11.8. +- Remove workaround for QEMU bug which is fixed in Fedora 30+. +- Make the tests run in parallel, otherwise they are too slow. + * Thu Mar 07 2019 Richard W.M. Jones - 1.11.7-1 - New upstream version 1.11.7. - Add nbdkit ssh plugin. diff --git a/sources b/sources index cddc0c3..94f6c82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.7.tar.gz) = c86161122d4f1060eab0b2aba319e29944649b453c44d9a1f7d660cc0d01b953f3808bfe41fcbf8c932c0a7d73011a692445a18cd48e6f4f7bf83a66bd1c6abd -SHA512 (nbdkit-1.11.7.tar.gz.sig) = 89a0f77db0964219883802dc4060d6e645d4c826e35bfd1a3ba9412c291d7802c194b700105e2db35d876657099bb5d26990ad78e6b67f16ddfed3464e931d7b +SHA512 (nbdkit-1.11.8.tar.gz) = 80b56c7cdfa56dfa259c8e04161a6127a933c7ca7b8f3de52ae76ef57d5f7b3de4ba5abe0aae3012a40ce16d3b1aabadf18e9cf740cf4320c8a7996ef6648e02 +SHA512 (nbdkit-1.11.8.tar.gz.sig) = eff8330ba8e463e35e7639c346c05a3f9bfce7f18e9073627f38a3ab414d27b924f67733ceb815afc4b5d53468f78532e7ef53ce95e5d6f79c1a8df714815d58 From 719ba5206180f8e610d345a2b412449dee7edfa6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Mar 2019 22:14:58 +0000 Subject: [PATCH 03/32] tests: Use a more robust method to create the test disk atomically. (cherry picked from commit 43f581b4342fbc586dfc762658fbf9a756a2cac9) --- ...-robust-method-to-create-the-test-di.patch | 31 +++++++++++++++++++ nbdkit.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch diff --git a/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch b/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch new file mode 100644 index 0000000..71ecdc6 --- /dev/null +++ b/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch @@ -0,0 +1,31 @@ +From 183d81fa792fd024f62d068ead9cad0cc53d3c8e Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 12 Mar 2019 22:13:24 +0000 +Subject: [PATCH] tests: Use a more robust method to create the test disk + atomically. + +--- + tests/Makefile.am | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 1712565..f50a35e 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -334,9 +334,10 @@ check_DATA += disk + CLEANFILES += disk + + disk: +- rm -f $@ test1.img +- guestfish -N fs:ext4:100M -m /dev/sda1 write /hello.txt "hello,world" +- mv test1.img disk ++ rm -f $@ $@-t ++ guestfish -N $@-t=fs:ext4:100M -m /dev/sda1 \ ++ write /hello.txt "hello,world" ++ mv $@-t $@ + + endif HAVE_GUESTFISH + +-- +2.20.1 + diff --git a/nbdkit.spec b/nbdkit.spec index d8e7c2c..f75a0d2 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -25,7 +25,8 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} +#%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 # The source directory. %global source_directory 1.11-development @@ -45,6 +46,9 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name Source2: libguestfs.keyring %endif +# Upstream patch for tests. +Patch1: 0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif From 2e222f7a50f15fd8f2d2f05ee7ce968724cf82e8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Mar 2019 22:21:01 +0000 Subject: [PATCH 04/32] +BR ssh-keygen. (cherry picked from commit 214b66bb6ff281336305c4b96161e73b3aab9bc4) --- nbdkit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nbdkit.spec b/nbdkit.spec index f75a0d2..1d8b14a 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -106,6 +106,7 @@ BuildRequires: /usr/bin/certtool BuildRequires: /usr/bin/qemu-img BuildRequires: /usr/bin/socat BuildRequires: /usr/sbin/ss +BuildRequires: /usr/bin/ssh-keygen # nbdkit is a metapackage pulling the server and a useful subset # of the plugins and filters. From 50976ce9cbd82f7a61fb96658846d716426b8b0b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 23 Mar 2019 12:15:22 +0000 Subject: [PATCH 05/32] New upstream version 1.11.9. (cherry picked from commit ff7421fe0e4aa28bc540e673fbd5b2866c7f81e0) --- ...-robust-method-to-create-the-test-di.patch | 31 ------------------- nbdkit.spec | 11 +++---- 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch diff --git a/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch b/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch deleted file mode 100644 index 71ecdc6..0000000 --- a/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 183d81fa792fd024f62d068ead9cad0cc53d3c8e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 12 Mar 2019 22:13:24 +0000 -Subject: [PATCH] tests: Use a more robust method to create the test disk - atomically. - ---- - tests/Makefile.am | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1712565..f50a35e 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -334,9 +334,10 @@ check_DATA += disk - CLEANFILES += disk - - disk: -- rm -f $@ test1.img -- guestfish -N fs:ext4:100M -m /dev/sda1 write /hello.txt "hello,world" -- mv test1.img disk -+ rm -f $@ $@-t -+ guestfish -N $@-t=fs:ext4:100M -m /dev/sda1 \ -+ write /hello.txt "hello,world" -+ mv $@-t $@ - - endif HAVE_GUESTFISH - --- -2.20.1 - diff --git a/nbdkit.spec b/nbdkit.spec index 1d8b14a..ba2ce15 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -25,14 +25,13 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -#%global patches_touch_autotools %{nil} -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.11-development Name: nbdkit -Version: 1.11.8 +Version: 1.11.9 Release: 1%{?dist} Summary: NBD server @@ -46,9 +45,6 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name Source2: libguestfs.keyring %endif -# Upstream patch for tests. -Patch1: 0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -1002,6 +998,9 @@ popd %changelog +* Sat Mar 23 2019 Richard W.M. Jones - 1.11.9-1 +- New upstream version 1.11.9. + * Tue Mar 12 2019 Richard W.M. Jones - 1.11.8-1 - New upstream version 1.11.8. - Remove workaround for QEMU bug which is fixed in Fedora 30+. From b459bddaad97e6b2968a5e41ea2e495d9677a6fd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 23 Mar 2019 12:19:10 +0000 Subject: [PATCH 06/32] Forgot to upload sources to previous commit. (cherry picked from commit 74708da224755c55f46b5ebe6f8cbf8721a8a995) --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 94f6c82..79d4b48 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.8.tar.gz) = 80b56c7cdfa56dfa259c8e04161a6127a933c7ca7b8f3de52ae76ef57d5f7b3de4ba5abe0aae3012a40ce16d3b1aabadf18e9cf740cf4320c8a7996ef6648e02 -SHA512 (nbdkit-1.11.8.tar.gz.sig) = eff8330ba8e463e35e7639c346c05a3f9bfce7f18e9073627f38a3ab414d27b924f67733ceb815afc4b5d53468f78532e7ef53ce95e5d6f79c1a8df714815d58 +SHA512 (nbdkit-1.11.9.tar.gz) = 99e19ac13b02f0c6b95eb3f78ad014900cab143d5769996d4c23193f4975701cb6cdc59a23c1a078f3e5e4e61be5761c60c818ab930f6d0e4900e363f3a6a2c5 +SHA512 (nbdkit-1.11.9.tar.gz.sig) = f83101b97c7b187418e95f285f2afcd8e217a62bfd9bb0e8dd34083ecca6c39ce1a2400793b1078faa5d6391fc0455b09f93566e42239c993bdbdd905c00531f From 306c6122792b850512e38ead567b9b90eb98f963 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 28 Mar 2019 16:36:44 +0000 Subject: [PATCH 07/32] New upstream version 1.11.10. (cherry picked from commit 60d0fe0e688f1708076e2e72e2797321e03a6179) --- nbdkit.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index ba2ce15..aab221f 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.9 +Version: 1.11.10 Release: 1%{?dist} Summary: NBD server @@ -99,6 +99,7 @@ BuildRequires: gnupg2 # Only for running the test suite: BuildRequires: /usr/bin/certtool +BuildRequires: jq BuildRequires: /usr/bin/qemu-img BuildRequires: /usr/bin/socat BuildRequires: /usr/sbin/ss @@ -998,6 +999,9 @@ popd %changelog +* Thu Mar 28 2019 Richard W.M. Jones - 1.11.10-1 +- New upstream version 1.11.10. + * Sat Mar 23 2019 Richard W.M. Jones - 1.11.9-1 - New upstream version 1.11.9. diff --git a/sources b/sources index 79d4b48..ddc5be2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.9.tar.gz) = 99e19ac13b02f0c6b95eb3f78ad014900cab143d5769996d4c23193f4975701cb6cdc59a23c1a078f3e5e4e61be5761c60c818ab930f6d0e4900e363f3a6a2c5 -SHA512 (nbdkit-1.11.9.tar.gz.sig) = f83101b97c7b187418e95f285f2afcd8e217a62bfd9bb0e8dd34083ecca6c39ce1a2400793b1078faa5d6391fc0455b09f93566e42239c993bdbdd905c00531f +SHA512 (nbdkit-1.11.10.tar.gz) = 8fa205a60579e1c54c61ec6e0d37b78f75b3bc42286749e9cbc335a9369679777cf451f38c40778ef201b530bb3cb4bb2af55bd07b9a0ae4dc67f4b838b0e5f0 +SHA512 (nbdkit-1.11.10.tar.gz.sig) = 3aae4592b34fae6dbb7cdd90dec0462dee09bdd2afd9d54923261abdafa01c4c15526916779dd689854c09102dfb87dbef57bf2b32537e0ae5b8b0bc6ce37566 From e96c9ca23f8a8325152005b891331b86ef422f1e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Mar 2019 13:54:47 +0000 Subject: [PATCH 08/32] New upstream version 1.11.11. (cherry picked from commit 929d1f7a4e2bcf40aefe93b1accdea86e9d4f65f) --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index aab221f..49dbd28 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.10 +Version: 1.11.11 Release: 1%{?dist} Summary: NBD server @@ -999,6 +999,9 @@ popd %changelog +* Fri Mar 29 2019 Richard W.M. Jones - 1.11.11-1 +- New upstream version 1.11.11. + * Thu Mar 28 2019 Richard W.M. Jones - 1.11.10-1 - New upstream version 1.11.10. diff --git a/sources b/sources index ddc5be2..83c6570 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.10.tar.gz) = 8fa205a60579e1c54c61ec6e0d37b78f75b3bc42286749e9cbc335a9369679777cf451f38c40778ef201b530bb3cb4bb2af55bd07b9a0ae4dc67f4b838b0e5f0 -SHA512 (nbdkit-1.11.10.tar.gz.sig) = 3aae4592b34fae6dbb7cdd90dec0462dee09bdd2afd9d54923261abdafa01c4c15526916779dd689854c09102dfb87dbef57bf2b32537e0ae5b8b0bc6ce37566 +SHA512 (nbdkit-1.11.11.tar.gz) = 85569fde8ac96b69d09ebf6c7fef22bde3a447764fc08b1b32112536088b5d60e18ce8086527bf9d1a58c656ba79c8f20c3161ab020e1b4b00cbe745046e8408 +SHA512 (nbdkit-1.11.11.tar.gz.sig) = 7f2545ec3a21ef771dc16ef6ab348761211bf4d597da9257f15a26f77fb2817baa9d69ad51b9748408c3ab29dfff4bc4052131d33850ed57ed8694813b5e2f70 From 7ad75a1b51d1d20e8828373bac71b2a5a4c37417 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Apr 2019 12:11:49 +0100 Subject: [PATCH 09/32] New upstream version 1.11.12. New nbdkit-readahead-filter. (cherry picked from commit 4e9723a10711c451b149de66f422775da383e561) --- nbdkit.spec | 10 +++++++++- sources | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 49dbd28..008a84d 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.11 +Version: 1.11.12 Release: 1%{?dist} Summary: NBD server @@ -559,6 +559,8 @@ nbdkit-partition-filter Serve a single partition. nbdkit-rate-filter Limit bandwidth by connection or server. +nbdkit-readahead-filter Prefetch data when reading sequentially. + nbdkit-truncate-filter Truncate, expand, round up or round down size. @@ -950,6 +952,7 @@ popd %{_libdir}/%{name}/filters/nbdkit-offset-filter.so %{_libdir}/%{name}/filters/nbdkit-partition-filter.so %{_libdir}/%{name}/filters/nbdkit-rate-filter.so +%{_libdir}/%{name}/filters/nbdkit-readahead-filter.so %{_libdir}/%{name}/filters/nbdkit-truncate-filter.so %{_mandir}/man1/nbdkit-blocksize-filter.1* %{_mandir}/man1/nbdkit-cache-filter.1* @@ -962,6 +965,7 @@ popd %{_mandir}/man1/nbdkit-offset-filter.1* %{_mandir}/man1/nbdkit-partition-filter.1* %{_mandir}/man1/nbdkit-rate-filter.1* +%{_mandir}/man1/nbdkit-readahead-filter.1* %{_mandir}/man1/nbdkit-truncate-filter.1* @@ -999,6 +1003,10 @@ popd %changelog +* Tue Apr 02 2019 Richard W.M. Jones - 1.11.12-1 +- New upstream version 1.11.12. +- New nbdkit-readahead-filter. + * Fri Mar 29 2019 Richard W.M. Jones - 1.11.11-1 - New upstream version 1.11.11. diff --git a/sources b/sources index 83c6570..551e661 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.11.tar.gz) = 85569fde8ac96b69d09ebf6c7fef22bde3a447764fc08b1b32112536088b5d60e18ce8086527bf9d1a58c656ba79c8f20c3161ab020e1b4b00cbe745046e8408 -SHA512 (nbdkit-1.11.11.tar.gz.sig) = 7f2545ec3a21ef771dc16ef6ab348761211bf4d597da9257f15a26f77fb2817baa9d69ad51b9748408c3ab29dfff4bc4052131d33850ed57ed8694813b5e2f70 +SHA512 (nbdkit-1.11.12.tar.gz) = 94e815915682807e326aa6b3c956dae1214807452535d8206122a4f1e834d2e46e327e87602ac18b283b96a956b41eb3e1ae54cdff5ab2c32f955ac6cd799985 +SHA512 (nbdkit-1.11.12.tar.gz.sig) = 2fc24dc3a3369c5c26a5187630859d44321db1800c7600adad616017ee79149f0e2fb4d8cbe01c5cf3c7d0a4bd81601a74d8bc61f0ea842c5c31540146efc047 From 18a7816b4066761554b8f51661601c75f1ca5a6b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Apr 2019 22:14:36 +0100 Subject: [PATCH 10/32] New upstream version 1.11.13. (cherry picked from commit f2d242ec5daa0420be798b343ab50907c921a22f) --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 008a84d..e8f5294 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.12 +Version: 1.11.13 Release: 1%{?dist} Summary: NBD server @@ -1003,6 +1003,9 @@ popd %changelog +* Tue Apr 02 2019 Richard W.M. Jones - 1.11.13-1 +- New upstream version 1.11.13. + * Tue Apr 02 2019 Richard W.M. Jones - 1.11.12-1 - New upstream version 1.11.12. - New nbdkit-readahead-filter. diff --git a/sources b/sources index 551e661..897b56c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.12.tar.gz) = 94e815915682807e326aa6b3c956dae1214807452535d8206122a4f1e834d2e46e327e87602ac18b283b96a956b41eb3e1ae54cdff5ab2c32f955ac6cd799985 -SHA512 (nbdkit-1.11.12.tar.gz.sig) = 2fc24dc3a3369c5c26a5187630859d44321db1800c7600adad616017ee79149f0e2fb4d8cbe01c5cf3c7d0a4bd81601a74d8bc61f0ea842c5c31540146efc047 +SHA512 (nbdkit-1.11.13.tar.gz) = 97a8204f5665d3a0a46a621a50e6158c852391916a73fee1fe682c4330cc9ba6cba94859d1cdc0ce5f48f11601ae11892b81efd16f6666d9828da9e5f6d95f6e +SHA512 (nbdkit-1.11.13.tar.gz.sig) = 2bc20b83f905d02690bab64cf23373ea3cdb9f45118dd321216742d29afb48b1140bc861b60479bebc42319163931fb16f9efa69fcadf68c6da77663b6782068 From 0f020dc1b1d31fc520f7ea3822916ef8a5d53d77 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 6 Apr 2019 16:14:09 +0100 Subject: [PATCH 11/32] New upstream version 1.11.14. Remove deprecated nbdkit-xz-plugin (replaced by nbdkit-xz-filter). (cherry picked from commit a7dbaded7d4bb759c44dc86535032bf003102d29) --- nbdkit.spec | 35 +++++++++-------------------------- sources | 4 ++-- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index e8f5294..a49e44c 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.13 +Version: 1.11.14 Release: 1%{?dist} Summary: NBD server @@ -508,24 +508,6 @@ VMware VDDK for accessing VMware disks and servers. %endif -%package xz-plugin -Summary: XZ file serving plugin for %{name} -License: BSD - -Requires: %{name}-server%{?_isa} = %{version}-%{release} - -# For upgrade path, remove this in Fedora 31. -Provides: %{name}-plugin-xz = %{version}-%{release} -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} License: BSD @@ -570,6 +552,10 @@ License: BSD Requires: %{name}-server%{?_isa} = %{version}-%{release} +# Remove in Fedora 33: +Provides: %{name}-xz-plugin = %{version}-%{release} +Obsoletes: %{name}-xz-plugin <= %{version}-%{release} + %description xz-filter This package is the xz filter for %{name}. @@ -931,13 +917,6 @@ popd %endif -%files xz-plugin -%doc README -%license LICENSE -%{_libdir}/%{name}/plugins/nbdkit-xz-plugin.so -%{_mandir}/man1/nbdkit-xz-plugin.1* - - %files basic-filters %doc README %license LICENSE @@ -1003,6 +982,10 @@ popd %changelog +* Sat Apr 06 2019 Richard W.M. Jones - 1.11.14-1 +- New upstream version 1.11.14. +- Remove deprecated nbdkit-xz-plugin (replaced by nbdkit-xz-filter). + * Tue Apr 02 2019 Richard W.M. Jones - 1.11.13-1 - New upstream version 1.11.13. diff --git a/sources b/sources index 897b56c..5c00cc8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.13.tar.gz) = 97a8204f5665d3a0a46a621a50e6158c852391916a73fee1fe682c4330cc9ba6cba94859d1cdc0ce5f48f11601ae11892b81efd16f6666d9828da9e5f6d95f6e -SHA512 (nbdkit-1.11.13.tar.gz.sig) = 2bc20b83f905d02690bab64cf23373ea3cdb9f45118dd321216742d29afb48b1140bc861b60479bebc42319163931fb16f9efa69fcadf68c6da77663b6782068 +SHA512 (nbdkit-1.11.14.tar.gz) = fc3ef8ea1f925f4f97c928f6f9f1b85e3165fbd2a9de0a0a62389033e416375cb13cc91581594560a7fab11714328137970b108c69070c336ab59c835831efc4 +SHA512 (nbdkit-1.11.14.tar.gz.sig) = a280b8502070535b304302f60fc94acf9488b8a96b1ddc4a75de866e5438da58d504ef62b17ea7a61f922d6d727c660c06841721c6090d4bf9fab2d41f0c7ef9 From 5765a7dc6f60cde0bb40bd5e096e5741c293a995 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 8 Apr 2019 21:35:56 +0100 Subject: [PATCH 12/32] New upstream version 1.11.15. (cherry picked from commit 543e91948eec51f2809d2bb028a271d5bd22da5f) --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index a49e44c..89b1208 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.11-development Name: nbdkit -Version: 1.11.14 +Version: 1.11.15 Release: 1%{?dist} Summary: NBD server @@ -982,6 +982,9 @@ popd %changelog +* Mon Apr 08 2019 Richard W.M. Jones - 1.11.15-1 +- New upstream version 1.11.15. + * Sat Apr 06 2019 Richard W.M. Jones - 1.11.14-1 - New upstream version 1.11.14. - Remove deprecated nbdkit-xz-plugin (replaced by nbdkit-xz-filter). diff --git a/sources b/sources index 5c00cc8..8576ce6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.14.tar.gz) = fc3ef8ea1f925f4f97c928f6f9f1b85e3165fbd2a9de0a0a62389033e416375cb13cc91581594560a7fab11714328137970b108c69070c336ab59c835831efc4 -SHA512 (nbdkit-1.11.14.tar.gz.sig) = a280b8502070535b304302f60fc94acf9488b8a96b1ddc4a75de866e5438da58d504ef62b17ea7a61f922d6d727c660c06841721c6090d4bf9fab2d41f0c7ef9 +SHA512 (nbdkit-1.11.15.tar.gz) = e1fbe99fd61c0aabf340a15a09fdd7026f890d17ed31cfe5c37ef86c8afb3247921dfa31e2862968b3374c81ae82ffc1a3611469ac8bd850684a8c7fc8d7464e +SHA512 (nbdkit-1.11.15.tar.gz.sig) = 3785b13b3d21e8ee166522de4e2f3c9291489490aeb7e92a45a379f09b6c1edabbdceac91f459f22b1f143a319d86ef571c7132f1a62467fc37007979a749afc From 321197087dda8171bd295e7b79fca664836d805d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 10 Apr 2019 13:45:05 +0100 Subject: [PATCH 13/32] New upstream version 1.12.0. Add noextents filter. (cherry picked from commit 08e33b1f6db80c290c55ec2ae378ade888335398) --- nbdkit.spec | 12 ++++++++++-- sources | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 89b1208..1eba64a 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -28,10 +28,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.11-development +%global source_directory 1.12-stable Name: nbdkit -Version: 1.11.15 +Version: 1.12.0 Release: 1%{?dist} Summary: NBD server @@ -533,6 +533,8 @@ nbdkit-fua-filter Modify flush behaviour in plugins. nbdkit-log-filter Log all transactions to a file. +nbdkit-noextents-filter Disable extents in the underlying plugin. + nbdkit-nozero-filter Adjust handling of zero requests by plugins. nbdkit-offset-filter Serve an offset and range. @@ -927,6 +929,7 @@ popd %{_libdir}/%{name}/filters/nbdkit-error-filter.so %{_libdir}/%{name}/filters/nbdkit-fua-filter.so %{_libdir}/%{name}/filters/nbdkit-log-filter.so +%{_libdir}/%{name}/filters/nbdkit-noextents-filter.so %{_libdir}/%{name}/filters/nbdkit-nozero-filter.so %{_libdir}/%{name}/filters/nbdkit-offset-filter.so %{_libdir}/%{name}/filters/nbdkit-partition-filter.so @@ -940,6 +943,7 @@ popd %{_mandir}/man1/nbdkit-error-filter.1* %{_mandir}/man1/nbdkit-fua-filter.1* %{_mandir}/man1/nbdkit-log-filter.1* +%{_mandir}/man1/nbdkit-noextents-filter.1* %{_mandir}/man1/nbdkit-nozero-filter.1* %{_mandir}/man1/nbdkit-offset-filter.1* %{_mandir}/man1/nbdkit-partition-filter.1* @@ -982,6 +986,10 @@ popd %changelog +* Wed Apr 10 2019 Richard W.M. Jones - 1.12.0-1 +- New upstream version 1.12.0. +- Add noextents filter. + * Mon Apr 08 2019 Richard W.M. Jones - 1.11.15-1 - New upstream version 1.11.15. diff --git a/sources b/sources index 8576ce6..f87841a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.11.15.tar.gz) = e1fbe99fd61c0aabf340a15a09fdd7026f890d17ed31cfe5c37ef86c8afb3247921dfa31e2862968b3374c81ae82ffc1a3611469ac8bd850684a8c7fc8d7464e -SHA512 (nbdkit-1.11.15.tar.gz.sig) = 3785b13b3d21e8ee166522de4e2f3c9291489490aeb7e92a45a379f09b6c1edabbdceac91f459f22b1f143a319d86ef571c7132f1a62467fc37007979a749afc +SHA512 (nbdkit-1.12.0.tar.gz) = 9587ef2823f27b91a6e20285cfedc531d8ce4cf375bb50688c7214b2c60e109fbbcbffae711d59dc83ce39f46707fbf21e953997b496c882a792351c0bdf079e +SHA512 (nbdkit-1.12.0.tar.gz.sig) = 4451e5ce8ebebcbc89cc113af11596ac16aa607649731759862d1c44a92a746a04d1ff2450da6a8a1be486bde5df84420d98690b595c7c53f6b322ca7f2a7d8c From fbcb60f7b469faa4c0fd688a78f0b4a8b5fa6698 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 13 Apr 2019 08:27:25 +0100 Subject: [PATCH 14/32] New upstream version 1.12.1. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 1eba64a..f7537a3 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?dist} Summary: NBD server @@ -986,6 +986,9 @@ popd %changelog +* Sat Apr 13 2019 Richard W.M. Jones - 1.12.0-1 +- New upstream version 1.12.1. + * Wed Apr 10 2019 Richard W.M. Jones - 1.12.0-1 - New upstream version 1.12.0. - Add noextents filter. diff --git a/sources b/sources index f87841a..3c6541f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.0.tar.gz) = 9587ef2823f27b91a6e20285cfedc531d8ce4cf375bb50688c7214b2c60e109fbbcbffae711d59dc83ce39f46707fbf21e953997b496c882a792351c0bdf079e -SHA512 (nbdkit-1.12.0.tar.gz.sig) = 4451e5ce8ebebcbc89cc113af11596ac16aa607649731759862d1c44a92a746a04d1ff2450da6a8a1be486bde5df84420d98690b595c7c53f6b322ca7f2a7d8c +SHA512 (nbdkit-1.12.1.tar.gz) = 67e0c4fd19b8b7fa6ea2702b63405d71701ad88bb907fa7c7979d8c24d0108a9caab83e3787492c12e1101befb516ea3b63e1a621600e393791b494ebe487876 +SHA512 (nbdkit-1.12.1.tar.gz.sig) = 4ca89b2fe8dcd3d84739ac9ab07f620d24c6bf268af1b3fd77cd9f6fa6f1573e1e2c37c5f36574dcb05869a7f4561decfc361dddedb4b496fa314db0d337585d From e737090f999566201e50287eeb1d612fb0f7204d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Apr 2019 18:03:53 +0100 Subject: [PATCH 15/32] New stable version 1.12.2. Distribute BENCHMARKING and SECURITY files. Includes a fix for possible remote memory heap leak with user plugins. --- nbdkit.spec | 13 +++++++++---- sources | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index f7537a3..3dd7214 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: NBD server @@ -960,7 +960,7 @@ popd %files devel -%doc OTHER_PLUGINS README TODO +%doc BENCHMARKING OTHER_PLUGINS README SECURITY TODO %license LICENSE # Include the source of the example plugins in the documentation. %doc plugins/example*/*.c @@ -986,8 +986,13 @@ popd %changelog -* Sat Apr 13 2019 Richard W.M. Jones - 1.12.0-1 -- New upstream version 1.12.1. +* Tue Apr 23 2019 Richard W.M. Jones - 1.12.2-1 +- New stable version 1.12.2. +- Distribute BENCHMARKING and SECURITY files. +- Includes a fix for possible remote memory heap leak with user plugins. + +* Sat Apr 13 2019 Richard W.M. Jones - 1.12.1-1 +- New stable version 1.12.1. * Wed Apr 10 2019 Richard W.M. Jones - 1.12.0-1 - New upstream version 1.12.0. diff --git a/sources b/sources index 3c6541f..e324aa7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.1.tar.gz) = 67e0c4fd19b8b7fa6ea2702b63405d71701ad88bb907fa7c7979d8c24d0108a9caab83e3787492c12e1101befb516ea3b63e1a621600e393791b494ebe487876 -SHA512 (nbdkit-1.12.1.tar.gz.sig) = 4ca89b2fe8dcd3d84739ac9ab07f620d24c6bf268af1b3fd77cd9f6fa6f1573e1e2c37c5f36574dcb05869a7f4561decfc361dddedb4b496fa314db0d337585d +SHA512 (nbdkit-1.12.2.tar.gz) = e072c6602c7f424db9a3911bb7077432dc19de89a452d2a105745d0865fbe79cc41e5a5e4e461fc124bc1c8b1b262903fce19b85fa3ee80b475bd9e270126e15 +SHA512 (nbdkit-1.12.2.tar.gz.sig) = e996457fa51db6230f1ca890d5bb0f2c6681720c61bd0799825b0728608cc7a72658849f33c2a4d6d2c933414c8f901d0b9653334730e11ceb4ba0cccc855fdf From b3f9252811c2ab33bc3d8f125fba999ce6cc619c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 May 2019 11:24:25 +0100 Subject: [PATCH 16/32] New stable version 1.12.3. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 3dd7214..fd4c1b8 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.2 +Version: 1.12.3 Release: 1%{?dist} Summary: NBD server @@ -986,6 +986,9 @@ popd %changelog +* Tue May 21 2019 Richard W.M. Jones - 1.12.3-1 +- New stable version 1.12.3. + * Tue Apr 23 2019 Richard W.M. Jones - 1.12.2-1 - New stable version 1.12.2. - Distribute BENCHMARKING and SECURITY files. diff --git a/sources b/sources index e324aa7..7a035fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.2.tar.gz) = e072c6602c7f424db9a3911bb7077432dc19de89a452d2a105745d0865fbe79cc41e5a5e4e461fc124bc1c8b1b262903fce19b85fa3ee80b475bd9e270126e15 -SHA512 (nbdkit-1.12.2.tar.gz.sig) = e996457fa51db6230f1ca890d5bb0f2c6681720c61bd0799825b0728608cc7a72658849f33c2a4d6d2c933414c8f901d0b9653334730e11ceb4ba0cccc855fdf +SHA512 (nbdkit-1.12.3.tar.gz) = 65662a31485609ab0722f95fd06497e72ff7a77e66195c585e775cd724fca8e2813fb39158d7befba741fdce09e33ae088ef79b4a1de3377a6c48927cb2ddfe1 +SHA512 (nbdkit-1.12.3.tar.gz.sig) = a6307204f9b12f8e49cf739277e0b299ba3970471d14c81dcc2726c357d94269d300cec82bcb2b0625f7ea9bcecde62c64b032b48c04846599a4719d46b446e0 From d473b435274ad202a01f191857976b64a3e32c69 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 26 Jul 2019 10:55:25 +0100 Subject: [PATCH 17/32] New stable version 1.12.4. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index fd4c1b8..7a59740 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.3 +Version: 1.12.4 Release: 1%{?dist} Summary: NBD server @@ -986,6 +986,9 @@ popd %changelog +* Fri Jul 26 2019 Richard W.M. Jones - 1.12.4-1 +- New stable version 1.12.4. + * Tue May 21 2019 Richard W.M. Jones - 1.12.3-1 - New stable version 1.12.3. diff --git a/sources b/sources index 7a035fc..ff361f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.3.tar.gz) = 65662a31485609ab0722f95fd06497e72ff7a77e66195c585e775cd724fca8e2813fb39158d7befba741fdce09e33ae088ef79b4a1de3377a6c48927cb2ddfe1 -SHA512 (nbdkit-1.12.3.tar.gz.sig) = a6307204f9b12f8e49cf739277e0b299ba3970471d14c81dcc2726c357d94269d300cec82bcb2b0625f7ea9bcecde62c64b032b48c04846599a4719d46b446e0 +SHA512 (nbdkit-1.12.4.tar.gz) = 90e70e47cce04d5ea8097b589e4159840b61a80884e7b99d099a8d1972be9d11a38891b50eac0d0c1e29559646b2206b5a0cdf8d4acb72caf208b90eb090c19a +SHA512 (nbdkit-1.12.4.tar.gz.sig) = ab87809fe664918c46484eee9f31170ff8a8bc67ae1a0691e3584ba5f6cf8e9330cf8b28e55e64af2d5cce60c33f46874651057c533ee17685b9d279ae6d18c2 From 97d61bff8ad0c630edfc0711045b13b019b62cb3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 2 Aug 2019 13:48:21 +0100 Subject: [PATCH 18/32] New stable version 1.12.5. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 7a59740..0a0444b 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.4 +Version: 1.12.5 Release: 1%{?dist} Summary: NBD server @@ -986,6 +986,9 @@ popd %changelog +* Fri Aug 2 2019 Richard W.M. Jones - 1.12.5-1 +- New stable version 1.12.5. + * Fri Jul 26 2019 Richard W.M. Jones - 1.12.4-1 - New stable version 1.12.4. diff --git a/sources b/sources index ff361f4..1eb1ab3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.4.tar.gz) = 90e70e47cce04d5ea8097b589e4159840b61a80884e7b99d099a8d1972be9d11a38891b50eac0d0c1e29559646b2206b5a0cdf8d4acb72caf208b90eb090c19a -SHA512 (nbdkit-1.12.4.tar.gz.sig) = ab87809fe664918c46484eee9f31170ff8a8bc67ae1a0691e3584ba5f6cf8e9330cf8b28e55e64af2d5cce60c33f46874651057c533ee17685b9d279ae6d18c2 +SHA512 (nbdkit-1.12.5.tar.gz) = b868561130f51f921727aea036a159188a3f25c1d95818fd98259ae93eb728cf6f710e83e53c588581f32bfbcffa3ea9ec723f1723c3c589a0124ac66eb25b53 +SHA512 (nbdkit-1.12.5.tar.gz.sig) = ee798e101c1e734fc5b8eb5ba16dad3d9ee5bb64ea93dc2c8dc7639de25b5257072c8f4fb4effffacddc9caccccc8a8ab0776c4d87f0b79699442895ba6925c9 From a34b33e5e0537a57808a00e91448cdfa8ca15ffe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 21 Aug 2019 09:13:37 +0100 Subject: [PATCH 19/32] Add provides for all basic plugins and filters. (cherry picked from commit 331127737ac2606353756ce5ff062b05e46f3fbe) For Fedora 29/30: Modified this to exclude the filters which are not present in 1.12. --- nbdkit.spec | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/nbdkit.spec b/nbdkit.spec index 0a0444b..0186762 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -157,6 +157,20 @@ Summary: Basic plugins for %{name} License: BSD Requires: %{name}-server%{?_isa} = %{version}-%{release} +Provides: %{name}-data-plugin = %{version}-%{release} +Provides: %{name}-file-plugin = %{version}-%{release} +Provides: %{name}-floppy-plugin = %{version}-%{release} +Provides: %{name}-full-plugin = %{version}-%{release} +Provides: %{name}-memory-plugin = %{version}-%{release} +Provides: %{name}-nbd-plugin = %{version}-%{release} +Provides: %{name}-null-plugin = %{version}-%{release} +Provides: %{name}-pattern-plugin = %{version}-%{release} +Provides: %{name}-partitioning-plugin = %{version}-%{release} +Provides: %{name}-random-plugin = %{version}-%{release} +Provides: %{name}-sh-plugin = %{version}-%{release} +Provides: %{name}-split-plugin = %{version}-%{release} +Provides: %{name}-streaming-plugin = %{version}-%{release} +Provides: %{name}-zero-plugin = %{version}-%{release} %description basic-plugins @@ -513,6 +527,21 @@ Summary: Basic filters for %{name} License: BSD Requires: %{name}-server%{?_isa} = %{version}-%{release} +Provides: %{name}-blocksize-filter = %{version}-%{release} +Provides: %{name}-cache-filter = %{version}-%{release} +Provides: %{name}-cow-filter = %{version}-%{release} +Provides: %{name}-delay-filter = %{version}-%{release} +Provides: %{name}-error-filter = %{version}-%{release} +Provides: %{name}-fua-filter = %{version}-%{release} +Provides: %{name}-log-filter = %{version}-%{release} +Provides: %{name}-noextents-filter = %{version}-%{release} +Provides: %{name}-noparallel-filter = %{version}-%{release} +Provides: %{name}-nozero-filter = %{version}-%{release} +Provides: %{name}-offset-filter = %{version}-%{release} +Provides: %{name}-partition-filter = %{version}-%{release} +Provides: %{name}-rate-filter = %{version}-%{release} +Provides: %{name}-readahead-filter = %{version}-%{release} +Provides: %{name}-truncate-filter = %{version}-%{release} %description basic-filters From cf53426d08d98138863a1f695c7a3823a52a2fcf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 29 Aug 2019 13:10:56 +0100 Subject: [PATCH 20/32] New stable version 1.12.6. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 0186762..c2938d9 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.5 +Version: 1.12.6 Release: 1%{?dist} Summary: NBD server @@ -1015,6 +1015,9 @@ popd %changelog +* Thu Aug 29 2019 Richard W.M. Jones - 1.12.6-1 +- New stable version 1.12.6. + * Fri Aug 2 2019 Richard W.M. Jones - 1.12.5-1 - New stable version 1.12.5. diff --git a/sources b/sources index 1eb1ab3..c6cb6c9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.5.tar.gz) = b868561130f51f921727aea036a159188a3f25c1d95818fd98259ae93eb728cf6f710e83e53c588581f32bfbcffa3ea9ec723f1723c3c589a0124ac66eb25b53 -SHA512 (nbdkit-1.12.5.tar.gz.sig) = ee798e101c1e734fc5b8eb5ba16dad3d9ee5bb64ea93dc2c8dc7639de25b5257072c8f4fb4effffacddc9caccccc8a8ab0776c4d87f0b79699442895ba6925c9 +SHA512 (nbdkit-1.12.6.tar.gz) = 0e7bcd8e14fb748a2e651e119d975e76c6b9e312e006f19ccb7039df010ada0ae0d2ff8ee3a8e3503b83f311c59a9e92ba0e63b769b387224ab342958d5a582c +SHA512 (nbdkit-1.12.6.tar.gz.sig) = 7ffbee3077f4266ffee466c79875a9d2640b95825357bee9f37afcc71ca64ea5682d9d0a6f529259b9f42e459fc98d20d051fe41861a85cd765083ea666795a8 From 0feddf862e37af165f668f5a76f3aa75250f0dfa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 Sep 2019 18:46:31 +0100 Subject: [PATCH 21/32] New upstream version 1.14.1. Fixes Denial of Service / Amplication Attack: https://www.redhat.com/archives/libguestfs/2019-September/msg00084.html --- nbdkit.spec | 9 +++++++-- sources | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 7a7d5ae..57dc3ed 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -27,8 +27,8 @@ %global source_directory 1.14-stable Name: nbdkit -Version: 1.14.0 -Release: 2%{?dist} +Version: 1.14.1 +Release: 1%{?dist} Summary: NBD server License: BSD @@ -895,6 +895,11 @@ make %{?_smp_mflags} check || { %changelog +* Thu Sep 12 2019 Richard W.M. Jones - 1.14.1-1 +- New upstream version 1.14.1. +- Fixes Denial of Service / Amplication Attack: + https://www.redhat.com/archives/libguestfs/2019-September/msg00084.html + * Thu Aug 29 2019 Richard W.M. Jones - 1.14.0-2 - Split out nbdkit-nbd-plugin subpackage. diff --git a/sources b/sources index 877e83a..9d21158 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.14.0.tar.gz) = 7f76ffabf01e1458a9a99527756e4d73f3acdb4193f8169b4e60604645d1fc01a96bd16ea76564d587e7773f9c86a40740d4e15863f0b2c051860cdf1f27c942 -SHA512 (nbdkit-1.14.0.tar.gz.sig) = 6f8215537c6bd780875eac154dbb7b8cf2fa95de58ac80eaa8fe44ddcb3e6d2cdef5991f87f888b63f528d6501172f84caafcf1dcb0400c22cde0ebb421524c8 +SHA512 (nbdkit-1.14.1.tar.gz) = fb91519e70c6e5a83004211e58de3b709a68bf1ba308f0ad10bf9a4b1ba19e7fb1792f31653309cbc7fd215d4f0b14cafa97f5d7cab5d7f46689c9091ca4a223 +SHA512 (nbdkit-1.14.1.tar.gz.sig) = ebcb72aa1b0290f1f2c01032b57bd3a2c5d92fbc1423b5c1b48c05ed8945fd4a4caa05cb9ae280e7681642eb15006c72422812c745e8e3784f5e7ce67bd9a9e2 From 7c1d7e123afdd913ed1dd04d774e52c4d3758408 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 Sep 2019 18:47:13 +0100 Subject: [PATCH 22/32] New upstream version 1.12.7. Fixes Denial of Service / Amplication Attack: https://www.redhat.com/archives/libguestfs/2019-September/msg00084.html --- nbdkit.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index c2938d9..17d369d 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.6 +Version: 1.12.7 Release: 1%{?dist} Summary: NBD server @@ -1015,6 +1015,11 @@ popd %changelog +* Thu Sep 12 2019 Richard W.M. Jones - 1.12.7-1 +- New upstream version 1.12.7. +- Fixes Denial of Service / Amplication Attack: + https://www.redhat.com/archives/libguestfs/2019-September/msg00084.html + * Thu Aug 29 2019 Richard W.M. Jones - 1.12.6-1 - New stable version 1.12.6. diff --git a/sources b/sources index c6cb6c9..3df84c5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.6.tar.gz) = 0e7bcd8e14fb748a2e651e119d975e76c6b9e312e006f19ccb7039df010ada0ae0d2ff8ee3a8e3503b83f311c59a9e92ba0e63b769b387224ab342958d5a582c -SHA512 (nbdkit-1.12.6.tar.gz.sig) = 7ffbee3077f4266ffee466c79875a9d2640b95825357bee9f37afcc71ca64ea5682d9d0a6f529259b9f42e459fc98d20d051fe41861a85cd765083ea666795a8 +SHA512 (nbdkit-1.12.7.tar.gz) = de3862d0e61b7a445c86e803fc7d26f1847555779db891b43be46ced2ec34feff858740c904c704ec72188ed4f550a1b2d73816e4ead3d71d921b206588f811b +SHA512 (nbdkit-1.12.7.tar.gz.sig) = 50ef63d5245f77aedb207bfdd37d34e860cbf3bc5d1c54ede4ea307b57244d6fc7321c29c0085863dc3925f7a18114741538663b6937bc9a9946c805e400d12b From 1d3e09709b582d6f7002672d0f36e3bca13305b2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Sep 2019 15:23:57 +0100 Subject: [PATCH 23/32] New upstream version 1.14.2. Fixes second Denial of Service attack: https://www.redhat.com/archives/libguestfs/2019-September/msg00272.html --- nbdkit.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 57dc3ed..1a91803 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -27,7 +27,7 @@ %global source_directory 1.14-stable Name: nbdkit -Version: 1.14.1 +Version: 1.14.2 Release: 1%{?dist} Summary: NBD server @@ -895,6 +895,11 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 20 2019 Richard W.M. Jones - 1.14.2-1 +- New upstream version 1.14.2. +- Fixes second Denial of Service attack: + https://www.redhat.com/archives/libguestfs/2019-September/msg00272.html + * Thu Sep 12 2019 Richard W.M. Jones - 1.14.1-1 - New upstream version 1.14.1. - Fixes Denial of Service / Amplication Attack: diff --git a/sources b/sources index 9d21158..f07ccc5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.14.1.tar.gz) = fb91519e70c6e5a83004211e58de3b709a68bf1ba308f0ad10bf9a4b1ba19e7fb1792f31653309cbc7fd215d4f0b14cafa97f5d7cab5d7f46689c9091ca4a223 -SHA512 (nbdkit-1.14.1.tar.gz.sig) = ebcb72aa1b0290f1f2c01032b57bd3a2c5d92fbc1423b5c1b48c05ed8945fd4a4caa05cb9ae280e7681642eb15006c72422812c745e8e3784f5e7ce67bd9a9e2 +SHA512 (nbdkit-1.14.2.tar.gz) = cb90cdcc2733897bcf08ad271f59ea741bc21438e4c67e7d3d41cfbf660d8d339186cc5ce75e4e885f57ce45f6b75ac2fc79283d53ec1fba5b16c0f2a1c58efa +SHA512 (nbdkit-1.14.2.tar.gz.sig) = ce144ae2dec52302d3099432e551b6c46df2fdaf2144ebe57044027da859aa50bd9d0f4f691ae06ef3742610d711d5456c00be67fad7474f6041a22b4ed22d0b From fe211a736ad91a87a7c80e8d87de873ea23232ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Sep 2019 15:24:24 +0100 Subject: [PATCH 24/32] New upstream version 1.12.8. Fixes second Denial of Service attack: https://www.redhat.com/archives/libguestfs/2019-September/msg00272.html --- nbdkit.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 17d369d..df8f3b6 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -31,7 +31,7 @@ %global source_directory 1.12-stable Name: nbdkit -Version: 1.12.7 +Version: 1.12.8 Release: 1%{?dist} Summary: NBD server @@ -1015,6 +1015,11 @@ popd %changelog +* Fri Sep 20 2019 Richard W.M. Jones - 1.12.8-1 +- New upstream version 1.12.8. +- Fixes second Denial of Service attack: + https://www.redhat.com/archives/libguestfs/2019-September/msg00272.html + * Thu Sep 12 2019 Richard W.M. Jones - 1.12.7-1 - New upstream version 1.12.7. - Fixes Denial of Service / Amplication Attack: diff --git a/sources b/sources index 3df84c5..34df786 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.12.7.tar.gz) = de3862d0e61b7a445c86e803fc7d26f1847555779db891b43be46ced2ec34feff858740c904c704ec72188ed4f550a1b2d73816e4ead3d71d921b206588f811b -SHA512 (nbdkit-1.12.7.tar.gz.sig) = 50ef63d5245f77aedb207bfdd37d34e860cbf3bc5d1c54ede4ea307b57244d6fc7321c29c0085863dc3925f7a18114741538663b6937bc9a9946c805e400d12b +SHA512 (nbdkit-1.12.8.tar.gz) = 68814d77e08436b21cf4d10e6b3e735417b837d6d538ebc7f28d616ebf6540a9c3e86e19e6e250500dbc8c418075bb5320d1f7c30761e1d412d9f0927a9b35a0 +SHA512 (nbdkit-1.12.8.tar.gz.sig) = f89015863069b4635d6793e815412979fd1963bdb4cc4b2f7c845211a222b833e143ce39a7eea9301a90d740247f00c02042a6cde0794655a6b2083f8a5b31cb From f74dd67565a5255d7c205b053a30a760055b2b61 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Nov 2019 11:05:38 +0000 Subject: [PATCH 25/32] Use gpgverify macro instead of explicit gpgv2 command. (cherry picked from commit f269e46c70e2f9d7cd89fdc9a5cae71f9d2edfa8) --- nbdkit.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index 25f4d41..fbe4934 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -550,8 +550,7 @@ for %{name}. %prep %if 0%{verify_tarball_signature} -tmphome="$(mktemp -d)" -gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %endif %autosetup -p1 %if 0%{patches_touch_autotools} @@ -903,6 +902,8 @@ make %{?_smp_mflags} check || { %changelog +- Use gpgverify macro instead of explicit gpgv2 command. + * Thu Nov 14 2019 Richard W.M. Jones - 1.16.0-1 - New stable release 1.16.0. From 0a511aee2e12c628cad77b0a843ae8dffe2fb2b5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Dec 2019 13:21:15 +0000 Subject: [PATCH 26/32] New stable release 1.16.1. Use gpgverify macro instead of explicit gpgv2 command. --- nbdkit.spec | 4 +++- sources | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index fbe4934..e75ac7f 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -27,7 +27,7 @@ %global source_directory 1.16-stable Name: nbdkit -Version: 1.16.0 +Version: 1.16.1 Release: 1%{?dist} Summary: NBD server @@ -902,6 +902,8 @@ make %{?_smp_mflags} check || { %changelog +* Tue Dec 3 2019 Richard W.M. Jones - 1.16.1-1 +- New stable release 1.16.1. - Use gpgverify macro instead of explicit gpgv2 command. * Thu Nov 14 2019 Richard W.M. Jones - 1.16.0-1 diff --git a/sources b/sources index 2e8a5d5..b6d0780 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.16.0.tar.gz) = 71f38d0290f6ae9bb765d728857b7eaee12d3960d46ad760f9ebe76c747a26fa72a770982af94d43cda5631f90a3c24002ca671aba599e674e929dcafa533e6e -SHA512 (nbdkit-1.16.0.tar.gz.sig) = bedc654fc3dd5b08415f482678fb7eba4a4c590d139176b0a08833642ee1503af36e868d80dbbeb3ad1e869b2ba001d6f997f8b516988963787e2c00ca4eabb3 +SHA512 (nbdkit-1.16.1.tar.gz) = cf908575ee341257dd7c89a317ca6912e135314992f5e60f6c33260a3e5bd3c21c959c9183d4c5f90738f2c7af5a600f8df166416c6c44c74acd83c42e6dfe1d +SHA512 (nbdkit-1.16.1.tar.gz.sig) = 6bd79cbafaba086e534a631686017122b21d83bfa6bf26f45b41b90fcc882da1209a75cd0915416c226bf891c15e80e1974bc3203dad1c545e248f04453f33c0 From 7a05d161dcfb5ca13464ea885db5724238ee9dd1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 1 Dec 2019 20:39:55 +0000 Subject: [PATCH 27/32] Fix complete_test_arches. (cherry picked from commit 41f790f919f0659cdec4112afe1606c3bcf3716d) --- nbdkit.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index e75ac7f..f5dd73e 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -9,8 +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. -# x86_64 is currently broken in F31 by https://bugzilla.redhat.com/1692047 -%global complete_test_arches NONE +%global complete_test_arches x86_64 # Disable libvirt on riscv64 for now. %ifnarch riscv64 @@ -559,8 +558,7 @@ autoreconf -i %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 +sed -i -e '/^LIBGUESTFS_TESTS/d' tests/Makefile.am autoreconf -i %endif From f0c7a95a1f0457aaddc104a35ee4939e7e70af69 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 1 Dec 2019 20:39:55 +0000 Subject: [PATCH 28/32] Fix complete_test_arches again. (cherry picked from commit 33d5db8c05aa1e9ade7c1ec04b07dc810c1c1d8f) --- nbdkit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nbdkit.spec b/nbdkit.spec index f5dd73e..427de38 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -559,6 +559,7 @@ autoreconf -i %ifnarch %{complete_test_arches} # Simplify the test suite so it doesn't require qemu. sed -i -e '/^LIBGUESTFS_TESTS/d' tests/Makefile.am +sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am autoreconf -i %endif From f3e43d71a90f6b8156e465e759d709cdb6780fcf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 1 Dec 2019 21:15:40 +0000 Subject: [PATCH 29/32] Disable libguestfs on ppc64le because of https://bugzilla.redhat.com/show_bug.cgi?id=1778520 (cherry picked from commit 4ccc35c84d1aa38291ab40832825586643bf984e) --- nbdkit.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nbdkit.spec b/nbdkit.spec index 427de38..d866d47 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -1,6 +1,8 @@ %global _hardened_build 1 -%ifarch aarch64 %{arm} x86_64 ppc %{power64} +# Broken on {power64} because of +# https://bugzilla.redhat.com/show_bug.cgi?id=1778520 +%ifarch aarch64 %{arm} x86_64 ppc %global have_libguestfs 1 %endif From 4c9af19e9795ea66cd5137211df1e82a6bf99e8e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 28 Jan 2020 11:16:00 +0000 Subject: [PATCH 30/32] New stable release 1.16.2. --- nbdkit.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nbdkit.spec b/nbdkit.spec index d866d47..fd18937 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -28,7 +28,7 @@ %global source_directory 1.16-stable Name: nbdkit -Version: 1.16.1 +Version: 1.16.2 Release: 1%{?dist} Summary: NBD server @@ -903,6 +903,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 28 2020 Richard W.M. Jones - 1.16.2-1 +- New stable release 1.16.2. + * Tue Dec 3 2019 Richard W.M. Jones - 1.16.1-1 - New stable release 1.16.1. - Use gpgverify macro instead of explicit gpgv2 command. diff --git a/sources b/sources index b6d0780..1562891 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (nbdkit-1.16.1.tar.gz) = cf908575ee341257dd7c89a317ca6912e135314992f5e60f6c33260a3e5bd3c21c959c9183d4c5f90738f2c7af5a600f8df166416c6c44c74acd83c42e6dfe1d -SHA512 (nbdkit-1.16.1.tar.gz.sig) = 6bd79cbafaba086e534a631686017122b21d83bfa6bf26f45b41b90fcc882da1209a75cd0915416c226bf891c15e80e1974bc3203dad1c545e248f04453f33c0 +SHA512 (nbdkit-1.16.2.tar.gz) = 3b3fe72373a4094e5c26dc9ea3e10d9f859524c0cacea33dbae0ee127a9e8bfadc277dc909c5240a7b918effcf67a790810adf6b2ebcd0a87dc4995d78c14a86 +SHA512 (nbdkit-1.16.2.tar.gz.sig) = 73feb233fe74e1e303fdca8441b9321b78d77fdb9a61de43037ffdbab0262376ad7e9b4c0d4f2182668f9aceec64886ca4b1cef90609d70306ce4cbe3a34e216 From b4c7a4b7d25e67df1957c9fb731aa73bbeb518c6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 28 Jan 2020 11:40:20 +0000 Subject: [PATCH 31/32] Disable tests on armv7 because of RHBZ#1795585. --- nbdkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nbdkit.spec b/nbdkit.spec index fd18937..e7b60e6 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -2,7 +2,10 @@ # Broken on {power64} because of # https://bugzilla.redhat.com/show_bug.cgi?id=1778520 -%ifarch aarch64 %{arm} x86_64 ppc +# Broken on {arm} because of +# https://bugzilla.redhat.com/1795585 +# (but only on F30 / 5.4.x stable branch). +%ifarch aarch64 x86_64 ppc %global have_libguestfs 1 %endif From b6092d8e76ccbfa94b1352777e5e1a43ba2a5075 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 28 Jan 2020 11:52:29 +0000 Subject: [PATCH 32/32] Disable tests/test-captive.sh. (cherry picked from commit d628f9060363f5ddd8b36e8b0c7aca33628f40ed) --- nbdkit.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nbdkit.spec b/nbdkit.spec index e7b60e6..efdc03d 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -607,6 +607,10 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3* # Workaround for broken libvirt (RHBZ#1138604). mkdir -p $HOME/.cache/libvirt +# tests/test-captive.sh is racy especially on s390x. We need to +# rethink this test upstream. +truncate -s 0 tests/test-captive.sh + # Temporarily kill tests/test-shutdown.sh because this test is racy on # slow hardware. truncate -s 0 tests/test-shutdown.sh