Fix a changelog entry

New tools nbddiscard and nbdzero.

.gitignore

@@ -1,2 +1,3 @@
 /libnbd-*.tar.gz
 /libnbd-*.tar.gz.sig
+/*~

copy-patches.sh

@@ -0,0 +1,55 @@
+#!/bin/bash -
+
+set -e
+
+# Maintainer script to copy patches from the git repo to the current
+# directory.  Use it like this:
+#   ./copy-patches.sh
+
+rhel_version=8.3
+
+# Check we're in the right directory.
+if [ ! -f libnbd.spec ]; then
+    echo "$0: run this from the directory containing 'libnbd.spec'"
+    exit 1
+fi
+
+git_checkout=$HOME/d/libnbd-rhel-$rhel_version
+if [ ! -d $git_checkout ]; then
+    echo "$0: $git_checkout does not exist"
+    echo "This script is only for use by the maintainer when preparing a"
+    echo "libnbd release on RHEL."
+    exit 1
+fi
+
+# Get the base version of libnbd.
+version=`grep '^Version:' libnbd.spec | awk '{print $2}'`
+tag="v$version"
+
+# Remove any existing patches.
+git rm -f [0-9]*.patch ||:
+rm -f [0-9]*.patch
+
+# Get the patches.
+(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N $tag)
+mv $git_checkout/[0-9]*.patch .
+
+# Remove any not to be applied.
+rm -f *NOT-FOR-RPM*.patch
+
+# Add the patches.
+git add [0-9]*.patch
+
+# Print out the patch lines.
+echo
+echo "--- Copy the following text into libnbd.spec file"
+echo
+
+echo "# Patches."
+for f in [0-9]*.patch; do
+    n=`echo $f | awk -F- '{print $1}'`
+    echo "Patch$n:     $f"
+done
+
+echo
+echo "--- End of text"

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

libnbd.spec

@@ -1,19 +1,31 @@
+# i686 no longer has any kind of OCaml compiler, not even ocamlc.
+%ifnarch %{ix86}
+%global have_ocaml 1
+%endif
+
+# No ublk in RHEL 9.
+%if !0%{?rhel}
+%global have_ublk 1
+%endif
+
+# No nbd.ko in RHEL 9.
+%if !0%{?rhel}
+%global have_nbd_ko 1
+%endif
+
 # If we should verify tarball signature with GPGv2.
 %global verify_tarball_signature 1
 
-# If there are patches which touch autotools files, set this to 1.
-%global patches_touch_autotools %{nil}
-
 # The source directory.
-%global source_directory 1.3-development
+%global source_directory 1.24-stable
 
 Name:           libnbd
-Version:        1.3.7
+Version:        1.24.0
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
-License:        LGPLv2+
-URL:            https://github.com/libguestfs/libnbd
+License:        LGPL-2.0-or-later AND BSD-3-Clause
+URL:            https://gitlab.com/nbdkit/libnbd
 
 Source0:        http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz
 Source1:        http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz.sig
@@ -22,48 +34,78 @@ Source1:        http://libguestfs.org/download/libnbd/%{source_directory}/%{name
 # https://pgp.key-server.io/pks/lookup?search=rjones%40redhat.com&fingerprint=on&op=vindex
 Source2:       libguestfs.keyring
 
-%if 0%{patches_touch_autotools}
-BuildRequires: autoconf, automake, libtool
-%endif
+# Maintainer script which helps with handling patches.
+Source3:        copy-patches.sh
 
 %if 0%{verify_tarball_signature}
 BuildRequires:  gnupg2
 %endif
 
+# For rebuilding autoconf cruft.
+BuildRequires:  autoconf, automake, libtool
+
 # For the core library.
 BuildRequires:  gcc
+BuildRequires:  make
 BuildRequires:  /usr/bin/pod2man
 BuildRequires:  gnutls-devel
 BuildRequires:  libxml2-devel
 
 # For nbdfuse.
-BuildRequires:  fuse, fuse-devel
+BuildRequires:  fuse3, fuse3-devel
+
+%if 0%{?have_ublk}
+# For nbdublk
+BuildRequires:  liburing-devel >= 2.2
+BuildRequires:  ubdsrv-devel >= 1.0-3.rc6
+%endif
 
 # For the Python 3 bindings.
 BuildRequires:  python3-devel
 
+%if 0%{?have_ocaml}
 # For the OCaml bindings.
 BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-ocamldoc
+%endif
 
 # Only for building the examples.
 BuildRequires:  glib2-devel
 
 # For bash-completion.
 BuildRequires:  bash-completion
+%if 0%{?fedora} || 0%{?rhel} >= 11
+BuildRequires:  bash-completion-devel
+%endif
 
 # Only for running the test suite.
+BuildRequires:  coreutils
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-utils
 BuildRequires:  gnutls-utils
-%if 0%{?fedora} >= 31
+BuildRequires:  iproute
+BuildRequires:  jq
+%if 0%{?have_nbd_ko}
+BuildRequires:  nbd
+%endif
+BuildRequires:  util-linux
+
+# On RHEL, maybe even in Fedora in future, we do not build qemu-img or
+# nbdkit for i686.  These are only needed for the test suite so make
+# them optional.  This reduces our test exposure on 32 bit platforms,
+# although there is still Fedora/armv7 and some upstream testing.
+%ifnarch %{ix86}
+BuildRequires:  qemu-img
 BuildRequires:  nbdkit
+BuildRequires:  nbdkit-data-plugin
+BuildRequires:  nbdkit-eval-plugin
 BuildRequires:  nbdkit-memory-plugin
 BuildRequires:  nbdkit-null-plugin
 BuildRequires:  nbdkit-pattern-plugin
 BuildRequires:  nbdkit-sh-plugin
+BuildRequires:  nbdkit-sparse-random-plugin
 %endif
-BuildRequires:  nbd
-BuildRequires:  qemu-img
-BuildRequires:  gcc-c++
 
 
 %description
@@ -89,7 +131,6 @@ The key features are:
 
 %package devel
 Summary:        Development headers for %{name}
-License:        LGPLv2+ and BSD
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
@@ -97,6 +138,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package contains development headers for %{name}.
 
 
+%if 0%{?have_ocaml}
 %package -n ocaml-%{name}
 Summary:        OCaml language bindings for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -115,6 +157,7 @@ Requires:       ocaml-%{name}%{?_isa} = %{version}-%{release}
 This package contains OCaml language development package for
 %{name}.  Install this if you want to compile OCaml software which
 uses %{name}.
+%endif
 
 
 %package -n python3-%{name}
@@ -133,14 +176,28 @@ python3-%{name} contains Python 3 bindings for %{name}.
 
 %package -n nbdfuse
 Summary:        FUSE support for %{name}
-License:        LGPLv2+ and BSD
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Recommends:     fuse3
 
 
 %description -n nbdfuse
 This package contains FUSE support for %{name}.
 
 
+%if 0%{?have_ublk}
+%package -n nbdublk
+Summary:        Userspace NBD block device
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Recommends:     kernel >= 6.0.0
+Recommends:     %{_sbindir}/ublk
+
+
+%description -n nbdublk
+This package contains a userspace NBD block device
+based on %{name}.
+%endif
+
+
 %package bash-completion
 Summary:       Bash tab-completion for %{name}
 BuildArch:     noarch
@@ -160,20 +217,31 @@ for %{name}.
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %endif
 %autosetup -p1
-%if 0%{patches_touch_autotools}
 autoreconf -i
-%endif
 
 
 %build
 %configure \
     --disable-static \
+    --with-extra='%{name}-%{version}-%{release}' \
     --with-tls-priority=@LIBNBD,SYSTEM \
+    --with-bash-completions \
     PYTHON=%{__python3} \
     --enable-python \
+%if 0%{?have_ocaml}
     --enable-ocaml \
+%else
+    --disable-ocaml \
+%endif
     --enable-fuse \
-    --disable-golang
+    --disable-golang \
+    --disable-rust \
+%if 0%{?have_ublk}
+    --enable-ublk \
+%else
+    --disable-ublk \
+%endif
+    %{nil}
 
 make %{?_smp_mflags}
 
@@ -187,28 +255,38 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 # Delete the golang man page since we're not distributing the bindings.
 rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3*
 
+%if !0%{?have_ocaml}
+# Delete the OCaml man page on i686.
+rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-ocaml.3*
+%endif
+
 
 %check
-# interop/structured-read.sh fails with the old qemu-nbd in Fedora 29,
-# so disable it there.
-%if 0%{?fedora} <= 29
-rm interop/structured-read.sh
-touch interop/structured-read.sh
-chmod +x interop/structured-read.sh
+function skip_test ()
+{
+    for f in "$@"; do
+        rm -f "$f"
+        echo 'exit 77' > "$f"
+        chmod +x "$f"
+    done
+}
+
+# interop/interop-qemu-storage-daemon.sh fails in RHEL 9 because of
+# this bug in qemu:
+# https://lists.nongnu.org/archive/html/qemu-devel/2021-03/threads.html#03544
+%if 0%{?rhel}
+skip_test interop/interop-qemu-storage-daemon.sh
 %endif
 
 # All fuse tests fail in Koji with:
 # fusermount: entry for fuse/test-*.d not found in /etc/mtab
 # for unknown reasons but probably related to the Koji environment.
-for f in fuse/test-*.sh; do
-    rm $f
-    touch $f
-    chmod +x $f
-done
+skip_test fuse/test-*.sh
+
+# IPv6 loopback connections fail in Koji.
+make -C tests connect-tcp6 ||:
+skip_test tests/connect-tcp6
 
-# Disable the tests on 32 bit because:
-# https://github.com/ocaml/ocaml/issues/9460
-%ifarch aarch64 ppc64 ppc64le riscv64 s390x x86_64
 make %{?_smp_mflags} check || {
     for f in $(find -name test-suite.log); do
         echo
@@ -217,13 +295,18 @@ make %{?_smp_mflags} check || {
     done
     exit 1
   }
-%endif
 
 
 %files
-%doc README
+%doc README.md
 %license COPYING.LIB
+%{_bindir}/nbdcopy
+%{_bindir}/nbddump
+%{_bindir}/nbdinfo
 %{_libdir}/libnbd.so.*
+%{_mandir}/man1/nbdcopy.1*
+%{_mandir}/man1/nbddump.1*
+%{_mandir}/man1/nbdinfo.1*
 
 
 %files devel
@@ -238,12 +321,12 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man3/nbd_*.3*
 
 
+%if 0%{?have_ocaml}
 %files -n ocaml-%{name}
-%{_libdir}/ocaml/nbd
-%exclude %{_libdir}/ocaml/nbd/*.a
-%exclude %{_libdir}/ocaml/nbd/*.cmxa
-%exclude %{_libdir}/ocaml/nbd/*.cmx
-%exclude %{_libdir}/ocaml/nbd/*.mli
+%dir %{_libdir}/ocaml/nbd
+%{_libdir}/ocaml/nbd/META
+%{_libdir}/ocaml/nbd/*.cma
+%{_libdir}/ocaml/nbd/*.cmi
 %{_libdir}/ocaml/stublibs/dllmlnbd.so
 %{_libdir}/ocaml/stublibs/dllmlnbd.so.owner
 
@@ -251,11 +334,16 @@ make %{?_smp_mflags} check || {
 %files -n ocaml-%{name}-devel
 %doc ocaml/examples/*.ml
 %license ocaml/examples/LICENSE-FOR-EXAMPLES
-%{_libdir}/ocaml/nbd/*.a
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/nbd/*.cmxa
 %{_libdir}/ocaml/nbd/*.cmx
+%endif
+%{_libdir}/ocaml/nbd/*.a
 %{_libdir}/ocaml/nbd/*.mli
 %{_mandir}/man3/libnbd-ocaml.3*
+%{_mandir}/man3/NBD.3*
+%{_mandir}/man3/NBD.*.3*
+%endif
 
 
 %files -n python3-%{name}
@@ -263,8 +351,13 @@ make %{?_smp_mflags} check || {
 %{python3_sitearch}/nbd.py
 %{python3_sitearch}/nbdsh.py
 %{python3_sitearch}/__pycache__/nbd*.py*
+%{_bindir}/nbddiscard
 %{_bindir}/nbdsh
+%{_bindir}/nbdzero
+%{_mandir}/man1/nbddiscard.1*
 %{_mandir}/man1/nbdsh.1*
+%{_mandir}/man1/nbdzero.1*
+%{_mandir}/man3/libnbd-python.3*
 
 
 %files -n nbdfuse
@@ -272,13 +365,598 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdfuse.1*
 
 
+%if 0%{?have_ublk}
+%files -n nbdublk
+%{_bindir}/nbdublk
+%{_mandir}/man1/nbdublk.1*
+%endif
+
+
 %files bash-completion
+%if 0%{?fedora} || 0%{?rhel} >= 11
+%dir %{bash_completions_dir}
+%{bash_completions_dir}/nbdcopy
+%{bash_completions_dir}/nbddiscard
+%{bash_completions_dir}/nbddump
+%{bash_completions_dir}/nbdfuse
+%{bash_completions_dir}/nbdinfo
+%{bash_completions_dir}/nbdsh
+%if 0%{?have_ublk}
+%{bash_completions_dir}/nbdublk
+%endif
+%{bash_completions_dir}/nbdzero
+%else
 %dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/nbdcopy
+%{_datadir}/bash-completion/completions/nbddiscard
+%{_datadir}/bash-completion/completions/nbddump
 %{_datadir}/bash-completion/completions/nbdfuse
+%{_datadir}/bash-completion/completions/nbdinfo
 %{_datadir}/bash-completion/completions/nbdsh
+%if 0%{?have_ublk}
+%{_datadir}/bash-completion/completions/nbdublk
+%endif
+%{_datadir}/bash-completion/completions/nbdzero
+%endif
 
 
 %changelog
+* Tue Dec 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1.24.0-1
+- New upstream stable version 1.24.0
+
+* Tue Dec 02 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.13-1
+- New upstream development version 1.23.13
+
+* Tue Nov 18 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.12-1
+- New upstream development version 1.23.12
+
+* Fri Nov 14 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.11-1
+- New upstream development version 1.23.11
+
+* Tue Nov  4 2025 Tom Callaway <spot@fedoraproject.org> - 1.23.10-2
+- rebuild for new fuse3
+
+* Sun Nov  2 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.10-1
+- New upstream development version 1.23.10
+- New tools nbddiscard and nbdzero.
+
+* Thu Oct 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.9-1
+- New upstream development version 1.23.9
+- Fixes security issue with nbd+ssh URIs
+  https://lists.libguestfs.org/archives/list/guestfs@lists.libguestfs.org/thread/YZMBF3SJRWTRVT5L3KWSNHITFTRMQNTT/
+
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.8-3
+- OCaml 5.4.0 rebuild
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.23.8-2
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Sat Sep 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.8-1
+- New upstream development version 1.23.8
+
+* Sat Aug 23 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.7-1
+- New upstream development version 1.23.7
+
+* Sat Aug 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.6-1
+- New upstream development version 1.23.6
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.23.5-3
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Wed Jul 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.5-1
+- New upstream development version 1.23.5
+- Add './configure --with-extra' containing downstream package information.
+
+* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 1.23.4-3
+- Rebuild to fix OCaml dependencies
+
+* Fri Jun 06 2025 Python Maint <python-maint@redhat.com> - 1.23.4-2
+- Rebuilt for Python 3.14
+
+* Thu Jun 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.4-1
+- New upstream development version 1.23.4
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 1.23.3-2
+- Rebuilt for Python 3.14
+
+* Tue Apr 22 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.3-1
+- New upstream development version 1.23.3
+
+* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.2-1
+- New upstream development version 1.23.2
+
+* Mon Mar 31 2025 Richard W.M. Jones <rjones@redhat.com> - 1.23.1-1
+- New upstream development version 1.23.1
+
+* Mon Mar 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1.22.1-1
+- New upstream stable version 1.22.1
+
+* Tue Feb 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1.22.0-1
+- New upstream stable version 1.22.0
+
+* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan  9 2025 Jerry James <loganjerry@gmail.com> - 1.21.6-2
+- OCaml 5.3.0 rebuild for Fedora 42
+
+* Mon Oct 14 2024 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-1
+- New upstream development version 1.21.6
+
+* Fri Sep 27 2024 Richard W.M. Jones <rjones@redhat.com> - 1.21.5-1
+- New upstream development version 1.21.5
+
+* Thu Sep 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1.21.4-1
+- New upstream development version 1.21.4
+
+* Sun Jul 28 2024 Richard W.M. Jones <rjones@redhat.com> - 1.21.3-1
+- New upstream development version 1.21.3
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jun 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1.21.1-1
+- New upstream development version 1.21.1
+- Fix: multiple flaws in TLS server certificate checking
+
+* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.20.1-4
+- OCaml 5.2.0 ppc64le fix
+
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 1.20.1-3
+- Rebuilt for Python 3.13
+
+* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1.20.1-2
+- OCaml 5.2.0 for Fedora 41
+
+* Thu May 23 2024 Jerry James <loganjerry@gmail.com> - 1.20.1-1
+- Remove unneeded Stdlib__Callback workaround
+
+* Tue May  7 2024 Richard W.M. Jones <rjones@redhat.com> - 1.20.1-1
+- New stable branch version 1.20.1
+
+* Thu Apr  4 2024 Richard W.M. Jones <rjones@redhat.com> - 1.20.0-1
+- New stable branch version 1.20.0
+- Rebuild autoconf cruft unconditionally.
+
+* Mon Mar 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.11-1
+- New upstream development version 1.19.11
+- Use %%{bash_completions_dir} macro
+
+* Fri Mar 15 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.10-1
+- New upstream development version 1.19.10
+
+* Mon Mar 11 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.9-1
+- New upstream development version 1.19.9
+
+* Mon Mar 04 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.8-1
+- New upstream development version 1.19.8
+
+* Sat Feb 17 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.7-1
+- New upstream development version 1.19.7
+
+* Mon Feb 05 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.6-1
+- New upstream development version 1.19.6
+
+* Thu Jan 25 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.5-3
+- Bump and rebuild for ELN
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.5-1
+- New upstream development version 1.19.5
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 16 2024 Richard W.M. Jones <rjones@redhat.com> - 1.19.4-1
+- New upstream development version 1.19.4
+
+* Tue Dec 19 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.3-2
+- New upstream development version 1.19.3
+
+* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.2-4
+- OCaml 5.1.1 + s390x code gen fix for Fedora 40
+
+* Thu Dec 14 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.2-3
+- Fixes for https://github.com/ocaml/ocaml/issues/12820
+
+* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.2-2
+- OCaml 5.1.1 rebuild for Fedora 40
+
+* Wed Nov 22 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.2-1
+- New upstream development version 1.19.2
+
+* Tue Oct 31 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-2
+- Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871)
+
+* Mon Oct 23 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-1
+- New upstream development version 1.19.1
+
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.0-2
+- OCaml 5.1 rebuild for Fedora 40
+
+* Wed Sep 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.18.0-1
+- New upstream stable version 1.18.0
+
+* Fri Sep 08 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.5-1
+- New upstream development version 1.17.5
+
+* Wed Aug 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.4-1
+- New upstream development version 1.17.4
+
+* Fri Aug 04 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.3-1
+- New upstream development version 1.17.3
+- Disable Rust bindings.
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jul 14 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.2-1
+- New upstream development version 1.17.2
+
+* Thu Jul 13 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.1-6
+- Bump and rebuild for updated python3 and perl
+
+* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.1-5
+- OCaml 5.0 rebuild for Fedora 39
+
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.17.1-4
+- OCaml 5.0.0 rebuild
+
+* Mon Jun 26 2023 Python Maint <python-maint@redhat.com> - 1.17.1-3
+- Rebuilt for Python 3.12
+
+* Thu Jun 22 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.1-2
+- Add OCaml 5 support
+
+* Mon Jun 19 2023 Richard W.M. Jones <rjones@redhat.com> - 1.17.1-1
+- New upstream development version 1.17.1
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.16.1-3
+- Rebuilt for Python 3.12
+
+* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.16.1-2
+- Migrated to SPDX license
+
+* Wed May 10 2023 Richard W.M. Jones <rjones@redhat.com> - 1.16.1-1
+- New upstream stable version 1.16.1
+
+* Tue Apr 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.16.0-1
+- New upstream stable version 1.16.0
+
+* Thu Apr 13 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.13-1
+- New upstream development version 1.15.13
+
+* Thu Mar 09 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.12-1
+- New upstream development version 1.15.12
+
+* Tue Feb 28 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.11-1
+- New upstream development version 1.15.11
+
+* Sat Feb 25 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.10-1
+- New upstream development version 1.15.10
+
+* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.9-2
+- Rebuild OCaml packages for F38
+
+* Sat Jan 21 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.9-1
+- New upstream development version 1.15.9
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 03 2023 Richard W.M. Jones <rjones@redhat.com> - 1.15.8-3
+- Fix for Python 3.12 distutils change (RHBZ#2152674).
+
+* Fri Dec 09 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.8-2
+- Rebuild against new ubdsrv API
+
+* Fri Nov 25 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.8-1
+- New upstream development version 1.15.8
+
+* Thu Nov 03 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.7-1
+- New upstream development version 1.15.7
+
+* Thu Oct 13 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.6-1
+- New upstream development version 1.15.6
+
+* Tue Oct 11 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.5-1
+- New upstream development version 1.15.5
+
+* Tue Sep 27 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.4-1
+- New upstream development version 1.15.4
+
+* Fri Sep 02 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.3-1
+- New upstream development version 1.15.3
+- New tool: nbdublk
+
+* Thu Aug 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.15.1-1
+- New upstream development version 1.15.1
+
+* Thu Aug 11 2022 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-1
+- New upstream stable version 1.14.1
+
+* Tue Aug 02 2022 Richard W.M. Jones <rjones@redhat.com> - 1.14.0-2
+- Add some small upstream patches since 1.14.0
+
+* Mon Aug 01 2022 Richard W.M. Jones <rjones@redhat.com> - 1.14.0-1
+- New upstream stable version 1.14.0
+
+* Fri Jul 29 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.9-1
+- New upstream development version 1.13.9
+
+* Wed Jul 27 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.8-1
+- New upstream development version 1.13.8
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Jul 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.7-1
+- New upstream development version 1.13.7
+
+* Sun Jul 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.6-1
+- New upstream development version 1.13.6
+
+* Fri Jul 01 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.5-1
+- New upstream development version 1.13.5
+
+* Thu Jun 30 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.4-1
+- New upstream development version 1.13.4
+- New tool: nbddump
+
+* Mon Jun 27 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.3-1
+- New upstream development version 1.13.3
+
+* Mon Jun 20 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.2-5
+- Rebuild for OCaml 4.14.0 because of Python conflict
+
+* Mon Jun 20 2022 Python Maint <python-maint@redhat.com> - 1.13.2-4
+- Rebuilt for Python 3.11
+
+* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.2-3
+- OCaml 4.14.0 rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.13.2-2
+- Rebuilt for Python 3.11
+
+* Mon Jun 13 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.2-1
+- New upstream development version 1.13.2
+
+* Thu Jun 09 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.1-1
+- New upstream development version 1.13.1
+- Rename README file.
+
+* Sun May 29 2022 Richard W.M. Jones <rjones@redhat.com> - 1.12.3-1
+- New upstream stable version 1.12.3
+
+* Tue Mar 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1.12.2-1
+- New upstream stable version 1.12.2
+
+* Tue Mar 01 2022 Richard W.M. Jones <rjones@redhat.com> - 1.12.1-1
+- New upstream stable version 1.12.1
+
+* Thu Feb 24 2022 Richard W.M. Jones <rjones@redhat.com> - 1.12.0-1
+- New upstream stable version 1.12.0
+
+* Sat Feb 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.11-1
+- New upstream development version 1.11.11
+
+* Tue Feb 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.10-1
+- New upstream development version 1.11.10
+
+* Thu Feb 10 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.9-1
+- New upstream development version 1.11.9
+
+* Sat Feb 05 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.8-1
+- New upstream development version 1.11.8.
+- Fixes: CVE-2022-0485 nbdcopy may create corrupted destination image
+
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.7-3
+- OCaml 4.13.1 rebuild to remove package notes
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 17 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.7-1
+- New upstream development version 1.11.7
+
+* Tue Jan 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.11.6-1
+- New upstream development version 1.11.6
+
+* Tue Nov 30 2021 Eric Blake <eblake@redhat.com> - 1.11.5-1
+- New upstream development version 1.11.5
+
+* Fri Nov 19 2021 Richard W.M. Jones <rjones@redhat.com> - 1.11.4-1
+- New upstream development version 1.11.4
+
+* Thu Nov 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.11.3-1
+- New upstream development version 1.11.3
+
+* Tue Nov 02 2021 Richard W.M. Jones <rjones@redhat.com> - 1.11.2-1
+- New upstream development version 1.11.2
+
+* Mon Oct 25 2021 Richard W.M. Jones <rjones@redhat.com> - 1.11.1-1
+- New upstream development version 1.11.1
+
+* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1.10.0-2
+- OCaml 4.13.1 build
+
+* Thu Sep 23 2021 Richard W.M. Jones <rjones@redhat.com> - 1.10.0-1
+- New upstream stable branch version 1.10.0
+
+* Tue Sep 21 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.6-1
+- New upstream development version 1.9.6.
+
+* Fri Sep 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.5-1
+- New upstream development version 1.9.5.
+
+* Fri Aug 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.4-1
+- New upstream development version 1.9.4.
+
+* Fri Jul 30 2021 Eric Blake <eblake@redhat.com> - 1.9.3-1
+- New upstream development version 1.9.3.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.2-1
+- New upstream development version 1.9.2.
+
+* Fri Jun 11 2021 Richard W.M. Jones <rjones@redhat.com> - 1.9.1-1
+- New upstream development version 1.9.1.
+
+* Mon Jun 07 2021 Python Maint <python-maint@redhat.com> - 1.8.0-2
+- Rebuilt for Python 3.10
+
+* Mon Jun 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-1
+- New upstream version 1.8.0.
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.7.12-2
+- Rebuilt for Python 3.10
+
+* Sat May 29 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.12-1
+- New upstream version 1.7.12.
+
+* Thu May 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.11-1
+- New upstream version 1.7.11.
+
+* Fri May 14 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.10-1
+- New upstream version 1.7.10.
+
+* Thu Apr 29 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.9-1
+- New upstream version 1.7.9.
+- Switch to fuse3.
+- Make nbdfuse package recommend fuse3 (to get fusermount3).
+
+* Sat Apr 24 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.8-1
+- New upstream development version 1.7.8.
+
+* Sat Apr 10 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.7-1
+- New upstream development version 1.7.7.
+- +BR iproute
+- Add skip_test helper function.
+- Skip connect-tcp6 test which fails under Koji.
+
+* Thu Apr 08 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.6-1
+- New upstream development version 1.7.6.
+
+* Sat Apr 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.5-1
+- New upstream development version 1.7.5.
+
+* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.4-1
+- New upstream development version 1.7.4.
+
+* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-3
+- Update documentation for CVE-2021-20286.
+- Workaround broken interop/interop-qemu-storage-daemon.sh test in RHEL 9.
+
+* Thu Mar  4 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-2
+- Add fix for nbdkit test suite.
+
+* Tue Mar  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-1
+- New upstream version 1.7.3.
+
+* Mon Mar  1 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.2-3
+- OCaml 4.12.0 build
+
+* Wed Feb 24 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.2-2
+- Disable nbd BR on RHEL.
+
+* Mon Feb 22 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.2-1
+- New upstream version 1.7.2.
+
+* Fri Jan 29 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-6
+- Disable BR qemu-img on i686.
+
+* Thu Jan 28 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-3
+- Disable BR nbdkit on i686 because it breaks ELN/RHEL 9.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-1
+- New upstream development version 1.7.1.
+
+* Thu Jan 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.6.0-1
+- New upstream stable version 1.6.0.
+
+* Tue Dec 08 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.9-1
+- New upstream development version 1.5.9.
+
+* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.8-1
+- New upstream development version 1.5.8.
+- Unify Fedora and RHEL spec files.
+
+* Wed Nov 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.7-1
+- New upstream development version 1.5.7.
+- Add some more test suite buildrequires lines.
+- Fix bogus date in changelog.
+
+* Thu Nov 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.6-1
+- New upstream development version 1.5.6.
+
+* Mon Nov 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.5-1
+- New upstream development version 1.5.5.
+
+* Mon Oct 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.4-1
+- New upstream development version 1.5.4.
+- More OCaml man pages.
+
+* Sat Sep 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.3-1
+- New upstream development version 1.5.3.
+
+* Thu Sep 10 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.2-1
+- New upstream development version 1.5.2.
+
+* Tue Sep 08 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.1-1
+- New upstream development version 1.5.1.
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-2
+- OCaml 4.11.1 rebuild
+
+* Tue Aug 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-1
+- New stable release 1.4.0.
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-3
+- Bump release and rebuild.
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-2
+- OCaml 4.11.0 rebuild
+
+* Thu Aug 20 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
+- New upstream version 1.3.12.
+
+* Thu Aug  6 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.11-1
+- New upstream version 1.3.11.
+
+* Tue Aug  4 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.10-1
+- New upstream version 1.3.10.
+
+* Wed Jul 29 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.9-3
+- Bump and rebuild.
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.9-1
+- New upstream version 1.3.9.
+- New tool: nbdinfo.
+
+* Fri Jul 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.8-2
+- New upstream version 1.3.8.
+- New tool: nbdcopy
+- Add upstream patch to fix compilation with glibc from Rawhide.
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.3.7-3
+- Rebuilt for Python 3.9
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-2
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
 * Thu Apr 23 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3.7-1
 - New upstream version 1.3.7.
 

sources

@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.3.7.tar.gz) = 28980a8b4200ec41a6e344ca34e3fcfb27fb7a896b93e0883709da1804b310b1dbc76e9313524934909fd1ce55f019d2fa72d7058ea8db00f44795fdaa8e33b2
-SHA512 (libnbd-1.3.7.tar.gz.sig) = fc7a13d957dbc2595301d14f45674ae700f98d50ef57577cd5ce2ce4a33df043423f9ee41e44c06637d29a0728a0a526887a33b3d3dfe8cd175a535e00836a11
+SHA512 (libnbd-1.24.0.tar.gz) = db05b606a19b3efb6a53c05b5b7ea96571892b7540fff1f4df0c53d0f82e3817f724fd0aa665597b58a4613545b03d7df6e1ac8f3fa64c7f85e824ca2221f3ae
+SHA512 (libnbd-1.24.0.tar.gz.sig) = 718b0ebeb3f3fa487682ef93184fc1851f44d3e74695b61e64f32d5de508833dba885aaea9366a29293ad60badce3cfafb8881b61a103559185517a2202fae27

tests/basic-test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -
+set -e
+set -x
+
+# Enable libnbd debugging.
+export LIBNBD_DEBUG=1
+
+# Connect to nbdkit.
+nbdsh -c - <<EOF
+h.connect_command (["nbdkit", "-s", "--exit-with-parent",
+                    "memory", "size=1G"])
+size = h.get_size ()
+print ("size = %s" % size)
+assert size == 1073741824
+EOF

tests/tests.yml

@@ -0,0 +1,12 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - python3-libnbd
+    - nbdkit
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh