From 75a8e8de07c26ae229792e8f7234359300c136d1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 18 Aug 2022 15:39:36 +0100 Subject: [PATCH 001/116] New upstream development version 1.15.1 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index bac72cd..64ed2f8 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,10 +8,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.14-stable +%global source_directory 1.15-development Name: libnbd -Version: 1.14.1 +Version: 1.15.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Aug 18 2022 Richard W.M. Jones - 1.15.1-1 +- New upstream development version 1.15.1 + * Thu Aug 11 2022 Richard W.M. Jones - 1.14.1-1 - New upstream stable version 1.14.1 diff --git a/sources b/sources index 439771a..4b4135d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.14.1.tar.gz) = 9d95cf7a66926d00ec9aacfc6d04f2dc885ccfed07c78f1e6693190dd14132d30d6d1ff7d46e46007732a8a20a9fbf648775bc0b3371ad49eff4ce1e44e47209 -SHA512 (libnbd-1.14.1.tar.gz.sig) = 2c7be46babfdf7bddb3aed35f510ab9b1e7ef11a6fc4948ecb5a49f0db1f1c01651262c749ce5846d401feb831f1becd6d9717d3a42be58c7ff30fb137f00e40 +SHA512 (libnbd-1.15.1.tar.gz) = a848ce5f2239d7adc328246f8be20dbc1595ce1269ae296879d6301603ff2b1654d9014014004cb45d82635e8445fe314cfb433afc02dd8495ee0bfbdad3d051 +SHA512 (libnbd-1.15.1.tar.gz.sig) = a4b1befc410807beaef7b371f4aa891af0261ce45c874d547774f372efd298c8890134b09907f26d2cf7bb85c2f8e8142b23f8a0b208096235044e48e212ddd7 From db6090551f48a07d60633605e1d3b4e930f9eca1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 2 Sep 2022 10:07:26 +0100 Subject: [PATCH 002/116] New upstream development version 1.15.2 New tool: nbdublk --- libnbd.spec | 29 ++++++++++++++++++++++++++++- sources | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 64ed2f8..52b55fd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.1 +Version: 1.15.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -46,6 +46,10 @@ BuildRequires: libxml2-devel # For nbdfuse. BuildRequires: fuse3, fuse3-devel +# For nbdublk +BuildRequires: liburing-devel >= 2.2 +BuildRequires: ubdsrv-devel >= 0.1-3 + # For the Python 3 bindings. BuildRequires: python3-devel @@ -164,6 +168,19 @@ Recommends: fuse3 This package contains FUSE support for %{name}. +%package -n nbdublk +Summary: Userspace NBD block device +License: LGPLv2+ +Requires: %{name}%{?_isa} = %{version}-%{release} +Recommends: kernel >= 6.0.0 +Recommends: %{_sbindir}/ublk + + +%description -n nbdublk +This package contains a userspace NBD block device +based on %{name}. + + %package bash-completion Summary: Bash tab-completion for %{name} BuildArch: noarch @@ -313,6 +330,11 @@ make %{?_smp_mflags} check || { %{_mandir}/man1/nbdfuse.1* +%files -n nbdublk +%{_bindir}/nbdublk +%{_mandir}/man1/nbdublk.1* + + %files bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/nbdcopy @@ -320,9 +342,14 @@ make %{?_smp_mflags} check || { %{_datadir}/bash-completion/completions/nbdfuse %{_datadir}/bash-completion/completions/nbdinfo %{_datadir}/bash-completion/completions/nbdsh +%{_datadir}/bash-completion/completions/nbdublk %changelog +* Fri Sep 02 2022 Richard W.M. Jones - 1.15.2-1 +- New upstream development version 1.15.2 +- New tool: nbdublk + * Thu Aug 18 2022 Richard W.M. Jones - 1.15.1-1 - New upstream development version 1.15.1 diff --git a/sources b/sources index 4b4135d..fb76c97 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.1.tar.gz) = a848ce5f2239d7adc328246f8be20dbc1595ce1269ae296879d6301603ff2b1654d9014014004cb45d82635e8445fe314cfb433afc02dd8495ee0bfbdad3d051 -SHA512 (libnbd-1.15.1.tar.gz.sig) = a4b1befc410807beaef7b371f4aa891af0261ce45c874d547774f372efd298c8890134b09907f26d2cf7bb85c2f8e8142b23f8a0b208096235044e48e212ddd7 +SHA512 (libnbd-1.15.2.tar.gz) = 519f12f3c234a7e09075edfac762acfc789641822b42cd2e5cc58e9b4552f48e33d4a2e9ec15ae15f40be96619217b6331091f16516f677850fb3e9ef7187c49 +SHA512 (libnbd-1.15.2.tar.gz.sig) = 5fb6032d646ca24abfffac9816e68986dfa418efdc8e25b5df0235454511620a8125651db5c79656e4273adf1e61dd4c337eff70a867eef1e30e97189ff5c495 From b0cb06815c44673d5c8b6793a0fabad6368a7232 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 2 Sep 2022 21:44:20 +0100 Subject: [PATCH 003/116] New upstream development version 1.15.3 --- libnbd.spec | 6 +++--- sources | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 52b55fd..ec091d8 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.2 +Version: 1.15.3 Release: 1%{?dist} Summary: NBD client library in userspace @@ -346,8 +346,8 @@ make %{?_smp_mflags} check || { %changelog -* Fri Sep 02 2022 Richard W.M. Jones - 1.15.2-1 -- New upstream development version 1.15.2 +* Fri Sep 02 2022 Richard W.M. Jones - 1.15.3-1 +- New upstream development version 1.15.3 - New tool: nbdublk * Thu Aug 18 2022 Richard W.M. Jones - 1.15.1-1 diff --git a/sources b/sources index fb76c97..6978ec5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.2.tar.gz) = 519f12f3c234a7e09075edfac762acfc789641822b42cd2e5cc58e9b4552f48e33d4a2e9ec15ae15f40be96619217b6331091f16516f677850fb3e9ef7187c49 -SHA512 (libnbd-1.15.2.tar.gz.sig) = 5fb6032d646ca24abfffac9816e68986dfa418efdc8e25b5df0235454511620a8125651db5c79656e4273adf1e61dd4c337eff70a867eef1e30e97189ff5c495 +SHA512 (libnbd-1.15.3.tar.gz) = cffe5a3e135b2708d08e4ebc561f7ffb3c41e31f500068ab184952762e38f12a9bddadfc8055d22db94ef2ea8fde49f5cf2aae85efb155180824d824b09e35b1 +SHA512 (libnbd-1.15.3.tar.gz.sig) = dd6d25ef19c34597f2cd60003a72e0d3f056cdd07cf4285d688394c7e555dc94402153ba0eba7fdc90c781fa663d4df195f1283bba32775483e004d8194c2540 From c17d1b3dbf8684ff85e267d1d1d284e2552c5d0d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 27 Sep 2022 11:34:00 +0100 Subject: [PATCH 004/116] New upstream development version 1.15.4 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index ec091d8..70596b9 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.3 +Version: 1.15.4 Release: 1%{?dist} Summary: NBD client library in userspace @@ -48,7 +48,7 @@ BuildRequires: fuse3, fuse3-devel # For nbdublk BuildRequires: liburing-devel >= 2.2 -BuildRequires: ubdsrv-devel >= 0.1-3 +BuildRequires: ubdsrv-devel >= 1.0-1 # For the Python 3 bindings. BuildRequires: python3-devel @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Sep 27 2022 Richard W.M. Jones - 1.15.4-1 +- New upstream development version 1.15.4 + * Fri Sep 02 2022 Richard W.M. Jones - 1.15.3-1 - New upstream development version 1.15.3 - New tool: nbdublk diff --git a/sources b/sources index 6978ec5..d6cd129 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.3.tar.gz) = cffe5a3e135b2708d08e4ebc561f7ffb3c41e31f500068ab184952762e38f12a9bddadfc8055d22db94ef2ea8fde49f5cf2aae85efb155180824d824b09e35b1 -SHA512 (libnbd-1.15.3.tar.gz.sig) = dd6d25ef19c34597f2cd60003a72e0d3f056cdd07cf4285d688394c7e555dc94402153ba0eba7fdc90c781fa663d4df195f1283bba32775483e004d8194c2540 +SHA512 (libnbd-1.15.4.tar.gz) = 9132a844a5ccfae0eb7a599d34ace89aac4a5ba7d9097348dc4cc0be9ae412076d612375fe0318588358716506091c7c5ebebe1af1841d3a6dfb711feb7785b8 +SHA512 (libnbd-1.15.4.tar.gz.sig) = 9489065449ff29f8925f8bcfcf60acee3a6b1d93b0658867ffb47a907ede9e3a0b6fca85ce779aa902f420fc05a7323589c57756fcd6f8525bed5be7ad1b1d20 From 7cc5223c9c1eadd65b84d73688278ff6aee7749b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Oct 2022 16:47:42 +0100 Subject: [PATCH 005/116] New upstream development version 1.15.5 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 70596b9..a1f1f90 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.4 +Version: 1.15.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Oct 11 2022 Richard W.M. Jones - 1.15.5-1 +- New upstream development version 1.15.5 + * Tue Sep 27 2022 Richard W.M. Jones - 1.15.4-1 - New upstream development version 1.15.4 diff --git a/sources b/sources index d6cd129..c14ba0b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.4.tar.gz) = 9132a844a5ccfae0eb7a599d34ace89aac4a5ba7d9097348dc4cc0be9ae412076d612375fe0318588358716506091c7c5ebebe1af1841d3a6dfb711feb7785b8 -SHA512 (libnbd-1.15.4.tar.gz.sig) = 9489065449ff29f8925f8bcfcf60acee3a6b1d93b0658867ffb47a907ede9e3a0b6fca85ce779aa902f420fc05a7323589c57756fcd6f8525bed5be7ad1b1d20 +SHA512 (libnbd-1.15.5.tar.gz) = 5faf33ff9be9a1114e4d897d7ff932355398e9e465179f3a7c938e84daaa154d471650040940ded5c226385951463aa6c97e7d00f3741e60f3f6b40517d8d8b7 +SHA512 (libnbd-1.15.5.tar.gz.sig) = f72b07322a27ddaad9eeb87a74e815d9090989b185aad8bc605a3c2919585e9a89b76cedf6b9c25b1524173a9eac3e8ca368ea70b7168218e05123b65e26b42c From c0247e1ac53ede19448b3d8096a32e7586c1ff5f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 13 Oct 2022 18:15:18 +0100 Subject: [PATCH 006/116] New upstream development version 1.15.6 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a1f1f90..1fb7646 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.5 +Version: 1.15.6 Release: 1%{?dist} Summary: NBD client library in userspace @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Oct 13 2022 Richard W.M. Jones - 1.15.6-1 +- New upstream development version 1.15.6 + * Tue Oct 11 2022 Richard W.M. Jones - 1.15.5-1 - New upstream development version 1.15.5 diff --git a/sources b/sources index c14ba0b..8014a74 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.5.tar.gz) = 5faf33ff9be9a1114e4d897d7ff932355398e9e465179f3a7c938e84daaa154d471650040940ded5c226385951463aa6c97e7d00f3741e60f3f6b40517d8d8b7 -SHA512 (libnbd-1.15.5.tar.gz.sig) = f72b07322a27ddaad9eeb87a74e815d9090989b185aad8bc605a3c2919585e9a89b76cedf6b9c25b1524173a9eac3e8ca368ea70b7168218e05123b65e26b42c +SHA512 (libnbd-1.15.6.tar.gz) = 04d296d2a24d7caee349868f891b3e7124f2ce6e8066dc2c10faf9633cb68a9c50d9382443cbd7d3ad4d4265aa8f1b4ad27c004f9759449f0ecc0c621482bcc4 +SHA512 (libnbd-1.15.6.tar.gz.sig) = bf30441baa1322499ed01b5487e51663511ad4f3f8c5650b602de0dea2f96d0ebd697399a9db12ee1d9583c9f164b1769350b15902d7d6dc03abb4a7b85c5f65 From 75c3b8f382c06e6aeb87f39dcc18e94bd158cfa9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Nov 2022 12:09:00 +0000 Subject: [PATCH 007/116] New upstream development version 1.15.7 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 1fb7646..a2239cd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.6 +Version: 1.15.7 Release: 1%{?dist} Summary: NBD client library in userspace @@ -48,7 +48,7 @@ BuildRequires: fuse3, fuse3-devel # For nbdublk BuildRequires: liburing-devel >= 2.2 -BuildRequires: ubdsrv-devel >= 1.0-1 +BuildRequires: ubdsrv-devel >= 1.0-2 # For the Python 3 bindings. BuildRequires: python3-devel @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Nov 03 2022 Richard W.M. Jones - 1.15.7-1 +- New upstream development version 1.15.7 + * Thu Oct 13 2022 Richard W.M. Jones - 1.15.6-1 - New upstream development version 1.15.6 diff --git a/sources b/sources index 8014a74..57597a9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.6.tar.gz) = 04d296d2a24d7caee349868f891b3e7124f2ce6e8066dc2c10faf9633cb68a9c50d9382443cbd7d3ad4d4265aa8f1b4ad27c004f9759449f0ecc0c621482bcc4 -SHA512 (libnbd-1.15.6.tar.gz.sig) = bf30441baa1322499ed01b5487e51663511ad4f3f8c5650b602de0dea2f96d0ebd697399a9db12ee1d9583c9f164b1769350b15902d7d6dc03abb4a7b85c5f65 +SHA512 (libnbd-1.15.7.tar.gz) = 5e901cee2e1d05aeb7ca832fb765eedb311123849ef54b7e313953a1bcd13914f4d35c9c2d080341d18b89fe364aae6dd269e2dcc348a0850cc8d2aadf6ed1b0 +SHA512 (libnbd-1.15.7.tar.gz.sig) = de0c7dc36d5d8eb4a4ab34da86989285e416b82a1cc9c44f5bf48290caebc868c959ce13ec0bb205633cf2aea25e28b1b4f29b4ee0dadf6e28b19ae3ff39278b From 0ce6737b9feea4aa1bd58b0a87188019123c41d5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 25 Nov 2022 12:53:21 +0000 Subject: [PATCH 008/116] New upstream development version 1.15.8 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a2239cd..0ae2ff5 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.7 +Version: 1.15.8 Release: 1%{?dist} Summary: NBD client library in userspace @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Nov 25 2022 Richard W.M. Jones - 1.15.8-1 +- New upstream development version 1.15.8 + * Thu Nov 03 2022 Richard W.M. Jones - 1.15.7-1 - New upstream development version 1.15.7 diff --git a/sources b/sources index 57597a9..b62c883 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.7.tar.gz) = 5e901cee2e1d05aeb7ca832fb765eedb311123849ef54b7e313953a1bcd13914f4d35c9c2d080341d18b89fe364aae6dd269e2dcc348a0850cc8d2aadf6ed1b0 -SHA512 (libnbd-1.15.7.tar.gz.sig) = de0c7dc36d5d8eb4a4ab34da86989285e416b82a1cc9c44f5bf48290caebc868c959ce13ec0bb205633cf2aea25e28b1b4f29b4ee0dadf6e28b19ae3ff39278b +SHA512 (libnbd-1.15.8.tar.gz) = b87ffbd5494a008927aba84910c3b35d09d343a7df643fa0366208572a9221b15d45eefad62f38f27c840defcdefaec70834d801b2454e5b7d094a90ac8dda96 +SHA512 (libnbd-1.15.8.tar.gz.sig) = 11b2291fd587557b84e8b8c5ba153bf3fe4a475c01c34577eac0cc6cb6475b701aec9a221b5a070c88a640e6d0f424a75a90d1ee4efe6090b625d730151bb796 From 3a2dc7862a28b6fcf705c06442f3d245366db2ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 9 Dec 2022 14:00:47 +0000 Subject: [PATCH 009/116] Rebuild against new ubdsrv API --- ...-ublk-Update-for-ubdsrv-changing-API.patch | 192 ++++++++++++++++++ libnbd.spec | 10 +- 2 files changed, 200 insertions(+), 2 deletions(-) create mode 100644 0001-ublk-Update-for-ubdsrv-changing-API.patch diff --git a/0001-ublk-Update-for-ubdsrv-changing-API.patch b/0001-ublk-Update-for-ubdsrv-changing-API.patch new file mode 100644 index 0000000..2de839b --- /dev/null +++ b/0001-ublk-Update-for-ubdsrv-changing-API.patch @@ -0,0 +1,192 @@ +From 7a402ab853f480245767d72ae2f61e880893ea4d Mon Sep 17 00:00:00 2001 +From: Ming Lei +Date: Fri, 9 Dec 2022 13:45:01 +0000 +Subject: [PATCH] ublk: Update for ubdsrv changing API + +See: +https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/NKQKUCUOHDCVVSR2PXVANGZSBXXPHYLY/ +--- + ublk/nbdublk.c | 7 +++++-- + ublk/tgt.c | 42 +++++++++++++++++++++++------------------- + 2 files changed, 28 insertions(+), 21 deletions(-) + +diff --git a/ublk/nbdublk.c b/ublk/nbdublk.c +index 53af840f7a..00aa23ec03 100644 +--- a/ublk/nbdublk.c ++++ b/ublk/nbdublk.c +@@ -166,6 +166,7 @@ main (int argc, char *argv[]) + uint64_t max_block_size; + const char *s; + struct ublksrv_dev_data data = { .dev_id = -1 }; ++ const struct ublksrv_ctrl_dev_info *dinfo; + struct sigaction sa = { 0 }; + + for (;;) { +@@ -420,6 +421,8 @@ main (int argc, char *argv[]) + exit (EXIT_FAILURE); + } + ++ dinfo = ublksrv_ctrl_get_dev_info(dev); ++ + /* Register signal handlers to try to stop the device. */ + sa.sa_handler = signal_handler; + sigaction (SIGHUP, &sa, NULL); +@@ -432,14 +435,14 @@ main (int argc, char *argv[]) + if (r < 0) { + errno = -r; + fprintf (stderr, "%s: ublksrv_ctrl_add_dev: "DEVICE_PREFIX "%d: %m\n", +- argv[0], dev->dev_info.dev_id); ++ argv[0], dinfo->dev_id); + ublksrv_ctrl_deinit (dev); + exit (EXIT_FAILURE); + } + + if (verbose) + fprintf (stderr, "%s: created %s%d\n", +- argv[0], DEVICE_PREFIX, dev->dev_info.dev_id); ++ argv[0], DEVICE_PREFIX, dinfo->dev_id); + + /* XXX nbdfuse creates a pid file. However I reason that you can + * tell if the service is available when the block device is created +diff --git a/ublk/tgt.c b/ublk/tgt.c +index e25e072875..3fb2223331 100644 +--- a/ublk/tgt.c ++++ b/ublk/tgt.c +@@ -33,6 +33,7 @@ + #define _Atomic /**/ + #endif + ++#include + #include + #include + +@@ -53,7 +54,7 @@ + * The thread_info entry is shared between each pair of threads. + */ + struct thread_info { +- struct ublksrv_dev *dev; ++ const struct ublksrv_dev *dev; + size_t i; /* index into nbd.ptr[], also q_id */ + pthread_t io_uring_thread; + pthread_t nbd_work_thread; +@@ -208,7 +209,7 @@ nbd_work_thread (void *vpinfo) + + ublksrv_aio_complete_worker (aio_ctx, &compl); + +- if (nbd_poll2 (h, aio_ctx->efd, -1) == -1) { ++ if (nbd_poll2 (h, ublksrv_aio_get_efd(aio_ctx), -1) == -1) { + fprintf (stderr, "%s\n", nbd_get_error ()); + exit (EXIT_FAILURE); + } +@@ -221,15 +222,17 @@ static void * + io_uring_thread (void *vpinfo) + { + struct thread_info *thread_info = vpinfo; +- struct ublksrv_dev *dev = thread_info->dev; +- const unsigned dev_id = dev->ctrl_dev->dev_info.dev_id; ++ const struct ublksrv_dev *dev = thread_info->dev; ++ const struct ublksrv_ctrl_dev *cdev = ublksrv_get_ctrl_dev(dev); ++ const struct ublksrv_ctrl_dev_info *dinfo = ublksrv_ctrl_get_dev_info(cdev); ++ const unsigned dev_id = dinfo->dev_id; + const size_t q_id = thread_info->i; +- struct ublksrv_queue *q; ++ const struct ublksrv_queue *q; + int r; ++ int tid = gettid(); + + pthread_mutex_lock (&jbuf_lock); +- ublksrv_json_write_queue_info (dev->ctrl_dev, jbuf, sizeof jbuf, +- q_id, gettid ()); ++ ublksrv_json_write_queue_info (cdev, jbuf, sizeof jbuf, q_id, tid); + pthread_mutex_unlock (&jbuf_lock); + + q = ublksrv_queue_init (dev, q_id, NULL); +@@ -240,7 +243,7 @@ io_uring_thread (void *vpinfo) + + if (verbose) + fprintf (stderr, "%s: ublk tid %d dev %d queue %d started\n", +- "nbdublk", q->tid, dev_id, q->q_id); ++ "nbdublk", tid, dev_id, q->q_id); + + for (;;) { + r = ublksrv_process_io (q); +@@ -255,7 +258,7 @@ io_uring_thread (void *vpinfo) + + if (verbose) + fprintf (stderr, "%s: ublk tid %d dev %d queue %d exited\n", +- "nbdublk", q->tid, dev_id, q->q_id); ++ "nbdublk", tid, dev_id, q->q_id); + + ublksrv_queue_deinit (q); + return NULL; +@@ -265,7 +268,7 @@ static int + set_parameters (struct ublksrv_ctrl_dev *ctrl_dev, + const struct ublksrv_dev *dev) + { +- struct ublksrv_ctrl_dev_info *dinfo = &ctrl_dev->dev_info; ++ const struct ublksrv_ctrl_dev_info *dinfo = ublksrv_ctrl_get_dev_info(ctrl_dev); + const unsigned attrs = + (readonly ? UBLK_ATTR_READ_ONLY : 0) | + (rotational ? UBLK_ATTR_ROTATIONAL : 0) | +@@ -305,8 +308,8 @@ set_parameters (struct ublksrv_ctrl_dev *ctrl_dev, + int + start_daemon (struct ublksrv_ctrl_dev *ctrl_dev) + { +- const struct ublksrv_ctrl_dev_info *dinfo = &ctrl_dev->dev_info; +- struct ublksrv_dev *dev; ++ const struct ublksrv_ctrl_dev_info *dinfo = ublksrv_ctrl_get_dev_info(ctrl_dev); ++ const struct ublksrv_dev *dev; + size_t i; + int r; + +@@ -418,7 +421,8 @@ start_daemon (struct ublksrv_ctrl_dev *ctrl_dev) + static int + init_tgt (struct ublksrv_dev *dev, int type, int argc, char *argv[]) + { +- const struct ublksrv_ctrl_dev_info *info = &dev->ctrl_dev->dev_info; ++ const struct ublksrv_ctrl_dev *cdev = ublksrv_get_ctrl_dev(dev); ++ const struct ublksrv_ctrl_dev_info *info = ublksrv_ctrl_get_dev_info(cdev); + struct ublksrv_tgt_info *tgt = &dev->tgt; + struct ublksrv_tgt_base_json tgt_json = { + .type = type, +@@ -435,14 +439,14 @@ init_tgt (struct ublksrv_dev *dev, int type, int argc, char *argv[]) + tgt->tgt_ring_depth = info->queue_depth; + tgt->nr_fds = 0; + +- ublksrv_json_write_dev_info (dev->ctrl_dev, jbuf, sizeof jbuf); ++ ublksrv_json_write_dev_info (ublksrv_get_ctrl_dev(dev), jbuf, sizeof jbuf); + ublksrv_json_write_target_base_info (jbuf, sizeof jbuf, &tgt_json); + + return 0; + } + + static void +-handle_event (struct ublksrv_queue *q) ++handle_event (const struct ublksrv_queue *q) + { + struct ublksrv_aio_ctx *aio_ctx = thread_info.ptr[q->q_id].aio_ctx; + +@@ -454,16 +458,16 @@ handle_event (struct ublksrv_queue *q) + } + + static int +-handle_io_async (struct ublksrv_queue *q, int tag) ++handle_io_async (const struct ublksrv_queue *q, const struct ublk_io_data *io) + { + struct ublksrv_aio_ctx *aio_ctx = thread_info.ptr[q->q_id].aio_ctx; +- const struct ublksrv_io_desc *iod = ublksrv_get_iod (q, tag); ++ const struct ublksrv_io_desc *iod = io->iod; + struct ublksrv_aio *req = ublksrv_aio_alloc_req (aio_ctx, 0); + + req->io = *iod; +- req->id = ublksrv_aio_pid_tag (q->q_id, tag); ++ req->id = ublksrv_aio_pid_tag (q->q_id, io->tag); + if (verbose) +- fprintf (stderr, "%s: qid %d tag %d\n", "nbdublk", q->q_id, tag); ++ fprintf (stderr, "%s: qid %d tag %d\n", "nbdublk", q->q_id, io->tag); + ublksrv_aio_submit_req (aio_ctx, q, req); + + return 0; +-- +2.37.3 + diff --git a/libnbd.spec b/libnbd.spec index 0ae2ff5..e942601 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.15.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -28,6 +28,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Upstream fix for changed ubdsrv API. +Patch: 0001-ublk-Update-for-ubdsrv-changing-API.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -48,7 +51,7 @@ BuildRequires: fuse3, fuse3-devel # For nbdublk BuildRequires: liburing-devel >= 2.2 -BuildRequires: ubdsrv-devel >= 1.0-2 +BuildRequires: ubdsrv-devel >= 1.0-3.rc6 # For the Python 3 bindings. BuildRequires: python3-devel @@ -346,6 +349,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Dec 09 2022 Richard W.M. Jones - 1.15.8-2 +- Rebuild against new ubdsrv API + * Fri Nov 25 2022 Richard W.M. Jones - 1.15.8-1 - New upstream development version 1.15.8 From 6bf2ec6727a6413985ab23949fb096a83bcbe15f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jan 2023 13:29:46 +0000 Subject: [PATCH 010/116] Fix for Python 3.12 distutils change (RHBZ#2152674). --- ...-ublk-Update-for-ubdsrv-changing-API.patch | 2 +- ...eplace-Python-distutils-by-sysconfig.patch | 54 +++++++++++++++++++ libnbd.spec | 8 ++- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 0002-build-Replace-Python-distutils-by-sysconfig.patch diff --git a/0001-ublk-Update-for-ubdsrv-changing-API.patch b/0001-ublk-Update-for-ubdsrv-changing-API.patch index 2de839b..2355e0b 100644 --- a/0001-ublk-Update-for-ubdsrv-changing-API.patch +++ b/0001-ublk-Update-for-ubdsrv-changing-API.patch @@ -1,7 +1,7 @@ From 7a402ab853f480245767d72ae2f61e880893ea4d Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Fri, 9 Dec 2022 13:45:01 +0000 -Subject: [PATCH] ublk: Update for ubdsrv changing API +Subject: [PATCH 1/2] ublk: Update for ubdsrv changing API See: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/NKQKUCUOHDCVVSR2PXVANGZSBXXPHYLY/ diff --git a/0002-build-Replace-Python-distutils-by-sysconfig.patch b/0002-build-Replace-Python-distutils-by-sysconfig.patch new file mode 100644 index 0000000..348c0c1 --- /dev/null +++ b/0002-build-Replace-Python-distutils-by-sysconfig.patch @@ -0,0 +1,54 @@ +From 8c802dd9459f695ab2195f7b29fbe71c65c33a81 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 18 Oct 2022 10:55:22 +0100 +Subject: [PATCH 2/2] build: Replace Python distutils by sysconfig +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This module has been deprecated in Python >= 3.10 +(https://peps.python.org/pep-0632/). Replace distutils.sysconfig with +sysconfig which is not quite a drop-in replacement. + +This fix is incomplete as we still reference distutils in +python/setup.py.in. However that is only used for PIP-style +distributions (make -C python sdist) which we don't really use or +recommend. + +Thanks: Miro Hrončok +See-also: https://peps.python.org/pep-0632/ +See-also: https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/N6ITYHLRWIDNYNXGPYG2ZHF3ZLQWZN7L/ + +Cherry picked from libguestfs commit 26940f64a7406761 +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3a09816af7..5f0ca6994d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -549,16 +549,16 @@ AS_IF([test "x$enable_python" != "xno"],[ + PYTHON_INSTALLDIR= + AC_MSG_CHECKING([for Python site-packages path]) + if test -z "$PYTHON_INSTALLDIR"; then +- PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_lib(1,0));"` ++ PYTHON_INSTALLDIR=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_path('platlib'));"` + fi + AC_MSG_RESULT([$PYTHON_INSTALLDIR]) + fi + + AC_MSG_CHECKING([for Python extension suffix (PEP-3149)]) + if test -z "$PYTHON_EXT_SUFFIX"; then +- python_ext_suffix=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_config_var('EXT_SUFFIX') or distutils.sysconfig.get_config_var('SO'))"` ++ python_ext_suffix=`$PYTHON -c "import sysconfig; \ ++ print (sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"` + PYTHON_EXT_SUFFIX=$python_ext_suffix + fi + AC_MSG_RESULT([$PYTHON_EXT_SUFFIX]) +-- +2.37.3 + diff --git a/libnbd.spec b/libnbd.spec index e942601..6bc4b26 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.15.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -31,6 +31,9 @@ Source3: copy-patches.sh # Upstream fix for changed ubdsrv API. Patch: 0001-ublk-Update-for-ubdsrv-changing-API.patch +# Upstream Python change (RHBZ#2152674). +Patch: 0002-build-Replace-Python-distutils-by-sysconfig.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -349,6 +352,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 03 2023 Richard W.M. Jones - 1.15.8-3 +- Fix for Python 3.12 distutils change (RHBZ#2152674). + * Fri Dec 09 2022 Richard W.M. Jones - 1.15.8-2 - Rebuild against new ubdsrv API From 5c8b7171a848d94885fc1666fa8e5d9722d2e853 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jan 2023 13:40:19 +0000 Subject: [PATCH 011/116] Set %patches_touch_autotools --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 6bc4b26..b9dc9cd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,7 +5,7 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 # The source directory. %global source_directory 1.15-development From b74ea0371416c7237ce3844c748ce291b90ea8ea Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jan 2023 14:05:39 +0000 Subject: [PATCH 012/116] New upstream stable version 1.14.2 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index bac72cd..cb5ce3b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.14-stable Name: libnbd -Version: 1.14.1 +Version: 1.14.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 03 2023 Richard W.M. Jones - 1.14.2-1 +- New upstream stable version 1.14.2 + * Thu Aug 11 2022 Richard W.M. Jones - 1.14.1-1 - New upstream stable version 1.14.1 diff --git a/sources b/sources index 439771a..b9be4f3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.14.1.tar.gz) = 9d95cf7a66926d00ec9aacfc6d04f2dc885ccfed07c78f1e6693190dd14132d30d6d1ff7d46e46007732a8a20a9fbf648775bc0b3371ad49eff4ce1e44e47209 -SHA512 (libnbd-1.14.1.tar.gz.sig) = 2c7be46babfdf7bddb3aed35f510ab9b1e7ef11a6fc4948ecb5a49f0db1f1c01651262c749ce5846d401feb831f1becd6d9717d3a42be58c7ff30fb137f00e40 +SHA512 (libnbd-1.14.2.tar.gz) = ce1aef449a2589734c750ca73d9dc79bf645d08bf7425205f45647b6ec717972568500e50e9546a09bb96a278df77a2752a0a6f50c87237ed3f665dec175ad63 +SHA512 (libnbd-1.14.2.tar.gz.sig) = 264ce543b200728ed17bc5b9b4b99f95aab13c078e01bbe53395dc3e77cfe06f367ec62bf4669824a5ccf573654d9090cc7c649beb95d1e6e3e669e1d2d13732 From 89aee3bed6bbc3d3747340ec824a10f14fbb8573 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:57:08 +0000 Subject: [PATCH 013/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index b9dc9cd..b2b1130 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.15.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -352,6 +352,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.15.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 03 2023 Richard W.M. Jones - 1.15.8-3 - Fix for Python 3.12 distutils change (RHBZ#2152674). From a34fe5827ecfd405a9c4211a11faa1a3ec7829da Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 21 Jan 2023 22:39:06 +0000 Subject: [PATCH 014/116] New upstream development version 1.15.9 --- ...-ublk-Update-for-ubdsrv-changing-API.patch | 192 ------------------ ...eplace-Python-distutils-by-sysconfig.patch | 54 ----- libnbd.spec | 15 +- 3 files changed, 6 insertions(+), 255 deletions(-) delete mode 100644 0001-ublk-Update-for-ubdsrv-changing-API.patch delete mode 100644 0002-build-Replace-Python-distutils-by-sysconfig.patch diff --git a/0001-ublk-Update-for-ubdsrv-changing-API.patch b/0001-ublk-Update-for-ubdsrv-changing-API.patch deleted file mode 100644 index 2355e0b..0000000 --- a/0001-ublk-Update-for-ubdsrv-changing-API.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 7a402ab853f480245767d72ae2f61e880893ea4d Mon Sep 17 00:00:00 2001 -From: Ming Lei -Date: Fri, 9 Dec 2022 13:45:01 +0000 -Subject: [PATCH 1/2] ublk: Update for ubdsrv changing API - -See: -https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/NKQKUCUOHDCVVSR2PXVANGZSBXXPHYLY/ ---- - ublk/nbdublk.c | 7 +++++-- - ublk/tgt.c | 42 +++++++++++++++++++++++------------------- - 2 files changed, 28 insertions(+), 21 deletions(-) - -diff --git a/ublk/nbdublk.c b/ublk/nbdublk.c -index 53af840f7a..00aa23ec03 100644 ---- a/ublk/nbdublk.c -+++ b/ublk/nbdublk.c -@@ -166,6 +166,7 @@ main (int argc, char *argv[]) - uint64_t max_block_size; - const char *s; - struct ublksrv_dev_data data = { .dev_id = -1 }; -+ const struct ublksrv_ctrl_dev_info *dinfo; - struct sigaction sa = { 0 }; - - for (;;) { -@@ -420,6 +421,8 @@ main (int argc, char *argv[]) - exit (EXIT_FAILURE); - } - -+ dinfo = ublksrv_ctrl_get_dev_info(dev); -+ - /* Register signal handlers to try to stop the device. */ - sa.sa_handler = signal_handler; - sigaction (SIGHUP, &sa, NULL); -@@ -432,14 +435,14 @@ main (int argc, char *argv[]) - if (r < 0) { - errno = -r; - fprintf (stderr, "%s: ublksrv_ctrl_add_dev: "DEVICE_PREFIX "%d: %m\n", -- argv[0], dev->dev_info.dev_id); -+ argv[0], dinfo->dev_id); - ublksrv_ctrl_deinit (dev); - exit (EXIT_FAILURE); - } - - if (verbose) - fprintf (stderr, "%s: created %s%d\n", -- argv[0], DEVICE_PREFIX, dev->dev_info.dev_id); -+ argv[0], DEVICE_PREFIX, dinfo->dev_id); - - /* XXX nbdfuse creates a pid file. However I reason that you can - * tell if the service is available when the block device is created -diff --git a/ublk/tgt.c b/ublk/tgt.c -index e25e072875..3fb2223331 100644 ---- a/ublk/tgt.c -+++ b/ublk/tgt.c -@@ -33,6 +33,7 @@ - #define _Atomic /**/ - #endif - -+#include - #include - #include - -@@ -53,7 +54,7 @@ - * The thread_info entry is shared between each pair of threads. - */ - struct thread_info { -- struct ublksrv_dev *dev; -+ const struct ublksrv_dev *dev; - size_t i; /* index into nbd.ptr[], also q_id */ - pthread_t io_uring_thread; - pthread_t nbd_work_thread; -@@ -208,7 +209,7 @@ nbd_work_thread (void *vpinfo) - - ublksrv_aio_complete_worker (aio_ctx, &compl); - -- if (nbd_poll2 (h, aio_ctx->efd, -1) == -1) { -+ if (nbd_poll2 (h, ublksrv_aio_get_efd(aio_ctx), -1) == -1) { - fprintf (stderr, "%s\n", nbd_get_error ()); - exit (EXIT_FAILURE); - } -@@ -221,15 +222,17 @@ static void * - io_uring_thread (void *vpinfo) - { - struct thread_info *thread_info = vpinfo; -- struct ublksrv_dev *dev = thread_info->dev; -- const unsigned dev_id = dev->ctrl_dev->dev_info.dev_id; -+ const struct ublksrv_dev *dev = thread_info->dev; -+ const struct ublksrv_ctrl_dev *cdev = ublksrv_get_ctrl_dev(dev); -+ const struct ublksrv_ctrl_dev_info *dinfo = ublksrv_ctrl_get_dev_info(cdev); -+ const unsigned dev_id = dinfo->dev_id; - const size_t q_id = thread_info->i; -- struct ublksrv_queue *q; -+ const struct ublksrv_queue *q; - int r; -+ int tid = gettid(); - - pthread_mutex_lock (&jbuf_lock); -- ublksrv_json_write_queue_info (dev->ctrl_dev, jbuf, sizeof jbuf, -- q_id, gettid ()); -+ ublksrv_json_write_queue_info (cdev, jbuf, sizeof jbuf, q_id, tid); - pthread_mutex_unlock (&jbuf_lock); - - q = ublksrv_queue_init (dev, q_id, NULL); -@@ -240,7 +243,7 @@ io_uring_thread (void *vpinfo) - - if (verbose) - fprintf (stderr, "%s: ublk tid %d dev %d queue %d started\n", -- "nbdublk", q->tid, dev_id, q->q_id); -+ "nbdublk", tid, dev_id, q->q_id); - - for (;;) { - r = ublksrv_process_io (q); -@@ -255,7 +258,7 @@ io_uring_thread (void *vpinfo) - - if (verbose) - fprintf (stderr, "%s: ublk tid %d dev %d queue %d exited\n", -- "nbdublk", q->tid, dev_id, q->q_id); -+ "nbdublk", tid, dev_id, q->q_id); - - ublksrv_queue_deinit (q); - return NULL; -@@ -265,7 +268,7 @@ static int - set_parameters (struct ublksrv_ctrl_dev *ctrl_dev, - const struct ublksrv_dev *dev) - { -- struct ublksrv_ctrl_dev_info *dinfo = &ctrl_dev->dev_info; -+ const struct ublksrv_ctrl_dev_info *dinfo = ublksrv_ctrl_get_dev_info(ctrl_dev); - const unsigned attrs = - (readonly ? UBLK_ATTR_READ_ONLY : 0) | - (rotational ? UBLK_ATTR_ROTATIONAL : 0) | -@@ -305,8 +308,8 @@ set_parameters (struct ublksrv_ctrl_dev *ctrl_dev, - int - start_daemon (struct ublksrv_ctrl_dev *ctrl_dev) - { -- const struct ublksrv_ctrl_dev_info *dinfo = &ctrl_dev->dev_info; -- struct ublksrv_dev *dev; -+ const struct ublksrv_ctrl_dev_info *dinfo = ublksrv_ctrl_get_dev_info(ctrl_dev); -+ const struct ublksrv_dev *dev; - size_t i; - int r; - -@@ -418,7 +421,8 @@ start_daemon (struct ublksrv_ctrl_dev *ctrl_dev) - static int - init_tgt (struct ublksrv_dev *dev, int type, int argc, char *argv[]) - { -- const struct ublksrv_ctrl_dev_info *info = &dev->ctrl_dev->dev_info; -+ const struct ublksrv_ctrl_dev *cdev = ublksrv_get_ctrl_dev(dev); -+ const struct ublksrv_ctrl_dev_info *info = ublksrv_ctrl_get_dev_info(cdev); - struct ublksrv_tgt_info *tgt = &dev->tgt; - struct ublksrv_tgt_base_json tgt_json = { - .type = type, -@@ -435,14 +439,14 @@ init_tgt (struct ublksrv_dev *dev, int type, int argc, char *argv[]) - tgt->tgt_ring_depth = info->queue_depth; - tgt->nr_fds = 0; - -- ublksrv_json_write_dev_info (dev->ctrl_dev, jbuf, sizeof jbuf); -+ ublksrv_json_write_dev_info (ublksrv_get_ctrl_dev(dev), jbuf, sizeof jbuf); - ublksrv_json_write_target_base_info (jbuf, sizeof jbuf, &tgt_json); - - return 0; - } - - static void --handle_event (struct ublksrv_queue *q) -+handle_event (const struct ublksrv_queue *q) - { - struct ublksrv_aio_ctx *aio_ctx = thread_info.ptr[q->q_id].aio_ctx; - -@@ -454,16 +458,16 @@ handle_event (struct ublksrv_queue *q) - } - - static int --handle_io_async (struct ublksrv_queue *q, int tag) -+handle_io_async (const struct ublksrv_queue *q, const struct ublk_io_data *io) - { - struct ublksrv_aio_ctx *aio_ctx = thread_info.ptr[q->q_id].aio_ctx; -- const struct ublksrv_io_desc *iod = ublksrv_get_iod (q, tag); -+ const struct ublksrv_io_desc *iod = io->iod; - struct ublksrv_aio *req = ublksrv_aio_alloc_req (aio_ctx, 0); - - req->io = *iod; -- req->id = ublksrv_aio_pid_tag (q->q_id, tag); -+ req->id = ublksrv_aio_pid_tag (q->q_id, io->tag); - if (verbose) -- fprintf (stderr, "%s: qid %d tag %d\n", "nbdublk", q->q_id, tag); -+ fprintf (stderr, "%s: qid %d tag %d\n", "nbdublk", q->q_id, io->tag); - ublksrv_aio_submit_req (aio_ctx, q, req); - - return 0; --- -2.37.3 - diff --git a/0002-build-Replace-Python-distutils-by-sysconfig.patch b/0002-build-Replace-Python-distutils-by-sysconfig.patch deleted file mode 100644 index 348c0c1..0000000 --- a/0002-build-Replace-Python-distutils-by-sysconfig.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8c802dd9459f695ab2195f7b29fbe71c65c33a81 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 18 Oct 2022 10:55:22 +0100 -Subject: [PATCH 2/2] build: Replace Python distutils by sysconfig -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This module has been deprecated in Python >= 3.10 -(https://peps.python.org/pep-0632/). Replace distutils.sysconfig with -sysconfig which is not quite a drop-in replacement. - -This fix is incomplete as we still reference distutils in -python/setup.py.in. However that is only used for PIP-style -distributions (make -C python sdist) which we don't really use or -recommend. - -Thanks: Miro Hrončok -See-also: https://peps.python.org/pep-0632/ -See-also: https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/N6ITYHLRWIDNYNXGPYG2ZHF3ZLQWZN7L/ - -Cherry picked from libguestfs commit 26940f64a7406761 ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3a09816af7..5f0ca6994d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -549,16 +549,16 @@ AS_IF([test "x$enable_python" != "xno"],[ - PYTHON_INSTALLDIR= - AC_MSG_CHECKING([for Python site-packages path]) - if test -z "$PYTHON_INSTALLDIR"; then -- PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_lib(1,0));"` -+ PYTHON_INSTALLDIR=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_path('platlib'));"` - fi - AC_MSG_RESULT([$PYTHON_INSTALLDIR]) - fi - - AC_MSG_CHECKING([for Python extension suffix (PEP-3149)]) - if test -z "$PYTHON_EXT_SUFFIX"; then -- python_ext_suffix=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_config_var('EXT_SUFFIX') or distutils.sysconfig.get_config_var('SO'))"` -+ python_ext_suffix=`$PYTHON -c "import sysconfig; \ -+ print (sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"` - PYTHON_EXT_SUFFIX=$python_ext_suffix - fi - AC_MSG_RESULT([$PYTHON_EXT_SUFFIX]) --- -2.37.3 - diff --git a/libnbd.spec b/libnbd.spec index b2b1130..5bafa3f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,14 +5,14 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.15-development Name: libnbd -Version: 1.15.8 -Release: 4%{?dist} +Version: 1.15.9 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -28,12 +28,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Upstream fix for changed ubdsrv API. -Patch: 0001-ublk-Update-for-ubdsrv-changing-API.patch - -# Upstream Python change (RHBZ#2152674). -Patch: 0002-build-Replace-Python-distutils-by-sysconfig.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -352,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Jan 21 2023 Richard W.M. Jones - 1.15.9-1 +- New upstream development version 1.15.9 + * Thu Jan 19 2023 Fedora Release Engineering - 1.15.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4d4b41cbf91845ba4a80aef75d6b9d246287bb24 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 21 Jan 2023 22:45:55 +0000 Subject: [PATCH 015/116] Forgot to update sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b62c883..8cb2512 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.8.tar.gz) = b87ffbd5494a008927aba84910c3b35d09d343a7df643fa0366208572a9221b15d45eefad62f38f27c840defcdefaec70834d801b2454e5b7d094a90ac8dda96 -SHA512 (libnbd-1.15.8.tar.gz.sig) = 11b2291fd587557b84e8b8c5ba153bf3fe4a475c01c34577eac0cc6cb6475b701aec9a221b5a070c88a640e6d0f424a75a90d1ee4efe6090b625d730151bb796 +SHA512 (libnbd-1.15.9.tar.gz) = 9a7b3c16921b26502fbed01d734de3f8b6ae67fd0dc6885726567b37d5eb63912a9438b00cb7fee2daa306e10ef26cca74e778fc3ac58297373a8e80b465fc0f +SHA512 (libnbd-1.15.9.tar.gz.sig) = 5d5b89aa8edf14faf6e483d37dfb04cfae46aa31be44c983ee22e7f59289475d84d4d32163e06b96cfec24680dc5a8b54e270e97b659ae2b2faac7e27e32f6b2 From 5fce862c602987e7ffe9f8ea5f1873e58d7e55a8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 09:04:06 +0000 Subject: [PATCH 016/116] Rebuild OCaml packages for F38 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 5bafa3f..23acb9f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.15.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 1.15.9-2 +- Rebuild OCaml packages for F38 + * Sat Jan 21 2023 Richard W.M. Jones - 1.15.9-1 - New upstream development version 1.15.9 From 6da6547d79eb9507fdae44ab809617dd164e4626 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 25 Feb 2023 13:44:36 +0000 Subject: [PATCH 017/116] New upstream development version 1.15.10 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 23acb9f..7420453 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,8 +11,8 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.9 -Release: 2%{?dist} +Version: 1.15.10 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Feb 25 2023 Richard W.M. Jones - 1.15.10-1 +- New upstream development version 1.15.10 + * Tue Jan 24 2023 Richard W.M. Jones - 1.15.9-2 - Rebuild OCaml packages for F38 diff --git a/sources b/sources index 8cb2512..0095311 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.9.tar.gz) = 9a7b3c16921b26502fbed01d734de3f8b6ae67fd0dc6885726567b37d5eb63912a9438b00cb7fee2daa306e10ef26cca74e778fc3ac58297373a8e80b465fc0f -SHA512 (libnbd-1.15.9.tar.gz.sig) = 5d5b89aa8edf14faf6e483d37dfb04cfae46aa31be44c983ee22e7f59289475d84d4d32163e06b96cfec24680dc5a8b54e270e97b659ae2b2faac7e27e32f6b2 +SHA512 (libnbd-1.15.10.tar.gz) = e3290936e779cc7a53bf304b1733b971f5e05f855358a39d572694cfa6ff5a1fe24e397584cbc881c5e9c53c44455b2c7c2c28fe02dd45d8592b5b6596533d6d +SHA512 (libnbd-1.15.10.tar.gz.sig) = 149ae417d2b52cd47ad425f021527e8a60e08f838b946025e1fbead7e46740075c0e7b88e103fd48dd76b8fc94c9528e73b13860cfccb6a770c1598e891865bd From 338922ef6c86c167716268908e5dc206d78836c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 28 Feb 2023 15:37:42 +0000 Subject: [PATCH 018/116] New upstream development version 1.15.11 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 7420453..f451d0b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.10 +Version: 1.15.11 Release: 1%{?dist} Summary: NBD client library in userspace @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Feb 28 2023 Richard W.M. Jones - 1.15.11-1 +- New upstream development version 1.15.11 + * Sat Feb 25 2023 Richard W.M. Jones - 1.15.10-1 - New upstream development version 1.15.10 diff --git a/sources b/sources index 0095311..46afcf7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.10.tar.gz) = e3290936e779cc7a53bf304b1733b971f5e05f855358a39d572694cfa6ff5a1fe24e397584cbc881c5e9c53c44455b2c7c2c28fe02dd45d8592b5b6596533d6d -SHA512 (libnbd-1.15.10.tar.gz.sig) = 149ae417d2b52cd47ad425f021527e8a60e08f838b946025e1fbead7e46740075c0e7b88e103fd48dd76b8fc94c9528e73b13860cfccb6a770c1598e891865bd +SHA512 (libnbd-1.15.11.tar.gz) = cea57e1027d0345ac665225b04fb975366572ba4fd532b1f027b0f57fb6c1054e68d3e0660f9c5741959f1d5d9576222ccbe092b92303f7e747da536d8932fbd +SHA512 (libnbd-1.15.11.tar.gz.sig) = f1e12a8e73743ca25f8d9957b06725e18113364e92476ce27d8c2c2574231e507262c456c2a95ed68eb4f40dc153b4237f459847394180456770d69759df6653 From 74cbbf9efd1a98b420941a0085be558e4051da44 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Mar 2023 11:19:01 +0000 Subject: [PATCH 019/116] New upstream development version 1.15.12 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f451d0b..a33c70c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.11 +Version: 1.15.12 Release: 1%{?dist} Summary: NBD client library in userspace @@ -346,6 +346,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Mar 09 2023 Richard W.M. Jones - 1.15.12-1 +- New upstream development version 1.15.12 + * Tue Feb 28 2023 Richard W.M. Jones - 1.15.11-1 - New upstream development version 1.15.11 diff --git a/sources b/sources index 46afcf7..17e125b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.11.tar.gz) = cea57e1027d0345ac665225b04fb975366572ba4fd532b1f027b0f57fb6c1054e68d3e0660f9c5741959f1d5d9576222ccbe092b92303f7e747da536d8932fbd -SHA512 (libnbd-1.15.11.tar.gz.sig) = f1e12a8e73743ca25f8d9957b06725e18113364e92476ce27d8c2c2574231e507262c456c2a95ed68eb4f40dc153b4237f459847394180456770d69759df6653 +SHA512 (libnbd-1.15.12.tar.gz) = fc3ec18d37b9ebcd62f5eeee303a73e5adc0c686d0023bb081020ebd91b7c5708c40d6e3247bb3b3975a0112aa2b8fb9b7d1f9ed7249d2c9fc46d46c75b01775 +SHA512 (libnbd-1.15.12.tar.gz.sig) = 92f967be93a7ac04391152ed1e96cf9f8a384e1dbd1a317c016ad9ef5e6b0f0938a2b92b19960211c019911512cccac3519c5bff9a6062b85dbbcb0f56d4b392 From 886812b61bb11c692503f828fcfc0609b4bcb4b7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Mar 2023 13:09:07 +0000 Subject: [PATCH 020/116] Disable nbdublk in RHEL --- libnbd.spec | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libnbd.spec b/libnbd.spec index a33c70c..fb058d4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -46,9 +46,11 @@ BuildRequires: libxml2-devel # For nbdfuse. BuildRequires: fuse3, fuse3-devel +%if !0%{?rhel} # For nbdublk BuildRequires: liburing-devel >= 2.2 BuildRequires: ubdsrv-devel >= 1.0-3.rc6 +%endif # For the Python 3 bindings. BuildRequires: python3-devel @@ -168,6 +170,7 @@ Recommends: fuse3 This package contains FUSE support for %{name}. +%if !0%{?rhel} %package -n nbdublk Summary: Userspace NBD block device License: LGPLv2+ @@ -179,6 +182,7 @@ Recommends: %{_sbindir}/ublk %description -n nbdublk This package contains a userspace NBD block device based on %{name}. +%endif %package bash-completion @@ -227,6 +231,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete # Delete the golang man page since we're not distributing the bindings. rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* +%if 0%{?rhel} +# Delete nbdublk on RHEL. +rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nbdublk +%endif + %check function skip_test () @@ -330,9 +339,11 @@ make %{?_smp_mflags} check || { %{_mandir}/man1/nbdfuse.1* +%if !0%{?rhel} %files -n nbdublk %{_bindir}/nbdublk %{_mandir}/man1/nbdublk.1* +%endif %files bash-completion @@ -342,7 +353,9 @@ make %{?_smp_mflags} check || { %{_datadir}/bash-completion/completions/nbdfuse %{_datadir}/bash-completion/completions/nbdinfo %{_datadir}/bash-completion/completions/nbdsh +%if !0%{?rhel} %{_datadir}/bash-completion/completions/nbdublk +%endif %changelog From 8aae86855ddfdd9492af88e230fa18d15cb8b77a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 13 Apr 2023 10:12:07 +0100 Subject: [PATCH 021/116] New upstream development version 1.15.13 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index fb058d4..76c0859 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.15-development Name: libnbd -Version: 1.15.12 +Version: 1.15.13 Release: 1%{?dist} Summary: NBD client library in userspace @@ -359,6 +359,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Apr 13 2023 Richard W.M. Jones - 1.15.13-1 +- New upstream development version 1.15.13 + * Thu Mar 09 2023 Richard W.M. Jones - 1.15.12-1 - New upstream development version 1.15.12 diff --git a/sources b/sources index 17e125b..41f139a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.12.tar.gz) = fc3ec18d37b9ebcd62f5eeee303a73e5adc0c686d0023bb081020ebd91b7c5708c40d6e3247bb3b3975a0112aa2b8fb9b7d1f9ed7249d2c9fc46d46c75b01775 -SHA512 (libnbd-1.15.12.tar.gz.sig) = 92f967be93a7ac04391152ed1e96cf9f8a384e1dbd1a317c016ad9ef5e6b0f0938a2b92b19960211c019911512cccac3519c5bff9a6062b85dbbcb0f56d4b392 +SHA512 (libnbd-1.15.13.tar.gz) = 49a57fa47d1c19b5306415b5fcc595495239fe705b30ee89cfd1251a962355cf5b4089a6e5d1967867a30e457d3ff08060dc702ee37e160cafb5c1c96fb1ce12 +SHA512 (libnbd-1.15.13.tar.gz.sig) = 2f5f763106addcdadd60fa8e1a584317d166e8bcde6c6e13942ad086f0902a1f634d31e4c0ad8bb18cf86f289639f7cf08cef028cf6249eef8e34af758c8a26d From 3811a948e543ea8790631c607a1e6d66cc2b4834 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Apr 2023 16:06:53 +0100 Subject: [PATCH 022/116] New upstream stable version 1.16.0 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 76c0859..fbca06c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,10 +8,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.15-development +%global source_directory 1.16-stable Name: libnbd -Version: 1.15.13 +Version: 1.16.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -359,6 +359,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Apr 18 2023 Richard W.M. Jones - 1.16.0-1 +- New upstream stable version 1.16.0 + * Thu Apr 13 2023 Richard W.M. Jones - 1.15.13-1 - New upstream development version 1.15.13 diff --git a/sources b/sources index 41f139a..e79696c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.15.13.tar.gz) = 49a57fa47d1c19b5306415b5fcc595495239fe705b30ee89cfd1251a962355cf5b4089a6e5d1967867a30e457d3ff08060dc702ee37e160cafb5c1c96fb1ce12 -SHA512 (libnbd-1.15.13.tar.gz.sig) = 2f5f763106addcdadd60fa8e1a584317d166e8bcde6c6e13942ad086f0902a1f634d31e4c0ad8bb18cf86f289639f7cf08cef028cf6249eef8e34af758c8a26d +SHA512 (libnbd-1.16.0.tar.gz) = 4ca366c819adf1f775412dd53d9b76859e6ca49a479f0b3e8f5fddfc54f27bfa43f4eed3edc2d367f6a646cfd87824323a6aafb5c3627e18b97ed44efc417150 +SHA512 (libnbd-1.16.0.tar.gz.sig) = fe5c0a6568130fd1cd5bb9481638767476858623cda86f905bb70608a4da38aab3ac2cb6243358df228dccd56abfedb68d2101885d3b140d97fc03ee702b03b2 From 684757a280bb56951e3cae98588e98ddb8eca37b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 10 May 2023 12:11:54 +0100 Subject: [PATCH 023/116] New upstream stable version 1.16.1 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index fbca06c..d50ead0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.16-stable Name: libnbd -Version: 1.16.0 +Version: 1.16.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -359,6 +359,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed May 10 2023 Richard W.M. Jones - 1.16.1-1 +- New upstream stable version 1.16.1 + * Tue Apr 18 2023 Richard W.M. Jones - 1.16.0-1 - New upstream stable version 1.16.0 diff --git a/sources b/sources index e79696c..f87556a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.16.0.tar.gz) = 4ca366c819adf1f775412dd53d9b76859e6ca49a479f0b3e8f5fddfc54f27bfa43f4eed3edc2d367f6a646cfd87824323a6aafb5c3627e18b97ed44efc417150 -SHA512 (libnbd-1.16.0.tar.gz.sig) = fe5c0a6568130fd1cd5bb9481638767476858623cda86f905bb70608a4da38aab3ac2cb6243358df228dccd56abfedb68d2101885d3b140d97fc03ee702b03b2 +SHA512 (libnbd-1.16.1.tar.gz) = e840cff964e847015955f0a0dcc7d03899d5e0fb0bdd3f5597ec87169d0b2689213fed72fd3afc84300ec86ed10703e9396599c11750ef10df66cf61853210a5 +SHA512 (libnbd-1.16.1.tar.gz.sig) = 995e9a9377518470692886e66adecaecf4eae6d821095e18dc81050e16caf3fe76f6dd013934c96bf22e20dd26eae302e3d62083ea1e468b51d7d861fd0e642c From 9ecdb73b851c3f5ab3296260f09330f2d7496df4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Jun 2023 15:46:38 +0100 Subject: [PATCH 024/116] Migrated to SPDX license --- libnbd.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index d50ead0..ebb6c4d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,10 +12,10 @@ Name: libnbd Version: 1.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace -License: LGPLv2+ +License: LGPL-2.0-or-later AND BSD-3-Clause URL: https://gitlab.com/nbdkit/libnbd Source0: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz @@ -117,7 +117,6 @@ The key features are: %package devel Summary: Development headers for %{name} -License: LGPLv2+ and BSD Requires: %{name}%{?_isa} = %{version}-%{release} @@ -161,7 +160,6 @@ python3-%{name} contains Python 3 bindings for %{name}. %package -n nbdfuse Summary: FUSE support for %{name} -License: LGPLv2+ and BSD Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: fuse3 @@ -173,7 +171,6 @@ This package contains FUSE support for %{name}. %if !0%{?rhel} %package -n nbdublk Summary: Userspace NBD block device -License: LGPLv2+ Requires: %{name}%{?_isa} = %{version}-%{release} Recommends: kernel >= 6.0.0 Recommends: %{_sbindir}/ublk @@ -359,6 +356,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 05 2023 Richard W.M. Jones - 1.16.1-2 +- Migrated to SPDX license + * Wed May 10 2023 Richard W.M. Jones - 1.16.1-1 - New upstream stable version 1.16.1 From 49e64ebaf1b73ce79eed6e7363be118c5478034b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:35:57 +0200 Subject: [PATCH 025/116] Rebuilt for Python 3.12 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index ebb6c4d..6425c84 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.16.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -356,6 +356,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jun 13 2023 Python Maint - 1.16.1-3 +- Rebuilt for Python 3.12 + * Mon Jun 05 2023 Richard W.M. Jones - 1.16.1-2 - Migrated to SPDX license From b1584dedf3c4c7358cdb6d25a809d1278f751b7d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 19 Jun 2023 10:26:42 +0100 Subject: [PATCH 026/116] New upstream development version 1.17.1 --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 6425c84..48a8a68 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,11 +8,11 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.16-stable +%global source_directory 1.17-development Name: libnbd -Version: 1.16.1 -Release: 3%{?dist} +Version: 1.17.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -356,6 +356,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 19 2023 Richard W.M. Jones - 1.17.1-1 +- New upstream development version 1.17.1 + * Tue Jun 13 2023 Python Maint - 1.16.1-3 - Rebuilt for Python 3.12 diff --git a/sources b/sources index f87556a..95c438a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.16.1.tar.gz) = e840cff964e847015955f0a0dcc7d03899d5e0fb0bdd3f5597ec87169d0b2689213fed72fd3afc84300ec86ed10703e9396599c11750ef10df66cf61853210a5 -SHA512 (libnbd-1.16.1.tar.gz.sig) = 995e9a9377518470692886e66adecaecf4eae6d821095e18dc81050e16caf3fe76f6dd013934c96bf22e20dd26eae302e3d62083ea1e468b51d7d861fd0e642c +SHA512 (libnbd-1.17.1.tar.gz) = bda8e840ff1b6d7501105feaaa3991ff9d29c33b313b5895a9f12f68b299410eb8a5562213d92c935837926c8d0ca3f3efbaf23f72ce6b3601bc7f787a0ced26 +SHA512 (libnbd-1.17.1.tar.gz.sig) = 1588c1ae90fcaa9e9af669223023bbf50f7b3f90264281753659e1f964115ae2c47a5c0ae82ac2a4d1104a339c0c26a8d91a8aabec998c5d92e2ce31a8d2e5a2 From 46c79ec2b2e093c74907afba0ac60b810b500632 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 22 Jun 2023 08:41:54 +0100 Subject: [PATCH 027/116] Add OCaml 5 support --- ...untime-lock-around-call-to-nbd_close.patch | 75 +++++++++++++++++++ libnbd.spec | 10 ++- 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch diff --git a/0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch b/0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch new file mode 100644 index 0000000..c7c91a4 --- /dev/null +++ b/0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch @@ -0,0 +1,75 @@ +From 2c909bc3b8594943c4306ec78e8c13327ca16284 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 21 Jun 2023 22:41:43 +0100 +Subject: [PATCH] ocaml: Release runtime lock around call to nbd_close + +OCaml 5 is stricter than earlier versions about correct locking. + +We must release the OCaml runtime lock when calling nbd_close since it +may do some long-running operations and we want to allow concurrent +threads to run. + +However specifically if there are callbacks (eg. a debug callback) +then we would end up trying to re-acquire the lock in the callback, +resulting in a crash: + + (gdb) bt + #0 __pthread_kill_implementation (threadid=, + signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44 + #1 0x00007f47ffc8f773 in __pthread_kill_internal (signo=6, + threadid=) at pthread_kill.c:78 + #2 0x00007f47ffc3e71e in __GI_raise (sig=sig@entry=6) + at ../sysdeps/posix/raise.c:26 + #3 0x00007f47ffc2687f in __GI_abort () at abort.c:79 + #4 0x0000560c9eb62779 in caml_fatal_error () + #5 0x0000560c9eb63238 in caml_plat_fatal_error () + #6 0x0000560c9eb4ea77 in caml_acquire_domain_lock () + #7 0x0000560c9eb65cdc in caml_leave_blocking_section () + #8 0x0000560c9eaf8a87 in debug_wrapper (user_data=0x560ca0af2670, + context=0x7f47fff8ca60 "nbd_close", msg=0x560ca0af28b0 "closing handle") + at ../nbd-c.c:187 + #9 0x00007f47fff7072f in nbd_internal_debug (h=h@entry=0x560ca0b57db0, + context=0x7f47fff8ca60 "nbd_close", context@entry=0x0, + fs=fs@entry=0x7f47fff8ca6a "closing handle") + at /home/rjones/d/libnbd/lib/debug.c:90 + #10 0x00007f47fff73f23 in nbd_close (h=0x560ca0b57db0) + at /home/rjones/d/libnbd/lib/handle.c:127 + #11 0x0000560c9eae8dbe in nbd_internal_ocaml_handle_finalize ( + hv=) at ../handle.c:39 + #12 nbd_internal_ocaml_nbd_close (hv=) at ../handle.c:62 + #13 + #14 0x0000560c9eae84dc in camlTest_140_explicit_close__entry () at NBD.ml:148 + #15 0x0000560c9eae5c5b in caml_program () + #16 + #17 0x0000560c9eb6cb77 in caml_startup_common () + #18 0x0000560c9eb6cbef in caml_main () + #19 0x0000560c9eae5910 in main () +--- + ocaml/handle.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ocaml/handle.c b/ocaml/handle.c +index fb45b30102..b3e5a0fc33 100644 +--- a/ocaml/handle.c ++++ b/ocaml/handle.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + +@@ -36,7 +37,9 @@ nbd_internal_ocaml_handle_finalize (value hv) + { + struct nbd_handle *h = NBD_val (hv); + ++ caml_enter_blocking_section (); + nbd_close (h); ++ caml_leave_blocking_section (); + } + + value +-- +2.41.0 + diff --git a/libnbd.spec b/libnbd.spec index 48a8a68..5be1bc8 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,14 +5,14 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 # The source directory. %global source_directory 1.17-development Name: libnbd Version: 1.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -28,6 +28,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Upstream patch to fix OCaml 5 support. +Patch: 0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -356,6 +359,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jun 22 2023 Richard W.M. Jones - 1.17.1-2 +- Add OCaml 5 support + * Mon Jun 19 2023 Richard W.M. Jones - 1.17.1-1 - New upstream development version 1.17.1 From 91c55f0608794a6944e643595bcbcd0d92cd858d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 26 Jun 2023 12:27:01 +0200 Subject: [PATCH 028/116] Rebuilt for Python 3.12 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 5be1bc8..4d45800 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.17.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -359,6 +359,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 26 2023 Python Maint - 1.17.1-3 +- Rebuilt for Python 3.12 + * Thu Jun 22 2023 Richard W.M. Jones - 1.17.1-2 - Add OCaml 5 support From efb2cea238cb6c2f26998e9c84f216c83c66f85f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 15:15:20 -0600 Subject: [PATCH 029/116] OCaml 5.0.0 rebuild --- libnbd.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4d45800..e0d7a22 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -1,6 +1,3 @@ -# Do this until the feature is fixed in Fedora. -%undefine _package_note_flags - # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -12,7 +9,7 @@ Name: libnbd Version: 1.17.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -96,6 +93,9 @@ BuildRequires: nbdkit-sh-plugin BuildRequires: nbdkit-sparse-random-plugin %endif +# The OCaml runtime system does not provide this symbol +%global __ocaml_requires_opts -x Stdlib__Callback + %description NBD — Network Block Device — is a protocol for accessing Block Devices @@ -304,11 +304,10 @@ make %{?_smp_mflags} check || { %files -n ocaml-%{name} -%{_libdir}/ocaml/nbd -%exclude %{_libdir}/ocaml/nbd/*.a -%exclude %{_libdir}/ocaml/nbd/*.cmxa -%exclude %{_libdir}/ocaml/nbd/*.cmx -%exclude %{_libdir}/ocaml/nbd/*.mli +%dir %{_libdir}/ocaml/nbd +%{_libdir}/ocaml/nbd/META +%{_libdir}/ocaml/nbd/*.cma +%{_libdir}/ocaml/nbd/*.cmi %{_libdir}/ocaml/stublibs/dllmlnbd.so %{_libdir}/ocaml/stublibs/dllmlnbd.so.owner @@ -316,9 +315,11 @@ make %{?_smp_mflags} check || { %files -n ocaml-%{name}-devel %doc ocaml/examples/*.ml %license ocaml/examples/LICENSE-FOR-EXAMPLES -%{_libdir}/ocaml/nbd/*.a +%ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/nbd/*.cmxa %{_libdir}/ocaml/nbd/*.cmx +%endif +%{_libdir}/ocaml/nbd/*.a %{_libdir}/ocaml/nbd/*.mli %{_mandir}/man3/libnbd-ocaml.3* %{_mandir}/man3/NBD.3* @@ -359,6 +360,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jul 10 2023 Jerry James - 1.17.1-4 +- OCaml 5.0.0 rebuild + * Mon Jun 26 2023 Python Maint - 1.17.1-3 - Rebuilt for Python 3.12 From 02b1f5d39dfed0423054e44ea2a541f210459175 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:26 +0100 Subject: [PATCH 030/116] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- libnbd.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libnbd.spec b/libnbd.spec index e0d7a22..2263681 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -55,10 +55,12 @@ BuildRequires: ubdsrv-devel >= 1.0-3.rc6 # For the Python 3 bindings. BuildRequires: python3-devel +%ifnarch %{ix86} # For the OCaml bindings. BuildRequires: ocaml BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc +%endif # Only for building the examples. BuildRequires: glib2-devel @@ -93,8 +95,10 @@ BuildRequires: nbdkit-sh-plugin BuildRequires: nbdkit-sparse-random-plugin %endif +%ifnarch %{ix86} # The OCaml runtime system does not provide this symbol %global __ocaml_requires_opts -x Stdlib__Callback +%endif %description @@ -127,6 +131,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains development headers for %{name}. +%ifnarch %{ix86} %package -n ocaml-%{name} Summary: OCaml language bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -145,6 +150,7 @@ Requires: ocaml-%{name}%{?_isa} = %{version}-%{release} This package contains OCaml language development package for %{name}. Install this if you want to compile OCaml software which uses %{name}. +%endif %package -n python3-%{name} @@ -215,7 +221,11 @@ autoreconf -i --with-tls-priority=@LIBNBD,SYSTEM \ PYTHON=%{__python3} \ --enable-python \ +%ifnarch %{ix86} --enable-ocaml \ +%else + --disable-ocaml \ +%endif --enable-fuse \ --disable-golang @@ -303,6 +313,7 @@ make %{?_smp_mflags} check || { %{_mandir}/man3/nbd_*.3* +%ifnarch %{ix86} %files -n ocaml-%{name} %dir %{_libdir}/ocaml/nbd %{_libdir}/ocaml/nbd/META @@ -324,6 +335,7 @@ make %{?_smp_mflags} check || { %{_mandir}/man3/libnbd-ocaml.3* %{_mandir}/man3/NBD.3* %{_mandir}/man3/NBD.*.3* +%endif %files -n python3-%{name} From f817d552513f38e0c3921ba32dc8eb893ab3c1eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 23:04:39 +0100 Subject: [PATCH 031/116] OCaml 5.0 rebuild for Fedora 39 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 2263681..d4dd393 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.17.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -372,6 +372,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 1.17.1-5 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 1.17.1-4 - OCaml 5.0.0 rebuild From 64f779d6fbde97f9df4d9addbebe5f62d1c8ae92 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 23:28:38 +0100 Subject: [PATCH 032/116] Delete the OCaml man page on i686 We are not building the OCaml subpackage on i686, but the man page is built anyway. Fixes: error: Installed (but unpackaged) file(s) found: /usr/share/man/man3/libnbd-ocaml.3.gz RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/man/man3/libnbd-ocaml.3.gz --- libnbd.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libnbd.spec b/libnbd.spec index d4dd393..902f161 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -241,6 +241,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete # Delete the golang man page since we're not distributing the bindings. rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* +%ifarch %{ix86} +# Delete the OCaml man page on i686. +rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-ocaml.3* +%endif + %if 0%{?rhel} # Delete nbdublk on RHEL. rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nbdublk From 07504a7ac2bfe09f5318990adbb6330d655a911e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 13 Jul 2023 13:19:32 +0100 Subject: [PATCH 033/116] Bump and rebuild for updated python3 and perl --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 902f161..d925346 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.17.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -377,6 +377,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jul 13 2023 Richard W.M. Jones - 1.17.1-6 +- Bump and rebuild for updated python3 and perl + * Tue Jul 11 2023 Richard W.M. Jones - 1.17.1-5 - OCaml 5.0 rebuild for Fedora 39 From f953f4fbc2d5f6488b7ae264ba1b36c9df1946a6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 14 Jul 2023 15:08:00 +0100 Subject: [PATCH 034/116] New upstream development version 1.17.2 --- ...untime-lock-around-call-to-nbd_close.patch | 75 ------------------- libnbd.spec | 12 +-- sources | 4 +- 3 files changed, 8 insertions(+), 83 deletions(-) delete mode 100644 0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch diff --git a/0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch b/0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch deleted file mode 100644 index c7c91a4..0000000 --- a/0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 2c909bc3b8594943c4306ec78e8c13327ca16284 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 21 Jun 2023 22:41:43 +0100 -Subject: [PATCH] ocaml: Release runtime lock around call to nbd_close - -OCaml 5 is stricter than earlier versions about correct locking. - -We must release the OCaml runtime lock when calling nbd_close since it -may do some long-running operations and we want to allow concurrent -threads to run. - -However specifically if there are callbacks (eg. a debug callback) -then we would end up trying to re-acquire the lock in the callback, -resulting in a crash: - - (gdb) bt - #0 __pthread_kill_implementation (threadid=, - signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44 - #1 0x00007f47ffc8f773 in __pthread_kill_internal (signo=6, - threadid=) at pthread_kill.c:78 - #2 0x00007f47ffc3e71e in __GI_raise (sig=sig@entry=6) - at ../sysdeps/posix/raise.c:26 - #3 0x00007f47ffc2687f in __GI_abort () at abort.c:79 - #4 0x0000560c9eb62779 in caml_fatal_error () - #5 0x0000560c9eb63238 in caml_plat_fatal_error () - #6 0x0000560c9eb4ea77 in caml_acquire_domain_lock () - #7 0x0000560c9eb65cdc in caml_leave_blocking_section () - #8 0x0000560c9eaf8a87 in debug_wrapper (user_data=0x560ca0af2670, - context=0x7f47fff8ca60 "nbd_close", msg=0x560ca0af28b0 "closing handle") - at ../nbd-c.c:187 - #9 0x00007f47fff7072f in nbd_internal_debug (h=h@entry=0x560ca0b57db0, - context=0x7f47fff8ca60 "nbd_close", context@entry=0x0, - fs=fs@entry=0x7f47fff8ca6a "closing handle") - at /home/rjones/d/libnbd/lib/debug.c:90 - #10 0x00007f47fff73f23 in nbd_close (h=0x560ca0b57db0) - at /home/rjones/d/libnbd/lib/handle.c:127 - #11 0x0000560c9eae8dbe in nbd_internal_ocaml_handle_finalize ( - hv=) at ../handle.c:39 - #12 nbd_internal_ocaml_nbd_close (hv=) at ../handle.c:62 - #13 - #14 0x0000560c9eae84dc in camlTest_140_explicit_close__entry () at NBD.ml:148 - #15 0x0000560c9eae5c5b in caml_program () - #16 - #17 0x0000560c9eb6cb77 in caml_startup_common () - #18 0x0000560c9eb6cbef in caml_main () - #19 0x0000560c9eae5910 in main () ---- - ocaml/handle.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ocaml/handle.c b/ocaml/handle.c -index fb45b30102..b3e5a0fc33 100644 ---- a/ocaml/handle.c -+++ b/ocaml/handle.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - -@@ -36,7 +37,9 @@ nbd_internal_ocaml_handle_finalize (value hv) - { - struct nbd_handle *h = NBD_val (hv); - -+ caml_enter_blocking_section (); - nbd_close (h); -+ caml_leave_blocking_section (); - } - - value --- -2.41.0 - diff --git a/libnbd.spec b/libnbd.spec index d925346..41890ee 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -2,14 +2,14 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.17-development Name: libnbd -Version: 1.17.1 -Release: 6%{?dist} +Version: 1.17.2 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,9 +25,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Upstream patch to fix OCaml 5 support. -Patch: 0001-ocaml-Release-runtime-lock-around-call-to-nbd_close.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -377,6 +374,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jul 14 2023 Richard W.M. Jones - 1.17.2-1 +- New upstream development version 1.17.2 + * Thu Jul 13 2023 Richard W.M. Jones - 1.17.1-6 - Bump and rebuild for updated python3 and perl diff --git a/sources b/sources index 95c438a..329ae5d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.17.1.tar.gz) = bda8e840ff1b6d7501105feaaa3991ff9d29c33b313b5895a9f12f68b299410eb8a5562213d92c935837926c8d0ca3f3efbaf23f72ce6b3601bc7f787a0ced26 -SHA512 (libnbd-1.17.1.tar.gz.sig) = 1588c1ae90fcaa9e9af669223023bbf50f7b3f90264281753659e1f964115ae2c47a5c0ae82ac2a4d1104a339c0c26a8d91a8aabec998c5d92e2ce31a8d2e5a2 +SHA512 (libnbd-1.17.2.tar.gz) = 9485f265f30dab1d518366d5c712f5e5c45443b06e84bb454288f4db6009b4ad5c286469d864aa78c1b9a3f3b64bc76dfc67f48fd9d257dd31482ef7b85e5909 +SHA512 (libnbd-1.17.2.tar.gz.sig) = aba3fb0ee3ffde4144f7dca888492c8d0df8dc31dd7615cf21745a0dd75828c4c8ba36580867b0a7b64963cc1bea7a9257d9bad1b190cdd7278b5ff4a9a172c9 From 3087f68c5155c24d63814e0b8ae02cd1d54ab6ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 11:32:21 +0000 Subject: [PATCH 035/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 41890ee..9a90604 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -374,6 +374,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jul 14 2023 Richard W.M. Jones - 1.17.2-1 - New upstream development version 1.17.2 From 704cc15c49680d8c40774c5e9730049550479561 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Aug 2023 15:04:04 +0100 Subject: [PATCH 036/116] New upstream development version 1.17.3 Disable Rust bindings. --- ...ator-Handle-.-configure-disable-rust.patch | 67 +++++++++++++++++++ libnbd.spec | 14 +++- sources | 4 +- 3 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 0001-generator-Handle-.-configure-disable-rust.patch diff --git a/0001-generator-Handle-.-configure-disable-rust.patch b/0001-generator-Handle-.-configure-disable-rust.patch new file mode 100644 index 0000000..66df3e6 --- /dev/null +++ b/0001-generator-Handle-.-configure-disable-rust.patch @@ -0,0 +1,67 @@ +From 473d78fb70c4ee6adb5e3596d699cf7b5a95f028 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 4 Aug 2023 15:10:52 +0100 +Subject: [PATCH] generator: Handle ./configure --disable-rust + +If this option is used, then "@RUSTFMT@" is expanded to "" (not "no"). +Let's change the Config.rustfmt value to be an option type, while also +fixing this problem. + +Fixes: commit b2511d640bc12b0116e6c013a17aefb4e772a058 +--- + generator/config.ml.in | 2 +- + generator/config.mli | 2 +- + generator/utils.ml | 17 ++++++++++------- + 3 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/generator/config.ml.in b/generator/config.ml.in +index 7ac5237c5d..d0e6760e4f 100644 +--- a/generator/config.ml.in ++++ b/generator/config.ml.in +@@ -18,4 +18,4 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + *) + +-let rustfmt = "@RUSTFMT@" ++let rustfmt = match "@RUSTFMT@" with "" | "no" -> None | s -> Some s +diff --git a/generator/config.mli b/generator/config.mli +index 5f1a46a6b1..8fb0c672ed 100644 +--- a/generator/config.mli ++++ b/generator/config.mli +@@ -17,4 +17,4 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + *) + +-val rustfmt : string ++val rustfmt : string option +diff --git a/generator/utils.ml b/generator/utils.ml +index 3302b309ae..8ce4240c31 100644 +--- a/generator/utils.ml ++++ b/generator/utils.ml +@@ -432,13 +432,16 @@ let + chan := NoOutput; + (match formatter with + | Some Rustfmt -> +- if Config.rustfmt <> "no" then ( +- let cmd = sprintf "%s %s" Config.rustfmt filename_new in +- match system cmd with +- | WEXITED 0 -> () +- | WEXITED i -> failwithf "rustfmt failed with exit code %d" i +- | WSIGNALED i | WSTOPPED i -> +- failwithf "rustfmt was killed or stopped by signal %d" i ++ (match Config.rustfmt with ++ | Some rustfmt -> ++ (let cmd = sprintf "%s %s" rustfmt filename_new in ++ match system cmd with ++ | WEXITED 0 -> () ++ | WEXITED i -> failwithf "rustfmt failed with exit code %d" i ++ | WSIGNALED i | WSTOPPED i -> ++ failwithf "rustfmt was killed or stopped by signal %d" i ++ ) ++ | None -> () + ); + | None -> ()); + (* Is the new file different from the current file? *) +-- +2.41.0 + diff --git a/libnbd.spec b/libnbd.spec index 9a90604..1875330 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.17-development Name: libnbd -Version: 1.17.2 -Release: 2%{?dist} +Version: 1.17.3 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,6 +25,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Upstream patch to fix ./configure --disable-rust +Patch: 0001-generator-Handle-.-configure-disable-rust.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -224,7 +227,8 @@ autoreconf -i --disable-ocaml \ %endif --enable-fuse \ - --disable-golang + --disable-golang \ + --disable-rust make %{?_smp_mflags} @@ -374,6 +378,10 @@ make %{?_smp_mflags} check || { %changelog +* Fri Aug 04 2023 Richard W.M. Jones - 1.17.3-1 +- New upstream development version 1.17.3 +- Disable Rust bindings. + * Thu Jul 20 2023 Fedora Release Engineering - 1.17.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 329ae5d..2f72ac0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.17.2.tar.gz) = 9485f265f30dab1d518366d5c712f5e5c45443b06e84bb454288f4db6009b4ad5c286469d864aa78c1b9a3f3b64bc76dfc67f48fd9d257dd31482ef7b85e5909 -SHA512 (libnbd-1.17.2.tar.gz.sig) = aba3fb0ee3ffde4144f7dca888492c8d0df8dc31dd7615cf21745a0dd75828c4c8ba36580867b0a7b64963cc1bea7a9257d9bad1b190cdd7278b5ff4a9a172c9 +SHA512 (libnbd-1.17.3.tar.gz) = 8e5c703dd88f3432284aaf2c912fd3ad98ef47fae89a72e6d26d833826108aca718d3447506bb7a7a247008da4525df0a691c197abc3ab4d6ad68e04495bd3b9 +SHA512 (libnbd-1.17.3.tar.gz.sig) = 31cf45662d1d71be3e2ad7c942092f1d0ddd3390a4f4644fd7395b3a0f0f00c4a68605697ba6b9eb9fd1270a931150dbc3a6917b014eff12ecdd7045ea8f1175 From fc1674bdc223d98ff0d85e0195028765ec4359b9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Aug 2023 15:04:12 +0100 Subject: [PATCH 037/116] New upstream development version 1.17.4 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 1875330..008b3ce 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.17-development Name: libnbd -Version: 1.17.3 +Version: 1.17.4 Release: 1%{?dist} Summary: NBD client library in userspace @@ -378,6 +378,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Aug 30 2023 Richard W.M. Jones - 1.17.4-1 +- New upstream development version 1.17.4 + * Fri Aug 04 2023 Richard W.M. Jones - 1.17.3-1 - New upstream development version 1.17.3 - Disable Rust bindings. diff --git a/sources b/sources index 2f72ac0..6b97ffc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.17.3.tar.gz) = 8e5c703dd88f3432284aaf2c912fd3ad98ef47fae89a72e6d26d833826108aca718d3447506bb7a7a247008da4525df0a691c197abc3ab4d6ad68e04495bd3b9 -SHA512 (libnbd-1.17.3.tar.gz.sig) = 31cf45662d1d71be3e2ad7c942092f1d0ddd3390a4f4644fd7395b3a0f0f00c4a68605697ba6b9eb9fd1270a931150dbc3a6917b014eff12ecdd7045ea8f1175 +SHA512 (libnbd-1.17.4.tar.gz) = de1e78782ce1cd5ab0256c40ff79a848d7a4668fdbe10dae16746c34d54ca54892b78c8d3802eb15d76c0707d9588d22f9bea5ec15da54b5fdd06f909e47df8e +SHA512 (libnbd-1.17.4.tar.gz.sig) = 971ed7367018a84ad5888a68698df67c197fdad4d7d9f7a8fb8da452a8493d4bc12c88af5dd35c4c47e4d1ca08d2be2dd066d019be770b2d256f5d59a742a496 From 00201fa860b0f3b30c2cc529279957a8ec0ac192 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Aug 2023 15:20:00 +0100 Subject: [PATCH 038/116] Remove upstream patch --- ...ator-Handle-.-configure-disable-rust.patch | 67 ------------------- libnbd.spec | 3 - 2 files changed, 70 deletions(-) delete mode 100644 0001-generator-Handle-.-configure-disable-rust.patch diff --git a/0001-generator-Handle-.-configure-disable-rust.patch b/0001-generator-Handle-.-configure-disable-rust.patch deleted file mode 100644 index 66df3e6..0000000 --- a/0001-generator-Handle-.-configure-disable-rust.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 473d78fb70c4ee6adb5e3596d699cf7b5a95f028 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 4 Aug 2023 15:10:52 +0100 -Subject: [PATCH] generator: Handle ./configure --disable-rust - -If this option is used, then "@RUSTFMT@" is expanded to "" (not "no"). -Let's change the Config.rustfmt value to be an option type, while also -fixing this problem. - -Fixes: commit b2511d640bc12b0116e6c013a17aefb4e772a058 ---- - generator/config.ml.in | 2 +- - generator/config.mli | 2 +- - generator/utils.ml | 17 ++++++++++------- - 3 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/generator/config.ml.in b/generator/config.ml.in -index 7ac5237c5d..d0e6760e4f 100644 ---- a/generator/config.ml.in -+++ b/generator/config.ml.in -@@ -18,4 +18,4 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - *) - --let rustfmt = "@RUSTFMT@" -+let rustfmt = match "@RUSTFMT@" with "" | "no" -> None | s -> Some s -diff --git a/generator/config.mli b/generator/config.mli -index 5f1a46a6b1..8fb0c672ed 100644 ---- a/generator/config.mli -+++ b/generator/config.mli -@@ -17,4 +17,4 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - *) - --val rustfmt : string -+val rustfmt : string option -diff --git a/generator/utils.ml b/generator/utils.ml -index 3302b309ae..8ce4240c31 100644 ---- a/generator/utils.ml -+++ b/generator/utils.ml -@@ -432,13 +432,16 @@ let - chan := NoOutput; - (match formatter with - | Some Rustfmt -> -- if Config.rustfmt <> "no" then ( -- let cmd = sprintf "%s %s" Config.rustfmt filename_new in -- match system cmd with -- | WEXITED 0 -> () -- | WEXITED i -> failwithf "rustfmt failed with exit code %d" i -- | WSIGNALED i | WSTOPPED i -> -- failwithf "rustfmt was killed or stopped by signal %d" i -+ (match Config.rustfmt with -+ | Some rustfmt -> -+ (let cmd = sprintf "%s %s" rustfmt filename_new in -+ match system cmd with -+ | WEXITED 0 -> () -+ | WEXITED i -> failwithf "rustfmt failed with exit code %d" i -+ | WSIGNALED i | WSTOPPED i -> -+ failwithf "rustfmt was killed or stopped by signal %d" i -+ ) -+ | None -> () - ); - | None -> ()); - (* Is the new file different from the current file? *) --- -2.41.0 - diff --git a/libnbd.spec b/libnbd.spec index 008b3ce..461814d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -25,9 +25,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Upstream patch to fix ./configure --disable-rust -Patch: 0001-generator-Handle-.-configure-disable-rust.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif From 23f48cf6337b6522d9805ebf78fa928f575bddb2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 8 Sep 2023 12:42:33 +0100 Subject: [PATCH 039/116] New upstream development version 1.17.5 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 461814d..abe38d2 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.17-development Name: libnbd -Version: 1.17.4 +Version: 1.17.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 08 2023 Richard W.M. Jones - 1.17.5-1 +- New upstream development version 1.17.5 + * Wed Aug 30 2023 Richard W.M. Jones - 1.17.4-1 - New upstream development version 1.17.4 diff --git a/sources b/sources index 6b97ffc..5c87cd0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.17.4.tar.gz) = de1e78782ce1cd5ab0256c40ff79a848d7a4668fdbe10dae16746c34d54ca54892b78c8d3802eb15d76c0707d9588d22f9bea5ec15da54b5fdd06f909e47df8e -SHA512 (libnbd-1.17.4.tar.gz.sig) = 971ed7367018a84ad5888a68698df67c197fdad4d7d9f7a8fb8da452a8493d4bc12c88af5dd35c4c47e4d1ca08d2be2dd066d019be770b2d256f5d59a742a496 +SHA512 (libnbd-1.17.5.tar.gz) = e7daf39b787004c482e338f81667fcf7639c7b7c7811e526527fbc967ccb01b193e50bd99bad9079c7b743123d3ceea60b9f1920a18748c78720ad798c917a13 +SHA512 (libnbd-1.17.5.tar.gz.sig) = 31775060e51d8e762d9e021668afd019b4ca36cb39b561ff27859c954e4dfa35ddc9644b4caabbe5e3822dd71fde7a361890748b8e720a616e75321fe97afb8e From ae2163df2161b5a06742bdf0aa5041fb5473aafb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Sep 2023 11:50:05 +0100 Subject: [PATCH 040/116] New upstream development version 1.18.0 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index abe38d2..62aa83f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,10 +5,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.17-development +%global source_directory 1.18-stable Name: libnbd -Version: 1.17.5 +Version: 1.18.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Sep 27 2023 Richard W.M. Jones - 1.18.0-1 +- New upstream development version 1.18.0 + * Fri Sep 08 2023 Richard W.M. Jones - 1.17.5-1 - New upstream development version 1.17.5 diff --git a/sources b/sources index 5c87cd0..342dd92 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.17.5.tar.gz) = e7daf39b787004c482e338f81667fcf7639c7b7c7811e526527fbc967ccb01b193e50bd99bad9079c7b743123d3ceea60b9f1920a18748c78720ad798c917a13 -SHA512 (libnbd-1.17.5.tar.gz.sig) = 31775060e51d8e762d9e021668afd019b4ca36cb39b561ff27859c954e4dfa35ddc9644b4caabbe5e3822dd71fde7a361890748b8e720a616e75321fe97afb8e +SHA512 (libnbd-1.18.0.tar.gz) = e0dc41ce8cae8d6c8efd55ad560b847dd829ad355cd67e4f682ac2ad145f3ced8ea42650ce1b2cd562a1f6f8cf05680ff2e1a5bdf5b4e5f8237b1fb8ec132a3a +SHA512 (libnbd-1.18.0.tar.gz.sig) = a506add984fddb12bb073947cf5ef6f798c6db6aae521aced778b03d7feb0227a4cf5bc346d68ada3e3da47b533cdcfd9c4470fddf61bfa82ed148d862b5ec82 From 2ff59d280104ff5621049affc6aa6ac4c993bc80 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 14:41:26 +0100 Subject: [PATCH 041/116] OCaml 5.1 rebuild for Fedora 40 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 62aa83f..f372c75 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 1.18.0-2 +- OCaml 5.1 rebuild for Fedora 40 + * Wed Sep 27 2023 Richard W.M. Jones - 1.18.0-1 - New upstream development version 1.18.0 From 0858d4ff45ee4a118b19c66532b5abf213f9fa3e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 23 Oct 2023 16:49:46 +0100 Subject: [PATCH 042/116] New upstream development version 1.19.1 --- libnbd.spec | 11 +++++++---- sources | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f372c75..1d6b6c2 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,11 +5,11 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.18-stable +%global source_directory 1.19-development Name: libnbd -Version: 1.18.0 -Release: 2%{?dist} +Version: 1.19.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -375,11 +375,14 @@ make %{?_smp_mflags} check || { %changelog +* Mon Oct 23 2023 Richard W.M. Jones - 1.19.1-1 +- New upstream development version 1.19.1 + * Thu Oct 05 2023 Richard W.M. Jones - 1.18.0-2 - OCaml 5.1 rebuild for Fedora 40 * Wed Sep 27 2023 Richard W.M. Jones - 1.18.0-1 -- New upstream development version 1.18.0 +- New upstream stable version 1.18.0 * Fri Sep 08 2023 Richard W.M. Jones - 1.17.5-1 - New upstream development version 1.17.5 diff --git a/sources b/sources index 342dd92..11a7fbc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.18.0.tar.gz) = e0dc41ce8cae8d6c8efd55ad560b847dd829ad355cd67e4f682ac2ad145f3ced8ea42650ce1b2cd562a1f6f8cf05680ff2e1a5bdf5b4e5f8237b1fb8ec132a3a -SHA512 (libnbd-1.18.0.tar.gz.sig) = a506add984fddb12bb073947cf5ef6f798c6db6aae521aced778b03d7feb0227a4cf5bc346d68ada3e3da47b533cdcfd9c4470fddf61bfa82ed148d862b5ec82 +SHA512 (libnbd-1.19.1.tar.gz) = 435c5410435514a1a13a52d4d7a9362b77f67238cd15cee92d63318dcd4c7a40aa755dc3a65e2dea683dd28c379b60f68716ed61ab0949e64c72fe5039298211 +SHA512 (libnbd-1.19.1.tar.gz.sig) = 1223e96f26190b85f70ffee980b805faf504043d63f2187cb7ee677695261aaf04afb646dce75065edb969b068e63019db56216ca0579fc03c485543b1565b03 From 267af1b60859fa32af67c11dd92b439fdd5d1973 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 31 Oct 2023 14:22:21 +0000 Subject: [PATCH 043/116] Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871) --- ...sertion-in-ext-mode-BLOCK_STATUS-CVE.patch | 86 +++++++++++++++++++ libnbd.spec | 8 +- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch diff --git a/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch b/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch new file mode 100644 index 0000000..e52dcd8 --- /dev/null +++ b/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch @@ -0,0 +1,86 @@ +From 177308adb17e81fce7c0f2b2fcf655c5c0b6a4d6 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Mon, 30 Oct 2023 12:50:53 -0500 +Subject: [PATCH] generator: Fix assertion in ext-mode BLOCK_STATUS, + CVE-2023-5871 + +Another round of fuzz testing revealed that when a server negotiates +extended headers and replies with a 64-bit flag value where the client +used the 32-bit API command, we were correctly flagging the server's +response as being an EOVERFLOW condition, but then immediately failing +in an assertion failure instead of reporting it to the application. + +The following one-byte change to qemu.git at commit fd9a38fd43 allows +the creation of an intentionally malicious server: + +| diff --git i/nbd/server.c w/nbd/server.c +| index 859c163d19f..32e1e771a95 100644 +| --- i/nbd/server.c +| +++ w/nbd/server.c +| @@ -2178,7 +2178,7 @@ static void nbd_extent_array_convert_to_be(NBDExtentArray *ea) +| +| for (i = 0; i < ea->count; i++) { +| ea->extents[i].length = cpu_to_be64(ea->extents[i].length); +| - ea->extents[i].flags = cpu_to_be64(ea->extents[i].flags); +| + ea->extents[i].flags = ~cpu_to_be64(ea->extents[i].flags); +| } +| } + +and can then be detected with the following command line: + +$ nbdsh -c - <<\EOF +> def f(a,b,c,d): +> pass +> +> h.connect_systemd_socket_activation(["/path/to/bad/qemu-nbd", +> "-r", "-f", "raw", "TODO"]) +> h.block_staus(h.get_size(), 0, f) +> EOF +nbdsh: generator/states-reply-chunk.c:626: enter_STATE_REPLY_CHUNK_REPLY_RECV_BS_ENTRIES: Assertion `(len | flags) <= UINT32_MAX' failed. +Aborted (core dumped) + +whereas a fixed libnbd will give: + +nbdsh: command line script failed: nbd_block_status: block-status: command failed: Value too large for defined data type + +We can either relax the assertion (by changing to 'assert ((len | +flags) <= UINT32_MAX || cmd->error)'), or intentionally truncate flags +to make the existing assertion reliable. This patch goes with the +latter approach. + +Sadly, this crash is possible in all existing 1.18.x stable releases, +if they were built with assertions enabled (most distros do this by +default), meaning a malicious server has an easy way to cause a Denial +of Service attack by triggering the assertion failure in vulnerable +clients, so we have assigned this CVE-2023-5871. Mitigating factors: +the crash only happens for a server that sends a 64-bit status block +reply (no known production servers do so; qemu 8.2 will be the first +known server to support extended headers, but it is not yet released); +and as usual, a client can use TLS to guarantee it is connecting only +to a known-safe server. If libnbd is compiled without assertions, +there is no crash or other mistaken behavior; and when assertions are +enabled, the attacker cannot accomplish anything more than a denial of +service. + +Reported-by: Richard W.M. Jones +Fixes: 20dadb0e10 ("generator: Prepare for extent64 callback", v1.17.4) +Signed-off-by: Eric Blake +--- + generator/states-reply-chunk.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/generator/states-reply-chunk.c b/generator/states-reply-chunk.c +index 5a31c19..8ab7e8b 100644 +--- a/generator/states-reply-chunk.c ++++ b/generator/states-reply-chunk.c +@@ -600,6 +600,7 @@ STATE_MACHINE { + break; /* Skip this and later extents; we already made progress */ + /* Expose this extent as an error; we made no progress */ + cmd->error = cmd->error ? : EOVERFLOW; ++ flags = (uint32_t)flags; + } + } + +-- +2.41.0 + diff --git a/libnbd.spec b/libnbd.spec index 1d6b6c2..b831716 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.19.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,6 +25,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# CVE-2023-5871 +Patch: 0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -375,6 +378,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Oct 31 2023 Richard W.M. Jones - 1.19.1-2 +- Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871) + * Mon Oct 23 2023 Richard W.M. Jones - 1.19.1-1 - New upstream development version 1.19.1 From d6a8129e57e9a2517e74f88f0a508bf0ec7f149c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 22 Nov 2023 13:57:17 +0000 Subject: [PATCH 044/116] New upstream development version 1.19.2 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index b831716..84cc0a1 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.1 -Release: 2%{?dist} +Version: 1.19.2 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -378,6 +378,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Nov 22 2023 Richard W.M. Jones - 1.19.2-1 +- New upstream development version 1.19.2 + * Tue Oct 31 2023 Richard W.M. Jones - 1.19.1-2 - Fix assertion in ext-mode BLOCK_STATUS (CVE-2023-5871) diff --git a/sources b/sources index 11a7fbc..8846198 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.1.tar.gz) = 435c5410435514a1a13a52d4d7a9362b77f67238cd15cee92d63318dcd4c7a40aa755dc3a65e2dea683dd28c379b60f68716ed61ab0949e64c72fe5039298211 -SHA512 (libnbd-1.19.1.tar.gz.sig) = 1223e96f26190b85f70ffee980b805faf504043d63f2187cb7ee677695261aaf04afb646dce75065edb969b068e63019db56216ca0579fc03c485543b1565b03 +SHA512 (libnbd-1.19.2.tar.gz) = 6e0b6f85bd4465d1f94f66eafc4d9dfbf686b38ee314f7faddcdea8a45a98e6eb00ffd0f1ed392a40798508b67edbff6ebe1c31f45011e5d7e5814d095c06005 +SHA512 (libnbd-1.19.2.tar.gz.sig) = 33e787ef17089ea468eacdeb21c8562c49180e1e4af842db0012a9b10eb02f7ebe5edbdf7e86da917beada7d71b6f8ad592d3f2692e88da86447111c083abf25 From cacc31d129332fe6190cd6ec7b1c6576a134865f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 22 Nov 2023 14:05:57 +0000 Subject: [PATCH 045/116] Remove patch upstream --- ...sertion-in-ext-mode-BLOCK_STATUS-CVE.patch | 86 ------------------- libnbd.spec | 3 - 2 files changed, 89 deletions(-) delete mode 100644 0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch diff --git a/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch b/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch deleted file mode 100644 index e52dcd8..0000000 --- a/0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 177308adb17e81fce7c0f2b2fcf655c5c0b6a4d6 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Mon, 30 Oct 2023 12:50:53 -0500 -Subject: [PATCH] generator: Fix assertion in ext-mode BLOCK_STATUS, - CVE-2023-5871 - -Another round of fuzz testing revealed that when a server negotiates -extended headers and replies with a 64-bit flag value where the client -used the 32-bit API command, we were correctly flagging the server's -response as being an EOVERFLOW condition, but then immediately failing -in an assertion failure instead of reporting it to the application. - -The following one-byte change to qemu.git at commit fd9a38fd43 allows -the creation of an intentionally malicious server: - -| diff --git i/nbd/server.c w/nbd/server.c -| index 859c163d19f..32e1e771a95 100644 -| --- i/nbd/server.c -| +++ w/nbd/server.c -| @@ -2178,7 +2178,7 @@ static void nbd_extent_array_convert_to_be(NBDExtentArray *ea) -| -| for (i = 0; i < ea->count; i++) { -| ea->extents[i].length = cpu_to_be64(ea->extents[i].length); -| - ea->extents[i].flags = cpu_to_be64(ea->extents[i].flags); -| + ea->extents[i].flags = ~cpu_to_be64(ea->extents[i].flags); -| } -| } - -and can then be detected with the following command line: - -$ nbdsh -c - <<\EOF -> def f(a,b,c,d): -> pass -> -> h.connect_systemd_socket_activation(["/path/to/bad/qemu-nbd", -> "-r", "-f", "raw", "TODO"]) -> h.block_staus(h.get_size(), 0, f) -> EOF -nbdsh: generator/states-reply-chunk.c:626: enter_STATE_REPLY_CHUNK_REPLY_RECV_BS_ENTRIES: Assertion `(len | flags) <= UINT32_MAX' failed. -Aborted (core dumped) - -whereas a fixed libnbd will give: - -nbdsh: command line script failed: nbd_block_status: block-status: command failed: Value too large for defined data type - -We can either relax the assertion (by changing to 'assert ((len | -flags) <= UINT32_MAX || cmd->error)'), or intentionally truncate flags -to make the existing assertion reliable. This patch goes with the -latter approach. - -Sadly, this crash is possible in all existing 1.18.x stable releases, -if they were built with assertions enabled (most distros do this by -default), meaning a malicious server has an easy way to cause a Denial -of Service attack by triggering the assertion failure in vulnerable -clients, so we have assigned this CVE-2023-5871. Mitigating factors: -the crash only happens for a server that sends a 64-bit status block -reply (no known production servers do so; qemu 8.2 will be the first -known server to support extended headers, but it is not yet released); -and as usual, a client can use TLS to guarantee it is connecting only -to a known-safe server. If libnbd is compiled without assertions, -there is no crash or other mistaken behavior; and when assertions are -enabled, the attacker cannot accomplish anything more than a denial of -service. - -Reported-by: Richard W.M. Jones -Fixes: 20dadb0e10 ("generator: Prepare for extent64 callback", v1.17.4) -Signed-off-by: Eric Blake ---- - generator/states-reply-chunk.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/generator/states-reply-chunk.c b/generator/states-reply-chunk.c -index 5a31c19..8ab7e8b 100644 ---- a/generator/states-reply-chunk.c -+++ b/generator/states-reply-chunk.c -@@ -600,6 +600,7 @@ STATE_MACHINE { - break; /* Skip this and later extents; we already made progress */ - /* Expose this extent as an error; we made no progress */ - cmd->error = cmd->error ? : EOVERFLOW; -+ flags = (uint32_t)flags; - } - } - --- -2.41.0 - diff --git a/libnbd.spec b/libnbd.spec index 84cc0a1..57428cc 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -25,9 +25,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# CVE-2023-5871 -Patch: 0001-generator-Fix-assertion-in-ext-mode-BLOCK_STATUS-CVE.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif From 9044c5f85a0daebbfa4985de29ba82ac85217601 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 09:46:02 +0000 Subject: [PATCH 046/116] OCaml 5.1.1 rebuild for Fedora 40 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 57428cc..039b2f2 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.19.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 1.19.2-2 +- OCaml 5.1.1 rebuild for Fedora 40 + * Wed Nov 22 2023 Richard W.M. Jones - 1.19.2-1 - New upstream development version 1.19.2 From a23f99a011cb005eb49e11bbbf958d7291fa536d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 14 Dec 2023 09:01:18 +0000 Subject: [PATCH 047/116] Fixes for https://github.com/ocaml/ocaml/issues/12820 --- ...Gc.finalize-instead-of-a-C-finalizer.patch | 106 ++++++++++++++++++ ...stom-block-before-releasing-runtime-.patch | 37 ++++++ libnbd.spec | 9 +- 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch create mode 100644 0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch diff --git a/0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch b/0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch new file mode 100644 index 0000000..3d2dd31 --- /dev/null +++ b/0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch @@ -0,0 +1,106 @@ +From db48794fa89547a4799b832331e82b4b8b98f03d Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 13 Dec 2023 22:32:12 +0000 +Subject: [PATCH 1/2] ocaml: Use Gc.finalize instead of a C finalizer + +Since OCaml 5.1.1, C finalizers no longer allow calling +caml_enter_blocking_section. They are relatively inflexible compared +to registering an OCaml finalizer (Gc.finalize) to call NBD.close, so +use that instead. + +I didn't replace NBD.Buffer which still uses a C finalizer. This one +doesn't call caml_enter_blocking_section. + +Suggested-by: Guillaume Munch-Maccagnoni +See: https://github.com/ocaml/ocaml/issues/12820 +--- + generator/OCaml.ml | 7 ++++++- + ocaml/handle.c | 21 ++++++++------------- + ocaml/nbd-c.h | 3 +-- + 3 files changed, 15 insertions(+), 16 deletions(-) + +diff --git a/generator/OCaml.ml b/generator/OCaml.ml +index 095a31df27..4d8501b518 100644 +--- a/generator/OCaml.ml ++++ b/generator/OCaml.ml +@@ -343,9 +343,14 @@ let + + type t + +-external create : unit -> t = \"nbd_internal_ocaml_nbd_create\" ++external _create : unit -> t = \"nbd_internal_ocaml_nbd_create\" + external close : t -> unit = \"nbd_internal_ocaml_nbd_close\" + ++let create () = ++ let nbd = _create () in ++ Gc.finalise close nbd; ++ nbd ++ + let with_handle f = + let nbd = create () in + try let r = f nbd in close nbd; r with exn -> close nbd; raise exn +diff --git a/ocaml/handle.c b/ocaml/handle.c +index b3e5a0fc33..0e809c6f0d 100644 +--- a/ocaml/handle.c ++++ b/ocaml/handle.c +@@ -32,16 +32,6 @@ + + #include "nbd-c.h" + +-void +-nbd_internal_ocaml_handle_finalize (value hv) +-{ +- struct nbd_handle *h = NBD_val (hv); +- +- caml_enter_blocking_section (); +- nbd_close (h); +- caml_leave_blocking_section (); +-} +- + value + nbd_internal_ocaml_nbd_create (value unitv) + { +@@ -61,11 +51,16 @@ value + nbd_internal_ocaml_nbd_close (value hv) + { + CAMLparam1 (hv); ++ struct nbd_handle *h = NBD_val (hv); + +- nbd_internal_ocaml_handle_finalize (hv); ++ if (h) { ++ caml_enter_blocking_section (); ++ nbd_close (h); ++ caml_leave_blocking_section (); + +- /* So we don't double-free in the finalizer. */ +- NBD_val (hv) = NULL; ++ /* So we don't double-free. */ ++ NBD_val (hv) = NULL; ++ } + + CAMLreturn (Val_unit); + } +diff --git a/ocaml/nbd-c.h b/ocaml/nbd-c.h +index adcdd15aa8..134c3a1608 100644 +--- a/ocaml/nbd-c.h ++++ b/ocaml/nbd-c.h +@@ -54,7 +54,6 @@ caml_alloc_initialized_string (mlsize_t len, const char *p) + } + #endif + +-extern void nbd_internal_ocaml_handle_finalize (value); + extern void nbd_internal_ocaml_buffer_finalize (value); + + extern void nbd_internal_ocaml_raise_error (void) Noreturn; +@@ -72,7 +71,7 @@ extern void nbd_internal_ocaml_exception_in_wrapper (const char *, value); + + static struct custom_operations libnbd_custom_operations = { + "libnbd_custom_operations", +- nbd_internal_ocaml_handle_finalize, ++ custom_finalize_default, + custom_compare_default, + custom_hash_default, + custom_serialize_default, +-- +2.43.0 + diff --git a/0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch b/0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch new file mode 100644 index 0000000..bf4236d --- /dev/null +++ b/0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch @@ -0,0 +1,37 @@ +From 37997f7e9a694715c764528567e569812fa3066a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 14 Dec 2023 08:34:56 +0000 +Subject: [PATCH 2/2] ocaml: Nullify custom block before releasing runtime lock + +Avoids a potential, though if possible then very rare, double free +path. + +Suggested-by: Guillaume Munch-Maccagnoni +See: https://github.com/ocaml/ocaml/issues/12820 +--- + ocaml/handle.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ocaml/handle.c b/ocaml/handle.c +index 0e809c6f0d..8d8a632fef 100644 +--- a/ocaml/handle.c ++++ b/ocaml/handle.c +@@ -54,12 +54,12 @@ nbd_internal_ocaml_nbd_close (value hv) + struct nbd_handle *h = NBD_val (hv); + + if (h) { ++ /* So we don't double-free. */ ++ NBD_val (hv) = NULL; ++ + caml_enter_blocking_section (); + nbd_close (h); + caml_leave_blocking_section (); +- +- /* So we don't double-free. */ +- NBD_val (hv) = NULL; + } + + CAMLreturn (Val_unit); +-- +2.43.0 + diff --git a/libnbd.spec b/libnbd.spec index 039b2f2..11838ec 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.19.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,6 +25,10 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Fixes for https://github.com/ocaml/ocaml/issues/12820 +Patch: 0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch +Patch: 0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -375,6 +379,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Dec 14 2023 Richard W.M. Jones - 1.19.2-3 +- Fixes for https://github.com/ocaml/ocaml/issues/12820 + * Tue Dec 12 2023 Richard W.M. Jones - 1.19.2-2 - OCaml 5.1.1 rebuild for Fedora 40 From 1fb6c2eeb10d6c8fec7914bf2a266d14ee56da32 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 13:34:53 +0000 Subject: [PATCH 048/116] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 11838ec..198ac08 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.19.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -379,6 +379,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 1.19.2-4 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Thu Dec 14 2023 Richard W.M. Jones - 1.19.2-3 - Fixes for https://github.com/ocaml/ocaml/issues/12820 From 67fcbe599b3d700faff86d0911c72553563de2bc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 15:54:13 +0000 Subject: [PATCH 049/116] New upstream development version 1.19.3 --- ...Gc.finalize-instead-of-a-C-finalizer.patch | 106 ------------------ ...stom-block-before-releasing-runtime-.patch | 37 ------ libnbd.spec | 11 +- sources | 4 +- 4 files changed, 7 insertions(+), 151 deletions(-) delete mode 100644 0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch delete mode 100644 0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch diff --git a/0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch b/0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch deleted file mode 100644 index 3d2dd31..0000000 --- a/0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch +++ /dev/null @@ -1,106 +0,0 @@ -From db48794fa89547a4799b832331e82b4b8b98f03d Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 13 Dec 2023 22:32:12 +0000 -Subject: [PATCH 1/2] ocaml: Use Gc.finalize instead of a C finalizer - -Since OCaml 5.1.1, C finalizers no longer allow calling -caml_enter_blocking_section. They are relatively inflexible compared -to registering an OCaml finalizer (Gc.finalize) to call NBD.close, so -use that instead. - -I didn't replace NBD.Buffer which still uses a C finalizer. This one -doesn't call caml_enter_blocking_section. - -Suggested-by: Guillaume Munch-Maccagnoni -See: https://github.com/ocaml/ocaml/issues/12820 ---- - generator/OCaml.ml | 7 ++++++- - ocaml/handle.c | 21 ++++++++------------- - ocaml/nbd-c.h | 3 +-- - 3 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/generator/OCaml.ml b/generator/OCaml.ml -index 095a31df27..4d8501b518 100644 ---- a/generator/OCaml.ml -+++ b/generator/OCaml.ml -@@ -343,9 +343,14 @@ let - - type t - --external create : unit -> t = \"nbd_internal_ocaml_nbd_create\" -+external _create : unit -> t = \"nbd_internal_ocaml_nbd_create\" - external close : t -> unit = \"nbd_internal_ocaml_nbd_close\" - -+let create () = -+ let nbd = _create () in -+ Gc.finalise close nbd; -+ nbd -+ - let with_handle f = - let nbd = create () in - try let r = f nbd in close nbd; r with exn -> close nbd; raise exn -diff --git a/ocaml/handle.c b/ocaml/handle.c -index b3e5a0fc33..0e809c6f0d 100644 ---- a/ocaml/handle.c -+++ b/ocaml/handle.c -@@ -32,16 +32,6 @@ - - #include "nbd-c.h" - --void --nbd_internal_ocaml_handle_finalize (value hv) --{ -- struct nbd_handle *h = NBD_val (hv); -- -- caml_enter_blocking_section (); -- nbd_close (h); -- caml_leave_blocking_section (); --} -- - value - nbd_internal_ocaml_nbd_create (value unitv) - { -@@ -61,11 +51,16 @@ value - nbd_internal_ocaml_nbd_close (value hv) - { - CAMLparam1 (hv); -+ struct nbd_handle *h = NBD_val (hv); - -- nbd_internal_ocaml_handle_finalize (hv); -+ if (h) { -+ caml_enter_blocking_section (); -+ nbd_close (h); -+ caml_leave_blocking_section (); - -- /* So we don't double-free in the finalizer. */ -- NBD_val (hv) = NULL; -+ /* So we don't double-free. */ -+ NBD_val (hv) = NULL; -+ } - - CAMLreturn (Val_unit); - } -diff --git a/ocaml/nbd-c.h b/ocaml/nbd-c.h -index adcdd15aa8..134c3a1608 100644 ---- a/ocaml/nbd-c.h -+++ b/ocaml/nbd-c.h -@@ -54,7 +54,6 @@ caml_alloc_initialized_string (mlsize_t len, const char *p) - } - #endif - --extern void nbd_internal_ocaml_handle_finalize (value); - extern void nbd_internal_ocaml_buffer_finalize (value); - - extern void nbd_internal_ocaml_raise_error (void) Noreturn; -@@ -72,7 +71,7 @@ extern void nbd_internal_ocaml_exception_in_wrapper (const char *, value); - - static struct custom_operations libnbd_custom_operations = { - "libnbd_custom_operations", -- nbd_internal_ocaml_handle_finalize, -+ custom_finalize_default, - custom_compare_default, - custom_hash_default, - custom_serialize_default, --- -2.43.0 - diff --git a/0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch b/0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch deleted file mode 100644 index bf4236d..0000000 --- a/0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 37997f7e9a694715c764528567e569812fa3066a Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 14 Dec 2023 08:34:56 +0000 -Subject: [PATCH 2/2] ocaml: Nullify custom block before releasing runtime lock - -Avoids a potential, though if possible then very rare, double free -path. - -Suggested-by: Guillaume Munch-Maccagnoni -See: https://github.com/ocaml/ocaml/issues/12820 ---- - ocaml/handle.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ocaml/handle.c b/ocaml/handle.c -index 0e809c6f0d..8d8a632fef 100644 ---- a/ocaml/handle.c -+++ b/ocaml/handle.c -@@ -54,12 +54,12 @@ nbd_internal_ocaml_nbd_close (value hv) - struct nbd_handle *h = NBD_val (hv); - - if (h) { -+ /* So we don't double-free. */ -+ NBD_val (hv) = NULL; -+ - caml_enter_blocking_section (); - nbd_close (h); - caml_leave_blocking_section (); -- -- /* So we don't double-free. */ -- NBD_val (hv) = NULL; - } - - CAMLreturn (Val_unit); --- -2.43.0 - diff --git a/libnbd.spec b/libnbd.spec index 198ac08..3a33c90 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.2 -Release: 4%{?dist} +Version: 1.19.3 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,10 +25,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Fixes for https://github.com/ocaml/ocaml/issues/12820 -Patch: 0001-ocaml-Use-Gc.finalize-instead-of-a-C-finalizer.patch -Patch: 0002-ocaml-Nullify-custom-block-before-releasing-runtime-.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -379,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Dec 19 2023 Richard W.M. Jones - 1.19.3-1 +- New upstream development version 1.19.3 + * Mon Dec 18 2023 Richard W.M. Jones - 1.19.2-4 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 diff --git a/sources b/sources index 8846198..68aec8f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.2.tar.gz) = 6e0b6f85bd4465d1f94f66eafc4d9dfbf686b38ee314f7faddcdea8a45a98e6eb00ffd0f1ed392a40798508b67edbff6ebe1c31f45011e5d7e5814d095c06005 -SHA512 (libnbd-1.19.2.tar.gz.sig) = 33e787ef17089ea468eacdeb21c8562c49180e1e4af842db0012a9b10eb02f7ebe5edbdf7e86da917beada7d71b6f8ad592d3f2692e88da86447111c083abf25 +SHA512 (libnbd-1.19.3.tar.gz) = ace3736f0dd26ab95bcf6db6d3fad7f094a85a01a1a947be1166c81dc83719129078dc380007e1abe527f7333aa7f05730ed4fd5a71dbf1da899094bbab970a8 +SHA512 (libnbd-1.19.3.tar.gz.sig) = 4fa1c2b125c98632562ea952104f133573961567ac289a748f31bd1dc0d33cfc7e6280c6ea47478f365a58afef83098bb68abf8fa825cfcf99f1393da60c0058 From 7e6c7ba0d64fb043312faee3e8c6732339782999 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 17:10:25 +0000 Subject: [PATCH 050/116] Fix bug in generator/Makefile.am which causes builds to fail on i686. --- ...le.am-Fix-missing-continuation-backs.patch | 26 +++++++++++++++++++ libnbd.spec | 9 ++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch diff --git a/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch b/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch new file mode 100644 index 0000000..c2cd547 --- /dev/null +++ b/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch @@ -0,0 +1,26 @@ +From 11372ab9801f69b48404246cd3f9ec65b41b473b Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 19 Dec 2023 17:08:07 +0000 +Subject: [PATCH] generator/Makefile.am: Fix missing continuation backslash + +Fixes: commit 2829b92aefb89a098e11a36b252383563a4e543a +--- + generator/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/generator/Makefile.am b/generator/Makefile.am +index c9555f5269..38509124d0 100644 +--- a/generator/Makefile.am ++++ b/generator/Makefile.am +@@ -111,7 +111,7 @@ stamp-generator: + echo; \ + echo "Install the OCaml bytecode compiler (the program called ‘ocamlc’)"; \ + echo "and rerun ./configure && make"; \ +- echo; ++ echo; \ + echo "OR build from the tarballs at https://download.libguestfs.org/libnbd/"; \ + echo "which include generated files."; \ + echo; \ +-- +2.43.0 + diff --git a/libnbd.spec b/libnbd.spec index 3a33c90..3e03c88 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -2,14 +2,14 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} +%global patches_touch_autotools 1 # The source directory. %global source_directory 1.19-development Name: libnbd Version: 1.19.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -25,6 +25,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Fixes bug in generator/Makefile.am which causes builds to fail on i686. +Patch: 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -375,7 +378,7 @@ make %{?_smp_mflags} check || { %changelog -* Tue Dec 19 2023 Richard W.M. Jones - 1.19.3-1 +* Tue Dec 19 2023 Richard W.M. Jones - 1.19.3-2 - New upstream development version 1.19.3 * Mon Dec 18 2023 Richard W.M. Jones - 1.19.2-4 From 9f4da8e5df02bdb33bd4fdd3740c9bec5ce75586 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 21:48:46 +0000 Subject: [PATCH 051/116] Remove skip test for ancient Fedora 29 --- libnbd.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 3e03c88..8eb2356 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -263,12 +263,6 @@ function skip_test () done } -# interop/structured-read.sh fails with the old qemu-nbd in Fedora 29, -# so disable it there. -%if 0%{?fedora} <= 29 -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 From 64f469406369c5eab38388a771e2b7765d9e5c5d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 21:49:59 +0000 Subject: [PATCH 052/116] Replace %{ix86} tests with more general %{have_ocaml} macro --- libnbd.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 8eb2356..4a68479 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -1,3 +1,8 @@ +# i686 no longer has any kind of OCaml compiler, not even ocamlc. +%ifnarch %{ix86} +%global have_ocaml 1 +%endif + # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -55,7 +60,7 @@ BuildRequires: ubdsrv-devel >= 1.0-3.rc6 # For the Python 3 bindings. BuildRequires: python3-devel -%ifnarch %{ix86} +%if 0%{?have_ocaml} # For the OCaml bindings. BuildRequires: ocaml BuildRequires: ocaml-findlib-devel @@ -95,7 +100,7 @@ BuildRequires: nbdkit-sh-plugin BuildRequires: nbdkit-sparse-random-plugin %endif -%ifnarch %{ix86} +%if 0%{?have_ocaml} # The OCaml runtime system does not provide this symbol %global __ocaml_requires_opts -x Stdlib__Callback %endif @@ -131,7 +136,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains development headers for %{name}. -%ifnarch %{ix86} +%if 0%{?have_ocaml} %package -n ocaml-%{name} Summary: OCaml language bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -221,7 +226,7 @@ autoreconf -i --with-tls-priority=@LIBNBD,SYSTEM \ PYTHON=%{__python3} \ --enable-python \ -%ifnarch %{ix86} +%if 0%{?have_ocaml} --enable-ocaml \ %else --disable-ocaml \ @@ -242,7 +247,7 @@ find $RPM_BUILD_ROOT -name '*.la' -delete # Delete the golang man page since we're not distributing the bindings. rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* -%ifarch %{ix86} +%if !0%{?have_ocaml} # Delete the OCaml man page on i686. rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-ocaml.3* %endif @@ -313,7 +318,7 @@ make %{?_smp_mflags} check || { %{_mandir}/man3/nbd_*.3* -%ifnarch %{ix86} +%if 0%{?have_ocaml} %files -n ocaml-%{name} %dir %{_libdir}/ocaml/nbd %{_libdir}/ocaml/nbd/META From 378ef997e069a2aa45c019682cb4eb68dfe4de2d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 21:50:42 +0000 Subject: [PATCH 053/116] Replace %{rhel} tests with more general %{have_ublk} macro Also force ./configure --enable-ublk or --disable-ublk option. --- libnbd.spec | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4a68479..cefb235 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -3,6 +3,11 @@ %global have_ocaml 1 %endif +# No ublk in RHEL 9. +%if !0%{?rhel} +%global have_ublk 1 +%endif + # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -51,7 +56,7 @@ BuildRequires: libxml2-devel # For nbdfuse. BuildRequires: fuse3, fuse3-devel -%if !0%{?rhel} +%if 0%{?have_ublk} # For nbdublk BuildRequires: liburing-devel >= 2.2 BuildRequires: ubdsrv-devel >= 1.0-3.rc6 @@ -182,7 +187,7 @@ Recommends: fuse3 This package contains FUSE support for %{name}. -%if !0%{?rhel} +%if 0%{?have_ublk} %package -n nbdublk Summary: Userspace NBD block device Requires: %{name}%{?_isa} = %{version}-%{release} @@ -233,7 +238,13 @@ autoreconf -i %endif --enable-fuse \ --disable-golang \ - --disable-rust + --disable-rust \ +%if 0%{?have_ublk} + --enable-ublk \ +%else + --disable-ublk \ +%endif + %{nil} make %{?_smp_mflags} @@ -252,7 +263,9 @@ rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-ocaml.3* %endif -%if 0%{?rhel} +# Remove this section in libnbd >= 1.20, since upstream was fixed to +# not install nbdublk completion if nbdublk was not built. +%if !0%{?have_ublk} # Delete nbdublk on RHEL. rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nbdublk %endif @@ -357,7 +370,7 @@ make %{?_smp_mflags} check || { %{_mandir}/man1/nbdfuse.1* -%if !0%{?rhel} +%if 0%{?have_ublk} %files -n nbdublk %{_bindir}/nbdublk %{_mandir}/man1/nbdublk.1* @@ -371,7 +384,7 @@ make %{?_smp_mflags} check || { %{_datadir}/bash-completion/completions/nbdfuse %{_datadir}/bash-completion/completions/nbdinfo %{_datadir}/bash-completion/completions/nbdsh -%if !0%{?rhel} +%if 0%{?have_ublk} %{_datadir}/bash-completion/completions/nbdublk %endif From a32f7f984cca3e6c9031f469129b68fdcc0039ed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 19 Dec 2023 21:51:04 +0000 Subject: [PATCH 054/116] Replace %{rhel} tests with more general %{have_nbd_ko} macro --- libnbd.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index cefb235..81d4262 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,6 +8,11 @@ %global have_ublk 1 %endif +# No nbd.ko in RHEL 9. +%if !0%{?rhel} +%global have_nbd_ko 1 +%endif + # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -84,7 +89,7 @@ BuildRequires: gcc-c++ BuildRequires: gnutls-utils BuildRequires: iproute BuildRequires: jq -%if !0%{?rhel} +%if 0%{?have_nbd_ko} BuildRequires: nbd %endif BuildRequires: util-linux From 9ae55d1c19ff1891d9835f4cb22bfbfc0631d959 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jan 2024 14:15:29 +0000 Subject: [PATCH 055/116] New upstream development version 1.19.4 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 81d4262..9fd1ae7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,8 +23,8 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.3 -Release: 2%{?dist} +Version: 1.19.4 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -395,6 +395,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 16 2024 Richard W.M. Jones - 1.19.4-1 +- New upstream development version 1.19.4 + * Tue Dec 19 2023 Richard W.M. Jones - 1.19.3-2 - New upstream development version 1.19.3 diff --git a/sources b/sources index 68aec8f..bf4e650 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.3.tar.gz) = ace3736f0dd26ab95bcf6db6d3fad7f094a85a01a1a947be1166c81dc83719129078dc380007e1abe527f7333aa7f05730ed4fd5a71dbf1da899094bbab970a8 -SHA512 (libnbd-1.19.3.tar.gz.sig) = 4fa1c2b125c98632562ea952104f133573961567ac289a748f31bd1dc0d33cfc7e6280c6ea47478f365a58afef83098bb68abf8fa825cfcf99f1393da60c0058 +SHA512 (libnbd-1.19.4.tar.gz) = 8351dcd4a1444a1d69926edaafe128e4239535a6c7cd51b6bb164f7964d2a71cb52c10809ceaf616ccbc70a122cd74f08e59f14bc391dc2d79492b974d52dc28 +SHA512 (libnbd-1.19.4.tar.gz.sig) = 2f2f569ef8ecefd9912579bbcfd5969f11cce5f9690a79bbbaed93850c028550790d5784419a8b6d7fb272ca24e8779a3bd94f327cb42dcc551375763d0e82ab From e1221bb7aaa7de61f4ea43fa7181aebef21cb1e0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Jan 2024 14:24:40 +0000 Subject: [PATCH 056/116] Remove patch already upstream --- ...le.am-Fix-missing-continuation-backs.patch | 26 ------------------- libnbd.spec | 3 --- 2 files changed, 29 deletions(-) delete mode 100644 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch diff --git a/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch b/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch deleted file mode 100644 index c2cd547..0000000 --- a/0001-generator-Makefile.am-Fix-missing-continuation-backs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 11372ab9801f69b48404246cd3f9ec65b41b473b Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 19 Dec 2023 17:08:07 +0000 -Subject: [PATCH] generator/Makefile.am: Fix missing continuation backslash - -Fixes: commit 2829b92aefb89a098e11a36b252383563a4e543a ---- - generator/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/generator/Makefile.am b/generator/Makefile.am -index c9555f5269..38509124d0 100644 ---- a/generator/Makefile.am -+++ b/generator/Makefile.am -@@ -111,7 +111,7 @@ stamp-generator: - echo; \ - echo "Install the OCaml bytecode compiler (the program called ‘ocamlc’)"; \ - echo "and rerun ./configure && make"; \ -- echo; -+ echo; \ - echo "OR build from the tarballs at https://download.libguestfs.org/libnbd/"; \ - echo "which include generated files."; \ - echo; \ --- -2.43.0 - diff --git a/libnbd.spec b/libnbd.spec index 9fd1ae7..b5dcbe8 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -40,9 +40,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Fixes bug in generator/Makefile.am which causes builds to fail on i686. -Patch: 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif From 262c25de1f88eec44e4ec076c0037123a968b830 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 04:46:03 +0000 Subject: [PATCH 057/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index b5dcbe8..340b6cd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -24,7 +24,7 @@ Name: libnbd Version: 1.19.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -392,6 +392,9 @@ make %{?_smp_mflags} check || { %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.19.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 16 2024 Richard W.M. Jones - 1.19.4-1 - New upstream development version 1.19.4 From 4d3f01730affd2862d4a409ea7e626ed9afaac9d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Jan 2024 10:59:51 +0000 Subject: [PATCH 058/116] New upstream development version 1.19.5 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 340b6cd..1bd4eae 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,8 +23,8 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.4 -Release: 2%{?dist} +Version: 1.19.5 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -392,6 +392,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jan 22 2024 Richard W.M. Jones - 1.19.5-1 +- New upstream development version 1.19.5 + * Sun Jan 21 2024 Fedora Release Engineering - 1.19.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index bf4e650..49562c6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.4.tar.gz) = 8351dcd4a1444a1d69926edaafe128e4239535a6c7cd51b6bb164f7964d2a71cb52c10809ceaf616ccbc70a122cd74f08e59f14bc391dc2d79492b974d52dc28 -SHA512 (libnbd-1.19.4.tar.gz.sig) = 2f2f569ef8ecefd9912579bbcfd5969f11cce5f9690a79bbbaed93850c028550790d5784419a8b6d7fb272ca24e8779a3bd94f327cb42dcc551375763d0e82ab +SHA512 (libnbd-1.19.5.tar.gz) = b4bf9394bf0e61a263ba88ae503de43366432945651dfc3601496ef432b5bf4696c70f145b4e3e3e29895f6028f5fb6079a527b1ba27f707cb20f3f5e7b87b55 +SHA512 (libnbd-1.19.5.tar.gz.sig) = 12fb22f1d259a916d54eb3f9a8128208f3b5246ff5d845bdabe914b059b80284c899266b88fa92a85e385aeadbf0a752a2ccde47e5f292edeec2c906ff7b40ec From eabcd4d6b3d310659649b6cf394ad07dc760c777 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 02:59:23 +0000 Subject: [PATCH 059/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 1bd4eae..97021b1 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -24,7 +24,7 @@ Name: libnbd Version: 1.19.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -392,6 +392,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.19.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Richard W.M. Jones - 1.19.5-1 - New upstream development version 1.19.5 From 27258360765ced00a1558f853be6edbaa050ac0f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 21 Jan 2024 22:25:43 -0500 Subject: [PATCH 060/116] Fix ELN build nbdublk bash-completion is conditional as of 1.19.4: https://gitlab.com/nbdkit/libnbd/-/commit/e817d4977490be09361a4a08d6298dff439951a2 --- libnbd.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 97021b1..dc263e0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -265,13 +265,6 @@ rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-ocaml.3* %endif -# Remove this section in libnbd >= 1.20, since upstream was fixed to -# not install nbdublk completion if nbdublk was not built. -%if !0%{?have_ublk} -# Delete nbdublk on RHEL. -rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nbdublk -%endif - %check function skip_test () From d11eba1050f722926ba495b6a7a01eedcac43294 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Jan 2024 15:54:39 +0000 Subject: [PATCH 061/116] Bump and rebuild for ELN --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index dc263e0..d7a7985 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -24,7 +24,7 @@ Name: libnbd Version: 1.19.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -385,6 +385,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jan 25 2024 Richard W.M. Jones - 1.19.5-3 +- Bump and rebuild for ELN + * Thu Jan 25 2024 Fedora Release Engineering - 1.19.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 698987b47936db1a64ed126034e08488cb168bb2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Feb 2024 15:16:40 +0000 Subject: [PATCH 062/116] New upstream development version 1.19.6 --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index d7a7985..69a20dd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -17,14 +17,14 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.19-development Name: libnbd -Version: 1.19.5 -Release: 3%{?dist} +Version: 1.19.6 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -385,6 +385,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Feb 05 2024 Richard W.M. Jones - 1.19.6-1 +- New upstream development version 1.19.6 + * Thu Jan 25 2024 Richard W.M. Jones - 1.19.5-3 - Bump and rebuild for ELN diff --git a/sources b/sources index 49562c6..9d71050 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.5.tar.gz) = b4bf9394bf0e61a263ba88ae503de43366432945651dfc3601496ef432b5bf4696c70f145b4e3e3e29895f6028f5fb6079a527b1ba27f707cb20f3f5e7b87b55 -SHA512 (libnbd-1.19.5.tar.gz.sig) = 12fb22f1d259a916d54eb3f9a8128208f3b5246ff5d845bdabe914b059b80284c899266b88fa92a85e385aeadbf0a752a2ccde47e5f292edeec2c906ff7b40ec +SHA512 (libnbd-1.19.6.tar.gz) = 00d4521cbccca878b2ac416189961318b89f147709e0144b1ac04a937051909686472ac6b40af7eec2611181de20156bc4759d41c925ce58afb02e03dc7b70f0 +SHA512 (libnbd-1.19.6.tar.gz.sig) = 02ea376d83f8fafd06cc4b4149d1ab39b3d9ce0e7a7983ce5bf64bd1bfb246c6c2bf39deb3f2f73add9ff64c9221e90ac3ca176114816691c35ca2032acb93df From 28ab0a30b98dbad6ad5c2f2f0bd43a6313e724bd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 17 Feb 2024 10:57:04 +0000 Subject: [PATCH 063/116] New upstream development version 1.19.7 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 69a20dd..7a93747 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,7 +23,7 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.6 +Version: 1.19.7 Release: 1%{?dist} Summary: NBD client library in userspace @@ -385,6 +385,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Feb 17 2024 Richard W.M. Jones - 1.19.7-1 +- New upstream development version 1.19.7 + * Mon Feb 05 2024 Richard W.M. Jones - 1.19.6-1 - New upstream development version 1.19.6 diff --git a/sources b/sources index 9d71050..b98f2bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.6.tar.gz) = 00d4521cbccca878b2ac416189961318b89f147709e0144b1ac04a937051909686472ac6b40af7eec2611181de20156bc4759d41c925ce58afb02e03dc7b70f0 -SHA512 (libnbd-1.19.6.tar.gz.sig) = 02ea376d83f8fafd06cc4b4149d1ab39b3d9ce0e7a7983ce5bf64bd1bfb246c6c2bf39deb3f2f73add9ff64c9221e90ac3ca176114816691c35ca2032acb93df +SHA512 (libnbd-1.19.7.tar.gz) = 62d6e7a0b2fd1c5e141c37c037b6dedb957629e3c246aa0ba962ca6e0e1f0c9f0146a059ab8045487b9905211939a82df7f085d84d01e28a3f9af4c776555fe1 +SHA512 (libnbd-1.19.7.tar.gz.sig) = 7a53e2c51eb828cbb36dc38881a8286369d2ba8a7ac7d94df0c5fdc0ac0d8ac7229abfbc7af409c0207ff062806a07af69a5be70e7a61c1c5dbc03a949f22055 From e53297ca42ca9bcaa694d184622c624e4ef152b1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 17 Feb 2024 11:17:30 +0000 Subject: [PATCH 064/116] +BR bash-completion-devel The bash-completion.pc file moved in Rawhide: https://src.fedoraproject.org/rpms/bash-completion/c/d1f5dc48c0440cc68efdd519b78fccca416cad94?branch=rawhide --- libnbd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 7a93747..a43231d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -78,7 +78,7 @@ BuildRequires: ocaml-ocamldoc BuildRequires: glib2-devel # For bash-completion. -BuildRequires: bash-completion +BuildRequires: bash-completion, bash-completion-devel # Only for running the test suite. BuildRequires: coreutils @@ -231,6 +231,7 @@ autoreconf -i %configure \ --disable-static \ --with-tls-priority=@LIBNBD,SYSTEM \ + --with-bash-completions \ PYTHON=%{__python3} \ --enable-python \ %if 0%{?have_ocaml} From af896bec5c64a26bacf27ccdf54692b4681145a9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Mar 2024 18:33:22 +0000 Subject: [PATCH 065/116] New upstream development version 1.19.8 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a43231d..4239283 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,7 +23,7 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.7 +Version: 1.19.8 Release: 1%{?dist} Summary: NBD client library in userspace @@ -386,6 +386,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 04 2024 Richard W.M. Jones - 1.19.8-1 +- New upstream development version 1.19.8 + * Sat Feb 17 2024 Richard W.M. Jones - 1.19.7-1 - New upstream development version 1.19.7 diff --git a/sources b/sources index b98f2bf..2236520 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.7.tar.gz) = 62d6e7a0b2fd1c5e141c37c037b6dedb957629e3c246aa0ba962ca6e0e1f0c9f0146a059ab8045487b9905211939a82df7f085d84d01e28a3f9af4c776555fe1 -SHA512 (libnbd-1.19.7.tar.gz.sig) = 7a53e2c51eb828cbb36dc38881a8286369d2ba8a7ac7d94df0c5fdc0ac0d8ac7229abfbc7af409c0207ff062806a07af69a5be70e7a61c1c5dbc03a949f22055 +SHA512 (libnbd-1.19.8.tar.gz) = a1856bced8db18634052cc2229b774b8e0f06c2c8c7749808ad82a23b59f3438e0a70b69e70f6cbb1ef9b8fc7873e6c04e120046598c01ffdd19829d45843180 +SHA512 (libnbd-1.19.8.tar.gz.sig) = 8db4d40c94fb845eff0e3095ddd0f1b9a59a756cae5d732a5dd73670a6e9623280810dedc693d0810718da5292a9f72838b80773ac59b147cd6f743af507de56 From 0b21d0faef76e69441c871a1a699082ad7e4d568 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 11 Mar 2024 10:39:20 +0000 Subject: [PATCH 066/116] New upstream development version 1.19.9 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4239283..5c5d22b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,7 +23,7 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.8 +Version: 1.19.9 Release: 1%{?dist} Summary: NBD client library in userspace @@ -386,6 +386,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 11 2024 Richard W.M. Jones - 1.19.9-1 +- New upstream development version 1.19.9 + * Mon Mar 04 2024 Richard W.M. Jones - 1.19.8-1 - New upstream development version 1.19.8 diff --git a/sources b/sources index 2236520..57dbe94 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.8.tar.gz) = a1856bced8db18634052cc2229b774b8e0f06c2c8c7749808ad82a23b59f3438e0a70b69e70f6cbb1ef9b8fc7873e6c04e120046598c01ffdd19829d45843180 -SHA512 (libnbd-1.19.8.tar.gz.sig) = 8db4d40c94fb845eff0e3095ddd0f1b9a59a756cae5d732a5dd73670a6e9623280810dedc693d0810718da5292a9f72838b80773ac59b147cd6f743af507de56 +SHA512 (libnbd-1.19.9.tar.gz) = e0d3a8594b456037dd03f82f566748f4e08a93984e4381bc2613732e9f04ce5a951baac53cdca122db381ceeacdae19a91f76b3243690bf886bafd93f0cda479 +SHA512 (libnbd-1.19.9.tar.gz.sig) = 7b23ec37fc85cacb286b01d8da1eded10c572e53f83b796cc81e5dac33e528fa09177fd6ba2d8d436ba4e8b863fd72cff6f2792776825fdcc6e764c0711bf374 From 335d1d6234b7be7eeaa7646b2e77c43401127b2d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 15 Mar 2024 09:41:26 +0000 Subject: [PATCH 067/116] New upstream development version 1.19.10 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 5c5d22b..af87255 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,7 +23,7 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.9 +Version: 1.19.10 Release: 1%{?dist} Summary: NBD client library in userspace @@ -386,6 +386,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Mar 15 2024 Richard W.M. Jones - 1.19.10-1 +- New upstream development version 1.19.10 + * Mon Mar 11 2024 Richard W.M. Jones - 1.19.9-1 - New upstream development version 1.19.9 diff --git a/sources b/sources index 57dbe94..ba99021 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.9.tar.gz) = e0d3a8594b456037dd03f82f566748f4e08a93984e4381bc2613732e9f04ce5a951baac53cdca122db381ceeacdae19a91f76b3243690bf886bafd93f0cda479 -SHA512 (libnbd-1.19.9.tar.gz.sig) = 7b23ec37fc85cacb286b01d8da1eded10c572e53f83b796cc81e5dac33e528fa09177fd6ba2d8d436ba4e8b863fd72cff6f2792776825fdcc6e764c0711bf374 +SHA512 (libnbd-1.19.10.tar.gz) = 64bb345207a2c3eb9e442c64b815b67d4087f67e990e70be429822c0ad7d1882bd98182af7804ff1bb723160d37973604b573f17d61fb4da281bd1d12780c125 +SHA512 (libnbd-1.19.10.tar.gz.sig) = 90dde477514cbb997bed731009b8093da028cb57a33b962ff4c39d96db047ad05abc7d46e4db3ec818c64975c6a44c145759d1da872445079560d98b30c06576 From 5b53adfdeb8d24f83b2f79e8443477387eed954e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Mar 2024 11:12:54 +0000 Subject: [PATCH 068/116] Use %{bash_completions_dir} macro --- libnbd.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index af87255..0c15646 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -24,7 +24,7 @@ Name: libnbd Version: 1.19.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -374,18 +374,21 @@ make %{?_smp_mflags} check || { %files bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/nbdcopy -%{_datadir}/bash-completion/completions/nbddump -%{_datadir}/bash-completion/completions/nbdfuse -%{_datadir}/bash-completion/completions/nbdinfo -%{_datadir}/bash-completion/completions/nbdsh +%dir %{bash_completions_dir} +%{bash_completions_dir}/nbdcopy +%{bash_completions_dir}/nbddump +%{bash_completions_dir}/nbdfuse +%{bash_completions_dir}/nbdinfo +%{bash_completions_dir}/nbdsh %if 0%{?have_ublk} -%{_datadir}/bash-completion/completions/nbdublk +%{bash_completions_dir}/nbdublk %endif %changelog +* Mon Mar 25 2024 Richard W.M. Jones - 1.19.10-2 +- Use %%{bash_completions_dir} macro + * Fri Mar 15 2024 Richard W.M. Jones - 1.19.10-1 - New upstream development version 1.19.10 From 000f65654273b06e339dd87116211279b4cf7b40 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Mar 2024 11:25:50 +0000 Subject: [PATCH 069/116] New upstream development version 1.19.11 Use %{bash_completions_dir} macro --- libnbd.spec | 7 ++++--- sources | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0c15646..5ac3f78 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -23,8 +23,8 @@ %global source_directory 1.19-development Name: libnbd -Version: 1.19.10 -Release: 2%{?dist} +Version: 1.19.11 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -386,7 +386,8 @@ make %{?_smp_mflags} check || { %changelog -* Mon Mar 25 2024 Richard W.M. Jones - 1.19.10-2 +* Mon Mar 25 2024 Richard W.M. Jones - 1.19.11-1 +- New upstream development version 1.19.11 - Use %%{bash_completions_dir} macro * Fri Mar 15 2024 Richard W.M. Jones - 1.19.10-1 diff --git a/sources b/sources index ba99021..39e419a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.10.tar.gz) = 64bb345207a2c3eb9e442c64b815b67d4087f67e990e70be429822c0ad7d1882bd98182af7804ff1bb723160d37973604b573f17d61fb4da281bd1d12780c125 -SHA512 (libnbd-1.19.10.tar.gz.sig) = 90dde477514cbb997bed731009b8093da028cb57a33b962ff4c39d96db047ad05abc7d46e4db3ec818c64975c6a44c145759d1da872445079560d98b30c06576 +SHA512 (libnbd-1.19.11.tar.gz) = 6d517b39b52f14c2c58c9935f96a830e35306bec593aca346da843bd691ec38d0d65207258c11d24b2a1d74ebe94660b65d945108ea9d05c9bbcbb01b1299aad +SHA512 (libnbd-1.19.11.tar.gz.sig) = 3aa5f29c1da2bdc7dd0cb6871c6ec10c97e32ed29577da1a1274f14e769d60603d235f87e4422c715688b3e7699bca03337db8c28b5c9d7569bc306a1c146022 From 11a78d929de957995cf127e70c2762326132a263 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Apr 2024 21:23:56 +0100 Subject: [PATCH 070/116] Rebuild autoconf cruft unconditionally --- libnbd.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 5ac3f78..48b1605 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -16,9 +16,6 @@ # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 -# If there are patches which touch autotools files, set this to 1. -%global patches_touch_autotools %{nil} - # The source directory. %global source_directory 1.19-development @@ -40,14 +37,13 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -%if 0%{patches_touch_autotools} -BuildRequires: autoconf, automake, libtool -%endif - %if 0%{verify_tarball_signature} BuildRequires: gnupg2 %endif +# For rebuilding autoconf cruft. +BuildRequires: autoconf, automake, libtool + # For the core library. BuildRequires: gcc BuildRequires: make @@ -222,9 +218,7 @@ for %{name}. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %endif %autosetup -p1 -%if 0%{patches_touch_autotools} autoreconf -i -%endif %build From ef2af37ed73235afe9161aa74ceef0bb7e56282b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Apr 2024 21:27:20 +0100 Subject: [PATCH 071/116] New stable branch version 1.20.0 --- libnbd.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 48b1605..b5d7464 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -17,10 +17,10 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.19-development +%global source_directory 1.20-stable Name: libnbd -Version: 1.19.11 +Version: 1.20.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -380,6 +380,10 @@ make %{?_smp_mflags} check || { %changelog +* Thu Apr 4 2024 Richard W.M. Jones - 1.20.0-1 +- New stable branch version 1.20.0 +- Rebuild autoconf cruft unconditionally. + * Mon Mar 25 2024 Richard W.M. Jones - 1.19.11-1 - New upstream development version 1.19.11 - Use %%{bash_completions_dir} macro diff --git a/sources b/sources index 39e419a..57c1e59 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.19.11.tar.gz) = 6d517b39b52f14c2c58c9935f96a830e35306bec593aca346da843bd691ec38d0d65207258c11d24b2a1d74ebe94660b65d945108ea9d05c9bbcbb01b1299aad -SHA512 (libnbd-1.19.11.tar.gz.sig) = 3aa5f29c1da2bdc7dd0cb6871c6ec10c97e32ed29577da1a1274f14e769d60603d235f87e4422c715688b3e7699bca03337db8c28b5c9d7569bc306a1c146022 +SHA512 (libnbd-1.20.0.tar.gz) = 28b72c8252cc7f497fc87c2a885256bdaeeb5fcf60f8df882e603b94e6a753191a9f081e65f8afc3d70cf1156b78c49ec53b89188bb82f6d2eeb172402ad7bd8 +SHA512 (libnbd-1.20.0.tar.gz.sig) = 214233d7d0f06bd1774d4edba99c3d4bc37715023ca798cc0982820ceaf9cad4926989078a1544897e2fb4bf9b450a8e2d9b9113d4ed8b6eb08d9c5e4618f255 From c87ac3e4a5cc32c36a525d49389c2460973bbecf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 11:26:53 +0100 Subject: [PATCH 072/116] gating: Match any version of RHEL --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 648918d..2c7ed80 100755 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-9 + - rhel-* decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} From 46f219c79e41822a45bea57b46d1e6c7f43cec3f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 May 2024 15:56:29 +0100 Subject: [PATCH 073/116] New stable branch version 1.20.1 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index b5d7464..3e29b8c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.20-stable Name: libnbd -Version: 1.20.0 +Version: 1.20.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -380,6 +380,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue May 7 2024 Richard W.M. Jones - 1.20.1-1 +- New stable branch version 1.20.1 + * Thu Apr 4 2024 Richard W.M. Jones - 1.20.0-1 - New stable branch version 1.20.0 - Rebuild autoconf cruft unconditionally. diff --git a/sources b/sources index 57c1e59..1b82619 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.20.0.tar.gz) = 28b72c8252cc7f497fc87c2a885256bdaeeb5fcf60f8df882e603b94e6a753191a9f081e65f8afc3d70cf1156b78c49ec53b89188bb82f6d2eeb172402ad7bd8 -SHA512 (libnbd-1.20.0.tar.gz.sig) = 214233d7d0f06bd1774d4edba99c3d4bc37715023ca798cc0982820ceaf9cad4926989078a1544897e2fb4bf9b450a8e2d9b9113d4ed8b6eb08d9c5e4618f255 +SHA512 (libnbd-1.20.1.tar.gz) = b3439ae1aa9da900fe2992c642bf021022a4eb6876e74ac4d8518cf9417e93f904e1baea13d944a77d641947b410bddc899e1aff36c661161481e3cfdcd956cc +SHA512 (libnbd-1.20.1.tar.gz.sig) = 7124421a0cf93cf9ce4ad5deff83b60fb8e25f7b917382c1971cb56e17fc9647839a2abde34ee652a2bc43e233e6c17da04300b64a7632b0bcdd344822b13200 From 90e4639bd640d9ea50fc48ef116d71b7165eac3c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 May 2024 09:59:55 -0600 Subject: [PATCH 074/116] Remove unneeded Stdlib__Callback workaround --- libnbd.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 3e29b8c..9930d9a 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -103,11 +103,6 @@ BuildRequires: nbdkit-sh-plugin BuildRequires: nbdkit-sparse-random-plugin %endif -%if 0%{?have_ocaml} -# The OCaml runtime system does not provide this symbol -%global __ocaml_requires_opts -x Stdlib__Callback -%endif - %description NBD — Network Block Device — is a protocol for accessing Block Devices @@ -380,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu May 23 2024 Jerry James - 1.20.1-1 +- Remove unneeded Stdlib__Callback workaround + * Tue May 7 2024 Richard W.M. Jones - 1.20.1-1 - New stable branch version 1.20.1 From f130496e84014107f6c72f844eb4f8d488e8f18e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 17:43:42 +0100 Subject: [PATCH 075/116] OCaml 5.2.0 for Fedora 41 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 9930d9a..b19f5f2 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.20.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed May 29 2024 Richard W.M. Jones - 1.20.1-2 +- OCaml 5.2.0 for Fedora 41 + * Thu May 23 2024 Jerry James - 1.20.1-1 - Remove unneeded Stdlib__Callback workaround From e16eec116b39db352588676b5acbae70ba399def Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:49:48 +0200 Subject: [PATCH 076/116] Rebuilt for Python 3.13 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index b19f5f2..51eed30 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.20.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jun 07 2024 Python Maint - 1.20.1-3 +- Rebuilt for Python 3.13 + * Wed May 29 2024 Richard W.M. Jones - 1.20.1-2 - OCaml 5.2.0 for Fedora 41 From 36efbc1533fe284d0e2a5e740b6d3ae2577cd1f8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 11:56:19 +0100 Subject: [PATCH 077/116] OCaml 5.2.0 ppc64le fix --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 51eed30..8b7ec7a 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.20.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -375,6 +375,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 1.20.1-4 +- OCaml 5.2.0 ppc64le fix + * Fri Jun 07 2024 Python Maint - 1.20.1-3 - Rebuilt for Python 3.13 From f177c4d92adac721224a4ee309c4ff816e441927 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 12:06:48 +0100 Subject: [PATCH 078/116] Add BR glibc-utils for libc_malloc_debug.so.0 --- libnbd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libnbd.spec b/libnbd.spec index 8b7ec7a..f2cccd9 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -79,6 +79,7 @@ BuildRequires: bash-completion, bash-completion-devel # Only for running the test suite. BuildRequires: coreutils BuildRequires: gcc-c++ +BuildRequires: glibc-utils BuildRequires: gnutls-utils BuildRequires: iproute BuildRequires: jq From 9cd593e56501d3fae46295d16d235747aebae096 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 25 Jun 2024 21:45:38 +0100 Subject: [PATCH 079/116] New upstream development version 1.21.1 Fix: multiple flaws in TLS server certificate checking --- libnbd.spec | 10 +++++++--- sources | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f2cccd9..230c284 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -17,11 +17,11 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.20-stable +%global source_directory 1.21-development Name: libnbd -Version: 1.20.1 -Release: 4%{?dist} +Version: 1.21.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,10 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jun 25 2024 Richard W.M. Jones - 1.21.1-1 +- New upstream development version 1.21.1 +- Fix: multiple flaws in TLS server certificate checking + * Wed Jun 19 2024 Richard W.M. Jones - 1.20.1-4 - OCaml 5.2.0 ppc64le fix diff --git a/sources b/sources index 1b82619..f3eec7c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.20.1.tar.gz) = b3439ae1aa9da900fe2992c642bf021022a4eb6876e74ac4d8518cf9417e93f904e1baea13d944a77d641947b410bddc899e1aff36c661161481e3cfdcd956cc -SHA512 (libnbd-1.20.1.tar.gz.sig) = 7124421a0cf93cf9ce4ad5deff83b60fb8e25f7b917382c1971cb56e17fc9647839a2abde34ee652a2bc43e233e6c17da04300b64a7632b0bcdd344822b13200 +SHA512 (libnbd-1.21.1.tar.gz) = 78e0345b907aeb9081554d8fc792e90ff75723093f01ff9a9372e9c65e3ee3907ec1436573c04915be5ed3be57d8cabc629c5b50d87748e252167fdaf97946ee +SHA512 (libnbd-1.21.1.tar.gz.sig) = e6ad5c4da784f45b406c94a2b3b881703dff5c0688915729f118a58dc15c99a3cfa8684945de21b5fbd64000763a6512b43a0ca20b2c2c73603102c0f726cebe From 1c3217a14a0c316ed509eae4b7df002f1e0e6405 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 14:32:14 +0000 Subject: [PATCH 080/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 230c284..727a105 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.21.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.21.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 25 2024 Richard W.M. Jones - 1.21.1-1 - New upstream development version 1.21.1 - Fix: multiple flaws in TLS server certificate checking From 26ff2416ab44464df761d87b41a9191b0ab2526e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Jul 2024 10:25:04 +0100 Subject: [PATCH 081/116] New upstream development version 1.21.2 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 727a105..8d1741c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.21-development Name: libnbd -Version: 1.21.1 -Release: 2%{?dist} +Version: 1.21.2 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Sun Jul 28 2024 Richard W.M. Jones - 1.21.2-1 +- New upstream development version 1.21.2 + * Thu Jul 18 2024 Fedora Release Engineering - 1.21.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index f3eec7c..430bcbd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.21.1.tar.gz) = 78e0345b907aeb9081554d8fc792e90ff75723093f01ff9a9372e9c65e3ee3907ec1436573c04915be5ed3be57d8cabc629c5b50d87748e252167fdaf97946ee -SHA512 (libnbd-1.21.1.tar.gz.sig) = e6ad5c4da784f45b406c94a2b3b881703dff5c0688915729f118a58dc15c99a3cfa8684945de21b5fbd64000763a6512b43a0ca20b2c2c73603102c0f726cebe +SHA512 (libnbd-1.21.2.tar.gz) = 19f4287450883789add69515544f110c2d4b9d6c53e6c6a21d537ef874cae34be01d2fbb13cb1fb58a95754a4ed15d5b19c9429b4fac204384704849a561637b +SHA512 (libnbd-1.21.2.tar.gz.sig) = 3320fc9159035077af2f75a5b60c55eaf935ef8e48ce6a6465ddb6bba597fd305c585ae72e755145fad5a3b784f3270f91ce2cb87c4c58cad19608bb95ec36a1 From 73d6ed92ceb492880310917c6f6a6e96862fbb5a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Jul 2024 10:41:17 +0100 Subject: [PATCH 082/116] Add fix for tests on i686 --- ...-Don-t-fail-to-compile-if-NBDKIT-is-.patch | 43 +++++++++++++++++++ libnbd.spec | 3 ++ 2 files changed, 46 insertions(+) create mode 100644 0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch diff --git a/0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch b/0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch new file mode 100644 index 0000000..3ceaf12 --- /dev/null +++ b/0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch @@ -0,0 +1,43 @@ +From ab220e25cbc8e0b150e527f0130d7fdc357f7a01 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 28 Jul 2024 10:38:09 +0100 +Subject: [PATCH] tests/requires.c: Don't fail to compile if NBDKIT is not + defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On Fedora/i686 in particular, but also in general if nbdkit is not +around at compile time, the tests fail with: + +requires.c: In function ‘requires_nbdkit_tls_verify_peer’: +requires.c:133:13: error: ‘NBDKIT’ undeclared (first use in this function) + 133 | requires (NBDKIT " --tls-verify-peer -U - null --run 'exit 0'"); + | ^~~~~~ +requires.c:133:13: note: each undeclared identifier is reported only once for each function it appears in + +Fixes: commit 9bc3478039be2cb1c9320f49fef1100dabf4c1a1 +--- + tests/requires.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tests/requires.c b/tests/requires.c +index 9dcd39a49..e47095614 100644 +--- a/tests/requires.c ++++ b/tests/requires.c +@@ -130,7 +130,12 @@ requires_nbd_server_supports_inetd (void) + void + requires_nbdkit_tls_verify_peer (void) + { ++#ifdef NBDKIT + requires (NBDKIT " --tls-verify-peer -U - null --run 'exit 0'"); ++#else ++ fprintf (stderr, "nbdkit not available at compile time\n"); ++ exit (77); ++#endif + } + + /* Check that ssh to localhost will work without any passwords or phrases. +-- +2.44.0 + diff --git a/libnbd.spec b/libnbd.spec index 8d1741c..b86a767 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -37,6 +37,9 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Fix for tests, upstream in libnbd > 1.21.2 +Patch: 0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch + %if 0%{verify_tarball_signature} BuildRequires: gnupg2 %endif From 8614c3ab299c191ec8c37b21bfdf6c687f82d959 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Jul 2024 22:56:41 +0100 Subject: [PATCH 083/116] New upstream development version 1.21.3 --- ...-Don-t-fail-to-compile-if-NBDKIT-is-.patch | 43 ------------------- libnbd.spec | 9 ++-- sources | 4 +- 3 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch diff --git a/0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch b/0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch deleted file mode 100644 index 3ceaf12..0000000 --- a/0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ab220e25cbc8e0b150e527f0130d7fdc357f7a01 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 28 Jul 2024 10:38:09 +0100 -Subject: [PATCH] tests/requires.c: Don't fail to compile if NBDKIT is not - defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On Fedora/i686 in particular, but also in general if nbdkit is not -around at compile time, the tests fail with: - -requires.c: In function ‘requires_nbdkit_tls_verify_peer’: -requires.c:133:13: error: ‘NBDKIT’ undeclared (first use in this function) - 133 | requires (NBDKIT " --tls-verify-peer -U - null --run 'exit 0'"); - | ^~~~~~ -requires.c:133:13: note: each undeclared identifier is reported only once for each function it appears in - -Fixes: commit 9bc3478039be2cb1c9320f49fef1100dabf4c1a1 ---- - tests/requires.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/requires.c b/tests/requires.c -index 9dcd39a49..e47095614 100644 ---- a/tests/requires.c -+++ b/tests/requires.c -@@ -130,7 +130,12 @@ requires_nbd_server_supports_inetd (void) - void - requires_nbdkit_tls_verify_peer (void) - { -+#ifdef NBDKIT - requires (NBDKIT " --tls-verify-peer -U - null --run 'exit 0'"); -+#else -+ fprintf (stderr, "nbdkit not available at compile time\n"); -+ exit (77); -+#endif - } - - /* Check that ssh to localhost will work without any passwords or phrases. --- -2.44.0 - diff --git a/libnbd.spec b/libnbd.spec index b86a767..f46dadc 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.21-development Name: libnbd -Version: 1.21.2 +Version: 1.21.3 Release: 1%{?dist} Summary: NBD client library in userspace @@ -37,9 +37,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Fix for tests, upstream in libnbd > 1.21.2 -Patch: 0001-tests-requires.c-Don-t-fail-to-compile-if-NBDKIT-is-.patch - %if 0%{verify_tarball_signature} BuildRequires: gnupg2 %endif @@ -379,8 +376,8 @@ make %{?_smp_mflags} check || { %changelog -* Sun Jul 28 2024 Richard W.M. Jones - 1.21.2-1 -- New upstream development version 1.21.2 +* Sun Jul 28 2024 Richard W.M. Jones - 1.21.3-1 +- New upstream development version 1.21.3 * Thu Jul 18 2024 Fedora Release Engineering - 1.21.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 430bcbd..7deffb9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.21.2.tar.gz) = 19f4287450883789add69515544f110c2d4b9d6c53e6c6a21d537ef874cae34be01d2fbb13cb1fb58a95754a4ed15d5b19c9429b4fac204384704849a561637b -SHA512 (libnbd-1.21.2.tar.gz.sig) = 3320fc9159035077af2f75a5b60c55eaf935ef8e48ce6a6465ddb6bba597fd305c585ae72e755145fad5a3b784f3270f91ce2cb87c4c58cad19608bb95ec36a1 +SHA512 (libnbd-1.21.3.tar.gz) = c0538aa483133ee0cef5c19f79a3b6441866de555e78ec3ddf74e2632c127561a0eef9e9300e8941f468a29447c8928936681984ebc3383c411acf50b4a40ab9 +SHA512 (libnbd-1.21.3.tar.gz.sig) = 93f1c08c260e5308a346a7ffa802ffdf227dd2daa2d3abfc02a2198946e737d737feb3dd0e333ac91d34e99e5bca1d65f4623fe391481b494dd57d401c20230a From a8fffa93cc92de3d69e3651af85dc54617571a46 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 12 Sep 2024 21:38:36 +0100 Subject: [PATCH 084/116] New upstream development version 1.21.4 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f46dadc..b8c007f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.21-development Name: libnbd -Version: 1.21.3 +Version: 1.21.4 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Sep 12 2024 Richard W.M. Jones - 1.21.4-1 +- New upstream development version 1.21.4 + * Sun Jul 28 2024 Richard W.M. Jones - 1.21.3-1 - New upstream development version 1.21.3 diff --git a/sources b/sources index 7deffb9..5d8fdb9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.21.3.tar.gz) = c0538aa483133ee0cef5c19f79a3b6441866de555e78ec3ddf74e2632c127561a0eef9e9300e8941f468a29447c8928936681984ebc3383c411acf50b4a40ab9 -SHA512 (libnbd-1.21.3.tar.gz.sig) = 93f1c08c260e5308a346a7ffa802ffdf227dd2daa2d3abfc02a2198946e737d737feb3dd0e333ac91d34e99e5bca1d65f4623fe391481b494dd57d401c20230a +SHA512 (libnbd-1.21.4.tar.gz) = 7ae9feffb79d73e1093f241e248ac6aab197a9241ec61feff6922b2dd42879ed5187ee93ac50306fa888dbf1b96e653337e28a10d084d46a7399e06f7489096a +SHA512 (libnbd-1.21.4.tar.gz.sig) = bfd357f13a629c68613d83f7fc4fb0535037893f707bbd42ba2e4850665245f5ce8af572db48caa81c4c794940a7d9a7d21d44d7b80352d4b2db24fb9a4da46d From ae6ac870e20bc38cc8adb8c61994b819623fcdbd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 27 Sep 2024 14:23:39 +0100 Subject: [PATCH 085/116] New upstream development version 1.21.5 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index b8c007f..393ccd5 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.21-development Name: libnbd -Version: 1.21.4 +Version: 1.21.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 27 2024 Richard W.M. Jones - 1.21.5-1 +- New upstream development version 1.21.5 + * Thu Sep 12 2024 Richard W.M. Jones - 1.21.4-1 - New upstream development version 1.21.4 diff --git a/sources b/sources index 5d8fdb9..3aa7796 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.21.4.tar.gz) = 7ae9feffb79d73e1093f241e248ac6aab197a9241ec61feff6922b2dd42879ed5187ee93ac50306fa888dbf1b96e653337e28a10d084d46a7399e06f7489096a -SHA512 (libnbd-1.21.4.tar.gz.sig) = bfd357f13a629c68613d83f7fc4fb0535037893f707bbd42ba2e4850665245f5ce8af572db48caa81c4c794940a7d9a7d21d44d7b80352d4b2db24fb9a4da46d +SHA512 (libnbd-1.21.5.tar.gz) = bb17b20e626ce626f9242335196d2ae61ff08eb4de098c47fd1032a4c39db7b3fc338c4c5f439dd1476e23e537a72140dffdfaec110225c20b5198d7793e394a +SHA512 (libnbd-1.21.5.tar.gz.sig) = a8c6aeece815c8b7faa8b470b9d9df1253b8d851e2ab8afaa68e53e872a785816f252815921c6a52061d0fc26d14aa1194b6b54eeded2a4d7d2d8eb6c92d48b3 From c7dfce169fecd6e87288be5f43e37f75ab896285 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 14 Oct 2024 20:40:54 +0100 Subject: [PATCH 086/116] New upstream development version 1.21.6 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 393ccd5..f46abcd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.21-development Name: libnbd -Version: 1.21.5 +Version: 1.21.6 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Oct 14 2024 Richard W.M. Jones - 1.21.6-1 +- New upstream development version 1.21.6 + * Fri Sep 27 2024 Richard W.M. Jones - 1.21.5-1 - New upstream development version 1.21.5 diff --git a/sources b/sources index 3aa7796..477ccc1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.21.5.tar.gz) = bb17b20e626ce626f9242335196d2ae61ff08eb4de098c47fd1032a4c39db7b3fc338c4c5f439dd1476e23e537a72140dffdfaec110225c20b5198d7793e394a -SHA512 (libnbd-1.21.5.tar.gz.sig) = a8c6aeece815c8b7faa8b470b9d9df1253b8d851e2ab8afaa68e53e872a785816f252815921c6a52061d0fc26d14aa1194b6b54eeded2a4d7d2d8eb6c92d48b3 +SHA512 (libnbd-1.21.6.tar.gz) = a242e1536ce69fdf45d1d63fd7366ae4b9cfeb4929bcfeda8748d64c011b7ebb716617148a3c9c86d5cf5076320b0517c48dcd99890dd920a47c87621be056e8 +SHA512 (libnbd-1.21.6.tar.gz.sig) = 1274f3a869a14a39bc4af4b947838e58d6c10512ce0907f07bd5db41ec173d2b566dd96d5412567e50f1322d5804379d09d4384475d4d90a471efcc5f1845c65 From 531f758ec1eba002464151bf8b44e71a823b2c2d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 11:03:38 -0700 Subject: [PATCH 087/116] OCaml 5.3.0 rebuild for Fedora 42 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index f46abcd..82c8e11 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.21.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jan 9 2025 Jerry James - 1.21.6-2 +- OCaml 5.3.0 rebuild for Fedora 42 + * Mon Oct 14 2024 Richard W.M. Jones - 1.21.6-1 - New upstream development version 1.21.6 From 2c10c7b60e56d7dd431ec24d40142ce5500d0188 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:37:54 +0000 Subject: [PATCH 088/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 82c8e11..55b3709 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.21.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 1.21.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 1.21.6-2 - OCaml 5.3.0 rebuild for Fedora 42 From 0ea810d042f2e27484de7632c68401a5d2f114bc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Feb 2025 13:27:00 +0000 Subject: [PATCH 089/116] New upstream stable version 1.22.0 --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 55b3709..8236209 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -17,11 +17,11 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.21-development +%global source_directory 1.22-stable Name: libnbd -Version: 1.21.6 -Release: 3%{?dist} +Version: 1.22.0 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Feb 11 2025 Richard W.M. Jones - 1.22.0-1 +- New upstream stable version 1.22.0 + * Mon Jan 20 2025 Fedora Release Engineering - 1.21.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 477ccc1..252c230 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.21.6.tar.gz) = a242e1536ce69fdf45d1d63fd7366ae4b9cfeb4929bcfeda8748d64c011b7ebb716617148a3c9c86d5cf5076320b0517c48dcd99890dd920a47c87621be056e8 -SHA512 (libnbd-1.21.6.tar.gz.sig) = 1274f3a869a14a39bc4af4b947838e58d6c10512ce0907f07bd5db41ec173d2b566dd96d5412567e50f1322d5804379d09d4384475d4d90a471efcc5f1845c65 +SHA512 (libnbd-1.22.0.tar.gz) = 68204a00d35cd6356e302543f993609cb39fb58c7b5478e9d6a4afafaf6ca91723b8586b4319502aadf546b2e9d5508089ed483a461d7857e6cad9d8f833fa36 +SHA512 (libnbd-1.22.0.tar.gz.sig) = 070a6ead2df7fe5b8158dfd96b8b0ae0c8434d52fa0e903b89f0fe5709a8c361ba8c21e1cb8eecf56abe7093bb0d257422bbeda801a28482625995d99cfa51b6 From 5236afe58a65c26870dc4022d79c17fbd0a59a2e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 3 Mar 2025 16:59:25 +0000 Subject: [PATCH 090/116] New upstream stable version 1.22.1 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 8236209..0a7bcea 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.22-stable Name: libnbd -Version: 1.22.0 +Version: 1.22.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 03 2025 Richard W.M. Jones - 1.22.1-1 +- New upstream stable version 1.22.1 + * Tue Feb 11 2025 Richard W.M. Jones - 1.22.0-1 - New upstream stable version 1.22.0 diff --git a/sources b/sources index 252c230..98368e0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.22.0.tar.gz) = 68204a00d35cd6356e302543f993609cb39fb58c7b5478e9d6a4afafaf6ca91723b8586b4319502aadf546b2e9d5508089ed483a461d7857e6cad9d8f833fa36 -SHA512 (libnbd-1.22.0.tar.gz.sig) = 070a6ead2df7fe5b8158dfd96b8b0ae0c8434d52fa0e903b89f0fe5709a8c361ba8c21e1cb8eecf56abe7093bb0d257422bbeda801a28482625995d99cfa51b6 +SHA512 (libnbd-1.22.1.tar.gz) = 3f265ed59020c394c5e1f46c51d0ae7f3e7e54461739da964ac92b5c4c8bc98ea9813b93342e025f5f770b688d16d155d6e74d715beab482a040115df6be5afa +SHA512 (libnbd-1.22.1.tar.gz.sig) = fd56b7ff28c3c8ecc39dc8433fe8b8e3852b2ce66fe003cb614957f3d6f09850c042f820098fe4a3039863320faf037657cfbafbc3a902ecc0849f771ea544c4 From b18ba076209af469b09e5053be7469c3a068e51f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 31 Mar 2025 10:22:13 +0100 Subject: [PATCH 091/116] New upstream development version 1.23.1 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0a7bcea..deeb55b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -17,10 +17,10 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.22-stable +%global source_directory 1.23-development Name: libnbd -Version: 1.22.1 +Version: 1.23.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 31 2025 Richard W.M. Jones - 1.23.1-1 +- New upstream development version 1.23.1 + * Mon Mar 03 2025 Richard W.M. Jones - 1.22.1-1 - New upstream stable version 1.22.1 diff --git a/sources b/sources index 98368e0..133ea30 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.22.1.tar.gz) = 3f265ed59020c394c5e1f46c51d0ae7f3e7e54461739da964ac92b5c4c8bc98ea9813b93342e025f5f770b688d16d155d6e74d715beab482a040115df6be5afa -SHA512 (libnbd-1.22.1.tar.gz.sig) = fd56b7ff28c3c8ecc39dc8433fe8b8e3852b2ce66fe003cb614957f3d6f09850c042f820098fe4a3039863320faf037657cfbafbc3a902ecc0849f771ea544c4 +SHA512 (libnbd-1.23.1.tar.gz) = eecdf15bf83fe703d0332afdff468ca3a2968fc1c5c1bff256b0ed2c75087a76b01d3a97c641cf88e692558df79ae6a07f62d34af8740838d6772633bf2dba4e +SHA512 (libnbd-1.23.1.tar.gz.sig) = d2e83c92272c92981050006c4451eb9609d783900199fbbbb74ce026a98d3b63189835159e1e519a16681a6eed1266b0a182bd2739d376dd8dcdb14650592e84 From 57639c22ce021fe0857b7cb882fafd4a6cdc1850 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 3 Apr 2025 12:41:39 +0100 Subject: [PATCH 092/116] New upstream development version 1.23.2 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index deeb55b..722da65 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.1 +Version: 1.23.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Apr 03 2025 Richard W.M. Jones - 1.23.2-1 +- New upstream development version 1.23.2 + * Mon Mar 31 2025 Richard W.M. Jones - 1.23.1-1 - New upstream development version 1.23.1 diff --git a/sources b/sources index 133ea30..f5a72f8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.1.tar.gz) = eecdf15bf83fe703d0332afdff468ca3a2968fc1c5c1bff256b0ed2c75087a76b01d3a97c641cf88e692558df79ae6a07f62d34af8740838d6772633bf2dba4e -SHA512 (libnbd-1.23.1.tar.gz.sig) = d2e83c92272c92981050006c4451eb9609d783900199fbbbb74ce026a98d3b63189835159e1e519a16681a6eed1266b0a182bd2739d376dd8dcdb14650592e84 +SHA512 (libnbd-1.23.2.tar.gz) = 146bf8f801ca2f5b2bb819afe3124896757db1ef7a6e17f2682bd89da0d066b12dd46ddc2b0c87ddc37fa91f450fe884d6f116c61d297540d54426d5268ed44f +SHA512 (libnbd-1.23.2.tar.gz.sig) = 09f00a4b64dfaf2d341b357102cf777c436a22806784f71152be0413053976b768e9f813f570a77cca78f1ff9de8e7261c72f2ab3da79624b75fd3897e90c760 From 11e9de17e0ccd88ca7fcef356883f62abfe77826 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Apr 2025 16:01:56 +0100 Subject: [PATCH 093/116] New upstream development version 1.23.3 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 722da65..e9f9a8b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.2 +Version: 1.23.3 Release: 1%{?dist} Summary: NBD client library in userspace @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Apr 22 2025 Richard W.M. Jones - 1.23.3-1 +- New upstream development version 1.23.3 + * Thu Apr 03 2025 Richard W.M. Jones - 1.23.2-1 - New upstream development version 1.23.2 diff --git a/sources b/sources index f5a72f8..c269284 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.2.tar.gz) = 146bf8f801ca2f5b2bb819afe3124896757db1ef7a6e17f2682bd89da0d066b12dd46ddc2b0c87ddc37fa91f450fe884d6f116c61d297540d54426d5268ed44f -SHA512 (libnbd-1.23.2.tar.gz.sig) = 09f00a4b64dfaf2d341b357102cf777c436a22806784f71152be0413053976b768e9f813f570a77cca78f1ff9de8e7261c72f2ab3da79624b75fd3897e90c760 +SHA512 (libnbd-1.23.3.tar.gz) = 4af85d20449ef0e6eba7445d54cddf23925e5d0a4976f1ee6c7fe52dde48f9ba476147be99243351b9d4ef85fa27b510b0745e696aed5072038a043cd60b6703 +SHA512 (libnbd-1.23.3.tar.gz.sig) = 7efab29147f4d9a772f9ce236ded24d0bb609976f6c42035defce5c2c928b368ede28e33c04a2a33db52d6dc402ab459678ea8ccae5d0de5cd3fe120dcfc58a6 From 18db9f91c276c32995a2f240865c33882d5c3a87 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 21:22:48 +0200 Subject: [PATCH 094/116] Rebuilt for Python 3.14 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index e9f9a8b..43ea241 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 02 2025 Python Maint - 1.23.3-2 +- Rebuilt for Python 3.14 + * Tue Apr 22 2025 Richard W.M. Jones - 1.23.3-1 - New upstream development version 1.23.3 From b8617fc9019711ecbe04d49fe42c999ebf0c18b6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Jun 2025 13:43:37 +0100 Subject: [PATCH 095/116] New upstream development version 1.23.4 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 43ea241..c3de112 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.3 -Release: 2%{?dist} +Version: 1.23.4 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jun 05 2025 Richard W.M. Jones - 1.23.4-1 +- New upstream development version 1.23.4 + * Mon Jun 02 2025 Python Maint - 1.23.3-2 - Rebuilt for Python 3.14 diff --git a/sources b/sources index c269284..dd3acc0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.3.tar.gz) = 4af85d20449ef0e6eba7445d54cddf23925e5d0a4976f1ee6c7fe52dde48f9ba476147be99243351b9d4ef85fa27b510b0745e696aed5072038a043cd60b6703 -SHA512 (libnbd-1.23.3.tar.gz.sig) = 7efab29147f4d9a772f9ce236ded24d0bb609976f6c42035defce5c2c928b368ede28e33c04a2a33db52d6dc402ab459678ea8ccae5d0de5cd3fe120dcfc58a6 +SHA512 (libnbd-1.23.4.tar.gz) = 870615431885f6755808a33d287be57ec4b019199daf40a0643d5c6fe4d00d04424a82c55324106f07c96b4004896121654ab545a7c9e05c64728c2fa853f5d4 +SHA512 (libnbd-1.23.4.tar.gz.sig) = 5f6dbb6df1766b16d5ccc490912b297a5c59da851284ff67ff726e89edd2ccadb6fa316d57f6af4572f92f5fccbef3a4debdfbf2d5bd8d5ae5cf555b7df1ef2b From 2c12500745b4f6eade1fdb1e353ba39d5a3b95ce Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 6 Jun 2025 09:30:51 +0200 Subject: [PATCH 096/116] Rebuilt for Python 3.14 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index c3de112..6507770 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jun 06 2025 Python Maint - 1.23.4-2 +- Rebuilt for Python 3.14 + * Thu Jun 05 2025 Richard W.M. Jones - 1.23.4-1 - New upstream development version 1.23.4 From ccf3b02aa3ec4e05c7749fc3c54d99c7566a3b41 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 13:14:27 -0600 Subject: [PATCH 097/116] Rebuild to fix OCaml dependencies --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 6507770..0efccad 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -376,6 +376,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jul 11 2025 Jerry James - 1.23.4-3 +- Rebuild to fix OCaml dependencies + * Fri Jun 06 2025 Python Maint - 1.23.4-2 - Rebuilt for Python 3.14 From a0006d68f89348076b807f7b27c36d28a02d5d5c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 16 Jul 2025 13:28:59 +0100 Subject: [PATCH 098/116] New upstream development version 1.23.5 Add './configure --with-extra' containing downstream package information. --- libnbd.spec | 9 +++++++-- sources | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0efccad..210ab72 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.4 -Release: 3%{?dist} +Version: 1.23.5 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -220,6 +220,7 @@ autoreconf -i %build %configure \ --disable-static \ + --with-extra='%{name}-%{version}-%{release}' \ --with-tls-priority=@LIBNBD,SYSTEM \ --with-bash-completions \ PYTHON=%{__python3} \ @@ -376,6 +377,10 @@ make %{?_smp_mflags} check || { %changelog +* Wed Jul 16 2025 Richard W.M. Jones - 1.23.5-1 +- New upstream development version 1.23.5 +- Add './configure --with-extra' containing downstream package information. + * Fri Jul 11 2025 Jerry James - 1.23.4-3 - Rebuild to fix OCaml dependencies diff --git a/sources b/sources index dd3acc0..75f7e9c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.4.tar.gz) = 870615431885f6755808a33d287be57ec4b019199daf40a0643d5c6fe4d00d04424a82c55324106f07c96b4004896121654ab545a7c9e05c64728c2fa853f5d4 -SHA512 (libnbd-1.23.4.tar.gz.sig) = 5f6dbb6df1766b16d5ccc490912b297a5c59da851284ff67ff726e89edd2ccadb6fa316d57f6af4572f92f5fccbef3a4debdfbf2d5bd8d5ae5cf555b7df1ef2b +SHA512 (libnbd-1.23.5.tar.gz) = f28a37778513f0a8d64b6398d06fb60db7adc25029501624d59045e79ec268e86abff7a5ffd452b80b052a8f6c4840d7d813d2a4231755d1bd99482a4668c165 +SHA512 (libnbd-1.23.5.tar.gz.sig) = 3f0f70538d535972b11f9c5c6ad4eb70d32d7619a48b2e024e46d2a8c64718ce47137cddabb63ff9abedebb81ac3e3b9ac64f99a940c9d57199fc6b2849cbe9d From 09d3b12f3a5321b99ac956f176aa524eb9499ec8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:02:46 +0000 Subject: [PATCH 099/116] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 210ab72..f703bbd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -377,6 +377,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.23.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Richard W.M. Jones - 1.23.5-1 - New upstream development version 1.23.5 - Add './configure --with-extra' containing downstream package information. From 6e02963b5b1e670b9fdea3a405f98394a8749f84 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:56:26 +0200 Subject: [PATCH 100/116] Rebuilt for Python 3.14.0rc2 bytecode --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index f703bbd..6cc9956 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -377,6 +377,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Aug 15 2025 Python Maint - 1.23.5-3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Jul 24 2025 Fedora Release Engineering - 1.23.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 84bc89622929decaf1f9d32f46a48251e44eab9d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 16 Aug 2025 19:16:25 +0100 Subject: [PATCH 101/116] New upstream development version 1.23.6 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 6cc9956..cd0cf4b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.5 -Release: 3%{?dist} +Version: 1.23.6 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -377,6 +377,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Aug 16 2025 Richard W.M. Jones - 1.23.6-1 +- New upstream development version 1.23.6 + * Fri Aug 15 2025 Python Maint - 1.23.5-3 - Rebuilt for Python 3.14.0rc2 bytecode diff --git a/sources b/sources index 75f7e9c..f951d58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.5.tar.gz) = f28a37778513f0a8d64b6398d06fb60db7adc25029501624d59045e79ec268e86abff7a5ffd452b80b052a8f6c4840d7d813d2a4231755d1bd99482a4668c165 -SHA512 (libnbd-1.23.5.tar.gz.sig) = 3f0f70538d535972b11f9c5c6ad4eb70d32d7619a48b2e024e46d2a8c64718ce47137cddabb63ff9abedebb81ac3e3b9ac64f99a940c9d57199fc6b2849cbe9d +SHA512 (libnbd-1.23.6.tar.gz) = ccfd24f0793ffb541e6751452b6c4d5a1ac6f9970ae2ca4621599d5ccfe007bdff0799ac87fcb085ac2d3ff963789fb68ebbc6374d5c3939ef584b02b053de67 +SHA512 (libnbd-1.23.6.tar.gz.sig) = 55746b2cc0a316d506997bb1d54202ce7d8c46410859476c8a37d738c6b44c90ea71d3fd641906ba00a2f852ea5387162e874c5060ecc9fbb08a840841d1736b From a5480b3b28d909be190028b90e81e25a7bc52e94 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 16 Aug 2025 21:25:48 +0100 Subject: [PATCH 102/116] Fix missing ibnbd-python(3) man page error: Installed (but unpackaged) file(s) found: /usr/share/man/man3/libnbd-python.3.gz RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/man/man3/libnbd-python.3.gz --- libnbd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libnbd.spec b/libnbd.spec index cd0cf4b..81605e4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -350,6 +350,7 @@ make %{?_smp_mflags} check || { %{python3_sitearch}/__pycache__/nbd*.py* %{_bindir}/nbdsh %{_mandir}/man1/nbdsh.1* +%{_mandir}/man3/libnbd-python.3* %files -n nbdfuse From 65680b6e8adc7888f71508c36dc41547130f6980 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 23 Aug 2025 17:07:04 +0100 Subject: [PATCH 103/116] New upstream development version 1.23.7 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 81605e4..83dcec7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.6 +Version: 1.23.7 Release: 1%{?dist} Summary: NBD client library in userspace @@ -378,6 +378,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Aug 23 2025 Richard W.M. Jones - 1.23.7-1 +- New upstream development version 1.23.7 + * Sat Aug 16 2025 Richard W.M. Jones - 1.23.6-1 - New upstream development version 1.23.6 diff --git a/sources b/sources index f951d58..f40889c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.6.tar.gz) = ccfd24f0793ffb541e6751452b6c4d5a1ac6f9970ae2ca4621599d5ccfe007bdff0799ac87fcb085ac2d3ff963789fb68ebbc6374d5c3939ef584b02b053de67 -SHA512 (libnbd-1.23.6.tar.gz.sig) = 55746b2cc0a316d506997bb1d54202ce7d8c46410859476c8a37d738c6b44c90ea71d3fd641906ba00a2f852ea5387162e874c5060ecc9fbb08a840841d1736b +SHA512 (libnbd-1.23.7.tar.gz) = a09a3e273829f17f5ba4b7f723afe31704ecd415f08056b308afd064358816548248cf943060acbe308ad581d4a8d236668606907bfc27f49021238a75897fc6 +SHA512 (libnbd-1.23.7.tar.gz.sig) = 67025852dfcea27a6c91c1fdec8245488699d85db25cdeedb339148d1cb3ae3f9102abd54513cc334345beb7b96180b4be80ec6b9aad628a6f4b14d458b62e03 From fc47dd51168f9cdd39c69c22bca864651da00f18 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Aug 2025 15:06:52 +0100 Subject: [PATCH 104/116] Unify Fedora and RHEL 10.2 spec files --- libnbd.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 83dcec7..dbf28be 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -74,7 +74,10 @@ BuildRequires: ocaml-ocamldoc BuildRequires: glib2-devel # For bash-completion. -BuildRequires: bash-completion, bash-completion-devel +BuildRequires: bash-completion +%if !0%{?rhel} +BuildRequires: bash-completion-devel +%endif # Only for running the test suite. BuildRequires: coreutils @@ -366,6 +369,7 @@ make %{?_smp_mflags} check || { %files bash-completion +%if !0%{?rhel} %dir %{bash_completions_dir} %{bash_completions_dir}/nbdcopy %{bash_completions_dir}/nbddump @@ -375,6 +379,17 @@ make %{?_smp_mflags} check || { %if 0%{?have_ublk} %{bash_completions_dir}/nbdublk %endif +%else +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/nbdcopy +%{_datadir}/bash-completion/completions/nbddump +%{_datadir}/bash-completion/completions/nbdfuse +%{_datadir}/bash-completion/completions/nbdinfo +%{_datadir}/bash-completion/completions/nbdsh +%if 0%{?have_ublk} +%{_datadir}/bash-completion/completions/nbdublk +%endif +%endif %changelog From b59ab82af626592037e788a750827403074f674f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 13 Sep 2025 09:44:25 +0100 Subject: [PATCH 105/116] New upstream development version 1.23.8 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index dbf28be..189b7ca 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.7 +Version: 1.23.8 Release: 1%{?dist} Summary: NBD client library in userspace @@ -393,6 +393,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Sep 13 2025 Richard W.M. Jones - 1.23.8-1 +- New upstream development version 1.23.8 + * Sat Aug 23 2025 Richard W.M. Jones - 1.23.7-1 - New upstream development version 1.23.7 diff --git a/sources b/sources index f40889c..cdf6729 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.7.tar.gz) = a09a3e273829f17f5ba4b7f723afe31704ecd415f08056b308afd064358816548248cf943060acbe308ad581d4a8d236668606907bfc27f49021238a75897fc6 -SHA512 (libnbd-1.23.7.tar.gz.sig) = 67025852dfcea27a6c91c1fdec8245488699d85db25cdeedb339148d1cb3ae3f9102abd54513cc334345beb7b96180b4be80ec6b9aad628a6f4b14d458b62e03 +SHA512 (libnbd-1.23.8.tar.gz) = 0cf0b5da2e87442eebc3776f26768b975bf89c0100fb610dca7a4131a8a2504fac4b268698a3a176cebcb511525f78dbe332959141c859df2f94022532e22b43 +SHA512 (libnbd-1.23.8.tar.gz.sig) = 8d945b4caa715399f844583d774b67ca2bdf48febc5ed295bb2127e6a68bba06b8a410cfc7aa36478d4b9c24436e620a1d466f4fccb0853c0aa45fb44d2fca04 From b431f95159a9bc8025298175036fba569e2004e7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 18 Sep 2025 12:15:04 -0400 Subject: [PATCH 106/116] Fix bash-completion conditional ELN (the future RHEL 11) tracks rawhide and therefore also has bash-completion-devel and the %bash_completions_dir macro. --- libnbd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 189b7ca..d238823 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -75,7 +75,7 @@ BuildRequires: glib2-devel # For bash-completion. BuildRequires: bash-completion -%if !0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 11 BuildRequires: bash-completion-devel %endif @@ -369,7 +369,7 @@ make %{?_smp_mflags} check || { %files bash-completion -%if !0%{?rhel} +%if 0%{?fedora} || 0%{?rhel} >= 11 %dir %{bash_completions_dir} %{bash_completions_dir}/nbdcopy %{bash_completions_dir}/nbddump From 9553da9d2224ca1bf3f97a2dcf1a11b37e9f7bfa Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:26:59 +0200 Subject: [PATCH 107/116] Rebuilt for Python 3.14.0rc3 bytecode --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index d238823..be4426e 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -393,6 +393,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 19 2025 Python Maint - 1.23.8-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Sat Sep 13 2025 Richard W.M. Jones - 1.23.8-1 - New upstream development version 1.23.8 From 784e0b4cf2ffb2787555d6dbea7073f750570a83 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 18:22:51 +0100 Subject: [PATCH 108/116] OCaml 5.4.0 rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index be4426e..23050ca 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -393,6 +393,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 1.23.8-3 +- OCaml 5.4.0 rebuild + * Fri Sep 19 2025 Python Maint - 1.23.8-2 - Rebuilt for Python 3.14.0rc3 bytecode From 6589f884576c23d9ff9b20147817a5f2983bd91e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 23 Oct 2025 12:19:11 +0100 Subject: [PATCH 109/116] New upstream development version 1.23.9 Fixes security issue with nbd+ssh URIs https://lists.libguestfs.org/archives/list/guestfs@lists.libguestfs.org/thread/YZMBF3SJRWTRVT5L3KWSNHITFTRMQNTT/ --- libnbd.spec | 9 +++++++-- sources | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 23050ca..50671d2 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.8 -Release: 3%{?dist} +Version: 1.23.9 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -393,6 +393,11 @@ make %{?_smp_mflags} check || { %changelog +* Thu Oct 23 2025 Richard W.M. Jones - 1.23.9-1 +- New upstream development version 1.23.9 +- Fixes security issue with nbd+ssh URIs + https://lists.libguestfs.org/archives/list/guestfs@lists.libguestfs.org/thread/YZMBF3SJRWTRVT5L3KWSNHITFTRMQNTT/ + * Mon Oct 13 2025 Richard W.M. Jones - 1.23.8-3 - OCaml 5.4.0 rebuild diff --git a/sources b/sources index cdf6729..0430f9b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.8.tar.gz) = 0cf0b5da2e87442eebc3776f26768b975bf89c0100fb610dca7a4131a8a2504fac4b268698a3a176cebcb511525f78dbe332959141c859df2f94022532e22b43 -SHA512 (libnbd-1.23.8.tar.gz.sig) = 8d945b4caa715399f844583d774b67ca2bdf48febc5ed295bb2127e6a68bba06b8a410cfc7aa36478d4b9c24436e620a1d466f4fccb0853c0aa45fb44d2fca04 +SHA512 (libnbd-1.23.9.tar.gz) = 0ff4fa3aea2e841fe22990055e073afa7262781d764c05830a14cec64142d5c859411d6cf593f95c12a0a47eb38b1cd6f4bf969af0e229ccc6dc7b44641ede49 +SHA512 (libnbd-1.23.9.tar.gz.sig) = 430c1fa584f593b125f411eaf3fb85d29ec3a7390e66da40534539cb5eacd0f237cff51d89de8a1fc6f61ecae5110b9f7994d595a7ebb1d3363cd37ff9b6ac3b From 9e84e3362d2b1db7354d2bdaec5baba237e869f4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 2 Nov 2025 16:49:45 +0000 Subject: [PATCH 110/116] New upstream development version 1.23.10 New tools nbddiscard and nbdzero. --- libnbd.spec | 14 +++++++++++++- sources | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 50671d2..c7973c5 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.9 +Version: 1.23.10 Release: 1%{?dist} Summary: NBD client library in userspace @@ -351,8 +351,12 @@ make %{?_smp_mflags} check || { %{python3_sitearch}/nbd.py %{python3_sitearch}/nbdsh.py %{python3_sitearch}/__pycache__/nbd*.py* +%{_bindir}/nbddiscard %{_bindir}/nbdsh +%{_bindir}/nbdzero +%{_mandir}/man1/nbddiscard.1* %{_mandir}/man1/nbdsh.1* +%{_mandir}/man1/nbdzero.1* %{_mandir}/man3/libnbd-python.3* @@ -372,6 +376,7 @@ make %{?_smp_mflags} check || { %if 0%{?fedora} || 0%{?rhel} >= 11 %dir %{bash_completions_dir} %{bash_completions_dir}/nbdcopy +%{bash_completions_dir}/nbddiscard %{bash_completions_dir}/nbddump %{bash_completions_dir}/nbdfuse %{bash_completions_dir}/nbdinfo @@ -379,9 +384,11 @@ make %{?_smp_mflags} check || { %if 0%{?have_ublk} %{bash_completions_dir}/nbdublk %endif +%{bash_completions_dir}/nbdzero %else %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/nbdcopy +%{_datadir}/bash-completion/completions/nbddiscard %{_datadir}/bash-completion/completions/nbddump %{_datadir}/bash-completion/completions/nbdfuse %{_datadir}/bash-completion/completions/nbdinfo @@ -389,10 +396,15 @@ make %{?_smp_mflags} check || { %if 0%{?have_ublk} %{_datadir}/bash-completion/completions/nbdublk %endif +%{_datadir}/bash-completion/completions/nbdzero %endif %changelog +* Sun Nov 2 2025 Richard W.M. Jones - 1.23.10-1 +- New upstream development version 1.23.10 +- New tools nbddiscard and nbdzero. + * Thu Oct 23 2025 Richard W.M. Jones - 1.23.9-1 - New upstream development version 1.23.9 - Fixes security issue with nbd+ssh URIs diff --git a/sources b/sources index 0430f9b..5cf63da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.9.tar.gz) = 0ff4fa3aea2e841fe22990055e073afa7262781d764c05830a14cec64142d5c859411d6cf593f95c12a0a47eb38b1cd6f4bf969af0e229ccc6dc7b44641ede49 -SHA512 (libnbd-1.23.9.tar.gz.sig) = 430c1fa584f593b125f411eaf3fb85d29ec3a7390e66da40534539cb5eacd0f237cff51d89de8a1fc6f61ecae5110b9f7994d595a7ebb1d3363cd37ff9b6ac3b +SHA512 (libnbd-1.23.10.tar.gz) = 92dd1812ffe8b58f178d5e7f150e2db9e129d2f7bd44eecc62ce9d796d4f2a8e9a3f018fbd31034bea3687efc46640e3988587cbf187ca93d48c7cec491b5924 +SHA512 (libnbd-1.23.10.tar.gz.sig) = fc1512c628efe9183292bcdd87e313df08677d7a731d5088b3a84c19e8044e7b025954f1f4c3936991d706b65b2dab1d6883dc269fae397047b09793949c8eda From 3c50b616300c55c25858112b9bfc98d9baae5d87 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 4 Nov 2025 16:24:00 -0500 Subject: [PATCH 111/116] rebuild for new fuse3 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index c7973c5..0e81acb 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -21,7 +21,7 @@ Name: libnbd Version: 1.23.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -401,6 +401,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Nov 4 2025 Tom Callaway - 1.23.10-2 +- rebuild for new fuse3 + * Sun Nov 2 2025 Richard W.M. Jones - 1.23.10-1 - New upstream development version 1.23.10 - New tools nbddiscard and nbdzero. From 055f24bfaaf9c2ed1cebb80c6aa59a24b71a3a7b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 14 Nov 2025 14:51:49 +0000 Subject: [PATCH 112/116] New upstream development version 1.23.11 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0e81acb..aa48467 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.10 -Release: 2%{?dist} +Version: 1.23.11 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -401,6 +401,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Nov 14 2025 Richard W.M. Jones - 1.23.11-1 +- New upstream development version 1.23.11 + * Tue Nov 4 2025 Tom Callaway - 1.23.10-2 - rebuild for new fuse3 diff --git a/sources b/sources index 5cf63da..0714208 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.10.tar.gz) = 92dd1812ffe8b58f178d5e7f150e2db9e129d2f7bd44eecc62ce9d796d4f2a8e9a3f018fbd31034bea3687efc46640e3988587cbf187ca93d48c7cec491b5924 -SHA512 (libnbd-1.23.10.tar.gz.sig) = fc1512c628efe9183292bcdd87e313df08677d7a731d5088b3a84c19e8044e7b025954f1f4c3936991d706b65b2dab1d6883dc269fae397047b09793949c8eda +SHA512 (libnbd-1.23.11.tar.gz) = 77b2c26c624690806bc202296dbe1b432bae3c0fc937b5d77cfd86e5100393e709c5a01e7a303eecd852209cc8d4b60fb8831a25ca5b9ffa20108c9a912c116d +SHA512 (libnbd-1.23.11.tar.gz.sig) = 44d629a26337df9d3bbfa1997f7a88c155e0a91e708aaf1632c6e535d3c4e3b7049d03bf36d360d9595fee33d34b7eabacdc63f37d9a4cba0107eda7ecd7df25 From ab7ede0a9b8ae7eef64ec1a52f6bbc9e52d8d54e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 18 Nov 2025 14:02:49 +0000 Subject: [PATCH 113/116] New upstream development version 1.23.12 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index aa48467..c41344f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.11 +Version: 1.23.12 Release: 1%{?dist} Summary: NBD client library in userspace @@ -401,6 +401,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Nov 18 2025 Richard W.M. Jones - 1.23.12-1 +- New upstream development version 1.23.12 + * Fri Nov 14 2025 Richard W.M. Jones - 1.23.11-1 - New upstream development version 1.23.11 diff --git a/sources b/sources index 0714208..3d6436e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.11.tar.gz) = 77b2c26c624690806bc202296dbe1b432bae3c0fc937b5d77cfd86e5100393e709c5a01e7a303eecd852209cc8d4b60fb8831a25ca5b9ffa20108c9a912c116d -SHA512 (libnbd-1.23.11.tar.gz.sig) = 44d629a26337df9d3bbfa1997f7a88c155e0a91e708aaf1632c6e535d3c4e3b7049d03bf36d360d9595fee33d34b7eabacdc63f37d9a4cba0107eda7ecd7df25 +SHA512 (libnbd-1.23.12.tar.gz) = 88dce0f8541af6c08022e63dc3b462c0e06200d748bc46d202c4b9ba1b0c1f4e83a51cc18aaa86ac6fd92647b19c00c60a2795fecfcc3255a9b9b89e3cc2f6b5 +SHA512 (libnbd-1.23.12.tar.gz.sig) = 638d1c8fdfec9b5a3f2e4b44a529d81317b9baace6949166669c947d1f54002591ee0a07edd1d024d4c0ab5b6b15b0271aa642f375ab6f55d23d8771f04d4fcb From b40df154dff16ba8b582093cfdd966d78e8ff609 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Dec 2025 15:15:23 +0000 Subject: [PATCH 114/116] libnbd 1.23.13 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index c41344f..a32e5bf 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.23-development Name: libnbd -Version: 1.23.12 +Version: 1.23.13 Release: 1%{?dist} Summary: NBD client library in userspace @@ -401,6 +401,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Dec 02 2025 Richard W.M. Jones - 1.23.13-1 +- New upstream development version 1.23.13 + * Tue Nov 18 2025 Richard W.M. Jones - 1.23.12-1 - New upstream development version 1.23.12 diff --git a/sources b/sources index 3d6436e..dbb5dc6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.12.tar.gz) = 88dce0f8541af6c08022e63dc3b462c0e06200d748bc46d202c4b9ba1b0c1f4e83a51cc18aaa86ac6fd92647b19c00c60a2795fecfcc3255a9b9b89e3cc2f6b5 -SHA512 (libnbd-1.23.12.tar.gz.sig) = 638d1c8fdfec9b5a3f2e4b44a529d81317b9baace6949166669c947d1f54002591ee0a07edd1d024d4c0ab5b6b15b0271aa642f375ab6f55d23d8771f04d4fcb +SHA512 (libnbd-1.23.13.tar.gz) = 7dc39938332446be61e20c8068c2a66e862fa3b17e6422dc283a42e8161d4b9c1b93077125e6310de15c69cbc02cbc250b5bff2485f130b84a7d783278333565 +SHA512 (libnbd-1.23.13.tar.gz.sig) = 0145b786c6464c167b00ecf5411b113f60aa08c27c64b8aea4c7c059904f757d904b51b3978b8bef59585173ca6695738424bf1c31aa74f4584d3c6255e448d8 From c93b33764611d201be7fadcd7c9ff7b0c5d3c165 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 16 Dec 2025 10:58:49 +0000 Subject: [PATCH 115/116] New upstream stable version 1.24.0 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a32e5bf..b9331d9 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -17,10 +17,10 @@ %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.23-development +%global source_directory 1.24-stable Name: libnbd -Version: 1.23.13 +Version: 1.24.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -401,6 +401,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Dec 16 2025 Richard W.M. Jones - 1.24.0-1 +- New upstream stable version 1.24.0 + * Tue Dec 02 2025 Richard W.M. Jones - 1.23.13-1 - New upstream development version 1.23.13 diff --git a/sources b/sources index dbb5dc6..386e80d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.23.13.tar.gz) = 7dc39938332446be61e20c8068c2a66e862fa3b17e6422dc283a42e8161d4b9c1b93077125e6310de15c69cbc02cbc250b5bff2485f130b84a7d783278333565 -SHA512 (libnbd-1.23.13.tar.gz.sig) = 0145b786c6464c167b00ecf5411b113f60aa08c27c64b8aea4c7c059904f757d904b51b3978b8bef59585173ca6695738424bf1c31aa74f4584d3c6255e448d8 +SHA512 (libnbd-1.24.0.tar.gz) = db05b606a19b3efb6a53c05b5b7ea96571892b7540fff1f4df0c53d0f82e3817f724fd0aa665597b58a4613545b03d7df6e1ac8f3fa64c7f85e824ca2221f3ae +SHA512 (libnbd-1.24.0.tar.gz.sig) = 718b0ebeb3f3fa487682ef93184fc1851f44d3e74695b61e64f32d5de508833dba885aaea9366a29293ad60badce3cfafb8881b61a103559185517a2202fae27 From 52bc4aaa234db59811532c911738d748f56be27f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 12 Jan 2026 15:57:45 -0700 Subject: [PATCH 116/116] Fix a changelog entry --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index b9331d9..704b674 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -450,7 +450,7 @@ make %{?_smp_mflags} check || { - New upstream development version 1.23.5 - Add './configure --with-extra' containing downstream package information. -* Fri Jul 11 2025 Jerry James - 1.23.4-3 +* Fri Jul 11 2025 Jerry James - 1.23.4-3 - Rebuild to fix OCaml dependencies * Fri Jun 06 2025 Python Maint - 1.23.4-2