import nbdkit-1.28.4-1.el9

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/libguestfs.keyring
-SOURCES/nbdkit-1.28.3.tar.gz
+SOURCES/nbdkit-1.28.4.tar.gz

.nbdkit.metadata

@@ -1,2 +1,2 @@
 cc1b37b9cfafa515aab3eefd345ecc59aac2ce7b SOURCES/libguestfs.keyring
-0ec6c759802dd658a7e78b657886c1af11fd16e8 SOURCES/nbdkit-1.28.3.tar.gz
+fe835102a83e76babc7050b6551beabc2f7fb226 SOURCES/nbdkit-1.28.4.tar.gz

SOURCES/0001-vddk-Refactor-how-D-vddk.stats-1-is-collected.patch

@@ -1,4 +1,4 @@
-From 40016b4cf27cd68c55fc505e97b658b4fc3643c9 Mon Sep 17 00:00:00 2001
+From 1d9a1341c6d9b0f2150a37ec3617eeee01bbfee2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 21 Oct 2021 14:49:52 +0100
 Subject: [PATCH] vddk: Refactor how -D vddk.stats=1 is collected

SOURCES/0002-vddk-Extend-D-vddk.stats-1-to-show-number-of-calls-a.patch

@@ -1,4 +1,4 @@
-From 262f7fcd22dd57ae30739703c94bc56f32a8ceec Mon Sep 17 00:00:00 2001
+From 3c72e2d273fd446905086c6611ca11bd7dace149 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 21 Oct 2021 15:10:00 +0100
 Subject: [PATCH] vddk: Extend -D vddk.stats=1 to show number of calls and

SOURCES/0003-vddk-Simplify-and-consolidate-VDDK_CALL_START-END-ma.patch

@@ -1,4 +1,4 @@
-From ea29f00332300e5a5808931ae48920c715c59182 Mon Sep 17 00:00:00 2001
+From a87b9b1ecd0b98ffb9e04d7de525952962875ec2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 21 Oct 2021 22:55:17 +0100
 Subject: [PATCH] vddk: Simplify and consolidate VDDK_CALL_START/END macros

SOURCES/0004-vddk-Document-troubleshooting-performance-problems.patch

@@ -1,4 +1,4 @@
-From 7433c58a81d156fe078a8d5d39d75c8cfde458de Mon Sep 17 00:00:00 2001
+From ae618b75f2b158b4563ab94371b01b2951b1bfec Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 22 Oct 2021 18:00:27 +0100
 Subject: [PATCH] vddk: Document troubleshooting performance problems

SOURCES/0005-vddk-Include-VDDK-major-library-version-in-dump-plug.patch

@@ -1,4 +1,4 @@
-From e1b498bef17d1be8a19a5d29f34bc99c21b54e12 Mon Sep 17 00:00:00 2001
+From 01f3fb69c8cdb730b74c36d0e5909adc7c50b35e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 23 Oct 2021 16:16:39 +0100
 Subject: [PATCH] vddk: Include VDDK major library version in --dump-plugin

SOURCES/0006-vddk-Add-logical-and-physical-sector-size-to-D-vddk..patch

@@ -1,4 +1,4 @@
-From 7cd9b2bbbdae01513baa215abfacecbf19af2b1d Mon Sep 17 00:00:00 2001
+From 8b62059a60444f2e85b0cdfc34cbe7e123796fc8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 23 Oct 2021 16:24:27 +0100
 Subject: [PATCH] vddk: Add logical and physical sector size to -D

SOURCES/0007-vddk-Fix-typo-in-debug-message.patch

@@ -1,4 +1,4 @@
-From f00a059f71372a38703a2393b791703dfcb4f143 Mon Sep 17 00:00:00 2001
+From a7e524ffec7c144d45838f4c2e9e311c0a0f4d01 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 23 Oct 2021 19:41:07 +0100
 Subject: [PATCH] vddk: Fix typo in debug message

SOURCES/0008-vddk-Only-print-vddk_library_version-when-we-managed.patch

@@ -1,4 +1,4 @@
-From 27926a76f087cc81fc07f5a72da50384aab785c6 Mon Sep 17 00:00:00 2001
+From 4c451e9e8f0916c319f6a89ef5ecbb0536cb36c0 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 23 Oct 2021 19:50:52 +0100
 Subject: [PATCH] vddk: Only print vddk_library_version when we managed to load

SOURCES/0009-vddk-Print-one-line-in-dump-plugin-output-for-each-V.patch

@@ -1,4 +1,4 @@
-From 7b43137763287b3d79874e27146ea2fecc5f9a17 Mon Sep 17 00:00:00 2001
+From 11bb4d037a9a14537cde30cef4e6a17cec2d47b8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 25 Oct 2021 08:36:53 +0100
 Subject: [PATCH] vddk: Print one line in --dump-plugin output for each VDDK

SOURCES/0010-vddk-Move-minimum-version-to-VDDK-6.5.patch

@@ -1,4 +1,4 @@
-From d4e1acf2e9b607a05b08ceb49d2879db02016cfe Mon Sep 17 00:00:00 2001
+From 498b4210c1f1a4b4d6cdc09ae354b86522e1d536 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 26 Oct 2021 19:46:32 +0100
 Subject: [PATCH] vddk: Move minimum version to VDDK 6.5

SOURCES/0011-vddk-Add-read-write-and-wait-asynchronous-functions.patch

@@ -1,4 +1,4 @@
-From 53622e928682d08acafb27ce973a654ef7814c4d Mon Sep 17 00:00:00 2001
+From b6e9c0ad8d498d5f50ca0aa4f05530709349adea Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 27 Oct 2021 11:57:35 +0100
 Subject: [PATCH] vddk: Add read, write and wait asynchronous functions

SOURCES/0012-vddk-Start-to-split-VDDK-over-several-files.patch

@@ -1,4 +1,4 @@
-From 35436075eb0df59c6480b79adaa755a2c6138833 Mon Sep 17 00:00:00 2001
+From 6d720b2ca5a63fa6782b2b4a2183d336269cc98e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 27 Oct 2021 12:20:31 +0100
 Subject: [PATCH] vddk: Start to split VDDK over several files

SOURCES/0013-vddk-Refactor-D-vddk.stats-1-into-a-new-file.patch

@@ -1,4 +1,4 @@
-From 27b7a2b4b58a99eb79386412a2b3d5387d28f6bc Mon Sep 17 00:00:00 2001
+From 78acd88165f3dfc5eb05c2204b270a01ed15e8a6 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 27 Oct 2021 12:30:41 +0100
 Subject: [PATCH] vddk: Refactor -D vddk.stats=1 into a new file

SOURCES/0014-vddk-Implement-parallel-thread-model.patch

@@ -1,4 +1,4 @@
-From d12a244fa6b5b582a7790a525a621b4573133749 Mon Sep 17 00:00:00 2001
+From 13223e8e3219d0310ce4d94093bbdb7732a891fb Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 27 Oct 2021 10:17:22 +0100
 Subject: [PATCH] vddk: Implement parallel thread model

SOURCES/0015-vddk-Assume-that-VixDiskLib_Flush-is-available.patch

@@ -1,4 +1,4 @@
-From dd2ae58503f3c17e8aee2f78f97e0f669ce464c6 Mon Sep 17 00:00:00 2001
+From 6a61ddd5a57e75fd1c76d3e61d746964d925b608 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 29 Oct 2021 20:56:55 +0100
 Subject: [PATCH] vddk: Assume that VixDiskLib_Flush is available

SOURCES/0016-vddk-Simplify-detection-of-VDDK-symbols-and-baseline.patch

@@ -1,4 +1,4 @@
-From 10bbf28ad230a887ec05a2b1d25d95fd0d742072 Mon Sep 17 00:00:00 2001
+From fd3632aaa6528d1164f729442bd2f104d18bb941 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 29 Oct 2021 21:02:54 +0100
 Subject: [PATCH] vddk: Simplify detection of VDDK symbols and baseline 6.5

SOURCES/0017-vddk-Remove-some-whitespace-from-a-couple-of-functio.patch

@@ -1,4 +1,4 @@
-From c0d6f863ecd47535fe55bae12ce5bf292e356dbd Mon Sep 17 00:00:00 2001
+From 7ae399e41e20b7684f475d67311f4ed02039374a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 30 Oct 2021 08:34:28 +0100
 Subject: [PATCH] vddk: Remove some whitespace from a couple of functions

SOURCES/0018-vddk-Move-config-debug-error-and-utility-functions-a.patch

@@ -1,4 +1,4 @@
-From c55eb650440d9cd713db74622ddc2afa3c1ce740 Mon Sep 17 00:00:00 2001
+From acf05e6d431c29ac8adc56a2680771c5051edb09 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 30 Oct 2021 08:27:39 +0100
 Subject: [PATCH] vddk: Move config, debug/error and utility functions around

SOURCES/0019-common-utils-test-vector.c-Add-vector-benchmarks.patch

@@ -1,4 +1,4 @@
-From 4cc4e2cfc6202d522b3c4282bbaedf3d47de16bb Mon Sep 17 00:00:00 2001
+From 0106334335271ad35e1be041492f2e9795a97a60 Mon Sep 17 00:00:00 2001
 From: Nir Soffer <nsoffer@redhat.com>
 Date: Fri, 5 Nov 2021 20:36:42 +0200
 Subject: [PATCH] common/utils/test-vector.c: Add vector benchmarks
@@ -70,10 +70,10 @@ index a04325be..b001620c 100644
  =================
  
 diff --git a/common/utils/Makefile.am b/common/utils/Makefile.am
-index 14e9dfc4..55415535 100644
+index c33811fc..b2f08cb4 100644
 --- a/common/utils/Makefile.am
 +++ b/common/utils/Makefile.am
-@@ -100,6 +100,9 @@ test_quotes_SOURCES = test-quotes.c quote.c utils.h
+@@ -101,6 +101,9 @@ test_quotes_SOURCES = test-quotes.c quote.c utils.h
  test_quotes_CPPFLAGS = -I$(srcdir)
  test_quotes_CFLAGS = $(WARNINGS_CFLAGS)
  

SOURCES/0020-common-urils-vector.c-Optimize-vector-append.patch

@@ -1,4 +1,4 @@
-From 20029d23e2992f929a3d75b5dea64832f8684d20 Mon Sep 17 00:00:00 2001
+From 58f10b380d63b061b71ad0b3e8462e9ef7f1d49a Mon Sep 17 00:00:00 2001
 From: Nir Soffer <nsoffer@redhat.com>
 Date: Fri, 5 Nov 2021 22:16:26 +0200
 Subject: [PATCH] common/urils/vector.c: Optimize vector append

SOURCES/0021-common-utils-vector-Rename-alloc-to-cap.patch

@@ -1,4 +1,4 @@
-From a329cd90b350b17eac3227c0f30794015b710366 Mon Sep 17 00:00:00 2001
+From a3e28d8cfa2d3252ec6bd348b2f15fd9e0c81329 Mon Sep 17 00:00:00 2001
 From: Nir Soffer <nsoffer@redhat.com>
 Date: Fri, 5 Nov 2021 22:59:38 +0200
 Subject: [PATCH] common/utils/vector: Rename `alloc` to `cap`

SOURCES/0022-common-utils-vector-Rename-size-to-len.patch

@@ -1,4 +1,4 @@
-From 932679668fc44839727ae350a1c2e94b26bcfc0a Mon Sep 17 00:00:00 2001
+From e06b90e7609a1f107d4e21467e84a300666e2d91 Mon Sep 17 00:00:00 2001
 From: Nir Soffer <nsoffer@redhat.com>
 Date: Sat, 6 Nov 2021 00:03:11 +0200
 Subject: [PATCH] common/utils/vector: Rename `size` to `len`

SOURCES/0023-podwrapper.pl.in-Use-short-commit-date.patch

@@ -1,4 +1,4 @@
-From 83f7325a317b4a3d670f1288715af8854627b0f6 Mon Sep 17 00:00:00 2001
+From 4e49f3c9c122458f318d94dfe0549cabdf24aede Mon Sep 17 00:00:00 2001
 From: Nir Soffer <nsoffer@redhat.com>
 Date: Mon, 8 Nov 2021 19:47:57 +0200
 Subject: [PATCH] podwrapper.pl.in: Use short commit date

SOURCES/0024-ocaml-Replace-noalloc-with-noalloc-annotation.patch

@@ -1,4 +1,4 @@
-From 8e5248fda608adbce5b86d938855294001276906 Mon Sep 17 00:00:00 2001
+From ca7dbd9c37b3b80ee33e3dae7a29c122f5b5d2ff Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Nov 2021 09:07:42 +0000
 Subject: [PATCH] ocaml: Replace "noalloc" with [@@noalloc] annotation
@@ -9,9 +9,9 @@ minimum version was 4.02.2.
 (cherry picked from commit d15dd73845065cc9ca04aa785e2be994f76bf832)
 ---
  README                                |  2 +-
- plugins/ocaml/NBDKit.ml               | 18 +++++++++---------
+ plugins/ocaml/NBDKit.ml               | 16 ++++++++--------
  plugins/ocaml/nbdkit-ocaml-plugin.pod |  5 +----
- 3 files changed, 11 insertions(+), 14 deletions(-)
+ 3 files changed, 10 insertions(+), 13 deletions(-)
 
 diff --git a/README b/README
 index b001620c..160856b6 100644
@@ -27,10 +27,10 @@ index b001620c..160856b6 100644
  For the Tcl plugin:
  
 diff --git a/plugins/ocaml/NBDKit.ml b/plugins/ocaml/NBDKit.ml
-index ecdc00c1..c9ce31b5 100644
+index 75823ba5..4d45cc0c 100644
 --- a/plugins/ocaml/NBDKit.ml
 +++ b/plugins/ocaml/NBDKit.ml
-@@ -152,13 +152,13 @@ let default_callbacks = {
+@@ -152,11 +152,11 @@ let default_callbacks = {
    export_description = None;
  }
  
@@ -45,11 +45,8 @@ index ecdc00c1..c9ce31b5 100644
 +external set_description : string -> unit = "ocaml_nbdkit_set_description" [@@noalloc]
 +external set_config_help : string -> unit = "ocaml_nbdkit_set_config_help" [@@noalloc]
  
--external set_field : string -> 'a -> unit = "ocaml_nbdkit_set_field" "noalloc"
+ external set_field : string -> 'a -> unit = "ocaml_nbdkit_set_field"
-+external set_field : string -> 'a -> unit = "ocaml_nbdkit_set_field" [@@noalloc]
  
- let register_plugin plugin =
-   (* Check the required fields have been set by the caller. *)
 @@ -220,7 +220,7 @@ let register_plugin plugin =
  
  (* Bindings to nbdkit server functions. *)

SOURCES/0025-vddk-Drop-obsolete-documentation-related-to-thread-m.patch

@@ -1,4 +1,4 @@
-From 6e85906311377b845f299d3a570e23db2809529c Mon Sep 17 00:00:00 2001
+From a18e18b3a50476a5364b32dd62d162a641fd0fd8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 27 Nov 2021 16:44:41 +0000
 Subject: [PATCH] vddk: Drop obsolete documentation related to thread model

SOURCES/0026-Revert-podwrapper.pl.in-Use-short-commit-date.patch

@@ -1,4 +1,4 @@
-From b235076a7df96253aa41a7859c3ba54386bd3fef Mon Sep 17 00:00:00 2001
+From 9678df33ecb45f7943acf3e485efed061ea4b856 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 20 Nov 2021 17:50:25 +0000
 Subject: [PATCH] Revert "podwrapper.pl.in: Use short commit date"

SOURCES/0027-Fix-podwrapper.pl.in-Use-short-commit-date.patch

@@ -1,4 +1,4 @@
-From fb7749b3497a7aaf1b00e975af166af029209c01 Mon Sep 17 00:00:00 2001
+From 38948544e6e12091506b658ab10ff1b0a5bf36b5 Mon Sep 17 00:00:00 2001
 From: Eric Blake <eblake@redhat.com>
 Date: Tue, 30 Nov 2021 12:42:01 -0600
 Subject: [PATCH] Fix "podwrapper.pl.in: Use short commit date"

SOURCES/0028-scripts-Add-simple-script-for-automating-VDDK-disk-c.patch

@@ -1,4 +1,4 @@
-From 599f64f5885cf546f85e6c28d98b0444c18ad1fa Mon Sep 17 00:00:00 2001
+From f8d649063edb9744c98aca17c6c82e5fce0a4be7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 30 Nov 2021 17:56:02 +0000
 Subject: [PATCH] scripts: Add simple script for automating VDDK disk
@@ -42,10 +42,10 @@ index 49f5d91c..6df5eba0 100644
  if !ENABLE_LIBFUZZER
  # NB: This is not the real nbdkit binary.  It's a wrapper that allows
 diff --git a/configure.ac b/configure.ac
-index 19514ef6..8a86326e 100644
+index 263714f0..60e7cce2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1253,6 +1253,8 @@ dnl Produce output files.
+@@ -1249,6 +1249,8 @@ dnl Produce output files.
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_FILES([podwrapper.pl],
                  [chmod +x,-w podwrapper.pl])

SOURCES/0029-file-Fix-implementation-of-cache-none-for-writes.patch

@@ -1,4 +1,4 @@
-From 86b2baa7cd4a32246d447cbcedaaef3a15212ea4 Mon Sep 17 00:00:00 2001
+From aaead0f62b190f0686f86d825c698f9cd3e803c6 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 7 Dec 2021 21:08:26 +0000
 Subject: [PATCH] file: Fix implementation of cache=none for writes

SOURCES/nbdkit-1.28.3.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmGvLUARHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKCUVA//RZwRNUPITvdw9CG8gaLAyvkQfhmHWR+X
-AlEHW3MmpG8esuX8Q3DEGwgub9q029J5kvnbKtZsKuGF78Fi1XPvbzZPCLa3M+VF
-kUABAOIht3Hg97h8dxURVUjv8QbG871buEQy3sENaGPAzI0sJHiO7VnykG0N/5S8
-YWbEh7i75KRMy3OqHQ9mNb7kq8OKM2h7LmJzK4QItvPX1/b5UkxC6w9h4N4fEbc1
-oJb9FXcS0TP/vYIZZwhO4FTmChaTGXRYFmfqe5b5zzeacqec3ufHpTevFCwxuVSc
-zHoVxYN7zGdLheYeUG2MMbbs8JR7Ia8hBHoP8tG707Y+IJ2yFYubs8SupbA4oJKj
-RfZD8jOIErdn56Qh3r9V0ExuGWWkhFYdjUBaEACMRm366d5GdPkvw5VEW1/Tf1Id
-JtRroke50G2hNrt+nrnGO2lU9G/xdJ1gz9+aMBqXMtk1MIBedtvDnDthEfEHNUwY
-dJGhoFwKBuWUI1ha2DX9bk7pb4jS29+eiIFbMv9Gw748Etfmr2pcNQEGIcauGz9e
-6rAtg5Afk8Z4vQUK0IN5Ex1+JnF1OIjTHFQSuCTVVyYhhVn7nWQWKWlwgXT/A4F4
-ciu6WlBnNgD86Kq0HJ9fSjWE6K3kKkUUHnDYYtnmt3CqzNeoKCZMt4VHMFMOMfR7
-LPKn+zwrGb8=
-=SDiY
------END PGP SIGNATURE-----

SOURCES/nbdkit-1.28.4.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmHUTfMRHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKCVdg/8DUlMyYdSwFGGD3uInUSiZPhmceI+azN8
+dg7FwVJHwTI+Xir71KoAcSnQXD1FCYVMGLNPdaFE/cA/pCLXt4dcoc3PhGcNeEJo
+lJDVodLliE7ZfDXIUDNF7cxGnYCTGtqFetiP3p2hiLndNWvQcYqVDmkqv5wKsgSw
+nf14Sik8VOmanRzVEauqKWTRfnasRYFL523gGFBeC4iPJ3d+bFbB6PvhgrZJ9khq
+p4lceODiWuLpnfVSE0gDPEXbqnSG5rWsUUzKbYeZarU/6VwCGywf2fIbAtfWbLEy
+Nv9xOmH6ECJDmCRQKak/1aPf/D4pGPILoJVFow9VqyiGRlFREP8SkklknJ4WGQCE
+oGKl7W4uWHKSmnxCk5atdil4jOOH92ZUjubtwXAFWYn4uP9/Is9ZjmCF5O7mHRli
+lzbhCS3c4Eg95Li0aX7JJfdEMVHZLKXY9AFuMvbbQX13v/I3RsQE/v5X+8d7lG5a
+v9Ac+/yvNCwdGr4mxsOAGXyiRi++PmWxWho3JWRPWEY2R/d9iEISef18OMOfOfUh
+wrbqpKCuD68K3mdiLSWY1pUF4eZ3Vwrcv0qB/75ncMwv0c4Hm+3kwG2bTPybKhBq
+YAcV/+2+EoIlh1kD6spR8ShLduzL4k/Et0lkXVNOP+LeW028LiEFDpCtGb0JTqN6
+y9aEofWy6Aw=
+=DOH3
+-----END PGP SIGNATURE-----

SPECS/nbdkit.spec

@@ -19,7 +19,8 @@
 %global have_ocaml 1
 %endif
 
-# Architectures where the complete test suite must pass.
+# Architectures where we run the complete test suite including
+# the libguestfs tests.
 #
 # On all other architectures, a simpler test suite must pass.  This
 # omits any tests that run full qemu, since running qemu under TCG is
@@ -50,8 +51,8 @@ ExclusiveArch:  x86_64
 %global source_directory 1.28-stable
 
 Name:           nbdkit
-Version:        1.28.3
+Version:        1.28.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -111,9 +112,6 @@ BuildRequires: make
 BuildRequires:  autoconf, automake, libtool
 %endif
 
-%ifnarch %{complete_test_arches}
-BuildRequires:  autoconf, automake, libtool
-%endif
 BuildRequires:  gcc, gcc-c++
 BuildRequires:  %{_bindir}/pod2man
 BuildRequires:  gnutls-devel
@@ -721,13 +719,6 @@ for %{name}.
 autoreconf -i
 %endif
 
-%ifnarch %{complete_test_arches}
-# Simplify the test suite so it doesn't require qemu.
-sed -i -e 's/^LIBGUESTFS_TESTS/xLIBGUESTFS_TESTS/' tests/Makefile.am
-sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
-autoreconf -i
-%endif
-
 
 %build
 # Golang bindings are not enabled in the build since they don't
@@ -757,6 +748,11 @@ export PYTHON=%{__python3}
     --with-libguestfs \
 %else
     --without-libguestfs \
+%endif
+%ifarch %{complete_test_arches}
+    --enable-libguestfs-tests \
+%else
+    --disable-libguestfs-tests \
 %endif
     --with-tls-priority=@NBDKIT,SYSTEM
 
@@ -1218,8 +1214,8 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
-* Wed Dec 08 2021 Richard W.M. Jones <rjones@redhat.com> - 1.28.3-2
+* Tue Jan 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.28.4-1
-- Rebase to new stable branch version 1.28.3
+- Rebase to new stable branch version 1.28.4
   resolves: rhbz#2011709
 - Move nbdkit-null-plugin to nbdkit-server package
   resolves: rhbz#2021154