From b5a71ab87ad8c2289fbd2364fae2fe7c2c3629b8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 15 Mar 2021 19:36:14 +0000
Subject: [PATCH] New upstream development version 1.7.4.

---
 libnbd.spec | 20 +++++---------------
 sources     |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/libnbd.spec b/libnbd.spec
index fdca285..da39a6f 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -8,8 +8,8 @@
 %global source_directory 1.7-development
 
 Name:           libnbd
-Version:        1.7.3
-Release:        3%{?dist}
+Version:        1.7.4
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPLv2+
@@ -25,19 +25,6 @@ Source2:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 Source3:        copy-patches.sh
 
-# Upstream patches to fix tests.
-Patch0001:      0001-copy-Stable-sort-in-tests.patch
-Patch0002:      0002-copy-Nicer-sort.patch
-Patch0003:      0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch
-Patch0004:      0004-copy-file-ops.c-Remove-unneeded-check.patch
-Patch0005:      0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch
-
-# Upstream patch to fix nbdkit test suite.
-Patch0006:      0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch
-
-# Upstream patch that documents CVE-2021-20286 (already fixed in 1.7.3).
-Patch0007:      0001-security-Document-assignment-of-CVE-2021-20286.patch
-
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -323,6 +310,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* 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.
diff --git a/sources b/sources
index 2a25167..062ad7d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.7.3.tar.gz) = 1d7a0e6a5797d1df2e40b5e211ccea78926e2df882423a557acbc3c040f1b4c3f782a4754340be64d1176f0fd3524b094b9266186e25a80668494c7f72e3ef13
-SHA512 (libnbd-1.7.3.tar.gz.sig) = 0d693add7361b29dab7f744d24dce56518f64c0f3133847e685175d711e281c924850046a573d64d8354b5acd21bee34815163f7a8eb9f41266026435f1ba892
+SHA512 (libnbd-1.7.4.tar.gz) = bf5174664b3950a6a81dc56393e51cd151ab6829206cc6289a149b371ab5ea85403c8501ee9d3ba14d16084fd9cdfaa4c35dcb4519cf6ce24d1713fadbc2dfb1
+SHA512 (libnbd-1.7.4.tar.gz.sig) = d101df29237948ac6820ded33c10b80711ec24a5827fe4851904885382ef20b202537625dba301847be5bf22857655a2e3da36cc38e1202d546dc079a5121e19