From ebaacbcabd4e09a77cff7785b9e515fecf2a7d54 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 7 May 2021 12:30:18 +0100
Subject: [PATCH] Manually merge fedora/rawhide related: rhbz#1950630

---
 libnbd.spec | 58 +++++++++++++++++++++++++++++++++++++----------------
 sources     |  4 ++--
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index 87c20d3..59f023c 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,12 +8,12 @@
 %global source_directory 1.7-development
 
 Name:           libnbd
-Version:        1.7.4
-Release:        2%{?dist}
+Version:        1.7.9
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
-URL:            https://github.com/libguestfs/libnbd
+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
@@ -41,7 +41,7 @@ BuildRequires:  gnutls-devel
 BuildRequires:  libxml2-devel
 
 # For nbdfuse.
-BuildRequires:  fuse, fuse-devel
+BuildRequires:  fuse3, fuse3-devel
 
 # For the Python 3 bindings.
 BuildRequires:  python3-devel
@@ -61,6 +61,7 @@ BuildRequires:  bash-completion
 BuildRequires:  coreutils
 BuildRequires:  gcc-c++
 BuildRequires:  gnutls-utils
+BuildRequires:  iproute
 BuildRequires:  jq
 %if !0%{?rhel}
 BuildRequires:  nbd
@@ -153,6 +154,7 @@ python3-%{name} contains Python 3 bindings for %{name}.
 Summary:        FUSE support for %{name}
 License:        LGPLv2+ and BSD
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Recommends:     fuse3
 
 
 %description -n nbdfuse
@@ -207,31 +209,36 @@ rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3*
 
 
 %check
+function skip_test ()
+{
+    for f in "$@"; do
+        rm -f "$f"
+        echo 'exit 77' > "$f"
+        chmod +x "$f"
+    done
+}
+
 # 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
+skip_test interop/structured-read.sh
 %endif
 
 # 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}
-rm interop/interop-qemu-storage-daemon.sh
-touch interop/interop-qemu-storage-daemon.sh
-chmod +x interop/interop-qemu-storage-daemon.sh
+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
 
 make %{?_smp_mflags} check || {
     for f in $(find -name test-suite.log); do
@@ -310,8 +317,25 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.4-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* 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.
diff --git a/sources b/sources
index 062ad7d..079545d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.7.4.tar.gz) = bf5174664b3950a6a81dc56393e51cd151ab6829206cc6289a149b371ab5ea85403c8501ee9d3ba14d16084fd9cdfaa4c35dcb4519cf6ce24d1713fadbc2dfb1
-SHA512 (libnbd-1.7.4.tar.gz.sig) = d101df29237948ac6820ded33c10b80711ec24a5827fe4851904885382ef20b202537625dba301847be5bf22857655a2e3da36cc38e1202d546dc079a5121e19
+SHA512 (libnbd-1.7.9.tar.gz) = 6fe3db6f5027fee59e60e7ea688111787567a4ac740db34ebdc45bccc76e34cc6298784c8b628cb40ff639caceca5d5413558187892511d9ac2167fc60b3d92a
+SHA512 (libnbd-1.7.9.tar.gz.sig) = f2ee29fe7017cec4a3ec0c03119b2c1d5de735f6703a12e4ecddcddf8548bf7e1be62440f54c9fd3859fb63072f1ef8fb6ef56c2db462f624f0efef254052970