Rebase along stable-1.30 branch

related: rhbz#2059289

0001-docs-nbdkit-protocol.pod-block-size-support-was-adde.patch

@@ -0,0 +1,28 @@
+From e5ddfa73e84495c6cba5410e414814c89e5616bb Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 14 Jun 2022 10:53:26 +0100
+Subject: [PATCH] docs/nbdkit-protocol.pod: block size support was added in
+ 1.30
+
+Fixes: commit 366c41f86f2846c742d0c42f110b70969fe3bf95
+(cherry picked from commit 9cc1e15014fc9565fd8169f56e4e91cbc9e585e4)
+---
+ docs/nbdkit-protocol.pod | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/nbdkit-protocol.pod b/docs/nbdkit-protocol.pod
+index 39ba021c..1baa1819 100644
+--- a/docs/nbdkit-protocol.pod
++++ b/docs/nbdkit-protocol.pod
+@@ -212,7 +212,7 @@ a client more details about the export.
+ 
+ =item C<NBD_INFO_BLOCK_SIZE>
+ 
+-I<Not supported>.
++Supported in nbdkit E<ge> 1.30.
+ 
+ =item Resize Extension
+ 
+-- 
+2.31.1
+

0002-perl-Move-GCC-diagnostic-ignored-earlier.patch

@@ -0,0 +1,50 @@
+From 3c00f00e5c42633b25f2d54f852af9332bf6c3b7 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sun, 19 Jun 2022 17:58:11 +0100
+Subject: [PATCH] perl: Move GCC diagnostic ignored earlier
+
+Since updating to perl 5.36, the -Wshadow warn/error now occurs when
+including the <perl.h> header file, rather than later on when a macro
+is used.  Because the GCC diagnostic ignored line appeared after
+<perl.h> was included it had no effect.  Moving it before the
+inclusion works around this.  The error was:
+
+In file included from /usr/lib64/perl5/CORE/perl.h:4155,
+                 from perl.c:47:
+/usr/lib64/perl5/CORE/sv_inline.h: In function 'Perl_newSV_type':
+/usr/lib64/perl5/CORE/handy.h:97:35: error: declaration of 'p_' shadows a previous local [-Werror=shadow]
+   97 | #  define MUTABLE_PTR(p) ({ void *p_ = (p); p_; })
+      |                                   ^~
+
+(cherry picked from commit 754f1d46d14b8c97133885fb1422697177e40722)
+---
+ plugins/perl/perl.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
+index 386d5052..26de0e54 100644
+--- a/plugins/perl/perl.c
++++ b/plugins/perl/perl.c
+@@ -42,6 +42,9 @@
+ #include <assert.h>
+ #include <errno.h>
+ 
++/* perl.h contains multiple variable shadowing */
++#pragma GCC diagnostic ignored "-Wshadow"
++
+ #include <XSUB.h>
+ #include <EXTERN.h>
+ #include <perl.h>
+@@ -51,9 +54,6 @@
+ 
+ #include "cleanup.h"
+ 
+-/* Use of perl.h insists on shadowing my_perl during XS(). */
+-#pragma GCC diagnostic ignored "-Wshadow"
+-
+ static PerlInterpreter *my_perl;
+ static const char *script;
+ 
+-- 
+2.31.1
+

0003-ocaml-Add-valgrind-suppression-for-OCaml-4.14-bug.patch

@@ -0,0 +1,55 @@
+From 661994028581a397336aee4b7a846c9b1d0e4b0e Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sun, 19 Jun 2022 18:13:34 +0100
+Subject: [PATCH] ocaml: Add valgrind suppression for OCaml 4.14 bug
+
+==3869068== Memcheck, a memory error detector
+==3869068== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward et al.
+==3869068== Using Valgrind-3.18.1 and LibVEX; rerun with -h for copyright info
+==3869068== Command: ./test_010_import.opt
+==3869068==
+==3869068== Syscall param sigaltstack(ss) points to uninitialised byte(s)
+==3869068==    at 0x49DF24B: sigaltstack (syscall-template.S:120)
+==3869068==    by 0x1A1365: caml_terminate_signals (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==    by 0x1C0C33: caml_startup_common (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==    by 0x1C0CAE: caml_main (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==    by 0x15CDC1: main (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==  Address 0x1ffeffe500 is on thread 1's stack
+==3869068==  in frame #1, created by caml_terminate_signals (???:)
+==3869068==
+==3869068== Syscall param sigaltstack(ss) points to uninitialised byte(s)
+==3869068==    at 0x49DF24B: sigaltstack (syscall-template.S:120)
+==3869068==    by 0x1A1365: caml_terminate_signals (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==    by 0x1B1B6F: caml_do_exit (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==    by 0x15CDC8: main (in /home/rjones/d/libnbd/ocaml/tests/test_010_import.opt)
+==3869068==  Address 0x1ffeffe4d0 is on thread 1's stack
+==3869068==  in frame #1, created by caml_terminate_signals (???:)
+
+(cherry picked from libnbd commit 73dec295f3bbdf8afbfd548eb5a776dee27b0ac0)
+
+(cherry picked from commit e586ca637dfb7d2b4629248cb067a980ccf324f3)
+---
+ valgrind/ocaml.suppressions | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/valgrind/ocaml.suppressions b/valgrind/ocaml.suppressions
+index 8bafc885..fd289c51 100644
+--- a/valgrind/ocaml.suppressions
++++ b/valgrind/ocaml.suppressions
+@@ -46,3 +46,13 @@
+    ...
+    fun:caml_setup_stack_overflow_detection
+ }
++
++# Potential bug in OCaml 4.14
++# https://github.com/ocaml/ocaml/issues/11335
++{
++  caml_terminate_signals_uninitialized_sigaltstack
++  Memcheck:Param
++  sigaltstack(ss)
++  fun:sigaltstack
++  fun:caml_terminate_signals
++}
+-- 
+2.31.1
+

0004-ocaml-Add-further-valgrind-suppression.patch

@@ -0,0 +1,53 @@
+From c92e0b0f2881b385f3183746039cf91a6d1821f9 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 20 Jun 2022 20:24:27 +0100
+Subject: [PATCH] ocaml: Add further valgrind suppression
+
+After discussion with the OCaml team we think these are both bugs in
+valgrind, not OCaml, but we still need a suppression.
+
+==4145632== Syscall param sigaltstack(ss) points to uninitialised byte(s)
+==4145632==    at 0xCC5E24B: sigaltstack (syscall-template.S:120)
+==4145632==    by 0xD7F46CC: caml_stop_stack_overflow_detection (in /home/rjones/d/nbdkit/tests/test-ocaml-plugin.so)
+==4145632==    by 0xD7F277E: caml_startup_common (in /home/rjones/d/nbdkit/tests/test-ocaml-plugin.so)
+==4145632==    by 0xD7F27CC: caml_startup (in /home/rjones/d/nbdkit/tests/test-ocaml-plugin.so)
+==4145632==    by 0xC986891: constructor (plugin.c:64)
+==4145632==    by 0xC133CED: call_init (dl-init.c:70)
+==4145632==    by 0xC133DDB: _dl_init (dl-init.c:117)
+==4145632==    by 0xCD72A73: _dl_catch_exception (dl-error-skeleton.c:182)
+==4145632==    by 0xC13A955: dl_open_worker (dl-open.c:808)
+==4145632==    by 0xCD72A1D: _dl_catch_exception (dl-error-skeleton.c:208)
+==4145632==    by 0xC13ACEB: _dl_open (dl-open.c:883)
+==4145632==    by 0xCCA7EC9: dlopen_doit (dlopen.c:56)
+==4145632==    by 0xCD72A1D: _dl_catch_exception (dl-error-skeleton.c:208)
+==4145632==    by 0xCD72AD2: _dl_catch_error (dl-error-skeleton.c:227)
+==4145632==    by 0xCCA79DE: _dlerror_run (dlerror.c:138)
+==4145632==    by 0xCCA7F67: dlopen@@GLIBC_2.34 (dlopen.c:71)
+==4145632==    by 0x10F775: main (main.c:833)
+==4145632==  Address 0x1ffeffaca0 is on thread 1's stack
+==4145632==  in frame #1, created by caml_stop_stack_overflow_detection (???:)
+
+(cherry picked from commit dba71bf2be6dbcc1585f36a6779395c9fe2cc49d)
+---
+ valgrind/ocaml.suppressions | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/valgrind/ocaml.suppressions b/valgrind/ocaml.suppressions
+index fd289c51..1e5e9505 100644
+--- a/valgrind/ocaml.suppressions
++++ b/valgrind/ocaml.suppressions
+@@ -56,3 +56,11 @@
+   fun:sigaltstack
+   fun:caml_terminate_signals
+ }
++
++{
++  caml_stop_stack_overflow_detection_uninitialized_sigaltstack
++  Memcheck:Param
++  sigaltstack(ss)
++  fun:sigaltstack
++  fun:caml_stop_stack_overflow_detection
++}
+-- 
+2.31.1
+

0005-valgrind-Update-comment-about-valgrind-bug-affecting.patch

@@ -0,0 +1,30 @@
+From 97e037a3abb0e5b4d8d78b8bcc810fd77803af12 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 21 Jun 2022 12:21:55 +0100
+Subject: [PATCH] valgrind: Update comment about valgrind bug affecting OCaml
+
+Fixes: e586ca637d ("ocaml: Add valgrind suppression for OCaml 4.14 bug")
+Fixes: dba71bf2be ("ocaml: Add further valgrind suppression")
+(cherry picked from commit 6f1584ca76979f4e5da912c9d36fbd12ab18d8e2)
+---
+ valgrind/ocaml.suppressions | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/valgrind/ocaml.suppressions b/valgrind/ocaml.suppressions
+index 1e5e9505..f2245431 100644
+--- a/valgrind/ocaml.suppressions
++++ b/valgrind/ocaml.suppressions
+@@ -47,8 +47,8 @@
+    fun:caml_setup_stack_overflow_detection
+ }
+ 
+-# Potential bug in OCaml 4.14
+-# https://github.com/ocaml/ocaml/issues/11335
++# Valgrind bug affecting OCaml 4.14
++# https://bugs.kde.org/show_bug.cgi?id=455711
+ {
+   caml_terminate_signals_uninitialized_sigaltstack
+   Memcheck:Param
+-- 
+2.31.1
+

0006-exitwhen-Check-nbdkit-doesn-t-exit-before-the-pipe-i.patch

@@ -0,0 +1,54 @@
+From 015c1abe341484a61afe31b765c4d8d2fece0fe6 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 25 Jun 2022 16:35:22 +0100
+Subject: [PATCH] exitwhen: Check nbdkit doesn't exit before the pipe is closed
+
+Enhance the existing test with a check that nbdkit does not exit
+before the pipe is closed.
+
+(cherry picked from commit 278b95f931044bd9f2aeb316ccfa00308beacc8d)
+---
+ tests/test-exitwhen-pipe-closed.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-exitwhen-pipe-closed.c b/tests/test-exitwhen-pipe-closed.c
+index 50f28bde..8949932e 100644
+--- a/tests/test-exitwhen-pipe-closed.c
++++ b/tests/test-exitwhen-pipe-closed.c
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <signal.h>
+ 
+ int
+ main (int argc, char *argv[])
+@@ -74,13 +75,23 @@ main (int argc, char *argv[])
+     perror ("execvp");
+     _exit (EXIT_FAILURE);
+   }
++  free (param);
+ 
+-  /* Close the read side of the pipe. */
++  /* Close the read side of the pipe (this does NOT cause nbdkit to exit). */
+   close (fd[0]);
+ 
++  /* Wait a bit. */
++  sleep (2);
++
++  /* nbdkit should still be running. */
++  if (kill (pid, 0) != 0) {
++    fprintf (stderr, "FAIL: %s: nbdkit exited before pipe was closed\n",
++             argv[0]);
++    exit (EXIT_FAILURE);
++  }
++
+   /* The test here is simply that nbdkit exits because we exit and our
+    * side of the pipe is closed.
+    */
+-  free (param);
+   exit (EXIT_SUCCESS);
+ }
+-- 
+2.31.1
+

0007-server-Display-kTLS-setting-in-debug-output.patch

@@ -0,0 +1,77 @@
+From 26e0163cb890ab688943fa8134b523bd6b6eae04 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 27 Jun 2022 10:41:04 +0100
+Subject: [PATCH] server: Display kTLS setting in debug output
+
+When using -D nbdkit.tls.session=1 display the kTLS
+(kernel-accelerated TLS) setting in the debug output.
+
+Thanks: Daiki Ueno
+(cherry picked from commit fd626688845324a4b3c387fa901d96e5d20ea634)
+---
+ configure.ac    |  1 +
+ server/crypto.c | 22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index d958ff2c..6b446a03 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -636,6 +636,7 @@ AS_IF([test "$GNUTLS_LIBS" != ""],[
+         gnutls_group_get_name \
+         gnutls_session_set_verify_cert \
+         gnutls_srp_server_get_username \
++        gnutls_transport_is_ktls_enabled \
+     ])
+     LIBS="$old_LIBS"
+ ])
+diff --git a/server/crypto.c b/server/crypto.c
+index df64e784..51a83b4d 100644
+--- a/server/crypto.c
++++ b/server/crypto.c
+@@ -53,6 +53,7 @@
+ #ifdef HAVE_GNUTLS
+ 
+ #include <gnutls/gnutls.h>
++#include <gnutls/socket.h>
+ #include <gnutls/x509.h>
+ 
+ static int crypto_auth;
+@@ -531,6 +532,9 @@ debug_session (gnutls_session_t session)
+   bool dhe = false, ecdh = false;
+   int grp;
+   const char *desc, *username, *hint;
++#ifdef HAVE_GNUTLS_TRANSPORT_IS_KTLS_ENABLED
++  gnutls_transport_ktls_enable_flags_t ktls_enabled;
++#endif
+ 
+   if (nbdkit_debug_tls_session <= 0)
+     return;
+@@ -538,6 +542,24 @@ debug_session (gnutls_session_t session)
+   desc = gnutls_session_get_desc (session);
+   if (desc) nbdkit_debug ("TLS session: %s", desc);
+ 
++#ifdef HAVE_GNUTLS_TRANSPORT_IS_KTLS_ENABLED
++  ktls_enabled = gnutls_transport_is_ktls_enabled (session);
++  switch (ktls_enabled) {
++  case GNUTLS_KTLS_RECV:
++    nbdkit_debug ("TLS: kTLS enabled for receive only"); break;
++  case GNUTLS_KTLS_SEND:
++    nbdkit_debug ("TLS: kTLS enabled for send only"); break;
++  case GNUTLS_KTLS_DUPLEX:
++    nbdkit_debug ("TLS: kTLS enabled full duplex"); break;
++  default:
++    if ((int) ktls_enabled == 0)
++      nbdkit_debug ("TLS: kTLS disabled");
++    else
++      nbdkit_debug ("TLS: kTLS enabled unknown setting: %d",
++                    (int) ktls_enabled);
++  }
++#endif
++
+   kx = gnutls_kx_get (session);
+   cred = gnutls_auth_get_type (session);
+   switch (cred) {
+-- 
+2.31.1
+

0008-server-Work-around-incorrect-include-in-gnutls-socke.patch

@@ -0,0 +1,46 @@
+From a009e5456582c17d537e63b34fecca99a2d58867 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 27 Jun 2022 11:59:57 +0100
+Subject: [PATCH] server: Work around incorrect include in gnutls/socket.h
+
+On MinGW:
+
+In file included from crypto.c:56:
+/usr/x86_64-w64-mingw32/sys-root/mingw/include/gnutls/socket.h:32:10: fatal error: sys/socket.h: No such file or directory
+   32 | #include <sys/socket.h>
+      |          ^~~~~~~~~~~~~~
+
+gnutls/socket.h shouldn't include this header on MinGW.  As a
+workaround until this is fixed, only include the header when we know
+that the function we need is available.
+
+We will need to revisit this fix when gnutls is fixed.
+
+Link: https://gitlab.com/gnutls/gnutls/-/issues/1382
+Updates: commit fd626688845324a4b3c387fa901d96e5d20ea634
+(cherry picked from commit efc6e3e9b8448ae9530ffab3e95adf072ff02adf)
+---
+ server/crypto.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/server/crypto.c b/server/crypto.c
+index 51a83b4d..06c719f5 100644
+--- a/server/crypto.c
++++ b/server/crypto.c
+@@ -53,9 +53,12 @@
+ #ifdef HAVE_GNUTLS
+ 
+ #include <gnutls/gnutls.h>
+-#include <gnutls/socket.h>
+ #include <gnutls/x509.h>
+ 
++#ifdef HAVE_GNUTLS_TRANSPORT_IS_KTLS_ENABLED
++#include <gnutls/socket.h>
++#endif
++
+ static int crypto_auth;
+ #define CRYPTO_AUTH_CERTIFICATES 1
+ #define CRYPTO_AUTH_PSK 2
+-- 
+2.31.1
+

0009-tests-test-parallel-sh.sh-Small-cleanups.patch

@@ -0,0 +1,72 @@
+From 660a2d164d27f6a563731172439a39a284a2e674 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 27 Jun 2022 14:01:51 +0100
+Subject: [PATCH] tests/test-parallel-sh.sh: Small cleanups
+
+Quote the inline script to make it easier to follow.  This requires us
+to export $curr_fds to nbdkit, but that's fine.
+
+Use $curr_fds != "" as a proxy for the existence of /proc/$$/fd so we
+don't need to test that twice.
+
+Print the parent /proc/$$/fd as well as the child, so if a leaked fd
+happens it's easier to tell what it is.
+
+These are just refactorings which should not affect the test.
+
+(cherry picked from commit 053293f93acee196e6411baf6f2b8827069ae7bf)
+---
+ tests/test-parallel-sh.sh | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/tests/test-parallel-sh.sh b/tests/test-parallel-sh.sh
+index 39ccd569..04f58b89 100755
+--- a/tests/test-parallel-sh.sh
++++ b/tests/test-parallel-sh.sh
+@@ -65,30 +65,34 @@ timeout 30s </dev/null qemu-io -f raw -c "aio_write -P 1 0 512" \
+ 
+ curr_fds=
+ if test -d /proc/$$/fd; then
++    echo "parent fds:" >&2
++    ls -l /proc/$$/fd >&2
+     curr_fds=$(/usr/bin/env bash -c '(ls /proc/$$/fd)' | wc -w)
+ fi
++export curr_fds
+ echo "using curr_fds=$curr_fds"
+ 
+-cat > test-parallel-sh.script <<EOF
++cat > test-parallel-sh.script <<'EOF'
+ #!/usr/bin/env bash
+ f=test-parallel-sh.data
+-if ! test -f \$f; then
++if ! test -f $f; then
+   echo "can't locate test-parallel-sh.data" >&2; exit 5
+ fi
+-if test -d /proc/\$\$/fd; then
++if test -n "$curr_fds"; then
+   (
+-    if test \$( ls /proc/\$\$/fd | wc -w ) -ne \$(($curr_fds + 1)); then
++    if test $( ls /proc/$$/fd | wc -w ) -ne $(($curr_fds + 1)); then
++      echo "nbdkit script fds:" >&2
++      ls -l /proc/$$/fd >&2
+       echo "there seem to be leaked fds, curr_fds=$curr_fds" >&2
+-      ls -l /proc/\$\$/fd >&2
+       exit 1
+     fi
+   ) || exit 5
+ fi
+-case \$1 in
++case $1 in
+   thread_model) echo parallel ;;
+-  get_size) stat -L -c %s \$f || exit 1 ;;
+-  pread) dd iflag=skip_bytes,count_bytes skip=\$4 count=\$3 if=\$f || exit 1 ;;
+-  pwrite) dd oflag=seek_bytes conv=notrunc seek=\$4 of=\$f || exit 1 ;;
++  get_size) stat -L -c %s $f || exit 1 ;;
++  pread) dd iflag=skip_bytes,count_bytes skip=$4 count=$3 if=$f || exit 1 ;;
++  pwrite) dd oflag=seek_bytes conv=notrunc seek=$4 of=$f || exit 1 ;;
+   can_write) ;;
+   *) exit 2 ;;
+ esac
+-- 
+2.31.1
+

0010-tests-test-parallel-sh.sh-Skip-test-under-valgrind-d.patch

@@ -0,0 +1,32 @@
+From 1452ea5da99ce2ad0f1758e656f4de4f78199091 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 27 Jun 2022 14:16:12 +0100
+Subject: [PATCH] tests/test-parallel-sh.sh: Skip test under valgrind +
+ debuginfod
+
+(cherry picked from commit ec44059fbbb32c6fb809a96d80e3e0dedf607794)
+---
+ tests/test-parallel-sh.sh | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tests/test-parallel-sh.sh b/tests/test-parallel-sh.sh
+index 04f58b89..d2c42305 100755
+--- a/tests/test-parallel-sh.sh
++++ b/tests/test-parallel-sh.sh
+@@ -41,6 +41,13 @@ requires dd iflag=count_bytes </dev/null
+ nbdkit --dump-plugin sh | grep -q ^thread_model=parallel ||
+     { echo "nbdkit lacks support for parallel requests"; exit 77; }
+ 
++# debuginfod breaks valgrinding of this test because it creates about
++# a dozen pipe file descriptors, which breaks the leaked fd
++# assumptions in the test below.
++if [ "$NBDKIT_VALGRIND" = "1" ]; then
++    requires test -z "$DEBUGINFOD_URLS"
++fi
++
+ cleanup_fn rm -f test-parallel-sh.data test-parallel-sh.out test-parallel-sh.script
+ 
+ # Populate file, and sanity check that qemu-io can issue parallel requests
+-- 
+2.31.1
+

0011-ssh-Allow-the-remote-file-to-be-created.patch

@@ -1,4 +1,4 @@
-From 3fd637dc2d30cb3001a00ab0f3d5ac0a8875140e Mon Sep 17 00:00:00 2001
+From 8ca4c61dfa5832e02a86e555d26ce4c31bac9a2a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 15 Apr 2022 12:08:37 +0100
 Subject: [PATCH] ssh: Allow the remote file to be created

0012-readahead-Rewrite-this-filter-so-it-prefetches-using.patch

@@ -1,4 +1,4 @@
-From 3e21d31621739533b3bdb77350b4107123b5b5ab Mon Sep 17 00:00:00 2001
+From e38ee7546c883225ee003285c96dadc54ee4fa99 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 16 Apr 2022 18:39:13 +0100
 Subject: [PATCH] readahead: Rewrite this filter so it prefetches using .cache

0013-readahead-Fix-test.patch

@@ -1,4 +1,4 @@
-From cbd0205229240f4a01e9ce7ef6ee4ba55d2b958c Mon Sep 17 00:00:00 2001
+From d1ff7d65048ec2fc7c65a241a15d492e9f2cf718 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 21 Apr 2022 16:14:46 +0100
 Subject: [PATCH] readahead: Fix test

0014-New-filter-luks.patch

@@ -1,4 +1,4 @@
-From 42213b71009e7e5f1f50df78c41ba49beebcf08b Mon Sep 17 00:00:00 2001
+From 9ec34835216f90a8d0d66c06f6b3395071b1c361 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 30 Apr 2022 12:35:07 +0100
 Subject: [PATCH] New filter: luks
@@ -55,7 +55,7 @@ index 4d2a9796..0f5dc41d 100644
  
  * The filter should open a new connection to the plugin per background
 diff --git a/configure.ac b/configure.ac
-index d958ff2c..45a7baf9 100644
+index 6b446a03..f054a9ac 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -127,6 +127,7 @@ filters="\
@@ -77,7 +77,7 @@ index d958ff2c..45a7baf9 100644
      AC_MSG_CHECKING([for default TLS session priority string])
      AC_ARG_WITH([tls-priority],
          [AS_HELP_STRING([--with-tls-priority],
-@@ -1379,6 +1381,7 @@ AC_CONFIG_FILES([Makefile
+@@ -1380,6 +1382,7 @@ AC_CONFIG_FILES([Makefile
                   filters/ip/Makefile
                   filters/limit/Makefile
                   filters/log/Makefile
@@ -85,7 +85,7 @@ index d958ff2c..45a7baf9 100644
                   filters/multi-conn/Makefile
                   filters/nocache/Makefile
                   filters/noextents/Makefile
-@@ -1495,6 +1498,8 @@ feature "ext2 ................................... " \
+@@ -1496,6 +1499,8 @@ feature "ext2 ................................... " \
          test "x$HAVE_EXT2_TRUE" = "x"
  feature "gzip ................................... " \
          test "x$HAVE_ZLIB_TRUE" = "x"

0015-luks-Disable-filter-with-old-GnuTLS-in-Debian-10.patch

@@ -1,4 +1,4 @@
-From fd5de2f6b2bc4e95e98ca44624d04809d989d1a0 Mon Sep 17 00:00:00 2001
+From 7b09b11d133ecd77a5b27c03b0525f66fd4745d5 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 8 May 2022 12:13:39 +0100
 Subject: [PATCH] luks: Disable filter with old GnuTLS in Debian 10
@@ -36,16 +36,17 @@ Fixes: commit 468919dce6c5eb57503eacac0f67e5dd87c58e6c
  3 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 45a7baf9..4c997b5b 100644
+index f054a9ac..d0c765af 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -636,11 +636,14 @@ AS_IF([test "x$GNUTLS_LIBS" != "x"],[
+@@ -636,12 +636,15 @@ AS_IF([test "x$GNUTLS_LIBS" != "x"],[
          gnutls_certificate_set_known_dh_params \
          gnutls_group_get \
          gnutls_group_get_name \
 +        gnutls_pbkdf2 \
          gnutls_session_set_verify_cert \
          gnutls_srp_server_get_username \
+         gnutls_transport_is_ktls_enabled \
      ])
      LIBS="$old_LIBS"
  ])
@@ -54,7 +55,7 @@ index 45a7baf9..4c997b5b 100644
  
  AC_ARG_ENABLE([linuxdisk],
      [AS_HELP_STRING([--disable-linuxdisk],
-@@ -1498,8 +1501,8 @@ feature "ext2 ................................... " \
+@@ -1499,8 +1502,8 @@ feature "ext2 ................................... " \
          test "x$HAVE_EXT2_TRUE" = "x"
  feature "gzip ................................... " \
          test "x$HAVE_ZLIB_TRUE" = "x"

0016-luks-Various-fixes-for-Clang.patch

@@ -1,4 +1,4 @@
-From f83c628b420fa38d9a224d2a7296f7386bf1bb70 Mon Sep 17 00:00:00 2001
+From 90d4d72b776f880a47d507cd930c98dc7a82647d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 8 May 2022 12:30:09 +0100
 Subject: [PATCH] luks: Various fixes for Clang

0017-luks-Link-with-libcompat-on-Windows.patch

@@ -1,4 +1,4 @@
-From dbf2d150c19b2fdad0ee786ace3ef9d3849069dd Mon Sep 17 00:00:00 2001
+From 20a69e48a4e280190179d738b163f30945cb87bb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 8 May 2022 12:38:00 +0100
 Subject: [PATCH] luks: Link with libcompat on Windows

0018-luks-Refactor-the-filter.patch

@@ -1,4 +1,4 @@
-From 792c7e83ea2e440cd4c3433c2ad01cc509502100 Mon Sep 17 00:00:00 2001
+From b329fbd928283ebdce9bb87e8625541beb0d34c9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 8 May 2022 16:13:13 +0100
 Subject: [PATCH] luks: Refactor the filter

0019-tests-luks-Reduce-time-taken-to-run-these-tests.patch

@@ -1,4 +1,4 @@
-From 8b1ce219c6fc62c848412f6ca1c1b2b94550cc7a Mon Sep 17 00:00:00 2001
+From 42f95095ffa8ccf28818eed906e35538503c4850 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 8 May 2022 18:05:45 +0100
 Subject: [PATCH] tests: luks: Reduce time taken to run these tests

0020-Add-nbdkit.parse_size-Python-function.patch

@@ -1,4 +1,4 @@
-From 633cc64db2654a8f64b0a699fb2135130da0b51d Mon Sep 17 00:00:00 2001
+From e6ae2f736e25a1cdc97e4720588a723f5eb8c94b Mon Sep 17 00:00:00 2001
 From: Nikolaus Rath <Nikolaus@rath.org>
 Date: Mon, 9 May 2022 10:04:30 +0100
 Subject: [PATCH] Add nbdkit.parse_size() Python function.

0021-cache-Fix-cross-reference-nbdkit-readahead-filter.patch

@@ -1,4 +1,4 @@
-From 7150142f1aa19d8ae3ba412583dc2452cb3ab865 Mon Sep 17 00:00:00 2001
+From b2271b0d1b38f7fa77fffa8287e56ba94df62c78 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 14 May 2022 13:47:19 +0100
 Subject: [PATCH] cache: Fix cross-reference nbdkit-readahead-filter

0022-curl-Don-t-document-curl-plugin-readahead-filter.patch

@@ -1,4 +1,4 @@
-From 236b50f2c89237de0dc27df7babc0c12cc124cba Mon Sep 17 00:00:00 2001
+From d2626f33f44877759a7d94630e3da8dfd31801b8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 14 May 2022 14:00:16 +0100
 Subject: [PATCH] curl: Don't document curl plugin + readahead filter

0023-New-filter-scan.patch

@@ -1,4 +1,4 @@
-From 89a6bbfee6034fdd649668e820b91133b029291d Mon Sep 17 00:00:00 2001
+From e807d37b9006a5284f60c092a3dae0787a0b30ee Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 14 May 2022 13:46:56 +0100
 Subject: [PATCH] New filter: scan
@@ -54,7 +54,7 @@ index 0f5dc41d..8600d9e4 100644
    single context into the backend shared among multiple client
    connections.  This may even allow a filter to offer a more parallel
 diff --git a/configure.ac b/configure.ac
-index 4c997b5b..38f1f00e 100644
+index d0c765af..fedb9383 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -142,6 +142,7 @@ filters="\
@@ -65,7 +65,7 @@ index 4c997b5b..38f1f00e 100644
          stats \
          swab \
          tar \
-@@ -1399,6 +1400,7 @@ AC_CONFIG_FILES([Makefile
+@@ -1400,6 +1401,7 @@ AC_CONFIG_FILES([Makefile
                   filters/readahead/Makefile
                   filters/retry/Makefile
                   filters/retry-request/Makefile

0024-scan-Remove-condition-variable.patch

@@ -1,4 +1,4 @@
-From 6087920696f9f8e727a126093ec85219a9786522 Mon Sep 17 00:00:00 2001
+From 120bad475468b0a2e2aa2effbd1e51dd04621ce9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 14 May 2022 18:54:32 +0100
 Subject: [PATCH] scan: Remove condition variable

0025-scan-Small-typographical-fix-in-manual.patch

@@ -1,4 +1,4 @@
-From b827d9b373e53468e7c94b4dfee27f0e12310a35 Mon Sep 17 00:00:00 2001
+From 542e0f33a76a232006b53569201a9b01fbcc36cb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 14 May 2022 19:02:48 +0100
 Subject: [PATCH] scan: Small typographical fix in manual

0026-ssh-Don-t-reference-readahead-or-scan-filters-from-t.patch

@@ -1,4 +1,4 @@
-From 5d74215f62f62dedcbf5750f111cc1af440bbb36 Mon Sep 17 00:00:00 2001
+From 66346327f756ba83c8e3ad402b8ff8f67371f335 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 14 May 2022 20:57:38 +0100
 Subject: [PATCH] ssh: Don't reference readahead or scan filters from this

0027-scan-Fix-bound-so-we-don-t-try-to-prefetch-beyond-en.patch

@@ -1,4 +1,4 @@
-From 010c19b3b77b12d5070ae380e4293ba8f2b39a4a Mon Sep 17 00:00:00 2001
+From 40b1785850d62bd1c5ed72121f0d505bb94173f5 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 17 May 2022 13:20:17 +0100
 Subject: [PATCH] scan: Fix bound so we don't try to prefetch beyond end of

0028-tests-Add-a-regression-test-for-LUKS-zeroing-crash.patch

@@ -1,4 +1,4 @@
-From f335c297cf4f8c3e2a92c626151c514f816816a8 Mon Sep 17 00:00:00 2001
+From 3c200a0232a6f49a65e76ef84cb067a49fd70676 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 10 Jun 2022 22:11:44 +0100
 Subject: [PATCH] tests: Add a regression test for LUKS zeroing crash

0029-rate-Allow-burstiness-to-be-controlled.patch

@@ -1,4 +1,4 @@
-From d21cdcc2913994bcc6871f235cfe00f73273ba7a Mon Sep 17 00:00:00 2001
+From b352e5f705d408facfb9798ef30c58db64a477c4 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 11 Jun 2022 12:34:02 +0100
 Subject: [PATCH] rate: Allow burstiness to be controlled

nbdkit.spec

@@ -53,7 +53,7 @@ ExclusiveArch:  x86_64
 
 Name:           nbdkit
 Version:        1.30.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -78,25 +78,35 @@ Source3:        copy-patches.sh
 # https://gitlab.com/nbdkit/nbdkit/-/commits/rhel-9.1/
 
 # Patches.
-Patch0001:     0001-ssh-Allow-the-remote-file-to-be-created.patch
+Patch0001:     0001-docs-nbdkit-protocol.pod-block-size-support-was-adde.patch
-Patch0002:     0002-readahead-Rewrite-this-filter-so-it-prefetches-using.patch
+Patch0002:     0002-perl-Move-GCC-diagnostic-ignored-earlier.patch
-Patch0003:     0003-readahead-Fix-test.patch
+Patch0003:     0003-ocaml-Add-valgrind-suppression-for-OCaml-4.14-bug.patch
-Patch0004:     0004-New-filter-luks.patch
+Patch0004:     0004-ocaml-Add-further-valgrind-suppression.patch
-Patch0005:     0005-luks-Disable-filter-with-old-GnuTLS-in-Debian-10.patch
+Patch0005:     0005-valgrind-Update-comment-about-valgrind-bug-affecting.patch
-Patch0006:     0006-luks-Various-fixes-for-Clang.patch
+Patch0006:     0006-exitwhen-Check-nbdkit-doesn-t-exit-before-the-pipe-i.patch
-Patch0007:     0007-luks-Link-with-libcompat-on-Windows.patch
+Patch0007:     0007-server-Display-kTLS-setting-in-debug-output.patch
-Patch0008:     0008-luks-Refactor-the-filter.patch
+Patch0008:     0008-server-Work-around-incorrect-include-in-gnutls-socke.patch
-Patch0009:     0009-tests-luks-Reduce-time-taken-to-run-these-tests.patch
+Patch0009:     0009-tests-test-parallel-sh.sh-Small-cleanups.patch
-Patch0010:     0010-Add-nbdkit.parse_size-Python-function.patch
+Patch0010:     0010-tests-test-parallel-sh.sh-Skip-test-under-valgrind-d.patch
-Patch0011:     0011-cache-Fix-cross-reference-nbdkit-readahead-filter.patch
+Patch0011:     0011-ssh-Allow-the-remote-file-to-be-created.patch
-Patch0012:     0012-curl-Don-t-document-curl-plugin-readahead-filter.patch
+Patch0012:     0012-readahead-Rewrite-this-filter-so-it-prefetches-using.patch
-Patch0013:     0013-New-filter-scan.patch
+Patch0013:     0013-readahead-Fix-test.patch
-Patch0014:     0014-scan-Remove-condition-variable.patch
+Patch0014:     0014-New-filter-luks.patch
-Patch0015:     0015-scan-Small-typographical-fix-in-manual.patch
+Patch0015:     0015-luks-Disable-filter-with-old-GnuTLS-in-Debian-10.patch
-Patch0016:     0016-ssh-Don-t-reference-readahead-or-scan-filters-from-t.patch
+Patch0016:     0016-luks-Various-fixes-for-Clang.patch
-Patch0017:     0017-scan-Fix-bound-so-we-don-t-try-to-prefetch-beyond-en.patch
+Patch0017:     0017-luks-Link-with-libcompat-on-Windows.patch
-Patch0018:     0018-tests-Add-a-regression-test-for-LUKS-zeroing-crash.patch
+Patch0018:     0018-luks-Refactor-the-filter.patch
-Patch0019:     0019-rate-Allow-burstiness-to-be-controlled.patch
+Patch0019:     0019-tests-luks-Reduce-time-taken-to-run-these-tests.patch
+Patch0020:     0020-Add-nbdkit.parse_size-Python-function.patch
+Patch0021:     0021-cache-Fix-cross-reference-nbdkit-readahead-filter.patch
+Patch0022:     0022-curl-Don-t-document-curl-plugin-readahead-filter.patch
+Patch0023:     0023-New-filter-scan.patch
+Patch0024:     0024-scan-Remove-condition-variable.patch
+Patch0025:     0025-scan-Small-typographical-fix-in-manual.patch
+Patch0026:     0026-ssh-Don-t-reference-readahead-or-scan-filters-from-t.patch
+Patch0027:     0027-scan-Fix-bound-so-we-don-t-try-to-prefetch-beyond-en.patch
+Patch0028:     0028-tests-Add-a-regression-test-for-LUKS-zeroing-crash.patch
+Patch0029:     0029-rate-Allow-burstiness-to-be-controlled.patch
 
 # For automatic RPM Provides generation.
 # See: https://rpm-software-management.github.io/rpm/manual/dependency_generators.html
@@ -1204,7 +1214,7 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
-* Mon Jun 13 2022 Richard W.M. Jones <rjones@redhat.com> - 1.30.6-1
+* Wed Jul 06 2022 Richard W.M. Jones <rjones@redhat.com> - 1.30.6-2
 - Rebase to new stable branch version 1.30.6
   resolves: rhbz#2059289
 - Add automatic provides generator and subpackage nbdkit-srpm-macros