import CS libnbd-1.20.3-1.el9

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/libguestfs.keyring
-SOURCES/libnbd-1.20.2.tar.gz
+SOURCES/libnbd-1.20.3.tar.gz

.libnbd.metadata

@@ -1,2 +1,2 @@
 cc1b37b9cfafa515aab3eefd345ecc59aac2ce7b SOURCES/libguestfs.keyring
-d3abc6e794dd4b99640328bfd395a8913288e859 SOURCES/libnbd-1.20.2.tar.gz
+0dd368dc40c30fda4225d90120bdf96dd1724557 SOURCES/libnbd-1.20.3.tar.gz

SOURCES/0001-generator-Print-full-error-in-handle_reply_error.patch

@@ -1,4 +1,4 @@
-From 89f0e33f355681b7c5b1835a09c5fac93c08e71e Mon Sep 17 00:00:00 2001
+From 654ab90d57d1ba54e27fd68a8550703a0f1059c4 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 23 Jul 2024 17:22:12 +0100
 Subject: [PATCH] generator: Print full error in handle_reply_error

SOURCES/0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch

@@ -1,4 +1,4 @@
-From f31e31b32e662d0aadb77bc639308c8a65968886 Mon Sep 17 00:00:00 2001
+From e1b029ff41ed2f3c3d7decae7a50e70a86766350 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 23 Jul 2024 17:26:39 +0100
 Subject: [PATCH] lib: Don't overwrite error in nbd_opt_{go,info}

SOURCES/0003-generator-Restore-assignment-to-local-err.patch

@@ -1,4 +1,4 @@
-From ff5ee9308e66fe9fd19ea578623c4540f44942d6 Mon Sep 17 00:00:00 2001
+From 0a21eef34ba568c662c338a345692bfd0524d726 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 25 Jul 2024 13:39:28 +0100
 Subject: [PATCH] generator: Restore assignment to local 'err'

SOURCES/0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch

@@ -1,4 +1,4 @@
-From 923357f49704d55cd74dc5334a12a7089825ff57 Mon Sep 17 00:00:00 2001
+From 144a024f99674ff7845b86b81e9e3cf6c1d88bf9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 25 Jul 2024 13:25:34 +0100
 Subject: [PATCH] generator/states-newstyle.c: Quote untrusted string from the

SOURCES/0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch

@@ -1,4 +1,4 @@
-From a8e554e53ce8150286e06f4afd578ab52e2f03d9 Mon Sep 17 00:00:00 2001
+From 73b48ea48f5681e4b25c3744db0aaf9dbb25b2f3 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 25 Jul 2024 15:48:46 +0100
 Subject: [PATCH] generator/states-newstyle.c: Don't sign extend escaped chars

SOURCES/copy-patches.sh

@@ -6,7 +6,7 @@ set -e
 # directory.  Use it like this:
 #   ./copy-patches.sh
 
-rhel_version=9.5
+rhel_version=9.6
 
 # Check we're in the right directory.
 if [ ! -f libnbd.spec ]; then

SOURCES/libnbd-1.20.2.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmZ7KY8RHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKAP7A/9EzaUWFPP1GDCrpfvVods7F+8DN87O/aZ
-mTzw59HNZVz42Yw0cM8MAEckgnpMdT7d64m6E1lx8fxIYGaO+c4r+VeZfYlsZIam
-HFzTe4UYwdjZT1HcR9njSkdL/6th5ZMM6NK+RI3MBmQAc5TfFxPUsXbHSAfLgclb
-v3yh2F0x6gnSBMxdVVYGha/eGegLZONGhZIxVYlVr0VlFrpy3Lo6+4mxIw5Sbery
-cY+LxKwpyx1Gj01qZS+muub7kCXefwZggf15F1NqaQNz6tzriwXpW1yrZGayERmT
-s11htXEvqSI3ViO3Rf/paq5vKwo5v7AMLHI7cv2dzrmNglLrEsY4GywlHdgbDYLh
-7qY6/35WzQwCcCWlvXP3K4SIkauH5lVR0KMsdU+idxpodqtHSTQN8f0z1vSSf5We
-wilBzw1LPiD55Dz7/9AIbjU/w/iUREsZceplbis1DFsVxf+cVZTtwx0LJn2enKTc
-O61LVcV9FDB7EJIdTQfFr9WJTR+6gfSF5R7H4kMX8gZHucoUruoXA+M4fqV8aRHc
-5lrzgnsVN/GatF5R63yt6dSByQGqnyhpLynoYWCht64PRglb7XekGuT9AR3m85VP
-hTu1fZsLfmVl9iJjc47/c5CKq9mAhoicDiCVCgTidCq5O9SmI2HgmCPUH/nd2+Fc
-uB2geCRdnZ0=
-=dUDc
------END PGP SIGNATURE-----

SOURCES/libnbd-1.20.3.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmb2th8RHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKCt/w//TKKhSrKc1CHZjKQpDF7pCe9WpCIDsyAP
+HaVIX4aBe+b6FoYyfnJG6D/o3qvv1yllaGRM77gttCBVmeTb/2pjrjOkxX1GcsMw
+yqW31YSNo2rkKCVFOGa3RggJb5Tn++g/IuoCI0sF0OZuejqkOIPLQ/yK3HlU01FE
+E4C2aZlbAn11RZ8Rz/uVfiNMmnUn9IqzyHozloIQNZjRGMFuOw4DAFPDc3wtq/yz
+ckTur09yGSLLu2q3vnbqdpJBvjoAWFv5F3UlxHtSz5tBaxyPQKnmI04Q8r3IiM+8
+hqZJ74dzeVtmfXf8Y8dFb40dYxn5OWrCj01qZu15RzhIhoOrhJcSBth1QPv0LXQS
+6b3n5Nx+rC4QzRPvEi0g4uBMgqdfBW5WesykbdH3+lSoxAJQgGwJXc2ceMzN9zGU
++wvGvX1wuTqtszEde1ydcpC3UayDDoMQYuY2QjJW0QbzPT1P884Mydc6zC7PCu8A
+QTMUbqdUOyg4i+jFjWMWrbU0Db9Kv5QaIrDGoR+cxlERYQh6rLA3kS7RDZexKlkc
+N2KrHbWJ/O24/JtLMqnl3X7Xcyek1MiQwN1SaEQl0QMmHGG7pF7MnZ3aVWmkhjlO
+J/FkBN+2hCQQPaANHCjPT/tDjqo7PcIAuUxP/fEp6048zk4BnAEgV4T4u10mz3mr
+xy8jdSC39iI=
+=pc1A
+-----END PGP SIGNATURE-----

SPECS/libnbd.spec

@@ -20,8 +20,8 @@
 %global source_directory 1.20-stable
 
 Name:           libnbd
-Version:        1.20.2
-Release:        2%{?dist}
+Version:        1.20.3
+Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
 License:        LGPL-2.0-or-later AND BSD-3-Clause
@@ -38,8 +38,9 @@ Source2:       libguestfs.keyring
 Source3:        copy-patches.sh
 
 # Patches are stored in the upstream repository:
-# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.5/
+# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-9.6/
 
+# Patches.
 Patch0001:     0001-generator-Print-full-error-in-handle_reply_error.patch
 Patch0002:     0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch
 Patch0003:     0003-generator-Restore-assignment-to-local-err.patch
@@ -389,6 +390,9 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Sat Sep 28 2024 Richard W.M. Jones <rjones@redhat.com> - 1.20.3-1
+- Rebase to libnbd 1.20.3
+
 * Fri Jul 26 2024 Richard W.M. Jones <rjones@redhat.com> - 1.20.2-2
 - Rebase to libnbd 1.20.2
   resolves: RHEL-31883