Rebase to new stable branch version 1.28.5

resolves: rhbz#2011709

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

@@ -1,4 +1,4 @@
-From 1d9a1341c6d9b0f2150a37ec3617eeee01bbfee2 Mon Sep 17 00:00:00 2001
+From 4f2f557b349ad621e502e304c87280835cf13146 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

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

@@ -1,4 +1,4 @@
-From 3c72e2d273fd446905086c6611ca11bd7dace149 Mon Sep 17 00:00:00 2001
+From edfdfff0dae54a41bbfca30fa60f4fa6438d45b9 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

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

@@ -1,4 +1,4 @@
-From a87b9b1ecd0b98ffb9e04d7de525952962875ec2 Mon Sep 17 00:00:00 2001
+From cbcf2a2f158a9889bd597b31159ab357dea05cd6 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

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

@@ -1,4 +1,4 @@
-From ae618b75f2b158b4563ab94371b01b2951b1bfec Mon Sep 17 00:00:00 2001
+From 8353ab55b8c6e7f1dc9ea27260fd7ec90b9d75af 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

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

@@ -1,4 +1,4 @@
-From 01f3fb69c8cdb730b74c36d0e5909adc7c50b35e Mon Sep 17 00:00:00 2001
+From d994773724266dd5f0a8b4282cc604f6b75e077c 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

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

@@ -1,4 +1,4 @@
-From 8b62059a60444f2e85b0cdfc34cbe7e123796fc8 Mon Sep 17 00:00:00 2001
+From 4c80b474a2c2a552e5bdfcaabfa2981540afe8d8 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

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

@@ -1,4 +1,4 @@
-From a7e524ffec7c144d45838f4c2e9e311c0a0f4d01 Mon Sep 17 00:00:00 2001
+From 4b0d278f3851baf37affa26d34e52963dc8c7c04 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

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

@@ -1,4 +1,4 @@
-From 4c451e9e8f0916c319f6a89ef5ecbb0536cb36c0 Mon Sep 17 00:00:00 2001
+From 670c1ddb6591046256511a680605c5e2349746e8 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

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

@@ -1,4 +1,4 @@
-From 11bb4d037a9a14537cde30cef4e6a17cec2d47b8 Mon Sep 17 00:00:00 2001
+From 21d6c2f8f29f0d7f98852b72ee33751814be49fe 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

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

@@ -1,4 +1,4 @@
-From 498b4210c1f1a4b4d6cdc09ae354b86522e1d536 Mon Sep 17 00:00:00 2001
+From f4379f04ea27e25c00e98db2e60d0fdb647442e9 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

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

@@ -1,4 +1,4 @@
-From b6e9c0ad8d498d5f50ca0aa4f05530709349adea Mon Sep 17 00:00:00 2001
+From 90dc3311582784f8b078a30a7207c15c6298b1e2 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

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

@@ -1,4 +1,4 @@
-From 6d720b2ca5a63fa6782b2b4a2183d336269cc98e Mon Sep 17 00:00:00 2001
+From c9e432e08e889d9e6edea52344b2452f0141f56b 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

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

@@ -1,4 +1,4 @@
-From 78acd88165f3dfc5eb05c2204b270a01ed15e8a6 Mon Sep 17 00:00:00 2001
+From 66945d24e9192a67af421eecbb1835d42636ab93 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

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

@@ -1,4 +1,4 @@
-From 13223e8e3219d0310ce4d94093bbdb7732a891fb Mon Sep 17 00:00:00 2001
+From 11a40792fde602861b987dc5a2c91a0539abfe78 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

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

@@ -1,4 +1,4 @@
-From 6a61ddd5a57e75fd1c76d3e61d746964d925b608 Mon Sep 17 00:00:00 2001
+From c91ac233f6474b07ef181a08093c5d0f2f4ec4c3 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

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

@@ -1,4 +1,4 @@
-From fd3632aaa6528d1164f729442bd2f104d18bb941 Mon Sep 17 00:00:00 2001
+From 984e95fcbdb19c2495851322a4c33f34291ecfab 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

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

@@ -1,4 +1,4 @@
-From 7ae399e41e20b7684f475d67311f4ed02039374a Mon Sep 17 00:00:00 2001
+From 342efed6bb9f8f0c8d2cb4aa2b09da64ed2e7ed4 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

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

@@ -1,4 +1,4 @@
-From acf05e6d431c29ac8adc56a2680771c5051edb09 Mon Sep 17 00:00:00 2001
+From edbded52b144ce3c8c45c7ef352f8969a1f5d1bb 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

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

@@ -1,4 +1,4 @@
-From 0106334335271ad35e1be041492f2e9795a97a60 Mon Sep 17 00:00:00 2001
+From 239df6ee9583bc520e9a3e18f0c0d8e58602fb5c 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

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

@@ -1,4 +1,4 @@
-From 58f10b380d63b061b71ad0b3e8462e9ef7f1d49a Mon Sep 17 00:00:00 2001
+From e544d86c797edec613673c7272f8d4f8b05d87f8 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

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

@@ -1,4 +1,4 @@
-From a3e28d8cfa2d3252ec6bd348b2f15fd9e0c81329 Mon Sep 17 00:00:00 2001
+From 24e2694b302f6602e0fc7808a53a766cb983dfb4 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`

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

@@ -1,4 +1,4 @@
-From e06b90e7609a1f107d4e21467e84a300666e2d91 Mon Sep 17 00:00:00 2001
+From 1674e453d5652018c989059ea19eb79bed7e12c8 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`
@@ -1688,7 +1688,7 @@ index 5fd8308f..225258de 100644
      write_pidfile ();
      top->after_fork (top);
 diff --git a/server/sockets.c b/server/sockets.c
-index 95fce484..f13f8600 100644
+index 18b68f0a..15a26f69 100644
 --- a/server/sockets.c
 +++ b/server/sockets.c
 @@ -246,14 +246,14 @@ bind_tcpip_socket (sockets *socks)

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

@@ -1,4 +1,4 @@
-From 4e49f3c9c122458f318d94dfe0549cabdf24aede Mon Sep 17 00:00:00 2001
+From 2df98ef35c3b023a44983583f65379793599e57f 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

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

@@ -1,4 +1,4 @@
-From ca7dbd9c37b3b80ee33e3dae7a29c122f5b5d2ff Mon Sep 17 00:00:00 2001
+From e9f77e9da946c963e4ec5d82dfd144305f79ebb5 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

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

@@ -1,4 +1,4 @@
-From a18e18b3a50476a5364b32dd62d162a641fd0fd8 Mon Sep 17 00:00:00 2001
+From 5da14da22c1e26aff24baf41fb2ae0f2832acae1 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

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

@@ -1,4 +1,4 @@
-From 9678df33ecb45f7943acf3e485efed061ea4b856 Mon Sep 17 00:00:00 2001
+From b986f25be4f013eb02cd327826fa225c8202571e 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"

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

@@ -1,4 +1,4 @@
-From 38948544e6e12091506b658ab10ff1b0a5bf36b5 Mon Sep 17 00:00:00 2001
+From 0c430f02eec2671155c001c8a1d2f964b42022e5 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"

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

@@ -1,4 +1,4 @@
-From f8d649063edb9744c98aca17c6c82e5fce0a4be7 Mon Sep 17 00:00:00 2001
+From e00a8f2709fdf238daa195da03d8ea2aec9b05e1 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,7 +42,7 @@ 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 263714f0..60e7cce2 100644
+index 1b737fc1..08c307e9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1249,6 +1249,8 @@ dnl Produce output files.

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

@@ -1,4 +1,4 @@
-From aaead0f62b190f0686f86d825c698f9cd3e803c6 Mon Sep 17 00:00:00 2001
+From 5cb4adb94a6ff4325205fea3512c037c91579263 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

0030-tests-Add-configure-disable-libguestfs-tests-flag.patch

@@ -1,4 +1,4 @@
-From a6c8f5123bd19941658f8395b4a119a37d6cf69e Mon Sep 17 00:00:00 2001
+From 92773e6852719354a136d31519948436f9adf7e9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 18 Dec 2021 20:31:10 +0000
 Subject: [PATCH] tests: Add configure --disable-libguestfs-tests flag
@@ -36,7 +36,7 @@ expressions like:
  2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 60e7cce2..7a672cbf 100644
+index 08c307e9..96d738d9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1146,7 +1146,8 @@ AS_IF([test "$with_libzstd" != "no"],[

0031-vddk-Implement-VMDK-creation.patch

@@ -1,4 +1,4 @@
-From 62d3369404b32eb486a6c6dc12c80d638d8f8d89 Mon Sep 17 00:00:00 2001
+From cf58241f19ed179e48c53f4d6c71df47dd2f5931 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 18 Jan 2022 08:58:15 +0000
 Subject: [PATCH] vddk: Implement VMDK creation

0032-vddk-Fix-documentation-of-new-create-flag.patch

@@ -1,4 +1,4 @@
-From ff09d5df01da12758db5caaffa9dfe0ad14c8889 Mon Sep 17 00:00:00 2001
+From eb5d5a628968c7fd5401cf7e73a6cff6c43994aa Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 18 Jan 2022 13:14:01 +0000
 Subject: [PATCH] vddk: Fix documentation of new create flag

0033-vddk-Allow-create-hwversion-to-be-specified-as-a-num.patch

@@ -1,4 +1,4 @@
-From 4089c9019c744f07f3d9b8035f8879588efccced Mon Sep 17 00:00:00 2001
+From c8cdce47bc38d2f59ecc4b75d6db7f032b63d527 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 18 Jan 2022 20:49:21 +0000
 Subject: [PATCH] vddk: Allow create-hwversion to be specified as a number

0034-tests-Fix-VDDK-tests.patch

@@ -1,4 +1,4 @@
-From fb9cff514ebb26a808a0ae43f64ab86df878cd77 Mon Sep 17 00:00:00 2001
+From 84c5bc4664607fdf1f051e9e52ac6d0e4f0be049 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 18 Jan 2022 21:02:32 +0000
 Subject: [PATCH] tests: Fix VDDK tests

0035-server-sockets-get-rid-of-AI_ADDRCONFIG.patch

@@ -0,0 +1,204 @@
+From 222bce6b83421db1afdad24cf4e8ab7b1aa7b273 Mon Sep 17 00:00:00 2001
+From: Laszlo Ersek <lersek@redhat.com>
+Date: Tue, 18 Jan 2022 14:48:33 +0100
+Subject: [PATCH] server/sockets: get rid of AI_ADDRCONFIG
+
+The AI_ADDRCONFIG hint of getaddrinfo() is supposed to restrict the name
+resolution to such address families (IPv4 vs. IPv6) for which the
+resolving host has publicly routable addresses assigned.
+
+The main problem with AI_ADDRCONFIG can be shown with the following
+command line:
+
+$ nbdkit -f -p 32776 -P pidfile -i ::1 --exit-with-parent null
+
+On a host where ::1 is the only IPv6 address assigned (namely to the
+loopback interface), the command fails with
+
+> nbdkit: getaddrinfo: ::1: 32776: Address family for hostname not
+> supported
+
+due to the "publicly routable" requirement.
+
+Remove AI_ADDRCONFIG from the getaddrinfo() hints, and as a replacement,
+introduce the "-4" and "-6" options, similarly to netcat and ssh.
+
+(1) This makes options of the form:
+
+    -i 127.0.0.1
+    -i ::1
+
+    work regardless of "public" IPv6 / IPv4 connectivity;
+
+(2) options of the form
+
+    -i localhost
+    -i FQDN
+
+    will bind both IPv4 and IPv6 addresses of the desired interface(s);
+
+(3) omitting the option "-i" will bind both IPv4 and IPv6 wildcard
+    addresses (0.0.0.0 and ::);
+
+(4) the configurations in (2) and (3) can be restricted to IPv4 or IPv6
+    addresses by adding the "-4" or "-6" option, respectively.
+
+Importantly, this change allows the "connect-tcp6" test case of libnbd to
+pass on such hosts that have no IPv6 connectivity (i.e., where the only
+assigned IPv6 address is ::1, namely on the loopback interface).
+
+Ref: https://listman.redhat.com/archives/libguestfs/2022-January/msg00110.html
+Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+Message-Id: <20220118134833.13246-3-lersek@redhat.com>
+[lersek@redhat.com: fix typo in "--exit-with-parent" (Eric)]
+Acked-by: Eric Blake <eblake@redhat.com>
+(cherry picked from commit 9eec2335d630ae8ef947a927c1922d725d482f4a)
+---
+ common/utils/windows-compat.h |  7 -------
+ docs/nbdkit.pod               | 20 +++++++++++++++++++-
+ docs/synopsis.txt             |  3 ++-
+ server/internal.h             |  1 +
+ server/main.c                 |  9 +++++++++
+ server/options.h              |  4 +++-
+ server/sockets.c              |  3 ++-
+ 7 files changed, 36 insertions(+), 11 deletions(-)
+
+diff --git a/common/utils/windows-compat.h b/common/utils/windows-compat.h
+index 7695bf7e..658c1d8b 100644
+--- a/common/utils/windows-compat.h
++++ b/common/utils/windows-compat.h
+@@ -75,13 +75,6 @@ struct sockaddr_un
+ #define O_NOCTTY 0
+ #endif
+ 
+-/* AI_ADDRCONFIG is not available on Windows.  It enables a rather
+- * obscure feature of getaddrinfo to do with IPv6.
+- */
+-#ifndef AI_ADDRCONFIG
+-#define AI_ADDRCONFIG 0
+-#endif
+-
+ /* Windows <errno.h> lacks certain errnos, so replace them here as
+  * best we can.
+  */
+diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod
+index 99cfb362..042607fb 100644
+--- a/docs/nbdkit.pod
++++ b/docs/nbdkit.pod
+@@ -173,6 +173,24 @@ Display information about nbdkit or a specific plugin:
+ 
+ Display brief command line usage information and exit.
+ 
++=item B<-4>
++
++=item B<--ipv4-only>
++
++=item B<-6>
++
++=item B<--ipv6-only>
++
++When a non-numeric argument is passed to the I<-i> option (such as a
++Fully Qualified Domain Name, or a host name from C</etc/hosts>),
++restrict the name resolution to IPv4 or IPv6 addresses.
++
++When the I<-i> option is omitted, listen on only the IPv4 or IPv6
++address of all interfaces (C<0.0.0.0> or C<::>, respectively).
++
++When both I<-4> and I<-6> options are present on the command line, the
++last one takes effect.
++
+ =item B<-D> PLUGIN.FLAG=N
+ 
+ =item B<-D> FILTER.FLAG=N
+@@ -265,7 +283,7 @@ See also I<-u>.
+ =item B<--ipaddr> IPADDR
+ 
+ Listen on the specified interface.  The default is to listen on all
+-interfaces.  See also I<-p>.
++interfaces.  See also I<-4>, I<-6>, and I<-p>.
+ 
+ =item B<--log=stderr>
+ 
+diff --git a/docs/synopsis.txt b/docs/synopsis.txt
+index 07b9dcff..6154bb2e 100644
+--- a/docs/synopsis.txt
++++ b/docs/synopsis.txt
+@@ -1,4 +1,5 @@
+-nbdkit [-D|--debug PLUGIN|FILTER|nbdkit.FLAG=N]
++nbdkit [-4|--ipv4-only] [-6|--ipv6-only]
++       [-D|--debug PLUGIN|FILTER|nbdkit.FLAG=N]
+        [-e|--exportname EXPORTNAME] [--exit-with-parent]
+        [--filter FILTER ...] [-f|--foreground]
+        [-g|--group GROUP] [-i|--ipaddr IPADDR]
+diff --git a/server/internal.h b/server/internal.h
+index bc81b786..46fcdd46 100644
+--- a/server/internal.h
++++ b/server/internal.h
+@@ -113,6 +113,7 @@ enum log_to {
+   LOG_TO_NULL,           /* --log=null forced on the command line */
+ };
+ 
++extern int tcpip_sock_af;
+ extern struct debug_flag *debug_flags;
+ extern const char *export_name;
+ extern bool foreground;
+diff --git a/server/main.c b/server/main.c
+index 225258de..8e7ac149 100644
+--- a/server/main.c
++++ b/server/main.c
+@@ -86,6 +86,7 @@ static void error_if_stdio_closed (void);
+ static void switch_stdio (void);
+ static void winsock_init (void);
+ 
++int tcpip_sock_af = AF_UNSPEC;  /* -4, -6 */
+ struct debug_flag *debug_flags; /* -D */
+ bool exit_with_parent;          /* --exit-with-parent */
+ const char *export_name;        /* -e */
+@@ -367,6 +368,14 @@ main (int argc, char *argv[])
+       exit (EXIT_FAILURE);
+ #endif
+ 
++    case '4':
++      tcpip_sock_af = AF_INET;
++      break;
++
++    case '6':
++      tcpip_sock_af = AF_INET6;
++      break;
++
+     case 'D':
+       add_debug_flag (optarg);
+       break;
+diff --git a/server/options.h b/server/options.h
+index e59ef17f..39299b9d 100644
+--- a/server/options.h
++++ b/server/options.h
+@@ -59,8 +59,10 @@ enum {
+   VSOCK_OPTION,
+ };
+ 
+-static const char *short_options = "D:e:fg:i:nop:P:rst:u:U:vV";
++static const char *short_options = "46D:e:fg:i:nop:P:rst:u:U:vV";
+ static const struct option long_options[] = {
++  { "ipv4-only",        no_argument,       NULL, '4' },
++  { "ipv6-only",        no_argument,       NULL, '6' },
+   { "debug",            required_argument, NULL, 'D' },
+   { "dump-config",      no_argument,       NULL, DUMP_CONFIG_OPTION },
+   { "dump-plugin",      no_argument,       NULL, DUMP_PLUGIN_OPTION },
+diff --git a/server/sockets.c b/server/sockets.c
+index 15a26f69..4e4ccbc4 100644
+--- a/server/sockets.c
++++ b/server/sockets.c
+@@ -179,7 +179,8 @@ bind_tcpip_socket (sockets *socks)
+     port = "10809";
+ 
+   memset (&hints, 0, sizeof hints);
+-  hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
++  hints.ai_flags = AI_PASSIVE;
++  hints.ai_family = tcpip_sock_af;
+   hints.ai_socktype = SOCK_STREAM;
+ 
+   err = getaddrinfo (ipaddr, port, &hints, &ai);
+-- 
+2.31.1
+

nbdkit.spec

@@ -51,8 +51,8 @@ ExclusiveArch:  x86_64
 %global source_directory 1.28-stable
 
 Name:           nbdkit
-Version:        1.28.4
+Version:        1.28.5
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -111,6 +111,7 @@ Patch0031:     0031-vddk-Implement-VMDK-creation.patch
 Patch0032:     0032-vddk-Fix-documentation-of-new-create-flag.patch
 Patch0033:     0033-vddk-Allow-create-hwversion-to-be-specified-as-a-num.patch
 Patch0034:     0034-tests-Fix-VDDK-tests.patch
+Patch0035:     0035-server-sockets-get-rid-of-AI_ADDRCONFIG.patch
 
 BuildRequires: make
 %if 0%{patches_touch_autotools}
@@ -1219,8 +1220,8 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
-* Tue Jan 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.28.4-2
+* Mon Jan 24 2022 Richard W.M. Jones <rjones@redhat.com> - 1.28.5-1
-- Rebase to new stable branch version 1.28.4
+- Rebase to new stable branch version 1.28.5
   resolves: rhbz#2011709
 - Move nbdkit-null-plugin to nbdkit-server package
   resolves: rhbz#2021154

sources

@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.28.4.tar.gz) = bd9ecc24bffbe2aa8a78e21953b01b853876fe916eee2b592780126b80611c539921ca46749197a0f531b017c4002aa8e7b6db2a5caf0510ba27f2d29e589906
+SHA512 (nbdkit-1.28.5.tar.gz) = 0ea7bf1c4e1d4e5e1f2077aed7c65e62c5b09af8a54868ef8dfdd4b8eee3a8783a2e4a5f3488ccfad6776a15cec8cfd808979f84c2523d4033bf0fc572975f32
-SHA512 (nbdkit-1.28.4.tar.gz.sig) = da2b5fde026e862c3a3f874743b71ecd3f2f155d740b35921c971ac104eb4e23b3683e6fa9447be53763f4887c16986ab25a94a7bc2631ca1f010bc8c91d1429
+SHA512 (nbdkit-1.28.5.tar.gz.sig) = e84575b4f0ee344d4cfb90bf0b285a6df2b5e7ffc46bb6e4e23ff47e85759494472c923b29fae367f97c7f140e649cc486a472397dbd375202ee44d8dfe0817b