Merge remote-tracking branch 'origin/f30' into f29

Fixes second Denial of Service attack:
  https://www.redhat.com/archives/libguestfs/2019-September/msg00272.html

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.7
+Version:        1.12.8
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -99,9 +99,11 @@ 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
+BuildRequires:  /usr/bin/ssh-keygen
 
 # nbdkit is a metapackage pulling the server and a useful subset
 # of the plugins and filters.
@@ -155,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
@@ -506,29 +522,26 @@ 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
 
 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
@@ -549,6 +562,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.
@@ -557,6 +572,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.
 
 
@@ -566,6 +583,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}.
@@ -708,16 +729,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 +738,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
   }
@@ -936,13 +948,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
@@ -953,10 +958,12 @@ 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
 %{_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*
@@ -965,10 +972,12 @@ 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*
 %{_mandir}/man1/nbdkit-rate-filter.1*
+%{_mandir}/man1/nbdkit-readahead-filter.1*
 %{_mandir}/man1/nbdkit-truncate-filter.1*
 
 
@@ -980,7 +989,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
@@ -1006,6 +1015,68 @@ popd
 
 
 %changelog
+* Fri Sep 20 2019 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 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 <rjones@redhat.com> - 1.12.6-1
+- New stable version 1.12.6.
+
+* Fri Aug  2 2019 Richard W.M. Jones <rjones@redhat.com> - 1.12.5-1
+- New stable version 1.12.5.
+
+* Fri Jul 26 2019 Richard W.M. Jones <rjones@redhat.com> - 1.12.4-1
+- New stable version 1.12.4.
+
+* Tue May 21 2019 Richard W.M. Jones <rjones@redhat.com> - 1.12.3-1
+- New stable version 1.12.3.
+
+* Tue Apr 23 2019 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 1.12.1-1
+- New stable version 1.12.1.
+
+* Wed Apr 10 2019 Richard W.M. Jones <rjones@redhat.com> - 1.12.0-1
+- New upstream version 1.12.0.
+- Add noextents filter.
+
+* Mon Apr 08 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.15-1
+- New upstream version 1.11.15.
+
+* Sat Apr 06 2019 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 1.11.13-1
+- New upstream version 1.11.13.
+
+* Tue Apr 02 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.12-1
+- New upstream version 1.11.12.
+- New nbdkit-readahead-filter.
+
+* Fri Mar 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.11-1
+- New upstream version 1.11.11.
+
+* Thu Mar 28 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.10-1
+- New upstream version 1.11.10.
+
+* Sat Mar 23 2019 Richard W.M. Jones <rjones@redhat.com> - 1.11.9-1
+- New upstream version 1.11.9.
+
+* Tue Mar 12 2019 Richard W.M. Jones <rjones@redhat.com> - 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 <rjones@redhat.com> - 1.11.7-1
 - New upstream version 1.11.7.
 - Add nbdkit ssh plugin.

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.12.8.tar.gz) = 68814d77e08436b21cf4d10e6b3e735417b837d6d538ebc7f28d616ebf6540a9c3e86e19e6e250500dbc8c418075bb5320d1f7c30761e1d412d9f0927a9b35a0
+SHA512 (nbdkit-1.12.8.tar.gz.sig) = f89015863069b4635d6793e815412979fd1963bdb4cc4b2f7c845211a222b833e143ce39a7eea9301a90d740247f00c02042a6cde0794655a6b2083f8a5b31cb