New upstream stable branch version 1.42.11

Contains data integrity fix: "server: Fix .zero fallback path"

0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch

@@ -1,31 +0,0 @@
-From 4076ff58512ee98928b1bdb13274466b175e1a97 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 2 Jan 2026 11:59:11 +0000
-Subject: [PATCH] tests/test-ocaml-debug-hexdump.sh: Fix test that plugin was
- built
-
-This is supposed to check that the test plugin was built and skip if
-not.  However because the 'requires' function call was missing, it
-actually failed the test if not built.
-
-Fixes: commit ec3be5030656a9126abbb0bceeb5a1ecf6898c6a
----
- tests/test-ocaml-debug-hexdump.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-ocaml-debug-hexdump.sh b/tests/test-ocaml-debug-hexdump.sh
-index 5cc71375..3954225e 100755
---- a/tests/test-ocaml-debug-hexdump.sh
-+++ b/tests/test-ocaml-debug-hexdump.sh
-@@ -36,7 +36,7 @@ set -x
- set -u
- 
- plugin=$abs_top_srcdir/tests/test-ocaml-debug-hexdump-plugin.$SOEXT
--test -x "$plugin"
-+requires test -x "$plugin"
- 
- requires_run
- requires_nbdsh_uri
--- 
-2.52.0
-

nbdkit.spec

@@ -51,10 +51,10 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 1.47-development
+%global source_directory 1.42-stable
 
 Name:           nbdkit
-Version:        1.47.1
+Version:        1.42.11
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -86,9 +86,6 @@ Source6:        %{modulename}.te
 Source7:        %{modulename}.if
 Source8:        %{modulename}.fc
 
-# Fix for broken test, upstream in nbdkit >= 1.47.2
-Patch:          0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch
-
 # For applying the patches:
 BuildRequires:  git
 
@@ -114,10 +111,6 @@ BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libnbd)
-%if !0%{?rhel}
-# We require libnfs >= 6, but the internal version is >= 16
-BuildRequires:  pkgconfig(libnfs) >= 16
-%endif
 BuildRequires:  pkgconfig(libssh)
 BuildRequires:  e2fsprogs
 BuildRequires:  pkgconfig(ext2fs)
@@ -129,13 +122,7 @@ BuildRequires:  pkgconfig(libtorrent-rasterbar)
 %if 0%{?have_blkio}
 BuildRequires:  pkgconfig(blkio)
 %endif
-%if !0%{?rhel}
-BuildRequires:  pkgconfig(OpenCL)
-%endif
-BuildRequires:  bash-completion
-%if 0%{?fedora} || 0%{?rhel} >= 11
-BuildRequires:  bash-completion-devel
-%endif
+BuildRequires:  bash-completion, bash-completion-devel
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
 %if 0%{?rhel} == 8
@@ -173,11 +160,9 @@ BuildRequires:  /usr/bin/lzip
 BuildRequires:  /usr/bin/nbdcopy
 BuildRequires:  /usr/bin/nbdinfo
 BuildRequires:  /usr/bin/nbdsh
-%ifnarch %{ix86}
 BuildRequires:  /usr/bin/qemu-img
 BuildRequires:  /usr/bin/qemu-io
 BuildRequires:  /usr/bin/qemu-nbd
-%endif
 BuildRequires:  /usr/sbin/sfdisk
 %if !0%{?rhel}
 BuildRequires:  /usr/bin/socat
@@ -445,16 +430,6 @@ This package lets you forward NBD connections from %{name}
 to another NBD server.
 
 
-%if !0%{?rhel}
-%package nfs-plugin
-Summary:        NFS (Network File Server) plugin for %{name}
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-
-%description nfs-plugin
-This package contains Network File Server (NFS) support for %{name}.
-%endif
-
-
 %if !0%{?rhel} && 0%{?have_ocaml}
 %package ocaml-plugin
 Summary:        OCaml plugin for %{name}
@@ -582,20 +557,11 @@ VMware VDDK for accessing VMware disks and servers.
 %endif
 
 
-%if !0%{?rhel}
-%package vram-plugin
-Summary:        use GPU Video RAM as a network block device
-Requires:       %{name}-server%{?_isa} = %{version}-%{release}
-Recommends:     %{_bindir}/clinfo
-
-%description vram-plugin
-This package contains GPU Video RAM support for %{name}.
-%endif
-
-
 %package basic-filters
 Summary:        Basic filters for %{name}
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+# Remove this in Fedora 43:
+Obsoletes:      nbdkit-gzip-filter < %{version}-%{release}
 
 %description basic-filters
 This package contains filters for %{name} which only depend on simple
@@ -608,9 +574,9 @@ nbdkit-blocksize-policy-filter  Set block size constraints and policy.
 
 nbdkit-cache-filter        Server-side cache.
 
-nbdkit-checkwrite-filter   Check writes match contents of plugin.
+nbdkit-cacheextents-filter Cache extents.
 
-nbdkit-count-filter        Count bytes read, written, zeroed and trimmed.
+nbdkit-checkwrite-filter   Check writes match contents of plugin.
 
 nbdkit-cow-filter          Copy-on-write overlay for read-only plugins.
 
@@ -634,8 +600,6 @@ nbdkit-fua-filter          Modify flush behaviour in plugins.
 
 nbdkit-gzip-filter         Decompress a .gz file
 
-nbdkit-indexed-gzip-filter Access .gz contents efficiently.
-
 nbdkit-ip-filter           Filter clients by IP address.
 
 nbdkit-limit-filter        Limit nr clients that can connect concurrently.
@@ -644,8 +608,6 @@ nbdkit-log-filter          Log all transactions to a file.
 
 nbdkit-luks-filter         Read and write LUKS-encrypted disks.
 
-nbdkit-map-filter          Remap disk blocks.
-
 nbdkit-multi-conn-filter   Enable, emulate or disable multi-conn.
 
 nbdkit-nocache-filter      Disable cache requests in the underlying plugin.
@@ -660,8 +622,6 @@ nbdkit-nozero-filter       Adjust handling of zero requests by plugins.
 
 nbdkit-offset-filter       Serve an offset and range.
 
-nbdkit-openonce-filter     Open the underlying plugin once.
-
 nbdkit-partition-filter    Serve a single partition.
 
 nbdkit-pause-filter        Pause NBD requests.
@@ -782,7 +742,7 @@ BuildRequires: selinux-policy-devel
 %{?selinux_requires}
 
 %description selinux
-%{name} SELinux policy module.
+%{nbdkit} SELinux policy module.
 %endif
 
 
@@ -873,7 +833,6 @@ export PYTHON=%{__python3}
     --enable-perl \
     --enable-tcl \
     --enable-torrent \
-    --enable-vram \
     --with-ext2 \
     --with-iso \
     --with-libvirt \
@@ -882,7 +841,6 @@ export PYTHON=%{__python3}
     --disable-perl \
     --disable-tcl \
     --disable-torrent \
-    --disable-vram \
     --without-ext2 \
     --without-iso \
     --without-libvirt \
@@ -947,7 +905,6 @@ popd
     --disable-torrent \
     --disable-valgrind \
     --disable-vddk \
-    --disable-vram \
     --without-bash-completions \
     --without-curl \
     --without-ext2 \
@@ -1261,15 +1218,6 @@ fi
 %{_mandir}/man1/nbdkit-nbd-plugin.1*
 
 
-%if !0%{?rhel}
-%files nfs-plugin
-%doc README.md
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-nfs-plugin.so
-%{_mandir}/man1/nbdkit-nfs-plugin.1*
-%endif
-
-
 %if !0%{?rhel} && 0%{?have_ocaml}
 %files ocaml-plugin
 %doc README.md
@@ -1357,23 +1305,14 @@ fi
 %endif
 
 
-%if !0%{?rhel}
-%files vram-plugin
-%doc README.md
-%license LICENSE
-%{_libdir}/%{name}/plugins/nbdkit-vram-plugin.so
-%{_mandir}/man1/nbdkit-vram-plugin.1*
-%endif
-
-
 %files basic-filters
 %doc README.md
 %license LICENSE
 %{_libdir}/%{name}/filters/nbdkit-blocksize-filter.so
 %{_libdir}/%{name}/filters/nbdkit-blocksize-policy-filter.so
 %{_libdir}/%{name}/filters/nbdkit-cache-filter.so
+%{_libdir}/%{name}/filters/nbdkit-cacheextents-filter.so
 %{_libdir}/%{name}/filters/nbdkit-checkwrite-filter.so
-%{_libdir}/%{name}/filters/nbdkit-count-filter.so
 %{_libdir}/%{name}/filters/nbdkit-cow-filter.so
 %{_libdir}/%{name}/filters/nbdkit-ddrescue-filter.so
 %{_libdir}/%{name}/filters/nbdkit-delay-filter.so
@@ -1385,12 +1324,10 @@ fi
 %{_libdir}/%{name}/filters/nbdkit-extentlist-filter.so
 %{_libdir}/%{name}/filters/nbdkit-fua-filter.so
 %{_libdir}/%{name}/filters/nbdkit-gzip-filter.so
-%{_libdir}/%{name}/filters/nbdkit-indexed-gzip-filter.so
 %{_libdir}/%{name}/filters/nbdkit-ip-filter.so
 %{_libdir}/%{name}/filters/nbdkit-limit-filter.so
 %{_libdir}/%{name}/filters/nbdkit-log-filter.so
 %{_libdir}/%{name}/filters/nbdkit-luks-filter.so
-%{_libdir}/%{name}/filters/nbdkit-map-filter.so
 %{_libdir}/%{name}/filters/nbdkit-multi-conn-filter.so
 %{_libdir}/%{name}/filters/nbdkit-nocache-filter.so
 %{_libdir}/%{name}/filters/nbdkit-noextents-filter.so
@@ -1398,7 +1335,6 @@ fi
 %{_libdir}/%{name}/filters/nbdkit-noparallel-filter.so
 %{_libdir}/%{name}/filters/nbdkit-nozero-filter.so
 %{_libdir}/%{name}/filters/nbdkit-offset-filter.so
-%{_libdir}/%{name}/filters/nbdkit-openonce-filter.so
 %{_libdir}/%{name}/filters/nbdkit-partition-filter.so
 %{_libdir}/%{name}/filters/nbdkit-pause-filter.so
 %{_libdir}/%{name}/filters/nbdkit-protect-filter.so
@@ -1420,8 +1356,8 @@ fi
 %{_mandir}/man1/nbdkit-blocksize-filter.1*
 %{_mandir}/man1/nbdkit-blocksize-policy-filter.1*
 %{_mandir}/man1/nbdkit-cache-filter.1*
+%{_mandir}/man1/nbdkit-cacheextents-filter.1*
 %{_mandir}/man1/nbdkit-checkwrite-filter.1*
-%{_mandir}/man1/nbdkit-count-filter.1*
 %{_mandir}/man1/nbdkit-cow-filter.1*
 %{_mandir}/man1/nbdkit-ddrescue-filter.1*
 %{_mandir}/man1/nbdkit-delay-filter.1*
@@ -1433,12 +1369,10 @@ fi
 %{_mandir}/man1/nbdkit-extentlist-filter.1*
 %{_mandir}/man1/nbdkit-fua-filter.1*
 %{_mandir}/man1/nbdkit-gzip-filter.1*
-%{_mandir}/man1/nbdkit-indexed-gzip-filter.1*
 %{_mandir}/man1/nbdkit-ip-filter.1*
 %{_mandir}/man1/nbdkit-limit-filter.1*
 %{_mandir}/man1/nbdkit-log-filter.1*
 %{_mandir}/man1/nbdkit-luks-filter.1*
-%{_mandir}/man1/nbdkit-map-filter.1*
 %{_mandir}/man1/nbdkit-multi-conn-filter.1*
 %{_mandir}/man1/nbdkit-nocache-filter.1*
 %{_mandir}/man1/nbdkit-noextents-filter.1*
@@ -1446,7 +1380,6 @@ fi
 %{_mandir}/man1/nbdkit-noparallel-filter.1*
 %{_mandir}/man1/nbdkit-nozero-filter.1*
 %{_mandir}/man1/nbdkit-offset-filter.1*
-%{_mandir}/man1/nbdkit-openonce-filter.1*
 %{_mandir}/man1/nbdkit-partition-filter.1*
 %{_mandir}/man1/nbdkit-pause-filter.1*
 %{_mandir}/man1/nbdkit-protect-filter.1*
@@ -1507,7 +1440,7 @@ fi
 
 
 %files devel
-%doc BENCHMARKING OTHER_PLUGINS README.md SECURITY.md TODO.md
+%doc BENCHMARKING OTHER_PLUGINS README.md SECURITY TODO
 %license LICENSE
 # Include the source of the example plugins in the documentation.
 %doc plugins/example*/*.c
@@ -1535,7 +1468,6 @@ fi
 %{_mandir}/man3/nbdkit-plugin.3*
 %{_mandir}/man3/nbdkit_*.3*
 %{_mandir}/man1/nbdkit-release-notes-1.*.1*
-%{_mandir}/man3/nbdkit-tracing.3*
 %{_libdir}/pkgconfig/nbdkit.pc
 
 
@@ -1547,13 +1479,8 @@ fi
 
 %files bash-completion
 %license LICENSE
-%if 0%{?fedora} || 0%{?rhel} >= 11
 %dir %{bash_completions_dir}
 %{bash_completions_dir}/nbdkit
-%else
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/nbdkit
-%endif
 
 
 %if 0%{?with_selinux}
@@ -1585,141 +1512,33 @@ fi
 
 
 %changelog
-* Fri Jan 02 2026 Richard W.M. Jones <rjones@redhat.com> - 1.47.1-1
-- New upstream development version 1.47.1
+* Thu Dec 18 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.11-1
+- New upstream stable branch version 1.42.11
 
-* Sat Dec 20 2025 Richard W.M. Jones <rjones@redhat.com> - 1.46.0-1
-- New upstream stable version 1.46.0
+* Mon Oct 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.9-1
+- New upstream stable branch version 1.42.9
 
-* Thu Dec 18 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.17-1
-- New upstream version 1.45.17
+* Sat Aug 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.8-1
+- New upstream stable branch version 1.42.8
 
-* Mon Dec 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.16-1
-- New upstream version 1.45.16
+* Sat Aug 02 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.7-1
+- New upstream stable branch version 1.42.7
 
-* Tue Dec 02 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.15-1
-- New upstream version 1.45.15
-
-* Fri Nov 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.13-1
-- New upstream version 1.45.13
-
-* Mon Oct 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.12-1
-- New upstream version 1.45.12
-- Add new nbdkit-vram-plugin
-
-* Mon Oct 20 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.11-1
-- New upstream version 1.45.11
-
-* Thu Oct 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.10-1
-- New upstream version 1.45.10
-- Remove OCaml 5.4.0 fix, which is included upstream.
-
-* Wed Oct 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.9-2
-- OCaml 5.4.0 rebuild
-
-* Fri Oct  3 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.9-1
-- New upstream version 1.45.9
-- Reenable the tests on all arches, since we can now handle missing qemu-img
-
-* Thu Oct  2 2025 Daniel P. Berrangé <berrange@redhat.com> - 1.45.8-2
-- Stop using QEMU for tests on 32-bit
-
-* Sat Sep 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.8-1
-- New upstream version 1.45.8
-
-* Tue Aug 26 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.7-1
-- New upstream version 1.45.7
-
-* Sat Aug 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.6-1
-- New upstream version 1.45.6
-
-* Wed Aug 20 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.5-1
-- New upstream version 1.45.5
-- Remove obsolete Obsoletes now this is Fedora 43+.
-- Add new nbdkit-indexed-gzip-filter.
-
-* Mon Aug 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.4-1
-- New upstream version 1.45.4
-
-* Tue Jul 29 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.3-1
-- New upstream version 1.45.3
-
-* Wed Jul 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.2-1
-- New upstream version 1.45.2
-- New map filter.
-
-* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 1.45.1-5
-- Rebuild to fix OCaml dependencies
-
-* Wed Jul 09 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.45.1-4
-- Perl 5.42 re-rebuild updated packages
-
-* Wed Jul 09 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.1-3
-- Remove cacheextents filter (deprecated & removed upstream)
-
-* Wed Jul 09 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.45.1-2
-- Perl 5.42 re-rebuild updated packages
-
-* Tue Jul 08 2025 Richard W.M. Jones <rjones@redhat.com> - 1.45.1-1
-- New upstream development branch 1.45.1
-- New nbdkit-count-filter.
-
-* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.44.1-2
-- Perl 5.42 rebuild
-
-* Sat Jul 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1.44.1-1
-- New upstream stable branch version 1.44.1
+* Sat Jul 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.6-1
+- New upstream stable branch version 1.42.6
 - Contains data integrity fix: "server: Fix .zero fallback path"
 
-* Tue Jul 01 2025 Richard W.M. Jones <rjones@redhat.com> - 1.44.0-1
-- New upstream stable branch version 1.44.0
+* Mon Jun 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.5-1
+- New upstream stable branch version 1.42.5
 
-* Mon Jun 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.13-1
-- New upstream development branch version 1.43.13
+* Sun Jun 08 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.4-1
+- New upstream stable branch version 1.42.4
 
-* Sat Jun 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.12-1
-- New upstream development branch version 1.43.12
+* Sat May 10 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.3-1
+- New upstream stable branch version 1.42.3
 
-* Fri Jun 06 2025 Python Maint <python-maint@redhat.com> - 1.43.11-2
-- Rebuilt for Python 3.14
-
-* Thu Jun 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.11-1
-- New upstream development branch version 1.43.11
-
-* Mon Jun 02 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.10-1
-- New upstream development branch version 1.43.10
-
-* Sat May 17 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.9-1
-- New upstream development branch version 1.43.9
-- New nbdkit-openonce-filter
-
-* Mon May 12 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.8-1
-- New upstream development branch version 1.43.8
-
-* Fri May 09 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.7-1
-- New upstream development branch version 1.43.7
-
-* Thu May 01 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.6-1
-- New upstream development branch version 1.43.6
-
-* Thu Apr 10 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.5-1
-- New upstream development branch version 1.43.5
-- New subpackage nbdkit-nfs-plugin
-
-* Wed Apr 02 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.4-1
-- New upstream development branch version 1.43.4
-
-* Mon Mar 31 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.3-1
-- New upstream development branch version 1.43.3
-
-* Thu Mar 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.2-1
-- New upstream development branch version 1.43.2
-
-* Wed Mar 26 2025 Tim Landscheidt <tim@tim-landscheidt.de> - 1.43.1-2
-- Fix description for nbdkit-selinux
-
-* Thu Mar 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.43.1-1
-- New upstream development branch version 1.43.1
+* Thu Mar 27 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.2-1
+- New upstream stable branch version 1.42.2
 
 * Mon Mar 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1.42.1-1
 - New upstream stable branch version 1.42.1

sources

@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.47.1.tar.gz) = 0c9d1da067bf1f7b6ba38dad33e86dff1fe893ff2e4a349dfcd6b259295fd00670e6af6c195e130d8a847520a78a730003315e60afda8eb94758e2195bd1a775
-SHA512 (nbdkit-1.47.1.tar.gz.sig) = 131d9bc191155186408ef7a577f9d2a2cc1fd1b53cbda755d19ff8de1341479a517fab79cc87f04a1bca5518046c24a8647cb4949d5c4d6fdca19ca968604c16
+SHA512 (nbdkit-1.42.11.tar.gz) = 8209340631feb1f3259fc5d1d1fb7b76cfb8476de56d621431e0f45cfdc240684642257da030a33e9ae7b74b5908974345c40bc2819e0fa814ba1bb142982137
+SHA512 (nbdkit-1.42.11.tar.gz.sig) = 3624994e3619f7d794f5601d6859b0f90fd643425bb094a58f758ef573321c96f2f8f042b7cf315f91b26687205b608cef5044d0f73311ba72604fce122c49bf