Rebase to 1.36.1 resolves: RHEL-14475

resolves: rhbz#2228131
Rebase to 1.34.2
resolves: rhbz#2168629

.nbdkit.metadata

@@ -0,0 +1,2 @@
+d9162275d83ca838f50180296dc58f2c8ef7c719 nbdkit-1.36.1.tar.gz
+7b6a527490a558950c05ab9c23f040e024d0085f nbdkit-1.36.1.tar.gz.sig

copy-patches.sh

@@ -6,7 +6,7 @@ set -e
 # directory.  Use it like this:
 #   ./copy-patches.sh
 
-rhel_version=9.3
+rhel_version=9.4
 
 # Check we're in the right directory.
 if [ ! -f nbdkit.spec ]; then

nbdkit.spec

@@ -22,6 +22,8 @@
 %global have_ocaml 1
 %endif
 
+%global have_blkio 1
+
 # Architectures where we run the complete test suite including
 # the libguestfs tests.
 #
@@ -49,14 +51,14 @@ ExclusiveArch:  x86_64
 %global patches_touch_autotools %{nil}
 
 # The source directory.
-%global source_directory 1.34-stable
+%global source_directory 1.36-stable
 
 Name:           nbdkit
-Version:        1.34.1
+Version:        1.36.1
 Release:        1%{?dist}
 Summary:        NBD server
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://gitlab.com/nbdkit/nbdkit
 
 %if 0%{?rhel} >= 8
@@ -75,10 +77,10 @@ Source2:        libguestfs.keyring
 Source3:        copy-patches.sh
 
 # Patches come from the upstream repository:
-# https://gitlab.com/nbdkit/nbdkit/-/commits/rhel-9.3/
+# https://gitlab.com/nbdkit/nbdkit/-/commits/rhel-9.4/
 
 # Patches.
-#(nothing)
+#(none)
 
 # For automatic RPM Provides generation.
 # See: https://rpm-software-management.github.io/rpm/manual/dependency_generators.html
@@ -100,6 +102,9 @@ BuildRequires:  libguestfs-devel
 BuildRequires:  libvirt-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
+%if !0%{?rhel}
+BuildRequires:  zlib-ng-devel
+%endif
 BuildRequires:  libzstd-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libnbd-devel >= 1.3.11
@@ -108,6 +113,8 @@ BuildRequires:  e2fsprogs, e2fsprogs-devel
 %if !0%{?rhel}
 BuildRequires:  xorriso
 BuildRequires:  rb_libtorrent-devel
+%endif
+%if 0%{?have_blkio}
 BuildRequires:  libblkio-devel
 %endif
 BuildRequires:  bash-completion
@@ -200,7 +207,6 @@ reading the nbdkit(1) and nbdkit-plugin(3) manual pages.
 
 %package server
 Summary:        The %{name} server
-License:        BSD
 
 %description server
 This package contains the %{name} server with only the null plugin
@@ -211,7 +217,6 @@ the metapackage "nbdkit".
 
 %package basic-plugins
 Summary:        Basic plugins for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 
@@ -236,6 +241,8 @@ nbdkit-memory-plugin        A virtual memory plugin.
 
 nbdkit-ondemand-plugin      Create filesystems on demand.
 
+nbdkit-ones-plugin          Fill disk with repeated 0xff or other bytes.
+
 nbdkit-pattern-plugin       Fixed test pattern.
 
 nbdkit-partitioning-plugin  Create virtual disks from partitions.
@@ -253,7 +260,6 @@ nbdkit-zero-plugin          Zero-length plugin for testing.
 
 %package example-plugins
 Summary:        Example plugins for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 %if !0%{?rhel}
 # example4 is written in Perl.
@@ -267,10 +273,9 @@ This package contains example plugins for %{name}.
 # The plugins below have non-trivial dependencies are so are
 # packaged separately.
 
-%if !0%{?rhel}
+%if 0%{?have_blkio}
 %package blkio-plugin
 Summary:        libblkio NVMe, vhost-user, vDPA, VFIO plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description blkio-plugin
@@ -282,7 +287,6 @@ for %{name}.
 %if !0%{?rhel}
 %package cc-plugin
 Summary:        Write small inline C plugins and scripts for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       gcc
 Requires:       %{_bindir}/cat
@@ -297,7 +301,6 @@ in C, install %{name}-devel for that.
 %if !0%{?rhel}
 %package cdi-plugin
 Summary:        Containerized Data Import plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       jq
 Requires:       podman
@@ -309,7 +312,6 @@ This package contains Containerized Data Import support for %{name}.
 
 %package curl-plugin
 Summary:        HTTP/FTP (cURL) plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description curl-plugin
@@ -319,7 +321,6 @@ This package contains cURL (HTTP/FTP) support for %{name}.
 %if !0%{?rhel} && 0%{?have_libguestfs}
 %package guestfs-plugin
 Summary:        libguestfs plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description guestfs-plugin
@@ -330,7 +331,6 @@ This package is a libguestfs plugin for %{name}.
 %if !0%{?rhel}
 %package iso-plugin
 Summary:        Virtual ISO 9660 plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       xorriso
 
@@ -342,7 +342,6 @@ This package is a virtual ISO 9660 (CD-ROM) plugin for %{name}.
 %if !0%{?rhel}
 %package libvirt-plugin
 Summary:        Libvirt plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description libvirt-plugin
@@ -354,7 +353,6 @@ virDomainBlockPeek API.
 
 %package linuxdisk-plugin
 Summary:        Virtual Linux disk plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 # for mke2fs
 Requires:       e2fsprogs
@@ -366,7 +364,6 @@ This package is a virtual Linux disk plugin for %{name}.
 %if !0%{?rhel}
 %package lua-plugin
 Summary:        Lua plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description lua-plugin
@@ -376,7 +373,6 @@ This package lets you write Lua plugins for %{name}.
 
 %package nbd-plugin
 Summary:        NBD proxy / forward plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description nbd-plugin
@@ -387,7 +383,6 @@ to another NBD server.
 %if !0%{?rhel} && 0%{?have_ocaml}
 %package ocaml-plugin
 Summary:        OCaml plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ocaml-plugin
@@ -399,7 +394,6 @@ To compile OCaml plugins you will also need to install
 
 %package ocaml-plugin-devel
 Summary:        OCaml development environment for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       %{name}-ocaml-plugin%{?_isa} = %{version}-%{release}
 
@@ -411,7 +405,6 @@ This package lets you write OCaml plugins for %{name}.
 %if !0%{?rhel}
 %package perl-plugin
 Summary:        Perl plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description perl-plugin
@@ -421,7 +414,6 @@ This package lets you write Perl plugins for %{name}.
 
 %package python-plugin
 Summary:        Python 3 plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description python-plugin
@@ -431,7 +423,6 @@ This package lets you write Python 3 plugins for %{name}.
 %if !0%{?rhel}
 %package ruby-plugin
 Summary:        Ruby plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ruby-plugin
@@ -444,7 +435,6 @@ This package lets you write Ruby plugins for %{name}.
 # which varies across architectures, RPM does not allow this.
 %package S3-plugin
 Summary:        Amazon S3 and Ceph plugin for %{name}
-License:        BSD
 Requires:       %{name}-python-plugin >= 1.22
 # XXX Should not need to add this.
 Requires:       python3-boto3
@@ -457,7 +447,6 @@ or Ceph using %{name}.
 
 %package ssh-plugin
 Summary:        SSH plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ssh-plugin
@@ -467,7 +456,6 @@ This package contains SSH support for %{name}.
 %if !0%{?rhel}
 %package tcl-plugin
 Summary:        Tcl plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description tcl-plugin
@@ -477,7 +465,6 @@ This package lets you write Tcl plugins for %{name}.
 
 %package tmpdisk-plugin
 Summary:        Remote temporary filesystem disk plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 # For mkfs and mke2fs (defaults).
 Requires:       util-linux, e2fsprogs
@@ -494,7 +481,6 @@ This package is a remote temporary filesystem disk plugin for %{name}.
 %if !0%{?rhel}
 %package torrent-plugin
 Summary:        BitTorrent plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description torrent-plugin
@@ -505,7 +491,6 @@ This package is a BitTorrent plugin for %{name}.
 %ifarch x86_64
 %package vddk-plugin
 Summary:        VMware VDDK plugin for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1931818
 Requires:       libxcrypt-compat
@@ -518,7 +503,6 @@ VMware VDDK for accessing VMware disks and servers.
 
 %package basic-filters
 Summary:        Basic filters for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description basic-filters
@@ -544,6 +528,8 @@ nbdkit-delay-filter        Inject read and write delays.
 
 nbdkit-error-filter        Inject errors.
 
+nbdkit-evil-filter         Add random data corruption to reads.
+
 nbdkit-exitlast-filter     Exit on last client connection.
 
 nbdkit-exitwhen-filter     Exit gracefully when an event occurs.
@@ -582,6 +568,10 @@ nbdkit-pause-filter        Pause NBD requests.
 
 nbdkit-protect-filter      Write-protect parts of a plugin.
 
+%if !0%{?rhel}
+nbdkit-qcow2dec-filter     Decode qcow2 files.
+
+%endif
 nbdkit-rate-filter         Limit bandwidth by connection or server.
 
 nbdkit-readahead-filter    Prefetch data when reading sequentially.
@@ -602,7 +592,6 @@ nbdkit-truncate-filter     Truncate, expand, round up or round down size.
 %if !0%{?rhel}
 %package ext2-filter
 Summary:        ext2, ext3 and ext4 filesystem support for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description ext2-filter
@@ -613,7 +602,6 @@ This package contains ext2, ext3 and ext4 filesystem support for
 
 %package gzip-filter
 Summary:        GZip filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description gzip-filter
@@ -622,7 +610,6 @@ This package is a gzip filter for %{name}.
 
 %package stats-filter
 Summary:        Statistics filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description stats-filter
@@ -631,7 +618,6 @@ Display statistics about operations.
 
 %package tar-filter
 Summary:        Tar archive filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       tar
 Obsoletes:      %{name}-tar-plugin < 1.23.9-3
@@ -642,7 +628,6 @@ This package is a tar archive filter for %{name}.
 
 %package xz-filter
 Summary:        XZ filter for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 
 %description xz-filter
@@ -651,7 +636,6 @@ This package is the xz filter for %{name}.
 
 %package devel
 Summary:        Development files and documentation for %{name}
-License:        BSD
 Requires:       %{name}-server%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -663,7 +647,6 @@ plugins for %{name}.
 
 %package srpm-macros
 Summary:       RPM Provides rules for %{name} plugins and filters
-License:       BSD
 BuildArch:     noarch
 
 %description srpm-macros
@@ -673,7 +656,6 @@ for %{name} plugins and filters found in the plugins directory.
 
 %package bash-completion
 Summary:       Bash tab-completion for %{name}
-License:       BSD
 BuildArch:     noarch
 Requires:      bash-completion >= 2.0
 Requires:      %{name}-server = %{version}-%{release}
@@ -711,6 +693,11 @@ export PYTHON=%{__python3}
     --with-selinux \
     --with-ssh \
     --with-zlib \
+%if !0%{?rhel}
+    --with-zlib-ng \
+%else
+    --without-zlib-ng \
+%endif
     --enable-linuxdisk \
     --enable-python \
     --disable-golang \
@@ -727,7 +714,6 @@ export PYTHON=%{__python3}
     --enable-ruby \
     --enable-tcl \
     --enable-torrent \
-    --with-libblkio \
     --with-ext2 \
     --with-iso \
     --with-libvirt \
@@ -737,11 +723,15 @@ export PYTHON=%{__python3}
     --disable-ruby \
     --disable-tcl \
     --disable-torrent \
-    --without-libblkio \
     --without-ext2 \
     --without-iso \
     --without-libvirt \
 %endif
+%if 0%{?have_blkio}
+    --with-libblkio \
+%else
+    --without-libblkio \
+%endif
 %ifarch x86_64
     --enable-vddk \
 %else
@@ -777,13 +767,15 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 rm -f $RPM_BUILD_ROOT%{_mandir}/man3/nbdkit-rust-plugin.3*
 
 %if 0%{?rhel}
-# In RHEL, remove some plugins we cannot --disable.
+# In RHEL, remove some plugins and filters we cannot --disable.
 for f in cc cdi ; do
     rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-$f-plugin.so
     rm -f $RPM_BUILD_ROOT%{_mandir}/man?/nbdkit-$f-plugin.*
 done
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/nbdkit-S3-plugin
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-S3-plugin.1*
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/filters/nbdkit-qcow2dec-filter.so
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-qcow2dec-filter.1*
 %endif
 
 # Install RPM dependency generator.
@@ -881,6 +873,7 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/plugins/nbdkit-info-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-memory-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-ondemand-plugin.so
+%{_libdir}/%{name}/plugins/nbdkit-ones-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-partitioning-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-pattern-plugin.so
 %{_libdir}/%{name}/plugins/nbdkit-random-plugin.so
@@ -896,6 +889,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-info-plugin.1*
 %{_mandir}/man1/nbdkit-memory-plugin.1*
 %{_mandir}/man1/nbdkit-ondemand-plugin.1*
+%{_mandir}/man1/nbdkit-ones-plugin.1*
 %{_mandir}/man1/nbdkit-partitioning-plugin.1*
 %{_mandir}/man1/nbdkit-pattern-plugin.1*
 %{_mandir}/man1/nbdkit-random-plugin.1*
@@ -915,7 +909,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-example*-plugin.1*
 
 
-%if !0%{?rhel}
+%if 0%{?have_blkio}
 %files blkio-plugin
 %doc README.md
 %license LICENSE
@@ -1100,6 +1094,7 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/filters/nbdkit-ddrescue-filter.so
 %{_libdir}/%{name}/filters/nbdkit-delay-filter.so
 %{_libdir}/%{name}/filters/nbdkit-error-filter.so
+%{_libdir}/%{name}/filters/nbdkit-evil-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exitlast-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exitwhen-filter.so
 %{_libdir}/%{name}/filters/nbdkit-exportname-filter.so
@@ -1119,6 +1114,9 @@ export LIBGUESTFS_TRACE=1
 %{_libdir}/%{name}/filters/nbdkit-partition-filter.so
 %{_libdir}/%{name}/filters/nbdkit-pause-filter.so
 %{_libdir}/%{name}/filters/nbdkit-protect-filter.so
+%if !0%{?rhel}
+%{_libdir}/%{name}/filters/nbdkit-qcow2dec-filter.so
+%endif
 %{_libdir}/%{name}/filters/nbdkit-rate-filter.so
 %{_libdir}/%{name}/filters/nbdkit-readahead-filter.so
 %{_libdir}/%{name}/filters/nbdkit-retry-filter.so
@@ -1136,6 +1134,7 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-ddrescue-filter.1*
 %{_mandir}/man1/nbdkit-delay-filter.1*
 %{_mandir}/man1/nbdkit-error-filter.1*
+%{_mandir}/man1/nbdkit-evil-filter.1*
 %{_mandir}/man1/nbdkit-exitlast-filter.1*
 %{_mandir}/man1/nbdkit-exitwhen-filter.1*
 %{_mandir}/man1/nbdkit-exportname-filter.1*
@@ -1155,6 +1154,9 @@ export LIBGUESTFS_TRACE=1
 %{_mandir}/man1/nbdkit-partition-filter.1*
 %{_mandir}/man1/nbdkit-pause-filter.1*
 %{_mandir}/man1/nbdkit-protect-filter.1*
+%if !0%{?rhel}
+%{_mandir}/man1/nbdkit-qcow2dec-filter.1*
+%endif
 %{_mandir}/man1/nbdkit-rate-filter.1*
 %{_mandir}/man1/nbdkit-readahead-filter.1*
 %{_mandir}/man1/nbdkit-retry-filter.1*
@@ -1249,6 +1251,16 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Tue Oct 31 2023 Richard W.M. Jones <rjones@redhat.com> - 1.36.1-1
+- Rebase to 1.36.1
+  resolves: RHEL-14475
+
+* Tue Aug 01 2023 Richard W.M. Jones <rjones@redhat.com> - 1.34.2-1
+- Rebase to 1.34.2
+  resolves: rhbz#2168629
+- Backport nbdkit-curl-plugin "multi" interface support
+  resolves: rhbz#2228131
+
 * Tue Apr 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.34.1-1
 - Rebase to 1.34.1
   resolves: rhbz#2168629

sources

@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.34.1.tar.gz) = 23d87f72046ea2ba5a315bfa85846a94f3557970e9db500d168ba45057d9835c0c51557b9ff6cdc3135bbdc6bb6e6dfed01f0640a08b576b5620c0476578d4ce
-SHA512 (nbdkit-1.34.1.tar.gz.sig) = c25077362fb6459a83e1acbf1a683017c11edffb9760c9707c929ef4ab54583bdfa5bcfd845ce1f3e98fa46add7a4fba9536a7d4fb0cc072b6a41116489a957d
+SHA512 (nbdkit-1.36.1.tar.gz) = ca0e6e6729fb6f43a9717a3815dfb8ff54a2f182ef079e72b0e5e1b018c55f2205be52a10abc0b0a2243d0737f27b1ccf67c0d9586135454a460d39dad79f042
+SHA512 (nbdkit-1.36.1.tar.gz.sig) = d0cf5e58f1d4e5fb601d33f6d1cba7fdc4f7085b3481775e061e89107e1d86cb524b1cae35e79a09873558945844993acd08294a74dbf0c289666caa39f0e243