From e60619c01d6b16a092400541ff94331d839c6761 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2020 15:02:42 +0000 Subject: [PATCH 001/224] OCaml 4.10.0 final (Fedora 32). --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 4c69e6a..dcd0459 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.3.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: NBD client library in userspace License: LGPLv2+ @@ -248,6 +248,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Feb 27 2020 Richard W.M. Jones - 1.3.3-2.1 +- OCaml 4.10.0 final (Fedora 32). + * Wed Feb 26 2020 Richard W.M. Jones - 1.3.3-2 - OCaml 4.10.0 final. From 536e109445642c0e55fa6ea5dae372d749ff44b8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2020 16:52:42 +0000 Subject: [PATCH 002/224] Bump release and rebuild. --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index dcd0459..be74bc7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.3.3 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 Summary: NBD client library in userspace License: LGPLv2+ @@ -248,6 +248,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Feb 27 2020 Richard W.M. Jones - 1.3.3-2.2 +- Bump release and rebuild. + * Thu Feb 27 2020 Richard W.M. Jones - 1.3.3-2.1 - OCaml 4.10.0 final (Fedora 32). From c9a1c8c30de9c0859939e0aee1b408a3f5ca1b93 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 29 Feb 2020 15:26:38 +0000 Subject: [PATCH 003/224] New upstream development version 1.3.4. (cherry picked from commit e71e650b32f9cf4df28e24bab44527dc89b6842f) --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index be74bc7..28cb9ad 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.3 -Release: 2%{?dist}.2 +Version: 1.3.4 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -248,6 +248,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Feb 29 2020 Richard W.M. Jones - 1.3.4-1 +- New upstream development version 1.3.4. + * Thu Feb 27 2020 Richard W.M. Jones - 1.3.3-2.2 - Bump release and rebuild. diff --git a/sources b/sources index 5a385ff..547085c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.3.tar.gz) = d6edf70fa754c604f3cd60bfbaf90a5dba1f7ce23eac87c538ed4dc06f126606c4e43d53d096139e30778a72cfe31f5fa5c867e395bc7ff698272e1d46a84e87 -SHA512 (libnbd-1.3.3.tar.gz.sig) = 41b30f77902bd98c2a6d6b0fcb07d5c8a0163423315d809979648a5f931d05886f0e6b8cf5125292c1460833f8388d3c60d1e1a653c6bdd55d0bf7daf8acec6c +SHA512 (libnbd-1.3.4.tar.gz) = 017096c0de34815a519fcd2026ee85c35fda75283c5638a33d48ff96ee8976baa531e32421ed01e5d250e5011f15faef09c7a52c36ec9b42fe1dfe78ef1ace0a +SHA512 (libnbd-1.3.4.tar.gz.sig) = f4022fd644287b2e6df9d5d2a9bbc50c0b8ac905a12ac825594d440ed4292ff0964e343002f042e02822649850335ae931b7515e71dce38c15199a51389c2535 From d9c8a67de77a36b8a8140c99afcb1c9ca46d1e65 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 10 Mar 2020 21:57:39 +0000 Subject: [PATCH 004/224] New upstream development version 1.3.5. Add new bash-completion subpackage. (cherry picked from commit 84455b03d57a6e84a5f26ce8442b1884b38ce513) --- libnbd.spec | 27 ++++++++++++++++++++++++++- sources | 4 ++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 28cb9ad..86b007b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.4 +Version: 1.3.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -49,6 +49,9 @@ BuildRequires: ocaml-findlib-devel # Only for building the examples. BuildRequires: glib2-devel +# For bash-completion. +BuildRequires: bash-completion + # Only for running the test suite. BuildRequires: gnutls-utils %if 0%{?fedora} >= 31 @@ -138,6 +141,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains FUSE support for %{name}. +%package bash-completion +Summary: Bash tab-completion for %{name} +BuildArch: noarch +Requires: bash-completion >= 2.0 +Requires: %{name}-server = %{version}-%{release} + + +%description bash-completion +Install this package if you want intelligent bash tab-completion +for %{name}. + + %prep %if 0%{verify_tarball_signature} %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' @@ -247,7 +262,17 @@ make %{?_smp_mflags} check || { %{_mandir}/man1/nbdfuse.1* +%files bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/nbdfuse +%{_datadir}/bash-completion/completions/nbdsh + + %changelog +* Tue Mar 10 2020 Richard W.M. Jones - 1.3.5-1 +- New upstream development version 1.3.5. +- Add new bash-completion subpackage. + * Sat Feb 29 2020 Richard W.M. Jones - 1.3.4-1 - New upstream development version 1.3.4. diff --git a/sources b/sources index 547085c..0b9bc05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.4.tar.gz) = 017096c0de34815a519fcd2026ee85c35fda75283c5638a33d48ff96ee8976baa531e32421ed01e5d250e5011f15faef09c7a52c36ec9b42fe1dfe78ef1ace0a -SHA512 (libnbd-1.3.4.tar.gz.sig) = f4022fd644287b2e6df9d5d2a9bbc50c0b8ac905a12ac825594d440ed4292ff0964e343002f042e02822649850335ae931b7515e71dce38c15199a51389c2535 +SHA512 (libnbd-1.3.5.tar.gz) = bd21e7673504a154beb44aab0d2e8b6bd325d5cb1a0f5575c5ee3e100f4539c0b32befab38514a0dfb304dc0245d885a145e8a89a9b3beffd362fee2a0bc77f2 +SHA512 (libnbd-1.3.5.tar.gz.sig) = 6718150401ea748c1575153a1c7e976cb726e5a8071f7b4553af81d42ef18ce37229005cde1c2ec04726a7b422b0cad6dc55b9fc87c85bc5284de2af7a3c9831 From f62121bd8a1ad27ba9d145f51bccb847bb30286b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Mar 2020 10:18:06 +0000 Subject: [PATCH 005/224] Fix bogus runtime Requires of new bash-completion package. (cherry picked from commit 6f99e818808fcca50132686fba8f2b1bf916420b) --- libnbd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 86b007b..b72edda 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -145,7 +145,7 @@ This package contains FUSE support for %{name}. Summary: Bash tab-completion for %{name} BuildArch: noarch Requires: bash-completion >= 2.0 -Requires: %{name}-server = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description bash-completion @@ -269,6 +269,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Mar 11 2020 Richard W.M. Jones - 1.3.5-2 +- Fix bogus runtime Requires of new bash-completion package. + * Tue Mar 10 2020 Richard W.M. Jones - 1.3.5-1 - New upstream development version 1.3.5. - Add new bash-completion subpackage. From 184c483dd94e702f35e9d43e00c107026950290a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 11 Mar 2020 10:28:11 +0000 Subject: [PATCH 006/224] Remove %{?_isa} from noarch package. (cherry picked from commit 452725e80a01b1e140aea31eae10cee5e52a77a9) --- libnbd.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index b72edda..4a7f9ba 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -145,7 +145,9 @@ This package contains FUSE support for %{name}. Summary: Bash tab-completion for %{name} BuildArch: noarch Requires: bash-completion >= 2.0 -Requires: %{name}%{?_isa} = %{version}-%{release} +# Don't use _isa here because it's a noarch package. This dependency +# is just to ensure that the subpackage is updated along with libnbd. +Requires: %{name} = %{version}-%{release} %description bash-completion From d4daf92cff7707f36ab4cfa469211b892dbe7ddd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 31 Mar 2020 18:55:52 +0100 Subject: [PATCH 007/224] New upstream development version 1.3.6. Golang bindings are contained in this release but not distributed. (cherry picked from commit d80bb85d984fc5cd77feda794443b8576137422e) --- libnbd.spec | 14 +++++++++++--- sources | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4a7f9ba..a91829f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.5 -Release: 2%{?dist} +Version: 1.3.6 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -172,7 +172,8 @@ autoreconf -i PYTHON=%{__python3} \ --enable-python \ --enable-ocaml \ - --enable-fuse + --enable-fuse \ + --disable-golang make %{?_smp_mflags} @@ -183,6 +184,9 @@ make %{?_smp_mflags} # Delete libtool crap. 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* + %check # interop/structured-read.sh fails with the old qemu-nbd in Fedora 29, @@ -271,6 +275,10 @@ make %{?_smp_mflags} check || { %changelog +* Tue Mar 31 2020 Richard W.M. Jones - 1.3.6-1 +- New upstream development version 1.3.6. +- Golang bindings are contained in this release but not distributed. + * Wed Mar 11 2020 Richard W.M. Jones - 1.3.5-2 - Fix bogus runtime Requires of new bash-completion package. diff --git a/sources b/sources index 0b9bc05..4c27f4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.5.tar.gz) = bd21e7673504a154beb44aab0d2e8b6bd325d5cb1a0f5575c5ee3e100f4539c0b32befab38514a0dfb304dc0245d885a145e8a89a9b3beffd362fee2a0bc77f2 -SHA512 (libnbd-1.3.5.tar.gz.sig) = 6718150401ea748c1575153a1c7e976cb726e5a8071f7b4553af81d42ef18ce37229005cde1c2ec04726a7b422b0cad6dc55b9fc87c85bc5284de2af7a3c9831 +SHA512 (libnbd-1.3.6.tar.gz) = 2c39b820c95cdc61aceea188d1804f4551a776487543a487bd17357b039036ca15805daf8953e9701d003b2166de305167d7fa578fd3b0fa5e6764caebe9a516 +SHA512 (libnbd-1.3.6.tar.gz.sig) = 6d8eaab14e5853c6c2ffdfbef86ca1362246bc156ac035a12777c59afc827483a65957a0c4fa82b6bc5cc2653fb2a01fe6e21497db46800d935a181cb257044b From 13e7dba005e3e88c5ac8d60fc13871377ac6408e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2020 22:29:33 +0100 Subject: [PATCH 008/224] OCaml 4.11.0 pre-release Add upstream patch to fix one of the tests that fails on slow machines. (cherry picked from commit 78c8600f66ac03e3b619c3f6c137307211bc2e1e) --- 0001-ocaml-Fix-bug-in-asynch-copy-test.patch | 52 ++++++++++++++++++++ libnbd.spec | 8 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-ocaml-Fix-bug-in-asynch-copy-test.patch diff --git a/0001-ocaml-Fix-bug-in-asynch-copy-test.patch b/0001-ocaml-Fix-bug-in-asynch-copy-test.patch new file mode 100644 index 0000000..d59a39b --- /dev/null +++ b/0001-ocaml-Fix-bug-in-asynch-copy-test.patch @@ -0,0 +1,52 @@ +From 0475bfe04a527051c0a37af59a733c4c8554e427 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 17 Apr 2020 22:23:56 +0100 +Subject: [PATCH] ocaml: Fix bug in asynch copy test. + +This program had a subtle bug: If we've read everything from the +source, but there are still source commands in flight, AND it happens +that there are no destination commands in flight, then the loop +finishes prematurely. This is particularly evident when you run the +test on a slow machine (armv7 in Koji is illustrative). The fix is to +check that there are no commands in flight either from the source or +to the destination. + +(I actually discovered this when writing the golang bindings which +copied from the OCaml version, but forgot to make the correction to +the original.) +--- + ocaml/examples/asynch_copy.ml | 3 ++- + ocaml/tests/test_590_aio_copy.ml | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ocaml/examples/asynch_copy.ml b/ocaml/examples/asynch_copy.ml +index d5dcc60..7132f57 100644 +--- a/ocaml/examples/asynch_copy.ml ++++ b/ocaml/examples/asynch_copy.ml +@@ -41,7 +41,8 @@ let asynch_copy src dst = + (* The main loop which runs until we have finished reading and + * there are no more commands in flight. + *) +- while !soff < size || NBD.aio_in_flight dst > 0 do ++ while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0 ++ do + (* If we're able to submit more reads from the source then do so now. *) + if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then ( + let bs = min bs (size -^ !soff) in +diff --git a/ocaml/tests/test_590_aio_copy.ml b/ocaml/tests/test_590_aio_copy.ml +index ac490ef..e3cd59d 100644 +--- a/ocaml/tests/test_590_aio_copy.ml ++++ b/ocaml/tests/test_590_aio_copy.ml +@@ -64,7 +64,8 @@ let asynch_copy src dst = + (* The main loop which runs until we have finished reading and + * there are no more commands in flight. + *) +- while !soff < size || NBD.aio_in_flight dst > 0 do ++ while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0 ++ do + (* If we're able to submit more reads from the source then do so now. *) + if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then ( + let bs = min bs (size -^ !soff) in +-- +2.25.0 + diff --git a/libnbd.spec b/libnbd.spec index a91829f..6a503f3 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.3.6 -Release: 1%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -22,6 +22,9 @@ Source1: http://libguestfs.org/download/libnbd/%{source_directory}/%{name # https://pgp.key-server.io/pks/lookup?search=rjones%40redhat.com&fingerprint=on&op=vindex Source2: libguestfs.keyring +# Upstream patch to fix one of the tests that fails on slow machines. +Patch1: 0001-ocaml-Fix-bug-in-asynch-copy-test.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -275,6 +278,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Apr 17 2020 Richard W.M. Jones - 1.3.6-4 +- Add upstream patch to fix one of the tests that fails on slow machines. + * Tue Mar 31 2020 Richard W.M. Jones - 1.3.6-1 - New upstream development version 1.3.6. - Golang bindings are contained in this release but not distributed. From 3f53b393082a00c9daa21e7d8aff0c4e8cd69685 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 23 Apr 2020 22:38:34 +0100 Subject: [PATCH 009/224] Fix previous incorrectly merged commit. Remove the patch. --- 0001-ocaml-Fix-bug-in-asynch-copy-test.patch | 52 -------------------- libnbd.spec | 3 -- 2 files changed, 55 deletions(-) delete mode 100644 0001-ocaml-Fix-bug-in-asynch-copy-test.patch diff --git a/0001-ocaml-Fix-bug-in-asynch-copy-test.patch b/0001-ocaml-Fix-bug-in-asynch-copy-test.patch deleted file mode 100644 index d59a39b..0000000 --- a/0001-ocaml-Fix-bug-in-asynch-copy-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0475bfe04a527051c0a37af59a733c4c8554e427 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Fri, 17 Apr 2020 22:23:56 +0100 -Subject: [PATCH] ocaml: Fix bug in asynch copy test. - -This program had a subtle bug: If we've read everything from the -source, but there are still source commands in flight, AND it happens -that there are no destination commands in flight, then the loop -finishes prematurely. This is particularly evident when you run the -test on a slow machine (armv7 in Koji is illustrative). The fix is to -check that there are no commands in flight either from the source or -to the destination. - -(I actually discovered this when writing the golang bindings which -copied from the OCaml version, but forgot to make the correction to -the original.) ---- - ocaml/examples/asynch_copy.ml | 3 ++- - ocaml/tests/test_590_aio_copy.ml | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ocaml/examples/asynch_copy.ml b/ocaml/examples/asynch_copy.ml -index d5dcc60..7132f57 100644 ---- a/ocaml/examples/asynch_copy.ml -+++ b/ocaml/examples/asynch_copy.ml -@@ -41,7 +41,8 @@ let asynch_copy src dst = - (* The main loop which runs until we have finished reading and - * there are no more commands in flight. - *) -- while !soff < size || NBD.aio_in_flight dst > 0 do -+ while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0 -+ do - (* If we're able to submit more reads from the source then do so now. *) - if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then ( - let bs = min bs (size -^ !soff) in -diff --git a/ocaml/tests/test_590_aio_copy.ml b/ocaml/tests/test_590_aio_copy.ml -index ac490ef..e3cd59d 100644 ---- a/ocaml/tests/test_590_aio_copy.ml -+++ b/ocaml/tests/test_590_aio_copy.ml -@@ -64,7 +64,8 @@ let asynch_copy src dst = - (* The main loop which runs until we have finished reading and - * there are no more commands in flight. - *) -- while !soff < size || NBD.aio_in_flight dst > 0 do -+ while !soff < size || NBD.aio_in_flight src > 0 || NBD.aio_in_flight dst > 0 -+ do - (* If we're able to submit more reads from the source then do so now. *) - if !soff < size && NBD.aio_in_flight src < max_reads_in_flight then ( - let bs = min bs (size -^ !soff) in --- -2.25.0 - diff --git a/libnbd.spec b/libnbd.spec index e04f259..7fb187e 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -22,9 +22,6 @@ Source1: http://libguestfs.org/download/libnbd/%{source_directory}/%{name # https://pgp.key-server.io/pks/lookup?search=rjones%40redhat.com&fingerprint=on&op=vindex Source2: libguestfs.keyring -# Upstream patch to fix one of the tests that fails on slow machines. -Patch1: 0001-ocaml-Fix-bug-in-asynch-copy-test.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif From 70cf68113590d8f54c51827470520e1a1bd616fc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Jul 2020 11:22:33 +0100 Subject: [PATCH 010/224] New upstream version 1.3.8. New tool: nbdcopy --- libnbd.spec | 9 ++++++++- sources | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 7fb187e..6847358 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.7 +Version: 1.3.8 Release: 1%{?dist} Summary: NBD client library in userspace @@ -219,7 +219,9 @@ make %{?_smp_mflags} check || { %files %doc README %license COPYING.LIB +%{_bindir}/nbdcopy %{_libdir}/libnbd.so.* +%{_mandir}/man1/nbdcopy.1* %files devel @@ -270,11 +272,16 @@ make %{?_smp_mflags} check || { %files bash-completion %dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/nbdcopy %{_datadir}/bash-completion/completions/nbdfuse %{_datadir}/bash-completion/completions/nbdsh %changelog +* Fri Jul 17 2020 Richard W.M. Jones - 1.3.8-1 +- New upstream version 1.3.8. +- New tool: nbdcopy + * Thu Apr 23 2020 Richard W.M. Jones - 1.3.7-1 - New upstream version 1.3.7. diff --git a/sources b/sources index add6f4a..c910683 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.7.tar.gz) = 28980a8b4200ec41a6e344ca34e3fcfb27fb7a896b93e0883709da1804b310b1dbc76e9313524934909fd1ce55f019d2fa72d7058ea8db00f44795fdaa8e33b2 -SHA512 (libnbd-1.3.7.tar.gz.sig) = fc7a13d957dbc2595301d14f45674ae700f98d50ef57577cd5ce2ce4a33df043423f9ee41e44c06637d29a0728a0a526887a33b3d3dfe8cd175a535e00836a11 +SHA512 (libnbd-1.3.8.tar.gz) = 01fb1c2a47e7db695e39de0331ca4db5e2a25a556d113e83ab5d393d6cbdfc4a1824e6add9f58a59807e92842c748c92ce37c3ea1b54468528d131139ce3d5c9 +SHA512 (libnbd-1.3.8.tar.gz.sig) = 488633083633c3e9c9ebdb91c0f69005f1ad508c9d175502bedfc3277d3f672477e62c4ed9058d5767083839739f7e6269628cb427d2ba8d6b1f551ceb559a1a From a18a0f1ce6395bc2dd151978dec9116829aacebe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Jul 2020 11:15:24 +0100 Subject: [PATCH 011/224] New upstream version 1.3.9. New tool: nbdinfo. (cherry picked from commit 4f792d0a40bec844b00294d1cb009fee449eb631) --- libnbd.spec | 9 ++++++++- sources | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 6847358..d20e58c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.8 +Version: 1.3.9 Release: 1%{?dist} Summary: NBD client library in userspace @@ -220,8 +220,10 @@ make %{?_smp_mflags} check || { %doc README %license COPYING.LIB %{_bindir}/nbdcopy +%{_bindir}/nbdinfo %{_libdir}/libnbd.so.* %{_mandir}/man1/nbdcopy.1* +%{_mandir}/man1/nbdinfo.1* %files devel @@ -274,10 +276,15 @@ make %{?_smp_mflags} check || { %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/nbdcopy %{_datadir}/bash-completion/completions/nbdfuse +%{_datadir}/bash-completion/completions/nbdinfo %{_datadir}/bash-completion/completions/nbdsh %changelog +* Tue Jul 21 2020 Richard W.M. Jones - 1.3.9-1 +- New upstream version 1.3.9. +- New tool: nbdinfo. + * Fri Jul 17 2020 Richard W.M. Jones - 1.3.8-1 - New upstream version 1.3.8. - New tool: nbdcopy diff --git a/sources b/sources index c910683..cd9ff07 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.8.tar.gz) = 01fb1c2a47e7db695e39de0331ca4db5e2a25a556d113e83ab5d393d6cbdfc4a1824e6add9f58a59807e92842c748c92ce37c3ea1b54468528d131139ce3d5c9 -SHA512 (libnbd-1.3.8.tar.gz.sig) = 488633083633c3e9c9ebdb91c0f69005f1ad508c9d175502bedfc3277d3f672477e62c4ed9058d5767083839739f7e6269628cb427d2ba8d6b1f551ceb559a1a +SHA512 (libnbd-1.3.9.tar.gz) = 4af441f7d1ca0b2b5f1afdbf06af7f2c68378e3168bb2b75901ebe09dfde009ca81c314cc7fbb03516f4ddc92309aa68cb5bc4d21fd8719c155c094e80a39ff2 +SHA512 (libnbd-1.3.9.tar.gz.sig) = cf453012ee2098a6eeb5844845f4d385cebc55d3d51a4f301f7be710f8eb1babd6a45cf2e5a17cb0eb02f39a911a44faee02f5a247d1e8cc8b6652798e930e28 From 6b5abd76b32cb21502a6e378de0d835deff6c5dd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Aug 2020 17:40:26 +0100 Subject: [PATCH 012/224] New upstream version 1.3.10. (cherry picked from commit 8b50ca5ec6d456361db5c60a61cfd355c1dd680c) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index d20e58c..3845441 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.9 +Version: 1.3.10 Release: 1%{?dist} Summary: NBD client library in userspace @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Aug 4 2020 Richard W.M. Jones - 1.3.10-1 +- New upstream version 1.3.10. + * Tue Jul 21 2020 Richard W.M. Jones - 1.3.9-1 - New upstream version 1.3.9. - New tool: nbdinfo. diff --git a/sources b/sources index cd9ff07..3fe58d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.9.tar.gz) = 4af441f7d1ca0b2b5f1afdbf06af7f2c68378e3168bb2b75901ebe09dfde009ca81c314cc7fbb03516f4ddc92309aa68cb5bc4d21fd8719c155c094e80a39ff2 -SHA512 (libnbd-1.3.9.tar.gz.sig) = cf453012ee2098a6eeb5844845f4d385cebc55d3d51a4f301f7be710f8eb1babd6a45cf2e5a17cb0eb02f39a911a44faee02f5a247d1e8cc8b6652798e930e28 +SHA512 (libnbd-1.3.10.tar.gz) = 51703d0bc4ea862e7d38d61bbed95388d30c6fbe65cad4aee3bad0309ed5a6a12b51e6087de7bc4dbadc7cbaadf0092c97513e1d21f6477babcbae4c8fc4fe55 +SHA512 (libnbd-1.3.10.tar.gz.sig) = 32849b01cb63fd43367665184b82372315eb067fdf805f00a1bca5512211639f626d4b702a8bcef542b26627b5be44ce6235e5658843c929e77129616fc03d90 From fdd890b4dd808e8932207fe6c5e78536a6b32ab5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 6 Aug 2020 16:29:27 +0100 Subject: [PATCH 013/224] New upstream version 1.3.11. (cherry picked from commit d0c412677dd2d0ad42377392e0a01708183b25cd) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 3845441..d13fa1a 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.10 +Version: 1.3.11 Release: 1%{?dist} Summary: NBD client library in userspace @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Aug 6 2020 Richard W.M. Jones - 1.3.11-1 +- New upstream version 1.3.11. + * Tue Aug 4 2020 Richard W.M. Jones - 1.3.10-1 - New upstream version 1.3.10. diff --git a/sources b/sources index 3fe58d9..af34e76 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.10.tar.gz) = 51703d0bc4ea862e7d38d61bbed95388d30c6fbe65cad4aee3bad0309ed5a6a12b51e6087de7bc4dbadc7cbaadf0092c97513e1d21f6477babcbae4c8fc4fe55 -SHA512 (libnbd-1.3.10.tar.gz.sig) = 32849b01cb63fd43367665184b82372315eb067fdf805f00a1bca5512211639f626d4b702a8bcef542b26627b5be44ce6235e5658843c929e77129616fc03d90 +SHA512 (libnbd-1.3.11.tar.gz) = e5ca8eb76697f4ae97ab0497f3f0c6496b1fa100a851b16ace798087bd2ac1cddcb96dd8b70029f4e4b0c0fb0bd5647026a38bff2a67ce277a076f4a6b97ee92 +SHA512 (libnbd-1.3.11.tar.gz.sig) = b8ee2cb470c57c7a1adecbbd9eb6095c80a08b62d1b3f6d4829018ee7d3188d2b48f9d04521de8152227f71dc1ca183eb6ffd809f99070126af7bda9fdba8d90 From dc9d3f7fdea97e14022f13e174cbaceb4297708f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 20 Aug 2020 16:34:40 +0100 Subject: [PATCH 014/224] New upstream version 1.3.12. (cherry picked from commit 2f5d7ec5751a6f55c701807c9ed1e30fcf7a6494) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index d13fa1a..83f898d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.3-development Name: libnbd -Version: 1.3.11 +Version: 1.3.12 Release: 1%{?dist} Summary: NBD client library in userspace @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Aug 20 2020 Richard W.M. Jones - 1.3.12-1 +- New upstream version 1.3.12. + * Thu Aug 6 2020 Richard W.M. Jones - 1.3.11-1 - New upstream version 1.3.11. diff --git a/sources b/sources index af34e76..e4547ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.11.tar.gz) = e5ca8eb76697f4ae97ab0497f3f0c6496b1fa100a851b16ace798087bd2ac1cddcb96dd8b70029f4e4b0c0fb0bd5647026a38bff2a67ce277a076f4a6b97ee92 -SHA512 (libnbd-1.3.11.tar.gz.sig) = b8ee2cb470c57c7a1adecbbd9eb6095c80a08b62d1b3f6d4829018ee7d3188d2b48f9d04521de8152227f71dc1ca183eb6ffd809f99070126af7bda9fdba8d90 +SHA512 (libnbd-1.3.12.tar.gz) = 7b4a55b2bd31b3a851d73861e7caebd1764eb05547c953132cb94fb7898aba5c40d19d7f88b91013332ae24806f5273490f8ce2fcf885e8be29919fbaee63209 +SHA512 (libnbd-1.3.12.tar.gz.sig) = 34da1132a7a22516c2df152e77ed7d4e8cbca7383c5a77dd13173c1c5b4c5d6fb43c96fde29a125878d13cb667dc7a2caae2957dff13825f6a0e0891996f9966 From b698a0a93df90d70c41b309eb6177e8cdc597e58 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 25 Aug 2020 21:02:10 +0100 Subject: [PATCH 015/224] New stable release 1.4.0. (cherry picked from commit 97b5eb6936a1eea242cb28021794348a845576f2) --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 83f898d..f447ad6 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,10 +5,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.3-development +%global source_directory 1.4-stable Name: libnbd -Version: 1.3.12 +Version: 1.4.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Aug 25 2020 Richard W.M. Jones - 1.4.0-1 +- New stable release 1.4.0. + * Thu Aug 20 2020 Richard W.M. Jones - 1.3.12-1 - New upstream version 1.3.12. diff --git a/sources b/sources index e4547ca..cdf8cae 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.3.12.tar.gz) = 7b4a55b2bd31b3a851d73861e7caebd1764eb05547c953132cb94fb7898aba5c40d19d7f88b91013332ae24806f5273490f8ce2fcf885e8be29919fbaee63209 -SHA512 (libnbd-1.3.12.tar.gz.sig) = 34da1132a7a22516c2df152e77ed7d4e8cbca7383c5a77dd13173c1c5b4c5d6fb43c96fde29a125878d13cb667dc7a2caae2957dff13825f6a0e0891996f9966 +SHA512 (libnbd-1.4.0.tar.gz) = 19f4b64cb76d4dfd813c04393030a2cba4015e2e9b05c8e9becf5baad8029ff38cf5327149a28266b6af78d26740d73ccbbe2adf57c47dc53592b4f28a683330 +SHA512 (libnbd-1.4.0.tar.gz.sig) = a0303a55a45af68b5409b5be4d7e4cee5b1c74157579a3307bfd201eaf222e150a7c16b8e3b58eae5a98b645be8d9eca40b54908d42a3bacad2ab05f4b61722c From 509151fd41071a61fb1812f24e271e7a53934316 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 2 Sep 2020 21:05:40 +0100 Subject: [PATCH 016/224] Bump release and rebuild. --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 8a8b657..c502bdd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.4.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: NBD client library in userspace License: LGPLv2+ @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Sep 02 2020 Richard W.M. Jones - 1.4.0-2.1 +- Bump release and rebuild. + * Tue Sep 01 2020 Richard W.M. Jones - 1.4.0-2 - OCaml 4.11.1 rebuild From b15097d621423eb63a43dbc66d797233f0d2835a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 10 Sep 2020 10:28:40 +0100 Subject: [PATCH 017/224] New stable version 1.4.1. --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index c502bdd..490cd53 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.4-stable Name: libnbd -Version: 1.4.0 -Release: 2%{?dist}.1 +Version: 1.4.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Sep 10 2020 Richard W.M. Jones - 1.4.1-1 +- New stable version 1.4.1. + * Wed Sep 02 2020 Richard W.M. Jones - 1.4.0-2.1 - Bump release and rebuild. diff --git a/sources b/sources index cdf8cae..c12b0d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.4.0.tar.gz) = 19f4b64cb76d4dfd813c04393030a2cba4015e2e9b05c8e9becf5baad8029ff38cf5327149a28266b6af78d26740d73ccbbe2adf57c47dc53592b4f28a683330 -SHA512 (libnbd-1.4.0.tar.gz.sig) = a0303a55a45af68b5409b5be4d7e4cee5b1c74157579a3307bfd201eaf222e150a7c16b8e3b58eae5a98b645be8d9eca40b54908d42a3bacad2ab05f4b61722c +SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3 +SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed From 6ec77bd6442139d00c14d38e20d7580a7c72e04d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 10 Sep 2020 10:28:40 +0100 Subject: [PATCH 018/224] New stable version 1.4.1. (cherry picked from commit b15097d621423eb63a43dbc66d797233f0d2835a) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f447ad6..1d66529 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.4-stable Name: libnbd -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Sep 10 2020 Richard W.M. Jones - 1.4.1-1 +- New stable version 1.4.1. + * Tue Aug 25 2020 Richard W.M. Jones - 1.4.0-1 - New stable release 1.4.0. diff --git a/sources b/sources index cdf8cae..c12b0d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.4.0.tar.gz) = 19f4b64cb76d4dfd813c04393030a2cba4015e2e9b05c8e9becf5baad8029ff38cf5327149a28266b6af78d26740d73ccbbe2adf57c47dc53592b4f28a683330 -SHA512 (libnbd-1.4.0.tar.gz.sig) = a0303a55a45af68b5409b5be4d7e4cee5b1c74157579a3307bfd201eaf222e150a7c16b8e3b58eae5a98b645be8d9eca40b54908d42a3bacad2ab05f4b61722c +SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3 +SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed From b011dda559537db245e0213605577659b42f62a8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Sep 2020 20:45:13 +0100 Subject: [PATCH 019/224] Rebuild in side tag for OCaml 4.11.1 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 490cd53..15541d0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 11 2020 Richard W.M. Jones - 1.4.1-2 +- Rebuild in side tag for OCaml 4.11.1 + * Thu Sep 10 2020 Richard W.M. Jones - 1.4.1-1 - New stable version 1.4.1. From 511060422d6e10e6a7004ca4de2f09348a945609 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Sep 2020 20:45:59 +0100 Subject: [PATCH 020/224] Make sure version < Rawhide. --- libnbd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 15541d0..06845c7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.4.1 -Release: 2%{?dist} +Release: 1%{?dist}.1 Summary: NBD client library in userspace License: LGPLv2+ @@ -281,7 +281,7 @@ make %{?_smp_mflags} check || { %changelog -* Fri Sep 11 2020 Richard W.M. Jones - 1.4.1-2 +* Fri Sep 11 2020 Richard W.M. Jones - 1.4.1-1.fc33.1 - Rebuild in side tag for OCaml 4.11.1 * Thu Sep 10 2020 Richard W.M. Jones - 1.4.1-1 From 86b44caab7b3075c44a2ed96744906f13cd86ba4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 26 Sep 2020 20:26:30 +0100 Subject: [PATCH 021/224] Rebuild for OCaml 4.11.1 in Fedora 33. --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 06845c7..ef917e4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.4.1 -Release: 1%{?dist}.1 +Release: 2%{?dist}.1 Summary: NBD client library in userspace License: LGPLv2+ @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Sep 26 2020 Richard W.M. Jones - 1.4.1-2.1 +- Rebuild for OCaml 4.11.1 in Fedora 33. + * Fri Sep 11 2020 Richard W.M. Jones - 1.4.1-1.fc33.1 - Rebuild in side tag for OCaml 4.11.1 From b66d579e9f7e6f9892846f55eadaff854d3a688d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 12 Dec 2020 21:44:23 +0000 Subject: [PATCH 022/224] New stable version 1.4.2. --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index ef917e4..186bbdb 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.4-stable Name: libnbd -Version: 1.4.1 -Release: 2%{?dist}.1 +Version: 1.4.2 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Dec 12 2020 Richard W.M. Jones - 1.4.2-1 +- New stable version 1.4.2. + * Sat Sep 26 2020 Richard W.M. Jones - 1.4.1-2.1 - Rebuild for OCaml 4.11.1 in Fedora 33. diff --git a/sources b/sources index c12b0d8..c471f98 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3 -SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed +SHA512 (libnbd-1.4.2.tar.gz) = c8ec95b0bc72ff401fbf8072758513cce601dfa542b5165a19fcb21cee5548db31b567514a8ee6313d9aa5f0170c508bacc82391542bf497b6c5db461b0c8956 +SHA512 (libnbd-1.4.2.tar.gz.sig) = 58109d0d68ee77068873c70b75e8f0686bd71c0e17e3e197bafa0e192bf410565acbe351da46cf270e2506c37760fd853811647b4249439cabb2c52ae5c58e0a From eb61dcd55592db1b88c5d00c8549dcabd74d89d3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 12 Dec 2020 21:44:23 +0000 Subject: [PATCH 023/224] New stable version 1.4.2. (cherry picked from commit b66d579e9f7e6f9892846f55eadaff854d3a688d) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 1d66529..ec5a99c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.4-stable Name: libnbd -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -281,6 +281,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Dec 12 2020 Richard W.M. Jones - 1.4.2-1 +- New stable version 1.4.2. + * Thu Sep 10 2020 Richard W.M. Jones - 1.4.1-1 - New stable version 1.4.1. diff --git a/sources b/sources index c12b0d8..c471f98 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.4.1.tar.gz) = 5787fdf97a16dc35dbd628adad7953dbff034dd44fd7acf99064eae512d27107665e5fc3f990c7be139f2657a30f961be6a399aaa19aa4b15c5ee9c0df74cef3 -SHA512 (libnbd-1.4.1.tar.gz.sig) = 85cf0ef0d5e56d8cfca627eeb1a8c48e102392d96facaf2d7c79fb045c095744cc99b0cd0544acd27a47b828dbe8a8a707ebf47a0238c221497591c54c2639ed +SHA512 (libnbd-1.4.2.tar.gz) = c8ec95b0bc72ff401fbf8072758513cce601dfa542b5165a19fcb21cee5548db31b567514a8ee6313d9aa5f0170c508bacc82391542bf497b6c5db461b0c8956 +SHA512 (libnbd-1.4.2.tar.gz.sig) = 58109d0d68ee77068873c70b75e8f0686bd71c0e17e3e197bafa0e192bf410565acbe351da46cf270e2506c37760fd853811647b4249439cabb2c52ae5c58e0a From 184572b10fbe56a9f5d0711eff5aa580aae53887 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jan 2021 18:40:58 +0000 Subject: [PATCH 024/224] Fix bogus year in changelog. --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 095a4f1..c4d4da0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -292,7 +292,7 @@ make %{?_smp_mflags} check || { %changelog -* Thu Jan 07 2020 Richard W.M. Jones - 1.6.0-1 +* Thu Jan 07 2021 Richard W.M. Jones - 1.6.0-1 - New upstream development version 1.6.0. * Tue Dec 08 2020 Richard W.M. Jones - 1.5.9-1 From e25c83b33b64e38e463a2ee229689d558f86668c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jan 2021 18:40:58 +0000 Subject: [PATCH 025/224] Fix bogus year in changelog. (cherry picked from commit 184572b10fbe56a9f5d0711eff5aa580aae53887) --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 8ad6ef0..402ec58 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -292,7 +292,7 @@ make %{?_smp_mflags} check || { %changelog -* Thu Jan 07 2020 Richard W.M. Jones - 1.6.0-1 +* Thu Jan 07 2021 Richard W.M. Jones - 1.6.0-1 - New upstream development version 1.6.0. * Sat Dec 12 2020 Richard W.M. Jones - 1.4.2-1 From 91281b622f4826f92649cb8c3e15fab7a434aca5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 20 Jan 2021 13:31:48 +0000 Subject: [PATCH 026/224] New upstream development version 1.7.1. --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index c4d4da0..d31ff26 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,10 +5,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.6-stable +%global source_directory 1.7-development Name: libnbd -Version: 1.6.0 +Version: 1.7.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -292,8 +292,11 @@ make %{?_smp_mflags} check || { %changelog +* Wed Jan 20 2021 Richard W.M. Jones - 1.7.1-1 +- New upstream development version 1.7.1. + * Thu Jan 07 2021 Richard W.M. Jones - 1.6.0-1 -- New upstream development version 1.6.0. +- New upstream stable version 1.6.0. * Tue Dec 08 2020 Richard W.M. Jones - 1.5.9-1 - New upstream development version 1.5.9. diff --git a/sources b/sources index 4925abf..50afe22 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.6.0.tar.gz) = 4bdd8a52bef6fb136bbb4034cd4521952e1a634334ed193e4883e4bf93baa59b01439135527a4cfeaa3ae9cb92ae70a330d93156666b86c048469c1f5b74ce5f -SHA512 (libnbd-1.6.0.tar.gz.sig) = e487ceece815b4e77a1a5977c6f8173599e12478514f0f014b1ffa7e69467411dbdb77c4b2f16aca5e4fa0f1bac35ab7f57e591db6af085d5e87b21448958c69 +SHA512 (libnbd-1.7.1.tar.gz) = a1ac588474ac1994522c2ca5c910c89c8d6831aaaadbf18874589a004b311c0d3883b196bf95b51610aaf7b704ff8fd781cc2657ec299f97c537209440848739 +SHA512 (libnbd-1.7.1.tar.gz.sig) = ff0752408c976ff6d351951e3697e5350361070483fc11039a850cf15b26991b65f65cddb7f5a6f34c3abb1195a10d8062b737e61a6103a4ba7c8c7ae9b0b09f From fb3c10f728e24a9b92e7abacd6b4915a55a2730f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 20 Jan 2021 13:31:51 +0000 Subject: [PATCH 027/224] New upstream stable version 1.6.1. --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 402ec58..6be2133 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.6-stable Name: libnbd -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -292,8 +292,11 @@ make %{?_smp_mflags} check || { %changelog +* Wed Jan 20 2021 Richard W.M. Jones - 1.6.1-1 +- New upstream stable version 1.6.1. + * Thu Jan 07 2021 Richard W.M. Jones - 1.6.0-1 -- New upstream development version 1.6.0. +- New upstream stable version 1.6.0. * Sat Dec 12 2020 Richard W.M. Jones - 1.4.2-1 - New stable version 1.4.2. diff --git a/sources b/sources index 4925abf..59c1752 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.6.0.tar.gz) = 4bdd8a52bef6fb136bbb4034cd4521952e1a634334ed193e4883e4bf93baa59b01439135527a4cfeaa3ae9cb92ae70a330d93156666b86c048469c1f5b74ce5f -SHA512 (libnbd-1.6.0.tar.gz.sig) = e487ceece815b4e77a1a5977c6f8173599e12478514f0f014b1ffa7e69467411dbdb77c4b2f16aca5e4fa0f1bac35ab7f57e591db6af085d5e87b21448958c69 +SHA512 (libnbd-1.6.1.tar.gz) = 8a8acf9f0abbe44098dcbd425526c46bc2c75a4c1e9e6e6c874cf42f875fcd0fe41a43ebfc8718babbc56825bafbf25d6b47f865003eb1779ab37e8d72725919 +SHA512 (libnbd-1.6.1.tar.gz.sig) = a2358d133637face6fa75020fa2162a231762c2047e7b24fd22a54020f96ec3e0c7e568d94a82b030520ad90db1ad4f29dee9197ad5685b651d03dfc8634981b From 0943b0aed7ec48481e64740199dd32b74365a6a3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 21 Jan 2021 16:26:59 +0000 Subject: [PATCH 028/224] Drop BR nbdkit-sparse-random-plugin. Only needed to run a small part of the test suite, and it's not available in F32. --- libnbd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 99b58a9..0a172d4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -69,7 +69,6 @@ BuildRequires: nbdkit-memory-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-pattern-plugin BuildRequires: nbdkit-sh-plugin -BuildRequires: nbdkit-sparse-random-plugin BuildRequires: nbd BuildRequires: qemu-img BuildRequires: util-linux From 26d7189fc3d38db7bbd436ae0f1e2b271e140cee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:35:06 +0000 Subject: [PATCH 029/224] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 d31ff26..7488f81 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -292,6 +292,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Richard W.M. Jones - 1.7.1-1 - New upstream development version 1.7.1. From 26b60ce381dca173d32befad52fd159942b68eb2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 28 Jan 2021 22:58:15 +0000 Subject: [PATCH 030/224] Disable BR nbdkit on i686 because it breaks ELN/RHEL 9. --- libnbd.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 7488f81..4eac8f5 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -62,6 +62,15 @@ BuildRequires: coreutils BuildRequires: gcc-c++ BuildRequires: gnutls-utils BuildRequires: jq +BuildRequires: nbd +BuildRequires: qemu-img +BuildRequires: util-linux + +# On RHEL, maybe even in Fedora in future, we do not build nbdkit for +# i686. nbdkit is only needed for the test suite so make it optional. +# This reduces our test exposure on 32 bit platforms, although there +# is still Fedora/armv7 and some upstream testing. +%ifnarch %{ix86} BuildRequires: nbdkit BuildRequires: nbdkit-data-plugin BuildRequires: nbdkit-eval-plugin @@ -70,9 +79,7 @@ BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-pattern-plugin BuildRequires: nbdkit-sh-plugin BuildRequires: nbdkit-sparse-random-plugin -BuildRequires: nbd -BuildRequires: qemu-img -BuildRequires: util-linux +%endif %description @@ -292,6 +299,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jan 28 2021 Richard W.M. Jones - 1.7.1-3 +- Disable BR nbdkit on i686 because it breaks ELN/RHEL 9. + * Tue Jan 26 2021 Fedora Release Engineering - 1.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 77f5ff090fa1f4e0519636ab7060a7bc52510c8b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Jan 2021 09:15:14 +0000 Subject: [PATCH 031/224] Disable BR: nbdkit-sparse-random-plugin temporarily. For RHEL 9 ... --- libnbd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4eac8f5..e1666f9 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -78,7 +78,7 @@ BuildRequires: nbdkit-memory-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-pattern-plugin BuildRequires: nbdkit-sh-plugin -BuildRequires: nbdkit-sparse-random-plugin +#BuildRequires: nbdkit-sparse-random-plugin %endif From e4160545b0e905841907a0aa7108f0bf9a3f3e55 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Jan 2021 17:31:34 +0000 Subject: [PATCH 032/224] Disable BR qemu-img on i686. --- libnbd.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index e1666f9..8850d03 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -63,14 +63,14 @@ BuildRequires: gcc-c++ BuildRequires: gnutls-utils BuildRequires: jq BuildRequires: nbd -BuildRequires: qemu-img BuildRequires: util-linux -# On RHEL, maybe even in Fedora in future, we do not build nbdkit for -# i686. nbdkit is only needed for the test suite so make it optional. -# This reduces our test exposure on 32 bit platforms, although there -# is still Fedora/armv7 and some upstream testing. +# On RHEL, maybe even in Fedora in future, we do not build qemu-img or +# nbdkit for i686. These are only needed for the test suite so make +# them optional. This reduces our test exposure on 32 bit platforms, +# although there is still Fedora/armv7 and some upstream testing. %ifnarch %{ix86} +BuildRequires: qemu-img BuildRequires: nbdkit BuildRequires: nbdkit-data-plugin BuildRequires: nbdkit-eval-plugin @@ -299,6 +299,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jan 29 2021 Richard W.M. Jones - 1.7.1-5 +- Disable BR qemu-img on i686. + * Thu Jan 28 2021 Richard W.M. Jones - 1.7.1-3 - Disable BR nbdkit on i686 because it breaks ELN/RHEL 9. From 2a84fec15cc5d51062f7943d5d22bca0bf8d8a3b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Jan 2021 20:34:25 +0000 Subject: [PATCH 033/224] Enable nbdkit-sparse-random-plugin tests again. Reverts: commit 77f5ff090fa1f4e0519636ab7060a7bc52510c8b --- libnbd.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 8850d03..186a29b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -78,7 +78,7 @@ BuildRequires: nbdkit-memory-plugin BuildRequires: nbdkit-null-plugin BuildRequires: nbdkit-pattern-plugin BuildRequires: nbdkit-sh-plugin -#BuildRequires: nbdkit-sparse-random-plugin +BuildRequires: nbdkit-sparse-random-plugin %endif @@ -299,7 +299,7 @@ make %{?_smp_mflags} check || { %changelog -* Fri Jan 29 2021 Richard W.M. Jones - 1.7.1-5 +* Fri Jan 29 2021 Richard W.M. Jones - 1.7.1-6 - Disable BR qemu-img on i686. * Thu Jan 28 2021 Richard W.M. Jones - 1.7.1-3 From 0221752ff7832a6d6ef2e18b7e16b3c893749e49 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Feb 2021 19:31:15 +0000 Subject: [PATCH 034/224] New upstream version 1.7.2. --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 186a29b..d44fac7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.1 -Release: 6%{?dist} +Version: 1.7.2 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -299,6 +299,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Feb 22 2021 Richard W.M. Jones - 1.7.2-1 +- New upstream version 1.7.2. + * Fri Jan 29 2021 Richard W.M. Jones - 1.7.1-6 - Disable BR qemu-img on i686. diff --git a/sources b/sources index 50afe22..fbc84b0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.1.tar.gz) = a1ac588474ac1994522c2ca5c910c89c8d6831aaaadbf18874589a004b311c0d3883b196bf95b51610aaf7b704ff8fd781cc2657ec299f97c537209440848739 -SHA512 (libnbd-1.7.1.tar.gz.sig) = ff0752408c976ff6d351951e3697e5350361070483fc11039a850cf15b26991b65f65cddb7f5a6f34c3abb1195a10d8062b737e61a6103a4ba7c8c7ae9b0b09f +SHA512 (libnbd-1.7.2.tar.gz) = e6b25c97f4c0675879ab665674ea83fb3e3dd34a9a11ec0c72c38b49ddd1cb886f7d33e2eb8ac0a7428c5ecb7f53c2fa1e3d68b60fb95d2655b6c775199ac50a +SHA512 (libnbd-1.7.2.tar.gz.sig) = 7d70f0fd6366bc897e9fd43e73c4f358195bef0142c1f8421b70d883a7cac2932970461fbd12791bea89e315c0f4c3ed7f13044b8ba719c47483a52505dbfa6f From b76726d60877c5f30fa807e4cc539b5cb2ce62da Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 24 Feb 2021 15:02:13 +0000 Subject: [PATCH 035/224] Disable nbd BR on RHEL. --- libnbd.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index d44fac7..814f3ff 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -62,7 +62,9 @@ BuildRequires: coreutils BuildRequires: gcc-c++ BuildRequires: gnutls-utils BuildRequires: jq +%if !0%{?rhel} BuildRequires: nbd +%endif BuildRequires: util-linux # On RHEL, maybe even in Fedora in future, we do not build qemu-img or @@ -299,6 +301,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Feb 24 2021 Richard W.M. Jones - 1.7.2-2 +- Disable nbd BR on RHEL. + * Mon Feb 22 2021 Richard W.M. Jones - 1.7.2-1 - New upstream version 1.7.2. From e1c4d7ae4c94d06884a890155815edffe5446601 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 14:31:58 +0000 Subject: [PATCH 036/224] OCaml 4.12.0 build --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 814f3ff..0cfe4e4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -301,6 +301,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 1 14:31:57 GMT 2021 Richard W.M. Jones - 1.7.2-3 +- OCaml 4.12.0 build + * Wed Feb 24 2021 Richard W.M. Jones - 1.7.2-2 - Disable nbd BR on RHEL. From cef4a0302912013325c17ba1d45b1b2234340254 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Mar 2021 22:02:18 +0000 Subject: [PATCH 037/224] New upstream version 1.7.3. --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0cfe4e4..a5a0265 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.2 -Release: 3%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -301,7 +301,10 @@ make %{?_smp_mflags} check || { %changelog -* Mon Mar 1 14:31:57 GMT 2021 Richard W.M. Jones - 1.7.2-3 +* Tue Mar 2 2021 Richard W.M. Jones - 1.7.3-1 +- New upstream version 1.7.3. + +* Mon Mar 1 2021 Richard W.M. Jones - 1.7.2-3 - OCaml 4.12.0 build * Wed Feb 24 2021 Richard W.M. Jones - 1.7.2-2 diff --git a/sources b/sources index fbc84b0..2a25167 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.2.tar.gz) = e6b25c97f4c0675879ab665674ea83fb3e3dd34a9a11ec0c72c38b49ddd1cb886f7d33e2eb8ac0a7428c5ecb7f53c2fa1e3d68b60fb95d2655b6c775199ac50a -SHA512 (libnbd-1.7.2.tar.gz.sig) = 7d70f0fd6366bc897e9fd43e73c4f358195bef0142c1f8421b70d883a7cac2932970461fbd12791bea89e315c0f4c3ed7f13044b8ba719c47483a52505dbfa6f +SHA512 (libnbd-1.7.3.tar.gz) = 1d7a0e6a5797d1df2e40b5e211ccea78926e2df882423a557acbc3c040f1b4c3f782a4754340be64d1176f0fd3524b094b9266186e25a80668494c7f72e3ef13 +SHA512 (libnbd-1.7.3.tar.gz.sig) = 0d693add7361b29dab7f744d24dce56518f64c0f3133847e685175d711e281c924850046a573d64d8354b5acd21bee34815163f7a8eb9f41266026435f1ba892 From 411ebcec072c9597d8fc1817f8caa35e1fc971b5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Mar 2021 22:03:49 +0000 Subject: [PATCH 038/224] New upstream version 1.6.2. (cherry picked from commit b4dd480e4b8570ae611440bcc7f5c5dc7575f683) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0a172d4..55b71f6 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.6-stable Name: libnbd -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -291,6 +291,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Mar 2 2021 Richard W.M. Jones - 1.6.2-1 +- New upstream version 1.6.2. + * Wed Jan 20 2021 Richard W.M. Jones - 1.6.1-1 - New upstream stable version 1.6.1. diff --git a/sources b/sources index 59c1752..7a3a717 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.6.1.tar.gz) = 8a8acf9f0abbe44098dcbd425526c46bc2c75a4c1e9e6e6c874cf42f875fcd0fe41a43ebfc8718babbc56825bafbf25d6b47f865003eb1779ab37e8d72725919 -SHA512 (libnbd-1.6.1.tar.gz.sig) = a2358d133637face6fa75020fa2162a231762c2047e7b24fd22a54020f96ec3e0c7e568d94a82b030520ad90db1ad4f29dee9197ad5685b651d03dfc8634981b +SHA512 (libnbd-1.6.2.tar.gz) = c9c68ae615e8e6f7db1833ed3778e7a07c4d36e3e370ef9fe824e773f04f176a5eb9e29396b5bab536f6ec9985843d6e99db8818621cf0f5197368b29872dd5a +SHA512 (libnbd-1.6.2.tar.gz.sig) = 051bcfb839768e782f3ead9bf2b452138f74fcb242dddd41c8d6bc4579eb21347331629b7b77c2e3c73cc20958f8f2f3165615eb31e6a99d46fa5102a5bbdfae From c81b6ed16c7c12942d3db5b3aa43136369b482c0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Mar 2021 22:24:23 +0000 Subject: [PATCH 039/224] Add patch to fix tests. --- 0001-copy-Stable-sort-in-tests.patch | 74 ++++++++++++++++++++++++++++ libnbd.spec | 2 + 2 files changed, 76 insertions(+) create mode 100644 0001-copy-Stable-sort-in-tests.patch diff --git a/0001-copy-Stable-sort-in-tests.patch b/0001-copy-Stable-sort-in-tests.patch new file mode 100644 index 0000000..5a4f91b --- /dev/null +++ b/0001-copy-Stable-sort-in-tests.patch @@ -0,0 +1,74 @@ +From 8b20bbd329c07941f3e4aa00e14c05ed27b25435 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 2 Mar 2021 22:20:49 +0000 +Subject: [PATCH] copy: Stable sort in tests. + +When running the tests in Koji they behaved differently from running +locally (under a UTF-8 locale). This turned out to be a difference in +sorting under the different locales. + +Thanks: Eric Blake +--- + copy/copy-sparse-request-size.sh | 2 +- + copy/copy-sparse.sh | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/copy/copy-sparse-request-size.sh b/copy/copy-sparse-request-size.sh +index b539f5e..f2e2b61 100755 +--- a/copy/copy-sparse-request-size.sh ++++ b/copy/copy-sparse-request-size.sh +@@ -50,7 +50,7 @@ $VG nbdcopy --no-extents -S 0 --request-size=1048576 -- \ + trim=" echo \$@ >> $out " \ + zero=" echo \$@ >> $out " ] + +-sort -n -o $out $out ++LC_ALL=C sort -n -o $out $out + + echo Output: + cat $out +diff --git a/copy/copy-sparse.sh b/copy/copy-sparse.sh +index c43b41a..5f12bad 100755 +--- a/copy/copy-sparse.sh ++++ b/copy/copy-sparse.sh +@@ -50,7 +50,7 @@ $VG nbdcopy -S 0 -- \ + + # Order of the output could vary because requests are sent in + # parallel. +-sort -n -o $out $out ++LC_ALL=C sort -n -o $out $out + + echo Output: + cat $out +@@ -65,8 +65,8 @@ zero 134184960 4160749568 may_trim + zero 134184960 939524096 may_trim + zero 134217728 1073741824 may_trim + zero 134217728 1207959552 may_trim +-zero 134217728 1342177280 may_trim + zero 134217728 134217728 may_trim ++zero 134217728 1342177280 may_trim + zero 134217728 1476395008 may_trim + zero 134217728 1610612736 may_trim + zero 134217728 1744830464 may_trim +@@ -76,8 +76,8 @@ zero 134217728 2147483648 may_trim + zero 134217728 2281701376 may_trim + zero 134217728 2415919104 may_trim + zero 134217728 2550136832 may_trim +-zero 134217728 2684354560 may_trim + zero 134217728 268435456 may_trim ++zero 134217728 2684354560 may_trim + zero 134217728 2818572288 may_trim + zero 134217728 2952790016 may_trim + zero 134217728 3087007744 may_trim +@@ -87,8 +87,8 @@ zero 134217728 3489660928 may_trim + zero 134217728 3623878656 may_trim + zero 134217728 3758096384 may_trim + zero 134217728 3892314112 may_trim +-zero 134217728 4026531840 may_trim + zero 134217728 402653184 may_trim ++zero 134217728 4026531840 may_trim + zero 134217728 536870912 may_trim + zero 134217728 671088640 may_trim + zero 134217728 805306368 may_trim" ]; then +-- +2.29.0.rc2 + diff --git a/libnbd.spec b/libnbd.spec index a5a0265..28ff240 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -25,6 +25,8 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +Patch1: 0001-copy-Stable-sort-in-tests.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif From 41eaea3549bd9f4b6ad52c585aff144b6ad945db Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Mar 2021 10:15:06 +0000 Subject: [PATCH 040/224] Add more upstream patches to fix tests. --- 0001-copy-Stable-sort-in-tests.patch | 2 +- 0002-copy-Nicer-sort.patch | 170 ++++++++++++++++++ ...opy-file-ops.c-Remove-unneeded-check.patch | 71 ++++++++ libnbd.spec | 5 +- 4 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 0002-copy-Nicer-sort.patch create mode 100644 0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch diff --git a/0001-copy-Stable-sort-in-tests.patch b/0001-copy-Stable-sort-in-tests.patch index 5a4f91b..24a2f73 100644 --- a/0001-copy-Stable-sort-in-tests.patch +++ b/0001-copy-Stable-sort-in-tests.patch @@ -1,7 +1,7 @@ From 8b20bbd329c07941f3e4aa00e14c05ed27b25435 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Mar 2021 22:20:49 +0000 -Subject: [PATCH] copy: Stable sort in tests. +Subject: [PATCH 1/3] copy: Stable sort in tests. When running the tests in Koji they behaved differently from running locally (under a UTF-8 locale). This turned out to be a difference in diff --git a/0002-copy-Nicer-sort.patch b/0002-copy-Nicer-sort.patch new file mode 100644 index 0000000..8f632e1 --- /dev/null +++ b/0002-copy-Nicer-sort.patch @@ -0,0 +1,170 @@ +From bae7c41a5126c56da4ee77bce39955036fca8b5f Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Tue, 2 Mar 2021 16:31:39 -0600 +Subject: [PATCH 2/3] copy: Nicer sort + +Tell sort where the numbers live, so we can get columns in ascending +numeric order. Improves 8b20bbd329. +--- + copy/copy-sparse-no-extents.sh | 12 ++++++------ + copy/copy-sparse-request-size.sh | 20 ++++++++++---------- + copy/copy-sparse.sh | 18 +++++++++--------- + 3 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/copy/copy-sparse-no-extents.sh b/copy/copy-sparse-no-extents.sh +index cdc132b..4dc5c88 100755 +--- a/copy/copy-sparse-no-extents.sh ++++ b/copy/copy-sparse-no-extents.sh +@@ -50,22 +50,21 @@ $VG nbdcopy --no-extents -S 0 -- \ + trim=" echo \$@ >> $out " \ + zero=" echo \$@ >> $out " ] + +-sort -n -o $out $out ++LC_ALL=C sort -k1,1 -k2,2n -k3,3n -o $out $out + + echo Output: + cat $out + + if [ "$(cat $out)" != "pwrite 33554432 0 ++pwrite 33554432 33554432 ++pwrite 33554432 67108864 + pwrite 33554432 100663296 +-pwrite 33554432 1006632960 +-pwrite 33554432 1040187392 + pwrite 33554432 134217728 + pwrite 33554432 167772160 + pwrite 33554432 201326592 + pwrite 33554432 234881024 + pwrite 33554432 268435456 + pwrite 33554432 301989888 +-pwrite 33554432 33554432 + pwrite 33554432 335544320 + pwrite 33554432 369098752 + pwrite 33554432 402653184 +@@ -76,7 +75,6 @@ pwrite 33554432 536870912 + pwrite 33554432 570425344 + pwrite 33554432 603979776 + pwrite 33554432 637534208 +-pwrite 33554432 67108864 + pwrite 33554432 671088640 + pwrite 33554432 704643072 + pwrite 33554432 738197504 +@@ -86,7 +84,9 @@ pwrite 33554432 838860800 + pwrite 33554432 872415232 + pwrite 33554432 905969664 + pwrite 33554432 939524096 +-pwrite 33554432 973078528" ]; then ++pwrite 33554432 973078528 ++pwrite 33554432 1006632960 ++pwrite 33554432 1040187392" ]; then + echo "$0: output does not match expected" + exit 1 + fi +diff --git a/copy/copy-sparse-request-size.sh b/copy/copy-sparse-request-size.sh +index f2e2b61..78a066a 100755 +--- a/copy/copy-sparse-request-size.sh ++++ b/copy/copy-sparse-request-size.sh +@@ -50,13 +50,21 @@ $VG nbdcopy --no-extents -S 0 --request-size=1048576 -- \ + trim=" echo \$@ >> $out " \ + zero=" echo \$@ >> $out " ] + +-LC_ALL=C sort -n -o $out $out ++LC_ALL=C sort -k1,1 -k2,2n -k3,3n -o $out $out + + echo Output: + cat $out + + if [ "$(cat $out)" != "pwrite 1048576 0 + pwrite 1048576 1048576 ++pwrite 1048576 2097152 ++pwrite 1048576 3145728 ++pwrite 1048576 4194304 ++pwrite 1048576 5242880 ++pwrite 1048576 6291456 ++pwrite 1048576 7340032 ++pwrite 1048576 8388608 ++pwrite 1048576 9437184 + pwrite 1048576 10485760 + pwrite 1048576 11534336 + pwrite 1048576 12582912 +@@ -67,7 +75,6 @@ pwrite 1048576 16777216 + pwrite 1048576 17825792 + pwrite 1048576 18874368 + pwrite 1048576 19922944 +-pwrite 1048576 2097152 + pwrite 1048576 20971520 + pwrite 1048576 22020096 + pwrite 1048576 23068672 +@@ -78,15 +85,8 @@ pwrite 1048576 27262976 + pwrite 1048576 28311552 + pwrite 1048576 29360128 + pwrite 1048576 30408704 +-pwrite 1048576 3145728 + pwrite 1048576 31457280 +-pwrite 1048576 32505856 +-pwrite 1048576 4194304 +-pwrite 1048576 5242880 +-pwrite 1048576 6291456 +-pwrite 1048576 7340032 +-pwrite 1048576 8388608 +-pwrite 1048576 9437184" ]; then ++pwrite 1048576 32505856" ]; then + echo "$0: output does not match expected" + exit 1 + fi +diff --git a/copy/copy-sparse.sh b/copy/copy-sparse.sh +index 5f12bad..1a6da86 100755 +--- a/copy/copy-sparse.sh ++++ b/copy/copy-sparse.sh +@@ -50,7 +50,7 @@ $VG nbdcopy -S 0 -- \ + + # Order of the output could vary because requests are sent in + # parallel. +-LC_ALL=C sort -n -o $out $out ++LC_ALL=C sort -k1,1 -k2,2n -k3,3n -o $out $out + + echo Output: + cat $out +@@ -61,11 +61,16 @@ pwrite 32768 0 + pwrite 32768 1073709056 + pwrite 32768 4294934528 + zero 134184960 32768 may_trim +-zero 134184960 4160749568 may_trim + zero 134184960 939524096 may_trim ++zero 134184960 4160749568 may_trim ++zero 134217728 134217728 may_trim ++zero 134217728 268435456 may_trim ++zero 134217728 402653184 may_trim ++zero 134217728 536870912 may_trim ++zero 134217728 671088640 may_trim ++zero 134217728 805306368 may_trim + zero 134217728 1073741824 may_trim + zero 134217728 1207959552 may_trim +-zero 134217728 134217728 may_trim + zero 134217728 1342177280 may_trim + zero 134217728 1476395008 may_trim + zero 134217728 1610612736 may_trim +@@ -76,7 +81,6 @@ zero 134217728 2147483648 may_trim + zero 134217728 2281701376 may_trim + zero 134217728 2415919104 may_trim + zero 134217728 2550136832 may_trim +-zero 134217728 268435456 may_trim + zero 134217728 2684354560 may_trim + zero 134217728 2818572288 may_trim + zero 134217728 2952790016 may_trim +@@ -87,11 +91,7 @@ zero 134217728 3489660928 may_trim + zero 134217728 3623878656 may_trim + zero 134217728 3758096384 may_trim + zero 134217728 3892314112 may_trim +-zero 134217728 402653184 may_trim +-zero 134217728 4026531840 may_trim +-zero 134217728 536870912 may_trim +-zero 134217728 671088640 may_trim +-zero 134217728 805306368 may_trim" ]; then ++zero 134217728 4026531840 may_trim" ]; then + echo "$0: output does not match expected" + exit 1 + fi +-- +2.29.0.rc2 + diff --git a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch new file mode 100644 index 0000000..5ff29b9 --- /dev/null +++ b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch @@ -0,0 +1,71 @@ +From 4e456ff6363580177ceffdad79b8fc1e8c7f35eb Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 3 Mar 2021 10:12:31 +0000 +Subject: [PATCH 3/3] Revert "copy: file-ops.c: Remove unneeded check" + +This reverts commit 0f6e4f38bc440fc52c20a3a448ef031f806ec5e2. + +This fails on ppc64le only with: + +lt-nbdcopy: file-ops.c:136: page_was_cached: Assertion `page < rwf->cached_pages.size' failed. + +Coincidentally this is the only architecture on Fedora that uses a 64K +page size, although I don't know if that is connected. I was not able +to make this fail on x86. +--- + copy/file-ops.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/copy/file-ops.c b/copy/file-ops.c +index 47ec768..ea725a4 100644 +--- a/copy/file-ops.c ++++ b/copy/file-ops.c +@@ -102,7 +102,7 @@ page_size_init (void) + /* Load the page cache map for a particular file into + * rwf->cached_pages. Only used when reading files. This doesn't + * fail: if a system call fails then rwf->cached_pages.size will be +- * zero which is handled in page_cache_evict. ++ * zero which is handled in page_was_cached. + */ + static inline void + page_cache_map (struct rw_file *rwf) +@@ -126,16 +126,19 @@ page_cache_map (struct rw_file *rwf) + munmap (ptr, rwf->rw.size); + } + +-/* Test if a single page of the file was cached before nbdcopy ran. +- * Valid only if we mapped the cached pages. +- */ ++/* Test if a single page of the file was cached before nbdcopy ran. */ + static inline bool + page_was_cached (struct rw_file *rwf, uint64_t offset) + { + uint64_t page = offset / page_size; +- assert (page < rwf->cached_pages.size); +- +- return (rwf->cached_pages.ptr[page] & 1) != 0; ++ if (page < rwf->cached_pages.size) ++ return (rwf->cached_pages.ptr[page] & 1) != 0; ++ else ++ /* This path is taken if we didn't manage to map the input file ++ * for any reason. In this case assume that pages were mapped so ++ * we will not evict them: essentially fall back to doing nothing. ++ */ ++ return true; + } + + /* Evict file contents from the page cache if they were not present in +@@ -147,10 +150,6 @@ page_cache_evict (struct rw_file *rwf, uint64_t orig_offset, size_t orig_len) + uint64_t offset, n; + size_t len; + +- /* If we didn't manage to map the input file for any reason, assume +- * that pages were mapped so we will not evict them: essentially fall +- * back to doing nothing. +- */ + if (rwf->cached_pages.size == 0) return; + + /* Only bother with whole pages. */ +-- +2.29.0.rc2 + diff --git a/libnbd.spec b/libnbd.spec index 28ff240..79eca68 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -25,7 +25,10 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -Patch1: 0001-copy-Stable-sort-in-tests.patch +# Upstream patches to fix tests. +Patch0001: 0001-copy-Stable-sort-in-tests.patch +Patch0002: 0002-copy-Nicer-sort.patch +Patch0003: 0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool From 8c37651ac69f29390463002bd07996f1f4b2a553 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Mar 2021 12:00:08 +0000 Subject: [PATCH 041/224] Even more upstream patches to fix tests. --- 0001-copy-Stable-sort-in-tests.patch | 2 +- 0002-copy-Nicer-sort.patch | 2 +- ...opy-file-ops.c-Remove-unneeded-check.patch | 2 +- ...opy-file-ops.c-Remove-unneeded-check.patch | 67 +++++++++++++++++++ ...Fix-page-eviction-when-len-page_size.patch | 32 +++++++++ libnbd.spec | 2 + 6 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 0004-copy-file-ops.c-Remove-unneeded-check.patch create mode 100644 0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch diff --git a/0001-copy-Stable-sort-in-tests.patch b/0001-copy-Stable-sort-in-tests.patch index 24a2f73..93b3ecd 100644 --- a/0001-copy-Stable-sort-in-tests.patch +++ b/0001-copy-Stable-sort-in-tests.patch @@ -1,7 +1,7 @@ From 8b20bbd329c07941f3e4aa00e14c05ed27b25435 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Mar 2021 22:20:49 +0000 -Subject: [PATCH 1/3] copy: Stable sort in tests. +Subject: [PATCH 1/5] copy: Stable sort in tests. When running the tests in Koji they behaved differently from running locally (under a UTF-8 locale). This turned out to be a difference in diff --git a/0002-copy-Nicer-sort.patch b/0002-copy-Nicer-sort.patch index 8f632e1..7ea1409 100644 --- a/0002-copy-Nicer-sort.patch +++ b/0002-copy-Nicer-sort.patch @@ -1,7 +1,7 @@ From bae7c41a5126c56da4ee77bce39955036fca8b5f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 2 Mar 2021 16:31:39 -0600 -Subject: [PATCH 2/3] copy: Nicer sort +Subject: [PATCH 2/5] copy: Nicer sort Tell sort where the numbers live, so we can get columns in ascending numeric order. Improves 8b20bbd329. diff --git a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch index 5ff29b9..b45d880 100644 --- a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch +++ b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch @@ -1,7 +1,7 @@ From 4e456ff6363580177ceffdad79b8fc1e8c7f35eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Mar 2021 10:12:31 +0000 -Subject: [PATCH 3/3] Revert "copy: file-ops.c: Remove unneeded check" +Subject: [PATCH 3/5] Revert "copy: file-ops.c: Remove unneeded check" This reverts commit 0f6e4f38bc440fc52c20a3a448ef031f806ec5e2. diff --git a/0004-copy-file-ops.c-Remove-unneeded-check.patch b/0004-copy-file-ops.c-Remove-unneeded-check.patch new file mode 100644 index 0000000..7c5cc03 --- /dev/null +++ b/0004-copy-file-ops.c-Remove-unneeded-check.patch @@ -0,0 +1,67 @@ +From 94a78764d80b6dc41ff2ae8a0e5f1b35c2fd8e78 Mon Sep 17 00:00:00 2001 +From: Nir Soffer +Date: Sat, 27 Feb 2021 05:36:38 +0200 +Subject: [PATCH 4/5] copy: file-ops.c: Remove unneeded check + +This function is called only from page_cache_evict(), which already +check that we could map the cached pages. Add an assert to document this +assumption. + +Signed-off-by: Nir Soffer +--- + copy/file-ops.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +diff --git a/copy/file-ops.c b/copy/file-ops.c +index ea725a4..47ec768 100644 +--- a/copy/file-ops.c ++++ b/copy/file-ops.c +@@ -102,7 +102,7 @@ page_size_init (void) + /* Load the page cache map for a particular file into + * rwf->cached_pages. Only used when reading files. This doesn't + * fail: if a system call fails then rwf->cached_pages.size will be +- * zero which is handled in page_was_cached. ++ * zero which is handled in page_cache_evict. + */ + static inline void + page_cache_map (struct rw_file *rwf) +@@ -126,19 +126,16 @@ page_cache_map (struct rw_file *rwf) + munmap (ptr, rwf->rw.size); + } + +-/* Test if a single page of the file was cached before nbdcopy ran. */ ++/* Test if a single page of the file was cached before nbdcopy ran. ++ * Valid only if we mapped the cached pages. ++ */ + static inline bool + page_was_cached (struct rw_file *rwf, uint64_t offset) + { + uint64_t page = offset / page_size; +- if (page < rwf->cached_pages.size) +- return (rwf->cached_pages.ptr[page] & 1) != 0; +- else +- /* This path is taken if we didn't manage to map the input file +- * for any reason. In this case assume that pages were mapped so +- * we will not evict them: essentially fall back to doing nothing. +- */ +- return true; ++ assert (page < rwf->cached_pages.size); ++ ++ return (rwf->cached_pages.ptr[page] & 1) != 0; + } + + /* Evict file contents from the page cache if they were not present in +@@ -150,6 +147,10 @@ page_cache_evict (struct rw_file *rwf, uint64_t orig_offset, size_t orig_len) + uint64_t offset, n; + size_t len; + ++ /* If we didn't manage to map the input file for any reason, assume ++ * that pages were mapped so we will not evict them: essentially fall ++ * back to doing nothing. ++ */ + if (rwf->cached_pages.size == 0) return; + + /* Only bother with whole pages. */ +-- +2.29.0.rc2 + diff --git a/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch b/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch new file mode 100644 index 0000000..9430c05 --- /dev/null +++ b/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch @@ -0,0 +1,32 @@ +From 107eb605cfb75238020332b5a5461d0e09d62bec Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 3 Mar 2021 12:51:51 +0100 +Subject: [PATCH 5/5] copy/file-ops.c: Fix page eviction when len < page_size. + +On Fedora ppc64le at the moment page size is 64K. When asked to evict +a range with length < 64K the length calculation wrapped around and it +tried to evict a huge number of pages beyond the end of the file. + +With Nir's commit 0f6e4f38b this (correctly) resulted in an assertion +failure. + +Fix this by checking for the overflow and returning early. +--- + copy/file-ops.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/copy/file-ops.c b/copy/file-ops.c +index 47ec768..6bad50c 100644 +--- a/copy/file-ops.c ++++ b/copy/file-ops.c +@@ -155,6 +155,7 @@ page_cache_evict (struct rw_file *rwf, uint64_t orig_offset, size_t orig_len) + + /* Only bother with whole pages. */ + offset = ROUND_UP (orig_offset, page_size); ++ if (orig_len < offset - orig_offset) return; + len = orig_len - (offset - orig_offset); + len = ROUND_DOWN (len, page_size); + +-- +2.29.0.rc2 + diff --git a/libnbd.spec b/libnbd.spec index 79eca68..785c0d7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -29,6 +29,8 @@ Source3: copy-patches.sh Patch0001: 0001-copy-Stable-sort-in-tests.patch Patch0002: 0002-copy-Nicer-sort.patch Patch0003: 0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch +Patch0004: 0004-copy-file-ops.c-Remove-unneeded-check.patch +Patch0005: 0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool From 4aff44eced9bc80eafd95b2910d022d03c440f4c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Mar 2021 15:59:18 +0000 Subject: [PATCH 042/224] Add fix for nbdkit test suite. --- 0001-copy-Stable-sort-in-tests.patch | 2 +- 0002-copy-Nicer-sort.patch | 2 +- ...opy-file-ops.c-Remove-unneeded-check.patch | 2 +- ...opy-file-ops.c-Remove-unneeded-check.patch | 2 +- ...Fix-page-eviction-when-len-page_size.patch | 2 +- ...atus-reflect-any-failures-during-NBD.patch | 119 ++++++++++++++++++ libnbd.spec | 8 +- 7 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch diff --git a/0001-copy-Stable-sort-in-tests.patch b/0001-copy-Stable-sort-in-tests.patch index 93b3ecd..ff86fd7 100644 --- a/0001-copy-Stable-sort-in-tests.patch +++ b/0001-copy-Stable-sort-in-tests.patch @@ -1,7 +1,7 @@ From 8b20bbd329c07941f3e4aa00e14c05ed27b25435 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Mar 2021 22:20:49 +0000 -Subject: [PATCH 1/5] copy: Stable sort in tests. +Subject: [PATCH 1/6] copy: Stable sort in tests. When running the tests in Koji they behaved differently from running locally (under a UTF-8 locale). This turned out to be a difference in diff --git a/0002-copy-Nicer-sort.patch b/0002-copy-Nicer-sort.patch index 7ea1409..092ea58 100644 --- a/0002-copy-Nicer-sort.patch +++ b/0002-copy-Nicer-sort.patch @@ -1,7 +1,7 @@ From bae7c41a5126c56da4ee77bce39955036fca8b5f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 2 Mar 2021 16:31:39 -0600 -Subject: [PATCH 2/5] copy: Nicer sort +Subject: [PATCH 2/6] copy: Nicer sort Tell sort where the numbers live, so we can get columns in ascending numeric order. Improves 8b20bbd329. diff --git a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch index b45d880..dc8c37d 100644 --- a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch +++ b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch @@ -1,7 +1,7 @@ From 4e456ff6363580177ceffdad79b8fc1e8c7f35eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Mar 2021 10:12:31 +0000 -Subject: [PATCH 3/5] Revert "copy: file-ops.c: Remove unneeded check" +Subject: [PATCH 3/6] Revert "copy: file-ops.c: Remove unneeded check" This reverts commit 0f6e4f38bc440fc52c20a3a448ef031f806ec5e2. diff --git a/0004-copy-file-ops.c-Remove-unneeded-check.patch b/0004-copy-file-ops.c-Remove-unneeded-check.patch index 7c5cc03..11f23a5 100644 --- a/0004-copy-file-ops.c-Remove-unneeded-check.patch +++ b/0004-copy-file-ops.c-Remove-unneeded-check.patch @@ -1,7 +1,7 @@ From 94a78764d80b6dc41ff2ae8a0e5f1b35c2fd8e78 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Sat, 27 Feb 2021 05:36:38 +0200 -Subject: [PATCH 4/5] copy: file-ops.c: Remove unneeded check +Subject: [PATCH 4/6] copy: file-ops.c: Remove unneeded check This function is called only from page_cache_evict(), which already check that we could map the cached pages. Add an assert to document this diff --git a/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch b/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch index 9430c05..ba5811a 100644 --- a/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch +++ b/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch @@ -1,7 +1,7 @@ From 107eb605cfb75238020332b5a5461d0e09d62bec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 3 Mar 2021 12:51:51 +0100 -Subject: [PATCH 5/5] copy/file-ops.c: Fix page eviction when len < page_size. +Subject: [PATCH 5/6] copy/file-ops.c: Fix page eviction when len < page_size. On Fedora ppc64le at the moment page size is 64K. When asked to evict a range with length < 64K the length calculation wrapped around and it diff --git a/0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch b/0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch new file mode 100644 index 0000000..7ac2cfa --- /dev/null +++ b/0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch @@ -0,0 +1,119 @@ +From 64962a582c00828cc2d26d94b149840ab2402165 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 4 Mar 2021 09:27:56 -0600 +Subject: [PATCH 6/6] info: Let exit status reflect any failures during + NBD_OPT_INFO + +It turns out that at least nbdkit's testsuite was relying on a +non-zero exit status from nbdinfo when purposefully attempting to get +info on an invalid export name. Printing as much information as +possible instead of going silent becaus of one error is good, but any +time we print to stderr, the exit status should reflect that. + +Fixes: 5473e34fc1 (info: Don't kill --list early just because one opt_info fails) +Reported-by: Rich Jones +--- + info/nbdinfo.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/info/nbdinfo.c b/info/nbdinfo.c +index 4b18ab2..3dfc463 100644 +--- a/info/nbdinfo.c ++++ b/info/nbdinfo.c +@@ -58,9 +58,9 @@ DEFINE_VECTOR_TYPE (uint32_vector, uint32_t) + static int collect_context (void *opaque, const char *name); + static int collect_export (void *opaque, const char *name, + const char *desc); +-static void list_one_export (struct nbd_handle *nbd, const char *desc, ++static bool list_one_export (struct nbd_handle *nbd, const char *desc, + bool first, bool last); +-static void list_all_exports (struct nbd_handle *nbd1, const char *uri); ++static bool list_all_exports (struct nbd_handle *nbd1, const char *uri); + static void print_json_string (const char *); + static char *get_content (struct nbd_handle *, int64_t size); + static int extent_callback (void *user_data, const char *metacontext, +@@ -124,6 +124,7 @@ main (int argc, char *argv[]) + int tls_negotiated; + char *output = NULL; + size_t output_len = 0; ++ bool list_okay = true; + + progname = argv[0]; + +@@ -336,9 +337,9 @@ main (int argc, char *argv[]) + } + + if (!list_all) +- list_one_export (nbd, NULL, true, true); ++ list_okay = list_one_export (nbd, NULL, true, true); + else +- list_all_exports (nbd, argv[optind]); ++ list_okay = list_all_exports (nbd, argv[optind]); + + if (json_output) + fprintf (fp, "}\n"); +@@ -365,7 +366,7 @@ main (int argc, char *argv[]) + exit (EXIT_FAILURE); + } + +- exit (EXIT_SUCCESS); ++ exit (list_okay ? EXIT_SUCCESS : EXIT_FAILURE); + } + + static int +@@ -398,7 +399,7 @@ collect_export (void *opaque, const char *name, const char *desc) + return 0; + } + +-static void ++static bool + list_one_export (struct nbd_handle *nbd, const char *desc, + bool first, bool last) + { +@@ -424,7 +425,7 @@ list_one_export (struct nbd_handle *nbd, const char *desc, + nbd_opt_go (nbd) == -1) { + fprintf (stderr, "%s: %s: %s\n", progname, nbd_get_export_name (nbd), + nbd_get_error ()); +- return; ++ return false; + } + size = nbd_get_size (nbd); + if (size == -1) { +@@ -599,12 +600,14 @@ list_one_export (struct nbd_handle *nbd, const char *desc, + free (content); + free (export_name); + free (export_desc); ++ return true; + } + +-static void ++static bool + list_all_exports (struct nbd_handle *nbd1, const char *uri) + { + size_t i; ++ bool list_okay = true; + + if (export_list.size == 0 && json_output) + fprintf (fp, "\"exports\": []\n"); +@@ -639,14 +642,16 @@ list_all_exports (struct nbd_handle *nbd1, const char *uri) + } + + /* List the metadata of this export. */ +- list_one_export (nbd2, export_list.ptr[i].desc, i == 0, +- i + 1 == export_list.size); ++ if (!list_one_export (nbd2, export_list.ptr[i].desc, i == 0, ++ i + 1 == export_list.size)) ++ list_okay = false; + + if (probe_content) { + nbd_shutdown (nbd2, 0); + nbd_close (nbd2); + } + } ++ return list_okay; + } + + static void +-- +2.29.0.rc2 + diff --git a/libnbd.spec b/libnbd.spec index 785c0d7..901cb5f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -32,6 +32,9 @@ Patch0003: 0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch Patch0004: 0004-copy-file-ops.c-Remove-unneeded-check.patch Patch0005: 0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch +# Upstream patch to fix nbdkit test suite. +Patch0006: 0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -308,6 +311,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Mar 4 2021 Richard W.M. Jones - 1.7.3-2 +- Add fix for nbdkit test suite. + * Tue Mar 2 2021 Richard W.M. Jones - 1.7.3-1 - New upstream version 1.7.3. From 654f8d029dcc43c0145260053848c438c05f59ea Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 09:26:43 +0000 Subject: [PATCH 043/224] Update documentation for CVE-2021-20286. --- ...ocument-assignment-of-CVE-2021-20286.patch | 39 +++++++++++++++++++ libnbd.spec | 8 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0001-security-Document-assignment-of-CVE-2021-20286.patch diff --git a/0001-security-Document-assignment-of-CVE-2021-20286.patch b/0001-security-Document-assignment-of-CVE-2021-20286.patch new file mode 100644 index 0000000..ca96878 --- /dev/null +++ b/0001-security-Document-assignment-of-CVE-2021-20286.patch @@ -0,0 +1,39 @@ +From 40308a005eaa6b2e8f98da8952d0c0cacc51efde Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Fri, 12 Mar 2021 17:00:58 -0600 +Subject: [PATCH] security: Document assignment of CVE-2021-20286 + +Now that we finally have a CVE number, it's time to document +the problem (it's low severity, but still a denial of service). + +Fixes: fb4440de9cc7 (opt_go: Tolerate unplanned server death) +--- + docs/libnbd-security.pod | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/docs/libnbd-security.pod b/docs/libnbd-security.pod +index 876ef2f..3c994de 100644 +--- a/docs/libnbd-security.pod ++++ b/docs/libnbd-security.pod +@@ -22,6 +22,12 @@ L + See the full announcement here: + L + ++=head2 CVE-2021-20286 ++denial of service when using L ++ ++See the full announcement here: ++L ++ + =head1 SEE ALSO + + L. +@@ -34,4 +40,4 @@ Richard W.M. Jones + + =head1 COPYRIGHT + +-Copyright (C) 2019 Red Hat Inc. ++Copyright (C) 2019-2021 Red Hat Inc. +-- +2.29.0.rc2 + diff --git a/libnbd.spec b/libnbd.spec index 901cb5f..a4131cb 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -35,6 +35,9 @@ Patch0005: 0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch # Upstream patch to fix nbdkit test suite. Patch0006: 0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch +# Upstream patch that documents CVE-2021-20286 (already fixed in 1.7.3). +Patch0007: 0001-security-Document-assignment-of-CVE-2021-20286.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -311,6 +314,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 15 2021 Richard W.M. Jones - 1.7.3-3 +- Update documentation for CVE-2021-20286. + * Thu Mar 4 2021 Richard W.M. Jones - 1.7.3-2 - Add fix for nbdkit test suite. From 3d807e8f17ccdedc6ea4f1aa68314db497ebcdfb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 09:30:57 +0000 Subject: [PATCH 044/224] Workaround broken interop/interop-qemu-storage-daemon.sh test in RHEL 9. --- libnbd.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libnbd.spec b/libnbd.spec index a4131cb..fdca285 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -228,6 +228,15 @@ touch interop/structured-read.sh chmod +x interop/structured-read.sh %endif +# interop/interop-qemu-storage-daemon.sh fails in RHEL 9 because of +# this bug in qemu: +# https://lists.nongnu.org/archive/html/qemu-devel/2021-03/threads.html#03544 +%if 0%{?rhel} +rm interop/interop-qemu-storage-daemon.sh +touch interop/interop-qemu-storage-daemon.sh +chmod +x interop/interop-qemu-storage-daemon.sh +%endif + # All fuse tests fail in Koji with: # fusermount: entry for fuse/test-*.d not found in /etc/mtab # for unknown reasons but probably related to the Koji environment. @@ -316,6 +325,7 @@ make %{?_smp_mflags} check || { %changelog * Mon Mar 15 2021 Richard W.M. Jones - 1.7.3-3 - Update documentation for CVE-2021-20286. +- Workaround broken interop/interop-qemu-storage-daemon.sh test in RHEL 9. * Thu Mar 4 2021 Richard W.M. Jones - 1.7.3-2 - Add fix for nbdkit test suite. From b5a71ab87ad8c2289fbd2364fae2fe7c2c3629b8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 19:36:14 +0000 Subject: [PATCH 045/224] New upstream development version 1.7.4. --- libnbd.spec | 20 +++++--------------- sources | 4 ++-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index fdca285..da39a6f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.3 -Release: 3%{?dist} +Version: 1.7.4 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -25,19 +25,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Upstream patches to fix tests. -Patch0001: 0001-copy-Stable-sort-in-tests.patch -Patch0002: 0002-copy-Nicer-sort.patch -Patch0003: 0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch -Patch0004: 0004-copy-file-ops.c-Remove-unneeded-check.patch -Patch0005: 0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch - -# Upstream patch to fix nbdkit test suite. -Patch0006: 0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch - -# Upstream patch that documents CVE-2021-20286 (already fixed in 1.7.3). -Patch0007: 0001-security-Document-assignment-of-CVE-2021-20286.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -323,6 +310,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Mar 15 2021 Richard W.M. Jones - 1.7.4-1 +- New upstream development version 1.7.4. + * Mon Mar 15 2021 Richard W.M. Jones - 1.7.3-3 - Update documentation for CVE-2021-20286. - Workaround broken interop/interop-qemu-storage-daemon.sh test in RHEL 9. diff --git a/sources b/sources index 2a25167..062ad7d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.3.tar.gz) = 1d7a0e6a5797d1df2e40b5e211ccea78926e2df882423a557acbc3c040f1b4c3f782a4754340be64d1176f0fd3524b094b9266186e25a80668494c7f72e3ef13 -SHA512 (libnbd-1.7.3.tar.gz.sig) = 0d693add7361b29dab7f744d24dce56518f64c0f3133847e685175d711e281c924850046a573d64d8354b5acd21bee34815163f7a8eb9f41266026435f1ba892 +SHA512 (libnbd-1.7.4.tar.gz) = bf5174664b3950a6a81dc56393e51cd151ab6829206cc6289a149b371ab5ea85403c8501ee9d3ba14d16084fd9cdfaa4c35dcb4519cf6ce24d1713fadbc2dfb1 +SHA512 (libnbd-1.7.4.tar.gz.sig) = d101df29237948ac6820ded33c10b80711ec24a5827fe4851904885382ef20b202537625dba301847be5bf22857655a2e3da36cc38e1202d546dc079a5121e19 From 6fca1977b0e29df7b0f55d7f6efe08c9de254dd4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 19:42:14 +0000 Subject: [PATCH 046/224] Remove patches. --- 0001-copy-Stable-sort-in-tests.patch | 74 -------- ...ocument-assignment-of-CVE-2021-20286.patch | 39 ---- 0002-copy-Nicer-sort.patch | 170 ------------------ ...opy-file-ops.c-Remove-unneeded-check.patch | 71 -------- ...opy-file-ops.c-Remove-unneeded-check.patch | 67 ------- ...Fix-page-eviction-when-len-page_size.patch | 32 ---- ...atus-reflect-any-failures-during-NBD.patch | 119 ------------ 7 files changed, 572 deletions(-) delete mode 100644 0001-copy-Stable-sort-in-tests.patch delete mode 100644 0001-security-Document-assignment-of-CVE-2021-20286.patch delete mode 100644 0002-copy-Nicer-sort.patch delete mode 100644 0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch delete mode 100644 0004-copy-file-ops.c-Remove-unneeded-check.patch delete mode 100644 0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch delete mode 100644 0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch diff --git a/0001-copy-Stable-sort-in-tests.patch b/0001-copy-Stable-sort-in-tests.patch deleted file mode 100644 index ff86fd7..0000000 --- a/0001-copy-Stable-sort-in-tests.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 8b20bbd329c07941f3e4aa00e14c05ed27b25435 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 2 Mar 2021 22:20:49 +0000 -Subject: [PATCH 1/6] copy: Stable sort in tests. - -When running the tests in Koji they behaved differently from running -locally (under a UTF-8 locale). This turned out to be a difference in -sorting under the different locales. - -Thanks: Eric Blake ---- - copy/copy-sparse-request-size.sh | 2 +- - copy/copy-sparse.sh | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/copy/copy-sparse-request-size.sh b/copy/copy-sparse-request-size.sh -index b539f5e..f2e2b61 100755 ---- a/copy/copy-sparse-request-size.sh -+++ b/copy/copy-sparse-request-size.sh -@@ -50,7 +50,7 @@ $VG nbdcopy --no-extents -S 0 --request-size=1048576 -- \ - trim=" echo \$@ >> $out " \ - zero=" echo \$@ >> $out " ] - --sort -n -o $out $out -+LC_ALL=C sort -n -o $out $out - - echo Output: - cat $out -diff --git a/copy/copy-sparse.sh b/copy/copy-sparse.sh -index c43b41a..5f12bad 100755 ---- a/copy/copy-sparse.sh -+++ b/copy/copy-sparse.sh -@@ -50,7 +50,7 @@ $VG nbdcopy -S 0 -- \ - - # Order of the output could vary because requests are sent in - # parallel. --sort -n -o $out $out -+LC_ALL=C sort -n -o $out $out - - echo Output: - cat $out -@@ -65,8 +65,8 @@ zero 134184960 4160749568 may_trim - zero 134184960 939524096 may_trim - zero 134217728 1073741824 may_trim - zero 134217728 1207959552 may_trim --zero 134217728 1342177280 may_trim - zero 134217728 134217728 may_trim -+zero 134217728 1342177280 may_trim - zero 134217728 1476395008 may_trim - zero 134217728 1610612736 may_trim - zero 134217728 1744830464 may_trim -@@ -76,8 +76,8 @@ zero 134217728 2147483648 may_trim - zero 134217728 2281701376 may_trim - zero 134217728 2415919104 may_trim - zero 134217728 2550136832 may_trim --zero 134217728 2684354560 may_trim - zero 134217728 268435456 may_trim -+zero 134217728 2684354560 may_trim - zero 134217728 2818572288 may_trim - zero 134217728 2952790016 may_trim - zero 134217728 3087007744 may_trim -@@ -87,8 +87,8 @@ zero 134217728 3489660928 may_trim - zero 134217728 3623878656 may_trim - zero 134217728 3758096384 may_trim - zero 134217728 3892314112 may_trim --zero 134217728 4026531840 may_trim - zero 134217728 402653184 may_trim -+zero 134217728 4026531840 may_trim - zero 134217728 536870912 may_trim - zero 134217728 671088640 may_trim - zero 134217728 805306368 may_trim" ]; then --- -2.29.0.rc2 - diff --git a/0001-security-Document-assignment-of-CVE-2021-20286.patch b/0001-security-Document-assignment-of-CVE-2021-20286.patch deleted file mode 100644 index ca96878..0000000 --- a/0001-security-Document-assignment-of-CVE-2021-20286.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 40308a005eaa6b2e8f98da8952d0c0cacc51efde Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Fri, 12 Mar 2021 17:00:58 -0600 -Subject: [PATCH] security: Document assignment of CVE-2021-20286 - -Now that we finally have a CVE number, it's time to document -the problem (it's low severity, but still a denial of service). - -Fixes: fb4440de9cc7 (opt_go: Tolerate unplanned server death) ---- - docs/libnbd-security.pod | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/docs/libnbd-security.pod b/docs/libnbd-security.pod -index 876ef2f..3c994de 100644 ---- a/docs/libnbd-security.pod -+++ b/docs/libnbd-security.pod -@@ -22,6 +22,12 @@ L - See the full announcement here: - L - -+=head2 CVE-2021-20286 -+denial of service when using L -+ -+See the full announcement here: -+L -+ - =head1 SEE ALSO - - L. -@@ -34,4 +40,4 @@ Richard W.M. Jones - - =head1 COPYRIGHT - --Copyright (C) 2019 Red Hat Inc. -+Copyright (C) 2019-2021 Red Hat Inc. --- -2.29.0.rc2 - diff --git a/0002-copy-Nicer-sort.patch b/0002-copy-Nicer-sort.patch deleted file mode 100644 index 092ea58..0000000 --- a/0002-copy-Nicer-sort.patch +++ /dev/null @@ -1,170 +0,0 @@ -From bae7c41a5126c56da4ee77bce39955036fca8b5f Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Tue, 2 Mar 2021 16:31:39 -0600 -Subject: [PATCH 2/6] copy: Nicer sort - -Tell sort where the numbers live, so we can get columns in ascending -numeric order. Improves 8b20bbd329. ---- - copy/copy-sparse-no-extents.sh | 12 ++++++------ - copy/copy-sparse-request-size.sh | 20 ++++++++++---------- - copy/copy-sparse.sh | 18 +++++++++--------- - 3 files changed, 25 insertions(+), 25 deletions(-) - -diff --git a/copy/copy-sparse-no-extents.sh b/copy/copy-sparse-no-extents.sh -index cdc132b..4dc5c88 100755 ---- a/copy/copy-sparse-no-extents.sh -+++ b/copy/copy-sparse-no-extents.sh -@@ -50,22 +50,21 @@ $VG nbdcopy --no-extents -S 0 -- \ - trim=" echo \$@ >> $out " \ - zero=" echo \$@ >> $out " ] - --sort -n -o $out $out -+LC_ALL=C sort -k1,1 -k2,2n -k3,3n -o $out $out - - echo Output: - cat $out - - if [ "$(cat $out)" != "pwrite 33554432 0 -+pwrite 33554432 33554432 -+pwrite 33554432 67108864 - pwrite 33554432 100663296 --pwrite 33554432 1006632960 --pwrite 33554432 1040187392 - pwrite 33554432 134217728 - pwrite 33554432 167772160 - pwrite 33554432 201326592 - pwrite 33554432 234881024 - pwrite 33554432 268435456 - pwrite 33554432 301989888 --pwrite 33554432 33554432 - pwrite 33554432 335544320 - pwrite 33554432 369098752 - pwrite 33554432 402653184 -@@ -76,7 +75,6 @@ pwrite 33554432 536870912 - pwrite 33554432 570425344 - pwrite 33554432 603979776 - pwrite 33554432 637534208 --pwrite 33554432 67108864 - pwrite 33554432 671088640 - pwrite 33554432 704643072 - pwrite 33554432 738197504 -@@ -86,7 +84,9 @@ pwrite 33554432 838860800 - pwrite 33554432 872415232 - pwrite 33554432 905969664 - pwrite 33554432 939524096 --pwrite 33554432 973078528" ]; then -+pwrite 33554432 973078528 -+pwrite 33554432 1006632960 -+pwrite 33554432 1040187392" ]; then - echo "$0: output does not match expected" - exit 1 - fi -diff --git a/copy/copy-sparse-request-size.sh b/copy/copy-sparse-request-size.sh -index f2e2b61..78a066a 100755 ---- a/copy/copy-sparse-request-size.sh -+++ b/copy/copy-sparse-request-size.sh -@@ -50,13 +50,21 @@ $VG nbdcopy --no-extents -S 0 --request-size=1048576 -- \ - trim=" echo \$@ >> $out " \ - zero=" echo \$@ >> $out " ] - --LC_ALL=C sort -n -o $out $out -+LC_ALL=C sort -k1,1 -k2,2n -k3,3n -o $out $out - - echo Output: - cat $out - - if [ "$(cat $out)" != "pwrite 1048576 0 - pwrite 1048576 1048576 -+pwrite 1048576 2097152 -+pwrite 1048576 3145728 -+pwrite 1048576 4194304 -+pwrite 1048576 5242880 -+pwrite 1048576 6291456 -+pwrite 1048576 7340032 -+pwrite 1048576 8388608 -+pwrite 1048576 9437184 - pwrite 1048576 10485760 - pwrite 1048576 11534336 - pwrite 1048576 12582912 -@@ -67,7 +75,6 @@ pwrite 1048576 16777216 - pwrite 1048576 17825792 - pwrite 1048576 18874368 - pwrite 1048576 19922944 --pwrite 1048576 2097152 - pwrite 1048576 20971520 - pwrite 1048576 22020096 - pwrite 1048576 23068672 -@@ -78,15 +85,8 @@ pwrite 1048576 27262976 - pwrite 1048576 28311552 - pwrite 1048576 29360128 - pwrite 1048576 30408704 --pwrite 1048576 3145728 - pwrite 1048576 31457280 --pwrite 1048576 32505856 --pwrite 1048576 4194304 --pwrite 1048576 5242880 --pwrite 1048576 6291456 --pwrite 1048576 7340032 --pwrite 1048576 8388608 --pwrite 1048576 9437184" ]; then -+pwrite 1048576 32505856" ]; then - echo "$0: output does not match expected" - exit 1 - fi -diff --git a/copy/copy-sparse.sh b/copy/copy-sparse.sh -index 5f12bad..1a6da86 100755 ---- a/copy/copy-sparse.sh -+++ b/copy/copy-sparse.sh -@@ -50,7 +50,7 @@ $VG nbdcopy -S 0 -- \ - - # Order of the output could vary because requests are sent in - # parallel. --LC_ALL=C sort -n -o $out $out -+LC_ALL=C sort -k1,1 -k2,2n -k3,3n -o $out $out - - echo Output: - cat $out -@@ -61,11 +61,16 @@ pwrite 32768 0 - pwrite 32768 1073709056 - pwrite 32768 4294934528 - zero 134184960 32768 may_trim --zero 134184960 4160749568 may_trim - zero 134184960 939524096 may_trim -+zero 134184960 4160749568 may_trim -+zero 134217728 134217728 may_trim -+zero 134217728 268435456 may_trim -+zero 134217728 402653184 may_trim -+zero 134217728 536870912 may_trim -+zero 134217728 671088640 may_trim -+zero 134217728 805306368 may_trim - zero 134217728 1073741824 may_trim - zero 134217728 1207959552 may_trim --zero 134217728 134217728 may_trim - zero 134217728 1342177280 may_trim - zero 134217728 1476395008 may_trim - zero 134217728 1610612736 may_trim -@@ -76,7 +81,6 @@ zero 134217728 2147483648 may_trim - zero 134217728 2281701376 may_trim - zero 134217728 2415919104 may_trim - zero 134217728 2550136832 may_trim --zero 134217728 268435456 may_trim - zero 134217728 2684354560 may_trim - zero 134217728 2818572288 may_trim - zero 134217728 2952790016 may_trim -@@ -87,11 +91,7 @@ zero 134217728 3489660928 may_trim - zero 134217728 3623878656 may_trim - zero 134217728 3758096384 may_trim - zero 134217728 3892314112 may_trim --zero 134217728 402653184 may_trim --zero 134217728 4026531840 may_trim --zero 134217728 536870912 may_trim --zero 134217728 671088640 may_trim --zero 134217728 805306368 may_trim" ]; then -+zero 134217728 4026531840 may_trim" ]; then - echo "$0: output does not match expected" - exit 1 - fi --- -2.29.0.rc2 - diff --git a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch b/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch deleted file mode 100644 index dc8c37d..0000000 --- a/0003-Revert-copy-file-ops.c-Remove-unneeded-check.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4e456ff6363580177ceffdad79b8fc1e8c7f35eb Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 3 Mar 2021 10:12:31 +0000 -Subject: [PATCH 3/6] Revert "copy: file-ops.c: Remove unneeded check" - -This reverts commit 0f6e4f38bc440fc52c20a3a448ef031f806ec5e2. - -This fails on ppc64le only with: - -lt-nbdcopy: file-ops.c:136: page_was_cached: Assertion `page < rwf->cached_pages.size' failed. - -Coincidentally this is the only architecture on Fedora that uses a 64K -page size, although I don't know if that is connected. I was not able -to make this fail on x86. ---- - copy/file-ops.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - -diff --git a/copy/file-ops.c b/copy/file-ops.c -index 47ec768..ea725a4 100644 ---- a/copy/file-ops.c -+++ b/copy/file-ops.c -@@ -102,7 +102,7 @@ page_size_init (void) - /* Load the page cache map for a particular file into - * rwf->cached_pages. Only used when reading files. This doesn't - * fail: if a system call fails then rwf->cached_pages.size will be -- * zero which is handled in page_cache_evict. -+ * zero which is handled in page_was_cached. - */ - static inline void - page_cache_map (struct rw_file *rwf) -@@ -126,16 +126,19 @@ page_cache_map (struct rw_file *rwf) - munmap (ptr, rwf->rw.size); - } - --/* Test if a single page of the file was cached before nbdcopy ran. -- * Valid only if we mapped the cached pages. -- */ -+/* Test if a single page of the file was cached before nbdcopy ran. */ - static inline bool - page_was_cached (struct rw_file *rwf, uint64_t offset) - { - uint64_t page = offset / page_size; -- assert (page < rwf->cached_pages.size); -- -- return (rwf->cached_pages.ptr[page] & 1) != 0; -+ if (page < rwf->cached_pages.size) -+ return (rwf->cached_pages.ptr[page] & 1) != 0; -+ else -+ /* This path is taken if we didn't manage to map the input file -+ * for any reason. In this case assume that pages were mapped so -+ * we will not evict them: essentially fall back to doing nothing. -+ */ -+ return true; - } - - /* Evict file contents from the page cache if they were not present in -@@ -147,10 +150,6 @@ page_cache_evict (struct rw_file *rwf, uint64_t orig_offset, size_t orig_len) - uint64_t offset, n; - size_t len; - -- /* If we didn't manage to map the input file for any reason, assume -- * that pages were mapped so we will not evict them: essentially fall -- * back to doing nothing. -- */ - if (rwf->cached_pages.size == 0) return; - - /* Only bother with whole pages. */ --- -2.29.0.rc2 - diff --git a/0004-copy-file-ops.c-Remove-unneeded-check.patch b/0004-copy-file-ops.c-Remove-unneeded-check.patch deleted file mode 100644 index 11f23a5..0000000 --- a/0004-copy-file-ops.c-Remove-unneeded-check.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 94a78764d80b6dc41ff2ae8a0e5f1b35c2fd8e78 Mon Sep 17 00:00:00 2001 -From: Nir Soffer -Date: Sat, 27 Feb 2021 05:36:38 +0200 -Subject: [PATCH 4/6] copy: file-ops.c: Remove unneeded check - -This function is called only from page_cache_evict(), which already -check that we could map the cached pages. Add an assert to document this -assumption. - -Signed-off-by: Nir Soffer ---- - copy/file-ops.c | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -diff --git a/copy/file-ops.c b/copy/file-ops.c -index ea725a4..47ec768 100644 ---- a/copy/file-ops.c -+++ b/copy/file-ops.c -@@ -102,7 +102,7 @@ page_size_init (void) - /* Load the page cache map for a particular file into - * rwf->cached_pages. Only used when reading files. This doesn't - * fail: if a system call fails then rwf->cached_pages.size will be -- * zero which is handled in page_was_cached. -+ * zero which is handled in page_cache_evict. - */ - static inline void - page_cache_map (struct rw_file *rwf) -@@ -126,19 +126,16 @@ page_cache_map (struct rw_file *rwf) - munmap (ptr, rwf->rw.size); - } - --/* Test if a single page of the file was cached before nbdcopy ran. */ -+/* Test if a single page of the file was cached before nbdcopy ran. -+ * Valid only if we mapped the cached pages. -+ */ - static inline bool - page_was_cached (struct rw_file *rwf, uint64_t offset) - { - uint64_t page = offset / page_size; -- if (page < rwf->cached_pages.size) -- return (rwf->cached_pages.ptr[page] & 1) != 0; -- else -- /* This path is taken if we didn't manage to map the input file -- * for any reason. In this case assume that pages were mapped so -- * we will not evict them: essentially fall back to doing nothing. -- */ -- return true; -+ assert (page < rwf->cached_pages.size); -+ -+ return (rwf->cached_pages.ptr[page] & 1) != 0; - } - - /* Evict file contents from the page cache if they were not present in -@@ -150,6 +147,10 @@ page_cache_evict (struct rw_file *rwf, uint64_t orig_offset, size_t orig_len) - uint64_t offset, n; - size_t len; - -+ /* If we didn't manage to map the input file for any reason, assume -+ * that pages were mapped so we will not evict them: essentially fall -+ * back to doing nothing. -+ */ - if (rwf->cached_pages.size == 0) return; - - /* Only bother with whole pages. */ --- -2.29.0.rc2 - diff --git a/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch b/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch deleted file mode 100644 index ba5811a..0000000 --- a/0005-copy-file-ops.c-Fix-page-eviction-when-len-page_size.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 107eb605cfb75238020332b5a5461d0e09d62bec Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 3 Mar 2021 12:51:51 +0100 -Subject: [PATCH 5/6] copy/file-ops.c: Fix page eviction when len < page_size. - -On Fedora ppc64le at the moment page size is 64K. When asked to evict -a range with length < 64K the length calculation wrapped around and it -tried to evict a huge number of pages beyond the end of the file. - -With Nir's commit 0f6e4f38b this (correctly) resulted in an assertion -failure. - -Fix this by checking for the overflow and returning early. ---- - copy/file-ops.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/copy/file-ops.c b/copy/file-ops.c -index 47ec768..6bad50c 100644 ---- a/copy/file-ops.c -+++ b/copy/file-ops.c -@@ -155,6 +155,7 @@ page_cache_evict (struct rw_file *rwf, uint64_t orig_offset, size_t orig_len) - - /* Only bother with whole pages. */ - offset = ROUND_UP (orig_offset, page_size); -+ if (orig_len < offset - orig_offset) return; - len = orig_len - (offset - orig_offset); - len = ROUND_DOWN (len, page_size); - --- -2.29.0.rc2 - diff --git a/0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch b/0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch deleted file mode 100644 index 7ac2cfa..0000000 --- a/0006-info-Let-exit-status-reflect-any-failures-during-NBD.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 64962a582c00828cc2d26d94b149840ab2402165 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Thu, 4 Mar 2021 09:27:56 -0600 -Subject: [PATCH 6/6] info: Let exit status reflect any failures during - NBD_OPT_INFO - -It turns out that at least nbdkit's testsuite was relying on a -non-zero exit status from nbdinfo when purposefully attempting to get -info on an invalid export name. Printing as much information as -possible instead of going silent becaus of one error is good, but any -time we print to stderr, the exit status should reflect that. - -Fixes: 5473e34fc1 (info: Don't kill --list early just because one opt_info fails) -Reported-by: Rich Jones ---- - info/nbdinfo.c | 25 +++++++++++++++---------- - 1 file changed, 15 insertions(+), 10 deletions(-) - -diff --git a/info/nbdinfo.c b/info/nbdinfo.c -index 4b18ab2..3dfc463 100644 ---- a/info/nbdinfo.c -+++ b/info/nbdinfo.c -@@ -58,9 +58,9 @@ DEFINE_VECTOR_TYPE (uint32_vector, uint32_t) - static int collect_context (void *opaque, const char *name); - static int collect_export (void *opaque, const char *name, - const char *desc); --static void list_one_export (struct nbd_handle *nbd, const char *desc, -+static bool list_one_export (struct nbd_handle *nbd, const char *desc, - bool first, bool last); --static void list_all_exports (struct nbd_handle *nbd1, const char *uri); -+static bool list_all_exports (struct nbd_handle *nbd1, const char *uri); - static void print_json_string (const char *); - static char *get_content (struct nbd_handle *, int64_t size); - static int extent_callback (void *user_data, const char *metacontext, -@@ -124,6 +124,7 @@ main (int argc, char *argv[]) - int tls_negotiated; - char *output = NULL; - size_t output_len = 0; -+ bool list_okay = true; - - progname = argv[0]; - -@@ -336,9 +337,9 @@ main (int argc, char *argv[]) - } - - if (!list_all) -- list_one_export (nbd, NULL, true, true); -+ list_okay = list_one_export (nbd, NULL, true, true); - else -- list_all_exports (nbd, argv[optind]); -+ list_okay = list_all_exports (nbd, argv[optind]); - - if (json_output) - fprintf (fp, "}\n"); -@@ -365,7 +366,7 @@ main (int argc, char *argv[]) - exit (EXIT_FAILURE); - } - -- exit (EXIT_SUCCESS); -+ exit (list_okay ? EXIT_SUCCESS : EXIT_FAILURE); - } - - static int -@@ -398,7 +399,7 @@ collect_export (void *opaque, const char *name, const char *desc) - return 0; - } - --static void -+static bool - list_one_export (struct nbd_handle *nbd, const char *desc, - bool first, bool last) - { -@@ -424,7 +425,7 @@ list_one_export (struct nbd_handle *nbd, const char *desc, - nbd_opt_go (nbd) == -1) { - fprintf (stderr, "%s: %s: %s\n", progname, nbd_get_export_name (nbd), - nbd_get_error ()); -- return; -+ return false; - } - size = nbd_get_size (nbd); - if (size == -1) { -@@ -599,12 +600,14 @@ list_one_export (struct nbd_handle *nbd, const char *desc, - free (content); - free (export_name); - free (export_desc); -+ return true; - } - --static void -+static bool - list_all_exports (struct nbd_handle *nbd1, const char *uri) - { - size_t i; -+ bool list_okay = true; - - if (export_list.size == 0 && json_output) - fprintf (fp, "\"exports\": []\n"); -@@ -639,14 +642,16 @@ list_all_exports (struct nbd_handle *nbd1, const char *uri) - } - - /* List the metadata of this export. */ -- list_one_export (nbd2, export_list.ptr[i].desc, i == 0, -- i + 1 == export_list.size); -+ if (!list_one_export (nbd2, export_list.ptr[i].desc, i == 0, -+ i + 1 == export_list.size)) -+ list_okay = false; - - if (probe_content) { - nbd_shutdown (nbd2, 0); - nbd_close (nbd2); - } - } -+ return list_okay; - } - - static void --- -2.29.0.rc2 - From b57878aba574d4edb516ae6f2c8e245dcb8a302c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Mar 2021 20:37:36 +0000 Subject: [PATCH 047/224] Fix upstream URL. Source repo moved to gitlab. --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index da39a6f..fd262f1 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -13,7 +13,7 @@ Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ -URL: https://github.com/libguestfs/libnbd +URL: https://gitlab.com/nbdkit/libnbd Source0: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz Source1: http://libguestfs.org/download/libnbd/%{source_directory}/%{name}-%{version}.tar.gz.sig From 53085876a697614878ef68e577e7a94e443615bb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 3 Apr 2021 14:00:37 +0100 Subject: [PATCH 048/224] New upstream development version 1.7.5. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index fd262f1..06d28ec 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.4 +Version: 1.7.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -310,6 +310,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Apr 03 2021 Richard W.M. Jones - 1.7.5-1 +- New upstream development version 1.7.5. + * Mon Mar 15 2021 Richard W.M. Jones - 1.7.4-1 - New upstream development version 1.7.4. diff --git a/sources b/sources index 062ad7d..6859aaf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.4.tar.gz) = bf5174664b3950a6a81dc56393e51cd151ab6829206cc6289a149b371ab5ea85403c8501ee9d3ba14d16084fd9cdfaa4c35dcb4519cf6ce24d1713fadbc2dfb1 -SHA512 (libnbd-1.7.4.tar.gz.sig) = d101df29237948ac6820ded33c10b80711ec24a5827fe4851904885382ef20b202537625dba301847be5bf22857655a2e3da36cc38e1202d546dc079a5121e19 +SHA512 (libnbd-1.7.5.tar.gz) = ab535c7063e020eb767484e1e5ac944f302779a9e865c90d68931c5e8ed6bd7747309d9fa08109f1c043029c3caa8c1b1ccbbb3d5dcfcc9ff7c257ac6a6ca9dd +SHA512 (libnbd-1.7.5.tar.gz.sig) = ea2ee982602ab3b37f9aa022d0956896665c4d7bc88984e137a5372a8fc1cf267f7d4aefc6a06f14f1bb1789df4b0c3c0ce7807c83ba9551d2ccffb73e466ea7 From 68451ea34c449abc041d7a988beaaf9f5a95b482 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 8 Apr 2021 21:27:46 +0100 Subject: [PATCH 049/224] New upstream development version 1.7.6. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 06d28ec..701a7fe 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.5 +Version: 1.7.6 Release: 1%{?dist} Summary: NBD client library in userspace @@ -310,6 +310,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Apr 08 2021 Richard W.M. Jones - 1.7.6-1 +- New upstream development version 1.7.6. + * Sat Apr 03 2021 Richard W.M. Jones - 1.7.5-1 - New upstream development version 1.7.5. diff --git a/sources b/sources index 6859aaf..d92df57 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.5.tar.gz) = ab535c7063e020eb767484e1e5ac944f302779a9e865c90d68931c5e8ed6bd7747309d9fa08109f1c043029c3caa8c1b1ccbbb3d5dcfcc9ff7c257ac6a6ca9dd -SHA512 (libnbd-1.7.5.tar.gz.sig) = ea2ee982602ab3b37f9aa022d0956896665c4d7bc88984e137a5372a8fc1cf267f7d4aefc6a06f14f1bb1789df4b0c3c0ce7807c83ba9551d2ccffb73e466ea7 +SHA512 (libnbd-1.7.6.tar.gz) = 84f538a8832bd56333c48d8abd94bd0bd1c5db1e4f6ed69cd0aec5910d0b626730aaf2ab51f9c4b76ef156a0e8a650908bc3a688129b79eacf25b73cfbf303d5 +SHA512 (libnbd-1.7.6.tar.gz.sig) = 3d20ee40f95faac128413f6690d506c6b096729828ac21a7ffff115c51cbead3b5ca62d712fb78c3e0151e59a40d28bc0ec70aee5e836fe26430d44870ca589f From 8da4b69cb660b8400f1dc12ee1171d2044393351 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 9 Apr 2021 10:45:47 +0100 Subject: [PATCH 050/224] +BR iproute Enhances the test suite starting in libnbd 1.7.7. --- libnbd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libnbd.spec b/libnbd.spec index 701a7fe..d7656ad 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -61,6 +61,7 @@ BuildRequires: bash-completion BuildRequires: coreutils BuildRequires: gcc-c++ BuildRequires: gnutls-utils +BuildRequires: iproute BuildRequires: jq %if !0%{?rhel} BuildRequires: nbd From 566819509e92bbc85707ee0a1673d444a263eaff Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 10 Apr 2021 10:53:12 +0100 Subject: [PATCH 051/224] New upstream development version 1.7.7. --- libnbd.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index d7656ad..46506f0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.6 +Version: 1.7.7 Release: 1%{?dist} Summary: NBD client library in userspace @@ -311,6 +311,10 @@ make %{?_smp_mflags} check || { %changelog +* Sat Apr 10 2021 Richard W.M. Jones - 1.7.7-1 +- New upstream development version 1.7.7. +- +BR iproute + * Thu Apr 08 2021 Richard W.M. Jones - 1.7.6-1 - New upstream development version 1.7.6. diff --git a/sources b/sources index d92df57..40c6586 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.6.tar.gz) = 84f538a8832bd56333c48d8abd94bd0bd1c5db1e4f6ed69cd0aec5910d0b626730aaf2ab51f9c4b76ef156a0e8a650908bc3a688129b79eacf25b73cfbf303d5 -SHA512 (libnbd-1.7.6.tar.gz.sig) = 3d20ee40f95faac128413f6690d506c6b096729828ac21a7ffff115c51cbead3b5ca62d712fb78c3e0151e59a40d28bc0ec70aee5e836fe26430d44870ca589f +SHA512 (libnbd-1.7.7.tar.gz) = 75568792d1b4e19315b84cc802f806524ea34eba038720d8f1e8d6e2aaf0e93e7957bd345b547c6724120ce0ffa2a3ec527437ba1037d104972f7c10f91b509e +SHA512 (libnbd-1.7.7.tar.gz.sig) = 11787efda732402df70c52dac09396d6a8a6eaf69fb031e251ba710a6632848ff4e523a1806fa648803e2df4913459eb9c0cbf9f495335666a28a91db29b42cb From 9fb600fb49dc0a1ced841cc3b642d94a7174611e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 10 Apr 2021 11:04:39 +0100 Subject: [PATCH 052/224] Add skip_test helper function. Skip connect-tcp6 test which fails under Koji. --- libnbd.spec | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 46506f0..4a2a016 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -208,31 +208,36 @@ rm $RPM_BUILD_ROOT%{_mandir}/man3/libnbd-golang.3* %check +function skip_test () +{ + for f in "$@"; do + rm -f "$f" + echo 'exit 77' > "$f" + chmod +x "$f" + done +} + # interop/structured-read.sh fails with the old qemu-nbd in Fedora 29, # so disable it there. %if 0%{?fedora} <= 29 -rm interop/structured-read.sh -touch interop/structured-read.sh -chmod +x interop/structured-read.sh +skip_test interop/structured-read.sh %endif # interop/interop-qemu-storage-daemon.sh fails in RHEL 9 because of # this bug in qemu: # https://lists.nongnu.org/archive/html/qemu-devel/2021-03/threads.html#03544 %if 0%{?rhel} -rm interop/interop-qemu-storage-daemon.sh -touch interop/interop-qemu-storage-daemon.sh -chmod +x interop/interop-qemu-storage-daemon.sh +skip_test interop/interop-qemu-storage-daemon.sh %endif # All fuse tests fail in Koji with: # fusermount: entry for fuse/test-*.d not found in /etc/mtab # for unknown reasons but probably related to the Koji environment. -for f in fuse/test-*.sh; do - rm $f - touch $f - chmod +x $f -done +skip_test fuse/test-*.sh + +# IPv6 loopback connections fail in Koji. +make -C tests connect-tcp6 +skip_test tests/connect-tcp6 make %{?_smp_mflags} check || { for f in $(find -name test-suite.log); do @@ -314,6 +319,8 @@ make %{?_smp_mflags} check || { * Sat Apr 10 2021 Richard W.M. Jones - 1.7.7-1 - New upstream development version 1.7.7. - +BR iproute +- Add skip_test helper function. +- Skip connect-tcp6 test which fails under Koji. * Thu Apr 08 2021 Richard W.M. Jones - 1.7.6-1 - New upstream development version 1.7.6. From 975fd0407ba575d4ac9d7c1cd4f11251d8170706 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 10 Apr 2021 11:16:16 +0100 Subject: [PATCH 053/224] Fix previous commit. --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 4a2a016..2cac422 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -236,7 +236,7 @@ skip_test interop/interop-qemu-storage-daemon.sh skip_test fuse/test-*.sh # IPv6 loopback connections fail in Koji. -make -C tests connect-tcp6 +make -C tests connect-tcp6 ||: skip_test tests/connect-tcp6 make %{?_smp_mflags} check || { From 68c179cec9946f62dfc54f8f84dd6531f4151361 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 24 Apr 2021 22:41:57 +0100 Subject: [PATCH 054/224] New upstream development version 1.7.8. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 2cac422..896d7f3 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.7 +Version: 1.7.8 Release: 1%{?dist} Summary: NBD client library in userspace @@ -316,6 +316,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Apr 24 2021 Richard W.M. Jones - 1.7.8-1 +- New upstream development version 1.7.8. + * Sat Apr 10 2021 Richard W.M. Jones - 1.7.7-1 - New upstream development version 1.7.7. - +BR iproute diff --git a/sources b/sources index 40c6586..f76237e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.7.tar.gz) = 75568792d1b4e19315b84cc802f806524ea34eba038720d8f1e8d6e2aaf0e93e7957bd345b547c6724120ce0ffa2a3ec527437ba1037d104972f7c10f91b509e -SHA512 (libnbd-1.7.7.tar.gz.sig) = 11787efda732402df70c52dac09396d6a8a6eaf69fb031e251ba710a6632848ff4e523a1806fa648803e2df4913459eb9c0cbf9f495335666a28a91db29b42cb +SHA512 (libnbd-1.7.8.tar.gz) = e4338c8a229f99e3a2a6f38eb8425369b423ed92f2ef72b819257e661bac4402901315c6d531b7b8b6b9e3f82fe2ec4624d6470d59e10a415fa779bfba5a0a31 +SHA512 (libnbd-1.7.8.tar.gz.sig) = d1cf041df8fad36deaa9ab57ccb9e4d0c6215c3656311c3377a1b4e059f56715f38d55a094c694e85750a528c76b078ba8f1cac464355b88ace2bff44b42bbd6 From dc985ae17258224f140ae30f9a9a293074440bb1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 29 Apr 2021 12:11:11 +0100 Subject: [PATCH 055/224] New upstream version 1.7.9. Switch to fuse3. Make nbdfuse package recommend fuse3 (to get fusermount3). --- libnbd.spec | 10 ++++++++-- sources | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 896d7f3..59f023c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.8 +Version: 1.7.9 Release: 1%{?dist} Summary: NBD client library in userspace @@ -41,7 +41,7 @@ BuildRequires: gnutls-devel BuildRequires: libxml2-devel # For nbdfuse. -BuildRequires: fuse, fuse-devel +BuildRequires: fuse3, fuse3-devel # For the Python 3 bindings. BuildRequires: python3-devel @@ -154,6 +154,7 @@ python3-%{name} contains Python 3 bindings for %{name}. Summary: FUSE support for %{name} License: LGPLv2+ and BSD Requires: %{name}%{?_isa} = %{version}-%{release} +Recommends: fuse3 %description -n nbdfuse @@ -316,6 +317,11 @@ make %{?_smp_mflags} check || { %changelog +* Thu Apr 29 2021 Richard W.M. Jones - 1.7.9-1 +- New upstream version 1.7.9. +- Switch to fuse3. +- Make nbdfuse package recommend fuse3 (to get fusermount3). + * Sat Apr 24 2021 Richard W.M. Jones - 1.7.8-1 - New upstream development version 1.7.8. diff --git a/sources b/sources index f76237e..079545d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.8.tar.gz) = e4338c8a229f99e3a2a6f38eb8425369b423ed92f2ef72b819257e661bac4402901315c6d531b7b8b6b9e3f82fe2ec4624d6470d59e10a415fa779bfba5a0a31 -SHA512 (libnbd-1.7.8.tar.gz.sig) = d1cf041df8fad36deaa9ab57ccb9e4d0c6215c3656311c3377a1b4e059f56715f38d55a094c694e85750a528c76b078ba8f1cac464355b88ace2bff44b42bbd6 +SHA512 (libnbd-1.7.9.tar.gz) = 6fe3db6f5027fee59e60e7ea688111787567a4ac740db34ebdc45bccc76e34cc6298784c8b628cb40ff639caceca5d5413558187892511d9ac2167fc60b3d92a +SHA512 (libnbd-1.7.9.tar.gz.sig) = f2ee29fe7017cec4a3ec0c03119b2c1d5de735f6703a12e4ecddcddf8548bf7e1be62440f54c9fd3859fb63072f1ef8fb6ef56c2db462f624f0efef254052970 From 13a35576f0c2d01958ce62c2f34d590b227033a8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 14 May 2021 21:01:19 +0100 Subject: [PATCH 056/224] New upstream version 1.7.10. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 59f023c..0235b09 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.9 +Version: 1.7.10 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri May 14 2021 Richard W.M. Jones - 1.7.10-1 +- New upstream version 1.7.10. + * Thu Apr 29 2021 Richard W.M. Jones - 1.7.9-1 - New upstream version 1.7.9. - Switch to fuse3. diff --git a/sources b/sources index 079545d..85a58a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.9.tar.gz) = 6fe3db6f5027fee59e60e7ea688111787567a4ac740db34ebdc45bccc76e34cc6298784c8b628cb40ff639caceca5d5413558187892511d9ac2167fc60b3d92a -SHA512 (libnbd-1.7.9.tar.gz.sig) = f2ee29fe7017cec4a3ec0c03119b2c1d5de735f6703a12e4ecddcddf8548bf7e1be62440f54c9fd3859fb63072f1ef8fb6ef56c2db462f624f0efef254052970 +SHA512 (libnbd-1.7.10.tar.gz) = a7f18e4651541149f7a30aae266887987f7da1e76606bcf0b6d0c9877a5313c277220b10c19e86ad84d5a9e726927c0c49ea4e270348c78dc111fddc44de2f7a +SHA512 (libnbd-1.7.10.tar.gz.sig) = 31631fe28905fa8288e24deb7b419f10eeb414e97cc692f1a10e79e14b27b3b68f65bf3a8d1d8e387d5bd7412f0b3f90bcc52a42f344332d22a30f819d67b603 From 32b53143f8be0ef83d3ce1d8fbfdd9ee9e6f8b3b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 20 May 2021 21:22:08 +0100 Subject: [PATCH 057/224] New upstream version 1.7.11. --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 0235b09..4353e0f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.10 +Version: 1.7.11 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu May 20 2021 Richard W.M. Jones - 1.7.11-1 +- New upstream version 1.7.11. + * Fri May 14 2021 Richard W.M. Jones - 1.7.10-1 - New upstream version 1.7.10. From 21c6a0606b051d860e91abd2788a079a98ae89dd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 May 2021 11:16:12 +0100 Subject: [PATCH 058/224] Forgot to upload sources in previous commit. --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 85a58a1..6864104 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.10.tar.gz) = a7f18e4651541149f7a30aae266887987f7da1e76606bcf0b6d0c9877a5313c277220b10c19e86ad84d5a9e726927c0c49ea4e270348c78dc111fddc44de2f7a -SHA512 (libnbd-1.7.10.tar.gz.sig) = 31631fe28905fa8288e24deb7b419f10eeb414e97cc692f1a10e79e14b27b3b68f65bf3a8d1d8e387d5bd7412f0b3f90bcc52a42f344332d22a30f819d67b603 +SHA512 (libnbd-1.7.11.tar.gz) = ea17e8b93e30843232550cb0e2f0d0990db049599dcdc565a54ac15c502319a24ab17889ce7b46ff7ba559f71476fb1a440a40f99b82c5bf28c234247bea8e62 +SHA512 (libnbd-1.7.11.tar.gz.sig) = b392341d3d957d0e25177164736cf742970ccb63c941a79aadf099e1661d9fa1099ea0ed4460849a540545ca0aa9eaa443369444258e2740ef3643f24aeee074 From 8c3ed0fafd13392e9f854155b74a875f803cb6d7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 29 May 2021 19:24:21 +0100 Subject: [PATCH 059/224] New upstream version 1.7.12. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4353e0f..9c4fbbc 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.7-development Name: libnbd -Version: 1.7.11 +Version: 1.7.12 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat May 29 2021 Richard W.M. Jones - 1.7.12-1 +- New upstream version 1.7.12. + * Thu May 20 2021 Richard W.M. Jones - 1.7.11-1 - New upstream version 1.7.11. diff --git a/sources b/sources index 6864104..e2e07b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.11.tar.gz) = ea17e8b93e30843232550cb0e2f0d0990db049599dcdc565a54ac15c502319a24ab17889ce7b46ff7ba559f71476fb1a440a40f99b82c5bf28c234247bea8e62 -SHA512 (libnbd-1.7.11.tar.gz.sig) = b392341d3d957d0e25177164736cf742970ccb63c941a79aadf099e1661d9fa1099ea0ed4460849a540545ca0aa9eaa443369444258e2740ef3643f24aeee074 +SHA512 (libnbd-1.7.12.tar.gz) = 62ec0600d42ae5fb8b779cf0c885fa9ff708472c67cb21f9ca964c986f82c6072087e59efc86547037543e01ba7348a0d1771fb1aa76a4f8905ebfe7af5bb4c1 +SHA512 (libnbd-1.7.12.tar.gz.sig) = ffc116fa642e8b8db74ca7eb51d8e2ec4fc68903d69c61eb9067fb3e976cb4c4c7b1019dd1e794fe34d4077032a3f6022469d72951876b08a1026f880f366bf7 From b0414abaa4b3a76fb6c00091d691a09201c9e473 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 2 Jun 2021 12:31:12 +0100 Subject: [PATCH 060/224] Run gating tests on RHEL 9 --- gating.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 6985029..648918d 100755 --- a/gating.yaml +++ b/gating.yaml @@ -1,6 +1,6 @@ --- !Policy product_versions: - - rhel-8 + - rhel-9 decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} From d0ce32c4ec2b8e1e223186906e550b6a55e8df9e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:09:32 +0200 Subject: [PATCH 061/224] Rebuilt for Python 3.10 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 9c4fbbc..403ac13 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.7.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jun 04 2021 Python Maint - 1.7.12-2 +- Rebuilt for Python 3.10 + * Sat May 29 2021 Richard W.M. Jones - 1.7.12-1 - New upstream version 1.7.12. From e48262409d5cd2daf893d864b814cb97b9454c12 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 7 Jun 2021 17:20:49 +0100 Subject: [PATCH 062/224] New upstream version 1.8.0. --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 403ac13..0406ca4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,11 +5,11 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.7-development +%global source_directory 1.8-stable Name: libnbd -Version: 1.7.12 -Release: 2%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 07 2021 Richard W.M. Jones - 1.8.0-1 +- New upstream version 1.8.0. + * Fri Jun 04 2021 Python Maint - 1.7.12-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index e2e07b3..cac10a6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.7.12.tar.gz) = 62ec0600d42ae5fb8b779cf0c885fa9ff708472c67cb21f9ca964c986f82c6072087e59efc86547037543e01ba7348a0d1771fb1aa76a4f8905ebfe7af5bb4c1 -SHA512 (libnbd-1.7.12.tar.gz.sig) = ffc116fa642e8b8db74ca7eb51d8e2ec4fc68903d69c61eb9067fb3e976cb4c4c7b1019dd1e794fe34d4077032a3f6022469d72951876b08a1026f880f366bf7 +SHA512 (libnbd-1.8.0.tar.gz) = 20e3160ccdca3cf05e44da5540e55f39116275d92d16475404b7625e330c18d39949e7957529bcf2be72026256b2b343ca3c3687ffe58288a83e3ccfb05b7398 +SHA512 (libnbd-1.8.0.tar.gz.sig) = 3fef464f326430bb79c09582cc87d0734d0522a13d42354f563e0d26bedb45018636eaeb5f2456f726e41899c6dd65dbde327cfbd85c449a0596e2e6230e58f4 From 0c527635f2c067c2ae6c15349cd66d8ff9aaa4ac Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 7 Jun 2021 19:14:31 +0200 Subject: [PATCH 063/224] Rebuilt for Python 3.10 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 0406ca4..04dcd4e 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 07 2021 Python Maint - 1.8.0-2 +- Rebuilt for Python 3.10 + * Mon Jun 07 2021 Richard W.M. Jones - 1.8.0-1 - New upstream version 1.8.0. From 97f7e685463ec7a9f31365acf1f31c3284d71a95 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 11 Jun 2021 14:39:02 +0100 Subject: [PATCH 064/224] New upstream development version 1.9.1. --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 04dcd4e..3fe8fa6 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,11 +5,11 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.8-stable +%global source_directory 1.9-develoment Name: libnbd -Version: 1.8.0 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jun 11 2021 Richard W.M. Jones - 1.9.1-1 +- New upstream development version 1.9.1. + * Mon Jun 07 2021 Python Maint - 1.8.0-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index cac10a6..f71ae2e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.8.0.tar.gz) = 20e3160ccdca3cf05e44da5540e55f39116275d92d16475404b7625e330c18d39949e7957529bcf2be72026256b2b343ca3c3687ffe58288a83e3ccfb05b7398 -SHA512 (libnbd-1.8.0.tar.gz.sig) = 3fef464f326430bb79c09582cc87d0734d0522a13d42354f563e0d26bedb45018636eaeb5f2456f726e41899c6dd65dbde327cfbd85c449a0596e2e6230e58f4 +SHA512 (libnbd-1.9.1.tar.gz) = b687fb003553943596cfed2a89d61c6c8c13ce19a2991766f93cd8ce52c61b39813662fcb1b516e257741a5b5c9a960e7e37b5f5e94c675d3df1bc2918f76f3e +SHA512 (libnbd-1.9.1.tar.gz.sig) = 1aad178ae03b354039526e18d6ad5913d85bb7a1535de0f0b005fd5a9fb1b23f7c21d50d25a220cb0bab4686bf973b26406182bb7f3304f57aa1c80ee8887b25 From 8aa2e0239c75f52cca7ac04e5a074c32bc88a4e5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 3 Jul 2021 16:59:50 +0100 Subject: [PATCH 065/224] New upstream development version 1.9.2. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 3fe8fa6..c66f142 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.9-develoment Name: libnbd -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Jul 03 2021 Richard W.M. Jones - 1.9.2-1 +- New upstream development version 1.9.2. + * Fri Jun 11 2021 Richard W.M. Jones - 1.9.1-1 - New upstream development version 1.9.1. diff --git a/sources b/sources index f71ae2e..65bfdbf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.9.1.tar.gz) = b687fb003553943596cfed2a89d61c6c8c13ce19a2991766f93cd8ce52c61b39813662fcb1b516e257741a5b5c9a960e7e37b5f5e94c675d3df1bc2918f76f3e -SHA512 (libnbd-1.9.1.tar.gz.sig) = 1aad178ae03b354039526e18d6ad5913d85bb7a1535de0f0b005fd5a9fb1b23f7c21d50d25a220cb0bab4686bf973b26406182bb7f3304f57aa1c80ee8887b25 +SHA512 (libnbd-1.9.2.tar.gz) = 6db0038d0152a8009f86b28f42efd0e9e2a13bd32ecae9bb0214d93788e3d7a3be2937f52eb658d5e98a556b0234fbf7826b53166299c741253c18bdaa0b24ee +SHA512 (libnbd-1.9.2.tar.gz.sig) = 742009e97ebd872ad13b071feb1f441eff5463b5be88ca45c8a5d6ea0d8a84bda18ad7de555da8a708d96cb30c1ff95df4f05cc7c7c3dd709d66cdecda73ec44 From 55dc474f1c8ecbfb290a863cc1a0766e1e3dca8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:55:09 +0000 Subject: [PATCH 066/224] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 c66f142..f375f3d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 03 2021 Richard W.M. Jones - 1.9.2-1 - New upstream development version 1.9.2. From 3ef448ba38370b734fbaa74a22ade04c04d8af4f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 30 Jul 2021 16:29:05 -0500 Subject: [PATCH 067/224] Update keyring. Add myself via: gpg --export 'Eric Blake' | \ gpg --no-default-keyring --keyring ./libguestfs.keyring --import --- .gitignore | 1 + libguestfs.keyring | Bin 2823 -> 82814 bytes 2 files changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0075fef..bfa215b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libnbd-*.tar.gz /libnbd-*.tar.gz.sig +/*~ diff --git a/libguestfs.keyring b/libguestfs.keyring index bb3eb5537b7c398a10b7e2b26ca00af011d1a73e..f0508c8d7008b4290b09df40ececc5dd721b5bf9 100644 GIT binary patch literal 82814 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�D_@9Btdl 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 DXm|6* delta 38 ucmey@#@a5nL4awp9FzLyU?yuOrY&ld6_`XPuVoS3e1^rEX)`~&5eoq2=nBFB From f68255b02018f319619a970c5edd36f70223a36a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 30 Jul 2021 16:19:33 -0500 Subject: [PATCH 068/224] New upstream development version 1.9.3. --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f375f3d..2f8dfad 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,8 +8,8 @@ %global source_directory 1.9-develoment Name: libnbd -Version: 1.9.2 -Release: 2%{?dist} +Version: 1.9.3 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jul 30 2021 Eric Blake - 1.9.3-1 +- New upstream development version 1.9.3. + * Thu Jul 22 2021 Fedora Release Engineering - 1.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 65bfdbf..4888809 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.9.2.tar.gz) = 6db0038d0152a8009f86b28f42efd0e9e2a13bd32ecae9bb0214d93788e3d7a3be2937f52eb658d5e98a556b0234fbf7826b53166299c741253c18bdaa0b24ee -SHA512 (libnbd-1.9.2.tar.gz.sig) = 742009e97ebd872ad13b071feb1f441eff5463b5be88ca45c8a5d6ea0d8a84bda18ad7de555da8a708d96cb30c1ff95df4f05cc7c7c3dd709d66cdecda73ec44 +SHA512 (libnbd-1.9.3.tar.gz) = d1bfaaa014ac015701b3ab65ead68a55d6548dce1dfc6a80f7a341574b73ee930da22f5104c6ec803b7ddec60b1d128ffb9d4efc667c6d723e93b21ecf726ed0 +SHA512 (libnbd-1.9.3.tar.gz.sig) = e458076ff090c87a4fc26c0e7f069f6a498ea914db9ea14d1c529e0c1c74fe67e73cce1208030d72a65f10fe6437ea91d9f8061643e040587ce1ec2b0d650d5d From 33b026f3665251c6d270cb5e38f1c9dbc2386f9b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 27 Aug 2021 09:47:06 +0100 Subject: [PATCH 069/224] New upstream development version 1.9.4. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 2f8dfad..072ba8d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.9-develoment Name: libnbd -Version: 1.9.3 +Version: 1.9.4 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Aug 27 2021 Richard W.M. Jones - 1.9.4-1 +- New upstream development version 1.9.4. + * Fri Jul 30 2021 Eric Blake - 1.9.3-1 - New upstream development version 1.9.3. diff --git a/sources b/sources index 4888809..1f91f3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.9.3.tar.gz) = d1bfaaa014ac015701b3ab65ead68a55d6548dce1dfc6a80f7a341574b73ee930da22f5104c6ec803b7ddec60b1d128ffb9d4efc667c6d723e93b21ecf726ed0 -SHA512 (libnbd-1.9.3.tar.gz.sig) = e458076ff090c87a4fc26c0e7f069f6a498ea914db9ea14d1c529e0c1c74fe67e73cce1208030d72a65f10fe6437ea91d9f8061643e040587ce1ec2b0d650d5d +SHA512 (libnbd-1.9.4.tar.gz) = 7e7edda1ce5dbe55aa2094967344f0635ae410971471f9d0944c125bccd0d6603b702298cdb299e971084485bf25653b7a6de55d9f64b24c09d68c02bb22fb33 +SHA512 (libnbd-1.9.4.tar.gz.sig) = 22c5f69c23f5d5f37de49761460be08d0bf3b45e173699fbd316b8fb4ff42a1d0dcb5eed75430415f1cb5c0fe507c7f2e5eb2d8ac6fea1837f06bfcc15d82779 From 1517376dc2b738a3901049c67219d2d7d2964156 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 3 Sep 2021 14:14:50 +0100 Subject: [PATCH 070/224] New upstream development version 1.9.5. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 072ba8d..ea0024b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.9-develoment Name: libnbd -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 03 2021 Richard W.M. Jones - 1.9.5-1 +- New upstream development version 1.9.5. + * Fri Aug 27 2021 Richard W.M. Jones - 1.9.4-1 - New upstream development version 1.9.4. diff --git a/sources b/sources index 1f91f3b..fac25e2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.9.4.tar.gz) = 7e7edda1ce5dbe55aa2094967344f0635ae410971471f9d0944c125bccd0d6603b702298cdb299e971084485bf25653b7a6de55d9f64b24c09d68c02bb22fb33 -SHA512 (libnbd-1.9.4.tar.gz.sig) = 22c5f69c23f5d5f37de49761460be08d0bf3b45e173699fbd316b8fb4ff42a1d0dcb5eed75430415f1cb5c0fe507c7f2e5eb2d8ac6fea1837f06bfcc15d82779 +SHA512 (libnbd-1.9.5.tar.gz) = a1f319986789810d6b61bb65fb24423bed53d1064cd066a82947363cb1d8f4535a4907a3cd6e92b6228bbfe135aa8e0fe112cc7bc19d3d9e2128d666057676b0 +SHA512 (libnbd-1.9.5.tar.gz.sig) = 1a570d0e4e551e59cf48f0fa73db8b0eb1ec42db7dd8d49e282d2a56fdcd39bc5d7ed1bd1903fdeb55bd618c875ebe1430fe10847fd8f3759c20ded43b4efe8c From b26f4d4a58e6032b06f489be140160848d7a21a5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Sep 2021 22:57:51 +0100 Subject: [PATCH 071/224] New upstream development version 1.9.6. --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index ea0024b..c3ba69d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.9-develoment Name: libnbd -Version: 1.9.5 +Version: 1.9.6 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Sep 21 2021 Richard W.M. Jones - 1.9.6-1 +- New upstream development version 1.9.6. + * Fri Sep 03 2021 Richard W.M. Jones - 1.9.5-1 - New upstream development version 1.9.5. diff --git a/sources b/sources index fac25e2..ebfd782 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.9.5.tar.gz) = a1f319986789810d6b61bb65fb24423bed53d1064cd066a82947363cb1d8f4535a4907a3cd6e92b6228bbfe135aa8e0fe112cc7bc19d3d9e2128d666057676b0 -SHA512 (libnbd-1.9.5.tar.gz.sig) = 1a570d0e4e551e59cf48f0fa73db8b0eb1ec42db7dd8d49e282d2a56fdcd39bc5d7ed1bd1903fdeb55bd618c875ebe1430fe10847fd8f3759c20ded43b4efe8c +SHA512 (libnbd-1.9.6.tar.gz) = 0406340c2ea65f9cef75e067ac3f86fd371016ca09dbe1a9ce89e44957aef51a1f161b479b45c89c9a7a0a7b9475c9dc55b98391117012e1dea492234d3efd03 +SHA512 (libnbd-1.9.6.tar.gz.sig) = 5ebc15ee7e0200497caecdbb08d3fb828ff11c2c652292f5c8c700131e0acebcb26e6f28ae1181f6fef04cd2245a0f85d0f0c94871642d951e0885e9eec74a3c From b4031f3c03234c35d495be85606e510651f15c4c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 23 Sep 2021 15:55:20 +0100 Subject: [PATCH 072/224] New upstream stable branch version 1.10.0 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index c3ba69d..d90f905 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,10 +5,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.9-develoment +%global source_directory 1.10-stable Name: libnbd -Version: 1.9.6 +Version: 1.10.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Sep 23 2021 Richard W.M. Jones - 1.10.0-1 +- New upstream stable branch version 1.10.0 + * Tue Sep 21 2021 Richard W.M. Jones - 1.9.6-1 - New upstream development version 1.9.6. diff --git a/sources b/sources index ebfd782..e630c5f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.9.6.tar.gz) = 0406340c2ea65f9cef75e067ac3f86fd371016ca09dbe1a9ce89e44957aef51a1f161b479b45c89c9a7a0a7b9475c9dc55b98391117012e1dea492234d3efd03 -SHA512 (libnbd-1.9.6.tar.gz.sig) = 5ebc15ee7e0200497caecdbb08d3fb828ff11c2c652292f5c8c700131e0acebcb26e6f28ae1181f6fef04cd2245a0f85d0f0c94871642d951e0885e9eec74a3c +SHA512 (libnbd-1.10.0.tar.gz) = b74866fce8c7bb96690f19171aa0c3f5f0bb486e728c538e30a0b615aa826299ee5472174bc3961721637a525221184b8c8196d8d25a0e765e9de5edbe2ea885 +SHA512 (libnbd-1.10.0.tar.gz.sig) = d189e1440cff33f878d2025c3e51feb814bf3c5ed63fa02f4fdf90906245f908e41bed12fb7e54356e8ed8e19ebeb4d3fc5a026ab3ef82abf6ac787609e54bc5 From 0f0b4e2454ca0e0d928e623f9ea8647cd10e9288 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:20:48 +0100 Subject: [PATCH 073/224] OCaml 4.13.1 build --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index d90f905..00e3953 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 1.10.0-2 +- OCaml 4.13.1 build + * Thu Sep 23 2021 Richard W.M. Jones - 1.10.0-1 - New upstream stable branch version 1.10.0 From 6f6d130e91b93e76aef6d1b05a86b6e4512dee9b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Oct 2021 21:37:50 +0100 Subject: [PATCH 074/224] New upstream development version 1.11.1 --- libnbd.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 00e3953..8d5f5cd 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -5,11 +5,11 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.10-stable +%global source_directory 1.11-development Name: libnbd -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.11.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Oct 25 2021 Richard W.M. Jones - 1.11.1-1 +- New upstream development version 1.11.1 + * Mon Oct 04 2021 Richard W.M. Jones - 1.10.0-2 - OCaml 4.13.1 build diff --git a/sources b/sources index e630c5f..08fbffd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.10.0.tar.gz) = b74866fce8c7bb96690f19171aa0c3f5f0bb486e728c538e30a0b615aa826299ee5472174bc3961721637a525221184b8c8196d8d25a0e765e9de5edbe2ea885 -SHA512 (libnbd-1.10.0.tar.gz.sig) = d189e1440cff33f878d2025c3e51feb814bf3c5ed63fa02f4fdf90906245f908e41bed12fb7e54356e8ed8e19ebeb4d3fc5a026ab3ef82abf6ac787609e54bc5 +SHA512 (libnbd-1.11.1.tar.gz) = 3304674bb36879865d014d3a7d2ce21a956d351d1ce14ace93ed4db16bc32f9b096ea08c68411d2f61fabfcdf055686a77f3a746cb6bc8785201f3f2babfa970 +SHA512 (libnbd-1.11.1.tar.gz.sig) = 4f932f9acc5ee9a222f8f9293582e48f924b5a2a7f5da806dc5637a059e194dc42638ef3d3831b61ccee2da1aca11c15841475bacc4577cebf242208a032303b From 8e3e1e7a2d7f1d27728507c4d6f06fa8a2c2913e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Nov 2021 20:01:47 +0000 Subject: [PATCH 075/224] New upstream development version 1.11.2 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 8d5f5cd..9a831a0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.1 +Version: 1.11.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Nov 02 2021 Richard W.M. Jones - 1.11.2-1 +- New upstream development version 1.11.2 + * Mon Oct 25 2021 Richard W.M. Jones - 1.11.1-1 - New upstream development version 1.11.1 diff --git a/sources b/sources index 08fbffd..0c1e6d7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.1.tar.gz) = 3304674bb36879865d014d3a7d2ce21a956d351d1ce14ace93ed4db16bc32f9b096ea08c68411d2f61fabfcdf055686a77f3a746cb6bc8785201f3f2babfa970 -SHA512 (libnbd-1.11.1.tar.gz.sig) = 4f932f9acc5ee9a222f8f9293582e48f924b5a2a7f5da806dc5637a059e194dc42638ef3d3831b61ccee2da1aca11c15841475bacc4577cebf242208a032303b +SHA512 (libnbd-1.11.2.tar.gz) = b7d38cd28585c75b8f61192d7a6dee3d2f3aa37d39e94f650ebfd201315d8f581ed8f88a92776d6cefbfe242a3a84ebcc8952080ad21eca9c20f4ca41573364d +SHA512 (libnbd-1.11.2.tar.gz.sig) = acb89ec9ed54f9fecca9f90543b9a29921ab61d73fa5162716dde0c436eb6a7e87b9ef8dfb0dfc2b7d9c061f6b32ca51c5c8913a4e1d2e06f4ad162a70113962 From 1bfaf0bf7a993e9516bc6c1d48def6aa22e63ec2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Nov 2021 10:56:04 +0000 Subject: [PATCH 076/224] New upstream development version 1.11.3 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 9a831a0..a511d2d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.2 +Version: 1.11.3 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,7 +317,10 @@ make %{?_smp_mflags} check || { %changelog -* Wed Nov 02 2021 Richard W.M. Jones - 1.11.2-1 +* Thu Nov 04 2021 Richard W.M. Jones - 1.11.3-1 +- New upstream development version 1.11.3 + +* Tue Nov 02 2021 Richard W.M. Jones - 1.11.2-1 - New upstream development version 1.11.2 * Mon Oct 25 2021 Richard W.M. Jones - 1.11.1-1 diff --git a/sources b/sources index 0c1e6d7..aca6be6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.2.tar.gz) = b7d38cd28585c75b8f61192d7a6dee3d2f3aa37d39e94f650ebfd201315d8f581ed8f88a92776d6cefbfe242a3a84ebcc8952080ad21eca9c20f4ca41573364d -SHA512 (libnbd-1.11.2.tar.gz.sig) = acb89ec9ed54f9fecca9f90543b9a29921ab61d73fa5162716dde0c436eb6a7e87b9ef8dfb0dfc2b7d9c061f6b32ca51c5c8913a4e1d2e06f4ad162a70113962 +SHA512 (libnbd-1.11.3.tar.gz) = 7a80504cf1cf89281d36d208763dbca023b77aa9f36494e727254aa50a7c2f5645554bdaecca4c947ff740335352ad9cb31129fe3ee7af6efc92b73c5d472e5a +SHA512 (libnbd-1.11.3.tar.gz.sig) = fd039fdcb548a3299f532cec780d60a6589d333e4fd839303c4843d89215e818c2ed1915e34daa33a90cd862d85e97f20e9669cbd7389f4c92ce7abe136edbbb From 72ebc60a1a89b750cc10d5b21fda81c9c1822f9c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 19 Nov 2021 21:01:43 +0000 Subject: [PATCH 077/224] New upstream development version 1.11.4 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a511d2d..268f306 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.3 +Version: 1.11.4 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Nov 19 2021 Richard W.M. Jones - 1.11.4-1 +- New upstream development version 1.11.4 + * Thu Nov 04 2021 Richard W.M. Jones - 1.11.3-1 - New upstream development version 1.11.3 diff --git a/sources b/sources index aca6be6..d5d0b11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.3.tar.gz) = 7a80504cf1cf89281d36d208763dbca023b77aa9f36494e727254aa50a7c2f5645554bdaecca4c947ff740335352ad9cb31129fe3ee7af6efc92b73c5d472e5a -SHA512 (libnbd-1.11.3.tar.gz.sig) = fd039fdcb548a3299f532cec780d60a6589d333e4fd839303c4843d89215e818c2ed1915e34daa33a90cd862d85e97f20e9669cbd7389f4c92ce7abe136edbbb +SHA512 (libnbd-1.11.4.tar.gz) = 93c2541729995477569edb3b32146789dcad0c10f989d7208538bd3ff6bdf3f70bdcb4746a7121907abf38d37c5d5131f59b60107e23dca524a15a83b46f5443 +SHA512 (libnbd-1.11.4.tar.gz.sig) = d18683009222052ceacb9a4298604480d20e98328c4cb74dbe79b7aafac2d8e87fc29def36f4a33728481ac43a9fc363705a92453ed9c90e5fa8bccd280345f9 From 192c26cf0a5e5e4ba461e5d2336132472ad72237 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 30 Nov 2021 15:26:54 -0600 Subject: [PATCH 078/224] New upstream development version 1.11.5 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 268f306..1039860 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.4 +Version: 1.11.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Nov 30 2021 Eric Blake - 1.11.5-1 +- New upstream development version 1.11.5 + * Fri Nov 19 2021 Richard W.M. Jones - 1.11.4-1 - New upstream development version 1.11.4 diff --git a/sources b/sources index d5d0b11..625c10a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.4.tar.gz) = 93c2541729995477569edb3b32146789dcad0c10f989d7208538bd3ff6bdf3f70bdcb4746a7121907abf38d37c5d5131f59b60107e23dca524a15a83b46f5443 -SHA512 (libnbd-1.11.4.tar.gz.sig) = d18683009222052ceacb9a4298604480d20e98328c4cb74dbe79b7aafac2d8e87fc29def36f4a33728481ac43a9fc363705a92453ed9c90e5fa8bccd280345f9 +SHA512 (libnbd-1.11.5.tar.gz) = d1add2c8681ec548d7100bafb4bc9c835195db513dfd4f560f746d32d766619244867098877a53a95d35049da9540367dc6be7e335646886b35f22f40a02ad4e +SHA512 (libnbd-1.11.5.tar.gz.sig) = e67a7537e1462c278fc1e82b9ea7cba0d1c08714133067ad35bea8bba5394cc9447847837f42d8662b924c85d6420b2a1ad9010823832359b430f4d20eb441d7 From 8413727de12c9f873dcdbe2eb3dc105e5a2aac66 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Jan 2022 13:49:05 +0000 Subject: [PATCH 079/224] New upstream development version 1.11.6 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 1039860..0118258 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.5 +Version: 1.11.6 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jan 04 2022 Richard W.M. Jones - 1.11.6-1 +- New upstream development version 1.11.6 + * Tue Nov 30 2021 Eric Blake - 1.11.5-1 - New upstream development version 1.11.5 diff --git a/sources b/sources index 625c10a..ebbf806 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.5.tar.gz) = d1add2c8681ec548d7100bafb4bc9c835195db513dfd4f560f746d32d766619244867098877a53a95d35049da9540367dc6be7e335646886b35f22f40a02ad4e -SHA512 (libnbd-1.11.5.tar.gz.sig) = e67a7537e1462c278fc1e82b9ea7cba0d1c08714133067ad35bea8bba5394cc9447847837f42d8662b924c85d6420b2a1ad9010823832359b430f4d20eb441d7 +SHA512 (libnbd-1.11.6.tar.gz) = 629c67713c7a86c5f03f7c0e70d58d0e36129b1da7f7e682f949886148c605fc168b552753a123bd351d98cfbbe44fad3c6dd54cbac4c329559fe3e0f9c1a503 +SHA512 (libnbd-1.11.6.tar.gz.sig) = 935f62931fac4228181e1fc44b67be81fbca7560ee1050b97c46c51cb978997d2254e3df1e559410e0e4ba260107f57a065335b528b5b2f5eb600b255b1b6d4b From 798a0e9f91e432b6bdde6b794fdbcb265409302c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 17 Jan 2022 16:10:14 +0000 Subject: [PATCH 080/224] New upstream development version 1.11.7 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0118258..b0b74d5 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,7 +8,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.6 +Version: 1.11.7 Release: 1%{?dist} Summary: NBD client library in userspace @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jan 17 2022 Richard W.M. Jones - 1.11.7-1 +- New upstream development version 1.11.7 + * Tue Jan 04 2022 Richard W.M. Jones - 1.11.6-1 - New upstream development version 1.11.6 diff --git a/sources b/sources index ebbf806..ee6bf8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.6.tar.gz) = 629c67713c7a86c5f03f7c0e70d58d0e36129b1da7f7e682f949886148c605fc168b552753a123bd351d98cfbbe44fad3c6dd54cbac4c329559fe3e0f9c1a503 -SHA512 (libnbd-1.11.6.tar.gz.sig) = 935f62931fac4228181e1fc44b67be81fbca7560ee1050b97c46c51cb978997d2254e3df1e559410e0e4ba260107f57a065335b528b5b2f5eb600b255b1b6d4b +SHA512 (libnbd-1.11.7.tar.gz) = 1fa0c3d1b48b7cac7355f928617678424b07eaa7d0d37feb9f06487698b718e109b8e5caff6c85fda9881d16ee09da9558e80e73b9b6bc8de6fcd26be44c5ae4 +SHA512 (libnbd-1.11.7.tar.gz.sig) = 815d23be0536b7b96617f7202f71b0c99957a41f0978eaaa3932127578a4b48a9053c16cb5912206c7ba40686929e63811a4a1c7e758f7c2d428b3e369749eec From 986d8db1a9dd0c5a079fc35a03dca0d08cc3d6cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:46:34 +0000 Subject: [PATCH 081/224] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 b0b74d5..20354bc 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -9,7 +9,7 @@ Name: libnbd Version: 1.11.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +317,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.11.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 17 2022 Richard W.M. Jones - 1.11.7-1 - New upstream development version 1.11.7 From f763475cef0fcce4c3b942580df43150ab2cb4c1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 13:02:36 +0000 Subject: [PATCH 082/224] OCaml 4.13.1 rebuild to remove package notes --- libnbd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 20354bc..afdee10 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -1,3 +1,4 @@ +%undefine _package_note_flags # If we should verify tarball signature with GPGv2. %global verify_tarball_signature 1 @@ -9,7 +10,7 @@ Name: libnbd Version: 1.11.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -317,6 +318,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 1.11.7-3 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Fedora Release Engineering - 1.11.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 566cb50dc34639e2676db86d4fd409602a83af21 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 5 Feb 2022 10:50:12 +0000 Subject: [PATCH 083/224] New upstream development version 1.11.8. Fixes: CVE-2022-0485 nbdcopy may create corrupted destination image --- libnbd.spec | 10 ++++++++-- sources | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index afdee10..d7a311b 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -1,4 +1,6 @@ +# 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 @@ -9,8 +11,8 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.7 -Release: 3%{?dist} +Version: 1.11.8 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -318,6 +320,10 @@ make %{?_smp_mflags} check || { %changelog +* Sat Feb 05 2022 Richard W.M. Jones - 1.11.8-1 +- New upstream development version 1.11.8. +- Fixes: CVE-2022-0485 nbdcopy may create corrupted destination image + * Fri Feb 04 2022 Richard W.M. Jones - 1.11.7-3 - OCaml 4.13.1 rebuild to remove package notes diff --git a/sources b/sources index ee6bf8c..6009b54 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.7.tar.gz) = 1fa0c3d1b48b7cac7355f928617678424b07eaa7d0d37feb9f06487698b718e109b8e5caff6c85fda9881d16ee09da9558e80e73b9b6bc8de6fcd26be44c5ae4 -SHA512 (libnbd-1.11.7.tar.gz.sig) = 815d23be0536b7b96617f7202f71b0c99957a41f0978eaaa3932127578a4b48a9053c16cb5912206c7ba40686929e63811a4a1c7e758f7c2d428b3e369749eec +SHA512 (libnbd-1.11.8.tar.gz) = 2e502dc7b8fe95edeb8732a1d34ed0d99d1f5cc3013398b32bd33aa71ca0a77e9ee41cc2e201a3636d54071a224de3539458de4e45a6e9c854ad25d441fe83ee +SHA512 (libnbd-1.11.8.tar.gz.sig) = d920ea8e52c6233bc44ff093b1c81067ad6058ef65664bcfe38c2572ab8416880f977d0644ddb7bafecb307cb7939e84826952e56cd6c910cce87f33f41592c5 From 89d1ac2f0781634dfbad90c2bf2aab0e9db2be26 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 10 Feb 2022 16:02:10 +0000 Subject: [PATCH 084/224] New upstream development version 1.11.9 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index d7a311b..da8465d 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.8 +Version: 1.11.9 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Feb 10 2022 Richard W.M. Jones - 1.11.9-1 +- New upstream development version 1.11.9 + * Sat Feb 05 2022 Richard W.M. Jones - 1.11.8-1 - New upstream development version 1.11.8. - Fixes: CVE-2022-0485 nbdcopy may create corrupted destination image diff --git a/sources b/sources index 6009b54..eb43468 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.8.tar.gz) = 2e502dc7b8fe95edeb8732a1d34ed0d99d1f5cc3013398b32bd33aa71ca0a77e9ee41cc2e201a3636d54071a224de3539458de4e45a6e9c854ad25d441fe83ee -SHA512 (libnbd-1.11.8.tar.gz.sig) = d920ea8e52c6233bc44ff093b1c81067ad6058ef65664bcfe38c2572ab8416880f977d0644ddb7bafecb307cb7939e84826952e56cd6c910cce87f33f41592c5 +SHA512 (libnbd-1.11.9.tar.gz) = 7486bf96a9841402193b14ff242419723ff79cca84bf6a6a52790b289f2a6e8bd215bd93356ae92c0d0ca614fee19805622097c3f93fc7f083748d17f852d0dd +SHA512 (libnbd-1.11.9.tar.gz.sig) = 147fdc0a686c05fba9fcc2599652a2590d546fdce860968cb3106ca3b06580975b96ffd738806a41f76dff591f0d3592b793173287cc0d179afe1d9c2d1b740d From e3b1d1773f6a15c722f27544aa4f0f1c93a41e88 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Feb 2022 19:23:53 +0000 Subject: [PATCH 085/224] New upstream development version 1.11.10 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index da8465d..9d1af55 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.9 +Version: 1.11.10 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Feb 15 2022 Richard W.M. Jones - 1.11.10-1 +- New upstream development version 1.11.10 + * Thu Feb 10 2022 Richard W.M. Jones - 1.11.9-1 - New upstream development version 1.11.9 diff --git a/sources b/sources index eb43468..5b15861 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.9.tar.gz) = 7486bf96a9841402193b14ff242419723ff79cca84bf6a6a52790b289f2a6e8bd215bd93356ae92c0d0ca614fee19805622097c3f93fc7f083748d17f852d0dd -SHA512 (libnbd-1.11.9.tar.gz.sig) = 147fdc0a686c05fba9fcc2599652a2590d546fdce860968cb3106ca3b06580975b96ffd738806a41f76dff591f0d3592b793173287cc0d179afe1d9c2d1b740d +SHA512 (libnbd-1.11.10.tar.gz) = d1ebcb3f92aac7a11ee16b8e5122db98c5935c9f467b9d266820fc8d74b8170bfe44989d0be0f950768783a2619fe16da5d5ff46a29a4db5f5b28e101bc6badf +SHA512 (libnbd-1.11.10.tar.gz.sig) = 1bc7b11267b6b875d4514372fa105de74f616778cef4acd6dcf6b591eafc8dcda860b8bd1b7974ef37a5878cf25c4435b56db5f655767c1797bfc9f501e69daf From 59885957bc7fde3cc6dd316571bb7158fdcdca69 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 19 Feb 2022 10:48:07 +0000 Subject: [PATCH 086/224] New upstream development version 1.11.11 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 9d1af55..fed64f3 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.11-development Name: libnbd -Version: 1.11.10 +Version: 1.11.11 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Feb 19 2022 Richard W.M. Jones - 1.11.11-1 +- New upstream development version 1.11.11 + * Tue Feb 15 2022 Richard W.M. Jones - 1.11.10-1 - New upstream development version 1.11.10 diff --git a/sources b/sources index 5b15861..5d0eca9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.10.tar.gz) = d1ebcb3f92aac7a11ee16b8e5122db98c5935c9f467b9d266820fc8d74b8170bfe44989d0be0f950768783a2619fe16da5d5ff46a29a4db5f5b28e101bc6badf -SHA512 (libnbd-1.11.10.tar.gz.sig) = 1bc7b11267b6b875d4514372fa105de74f616778cef4acd6dcf6b591eafc8dcda860b8bd1b7974ef37a5878cf25c4435b56db5f655767c1797bfc9f501e69daf +SHA512 (libnbd-1.11.11.tar.gz) = e9d5bd8735c82d3b99c409091d4bd9368c41aac32043c065f27bd0309c69b2065b4cae4841a01cac63e22ed4837159ed32836d7f220a0af06a555c89d94bdefa +SHA512 (libnbd-1.11.11.tar.gz.sig) = 79c518b4103e92b3b2808cdcdb3f40dab93baf3ce62038e56234bfb331809c8a7102c67bf30705b1d2af8c8194c14cd73170ae892cda926f3136b0116f790f3e From a0ab4f095a4ba62f564ac0bb27ef4b9607a3635f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 24 Feb 2022 19:14:16 +0000 Subject: [PATCH 087/224] New upstream stable version 1.12.0 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index fed64f3..37c6be4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,10 +8,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.11-development +%global source_directory 1.12-stable Name: libnbd -Version: 1.11.11 +Version: 1.12.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Feb 24 2022 Richard W.M. Jones - 1.12.0-1 +- New upstream stable version 1.12.0 + * Sat Feb 19 2022 Richard W.M. Jones - 1.11.11-1 - New upstream development version 1.11.11 diff --git a/sources b/sources index 5d0eca9..09053e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.11.11.tar.gz) = e9d5bd8735c82d3b99c409091d4bd9368c41aac32043c065f27bd0309c69b2065b4cae4841a01cac63e22ed4837159ed32836d7f220a0af06a555c89d94bdefa -SHA512 (libnbd-1.11.11.tar.gz.sig) = 79c518b4103e92b3b2808cdcdb3f40dab93baf3ce62038e56234bfb331809c8a7102c67bf30705b1d2af8c8194c14cd73170ae892cda926f3136b0116f790f3e +SHA512 (libnbd-1.12.0.tar.gz) = 3a771de8089b17dad917e7be972c3ff4fc0505caa80afd3cc956f32b6bc951375cb3922ef53afe1eafe4cf407ccd9cc84f0516e09c4e8e4a2106880d1412f6de +SHA512 (libnbd-1.12.0.tar.gz.sig) = f60edd88e7e44287da1f1d5824f0b78f65ea26405293966528e792cd19256bfdb0db70b134739a497322e374feb23049061d19b622d558ce75d8a63188e42884 From 1eeaae2c744fdcc21702b74c0b5270236e7242fe Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Mar 2022 14:45:31 +0000 Subject: [PATCH 088/224] New upstream stable version 1.12.1 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 37c6be4..dd71bba 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.12-stable Name: libnbd -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Mar 01 2022 Richard W.M. Jones - 1.12.1-1 +- New upstream stable version 1.12.1 + * Thu Feb 24 2022 Richard W.M. Jones - 1.12.0-1 - New upstream stable version 1.12.0 diff --git a/sources b/sources index 09053e8..79a2aab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.12.0.tar.gz) = 3a771de8089b17dad917e7be972c3ff4fc0505caa80afd3cc956f32b6bc951375cb3922ef53afe1eafe4cf407ccd9cc84f0516e09c4e8e4a2106880d1412f6de -SHA512 (libnbd-1.12.0.tar.gz.sig) = f60edd88e7e44287da1f1d5824f0b78f65ea26405293966528e792cd19256bfdb0db70b134739a497322e374feb23049061d19b622d558ce75d8a63188e42884 +SHA512 (libnbd-1.12.1.tar.gz) = 417fb97942aa2c1e94d37c313df2066dcc49504f7214b48752a8afbc2e627e2635e27161d2d9828edafebd61ce3d10def52139876f1bb219858af7b61a054c12 +SHA512 (libnbd-1.12.1.tar.gz.sig) = c9fbb123b4c938e890faf0efe2059343dbbd196ec77e115b7c12bc7b10d527f9814a2a90ab9298e1af34db5f7994c51a54900829036ad4eb297fb509aca8bc61 From 497ebcdb3a63b28c38d42e167b1737bfd9cc2783 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 15 Mar 2022 17:01:49 +0000 Subject: [PATCH 089/224] New upstream stable version 1.12.2 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index dd71bba..c6d5011 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.12-stable Name: libnbd -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Mar 15 2022 Richard W.M. Jones - 1.12.2-1 +- New upstream stable version 1.12.2 + * Tue Mar 01 2022 Richard W.M. Jones - 1.12.1-1 - New upstream stable version 1.12.1 diff --git a/sources b/sources index 79a2aab..c241ccc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.12.1.tar.gz) = 417fb97942aa2c1e94d37c313df2066dcc49504f7214b48752a8afbc2e627e2635e27161d2d9828edafebd61ce3d10def52139876f1bb219858af7b61a054c12 -SHA512 (libnbd-1.12.1.tar.gz.sig) = c9fbb123b4c938e890faf0efe2059343dbbd196ec77e115b7c12bc7b10d527f9814a2a90ab9298e1af34db5f7994c51a54900829036ad4eb297fb509aca8bc61 +SHA512 (libnbd-1.12.2.tar.gz) = 98197029043b11ce2c9d96c67d6221f6e261c2f44b90986ecdab626f20bf330ca24849f378d37a94293656a19d91364ceeec41e277806791d7c711d2698416ce +SHA512 (libnbd-1.12.2.tar.gz.sig) = 90fe96f33fb88b4f3ef7b33f8bf5d187fb6974b60dc41e864257e008630af2c3a5178fc9ce025201ed5d92d44ad91cc4a2b31ab0c512a160a4e280af23732bd4 From cf3590826ce727e81930ede71292a5a938a800f7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 29 May 2022 16:10:28 +0100 Subject: [PATCH 090/224] New upstream stable version 1.12.3 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index c6d5011..54f415e 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.12-stable Name: libnbd -Version: 1.12.2 +Version: 1.12.3 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Sun May 29 2022 Richard W.M. Jones - 1.12.3-1 +- New upstream stable version 1.12.3 + * Tue Mar 15 2022 Richard W.M. Jones - 1.12.2-1 - New upstream stable version 1.12.2 diff --git a/sources b/sources index c241ccc..ecbb7e9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.12.2.tar.gz) = 98197029043b11ce2c9d96c67d6221f6e261c2f44b90986ecdab626f20bf330ca24849f378d37a94293656a19d91364ceeec41e277806791d7c711d2698416ce -SHA512 (libnbd-1.12.2.tar.gz.sig) = 90fe96f33fb88b4f3ef7b33f8bf5d187fb6974b60dc41e864257e008630af2c3a5178fc9ce025201ed5d92d44ad91cc4a2b31ab0c512a160a4e280af23732bd4 +SHA512 (libnbd-1.12.3.tar.gz) = 3397f5f916f40176a08dfe2426aeeedebad4837236f0dbbf90ac7aa279d1933d8b372ef9bfb82715be40a50b3404f170564dd14ffc4e43b521d9594d218e3aae +SHA512 (libnbd-1.12.3.tar.gz.sig) = 1b0ddd5864ad903552f45115b9f8401de110d1d95a0d3f32fef0cef2a9017be6657e5c5f0d19df787b5944ee740d9d87406cd32a1ef2ae4c488758f398ab5ffa From a32a64e05f4fb8ca829de3991b790714323f10d2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Jun 2022 21:15:33 +0100 Subject: [PATCH 091/224] New upstream development version 1.13.1 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 54f415e..8c80506 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,10 +8,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.12-stable +%global source_directory 1.13-development Name: libnbd -Version: 1.12.3 +Version: 1.13.1 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jun 09 2022 Richard W.M. Jones - 1.13.1-1 +- New upstream development version 1.13.1 + * Sun May 29 2022 Richard W.M. Jones - 1.12.3-1 - New upstream stable version 1.12.3 diff --git a/sources b/sources index ecbb7e9..b7de161 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.12.3.tar.gz) = 3397f5f916f40176a08dfe2426aeeedebad4837236f0dbbf90ac7aa279d1933d8b372ef9bfb82715be40a50b3404f170564dd14ffc4e43b521d9594d218e3aae -SHA512 (libnbd-1.12.3.tar.gz.sig) = 1b0ddd5864ad903552f45115b9f8401de110d1d95a0d3f32fef0cef2a9017be6657e5c5f0d19df787b5944ee740d9d87406cd32a1ef2ae4c488758f398ab5ffa +SHA512 (libnbd-1.13.1.tar.gz) = 644ac71efc24b20aede76a23763c87f4c4c119ed0086b1ec3020845098283d08ccafd2b209a9723cbe751eb23f93d785cb8b19611939d967178209658c3897d7 +SHA512 (libnbd-1.13.1.tar.gz.sig) = 84d74cc3febfe1f63dfac05837044823fd4ebe4f826e1ec5f9d02adedf7e43a1991b43f5f01dbf017c5e551a678c7857a505e53a03c6c6e3e1e3133157c8af1e From 80ecaa9148f4b206f9617ab87c7c2ed1d0254891 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 9 Jun 2022 21:22:35 +0100 Subject: [PATCH 092/224] Rename README file --- libnbd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 8c80506..364c2b0 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -254,7 +254,7 @@ make %{?_smp_mflags} check || { %files -%doc README +%doc README.md %license COPYING.LIB %{_bindir}/nbdcopy %{_bindir}/nbdinfo @@ -322,6 +322,7 @@ make %{?_smp_mflags} check || { %changelog * Thu Jun 09 2022 Richard W.M. Jones - 1.13.1-1 - New upstream development version 1.13.1 +- Rename README file. * Sun May 29 2022 Richard W.M. Jones - 1.12.3-1 - New upstream stable version 1.12.3 From 51de4333dcc719d535b53c7f596c3703819d27a7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Jun 2022 13:09:41 +0100 Subject: [PATCH 093/224] New upstream development version 1.13.2 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 364c2b0..1a78278 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.1 +Version: 1.13.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 13 2022 Richard W.M. Jones - 1.13.2-1 +- New upstream development version 1.13.2 + * Thu Jun 09 2022 Richard W.M. Jones - 1.13.1-1 - New upstream development version 1.13.1 - Rename README file. diff --git a/sources b/sources index b7de161..c6dbd31 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.1.tar.gz) = 644ac71efc24b20aede76a23763c87f4c4c119ed0086b1ec3020845098283d08ccafd2b209a9723cbe751eb23f93d785cb8b19611939d967178209658c3897d7 -SHA512 (libnbd-1.13.1.tar.gz.sig) = 84d74cc3febfe1f63dfac05837044823fd4ebe4f826e1ec5f9d02adedf7e43a1991b43f5f01dbf017c5e551a678c7857a505e53a03c6c6e3e1e3133157c8af1e +SHA512 (libnbd-1.13.2.tar.gz) = 5c4109d603a2a0d4bd9b8db618132beb8ca53e9db57cdca488ecceb08d0c9c64dc7bc72c605ee33f5378d6ccf2877e72f96740b98bbf2b82b5628af9b2bd0210 +SHA512 (libnbd-1.13.2.tar.gz.sig) = 431ef4de300de5c90cd22acec49b7b78f6d5121cdb7d1fa8d68031c008c880fc9d8f6ca96e9278f3ddaed8cc5ccda52efa32eb215415d0449efddfa89263136a From 468417340d6b241f06c492b216376f0bea2d5518 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 17:12:03 +0200 Subject: [PATCH 094/224] Rebuilt for Python 3.11 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 1a78278..8c8e2bf 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 13 2022 Python Maint - 1.13.2-2 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Richard W.M. Jones - 1.13.2-1 - New upstream development version 1.13.2 From b48123a8722b540fd96b051a55a2586e93aaf54a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:40:47 +0100 Subject: [PATCH 095/224] OCaml 4.14.0 rebuild --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 8c8e2bf..315ac4f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 1.13.2-3 +- OCaml 4.14.0 rebuild + * Mon Jun 13 2022 Python Maint - 1.13.2-2 - Rebuilt for Python 3.11 From 626d85b5d69d43a673ca54e066bde14ff43520d6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 20 Jun 2022 10:45:39 +0200 Subject: [PATCH 096/224] Rebuilt for Python 3.11 --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 315ac4f..6ccbd92 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.13.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 20 2022 Python Maint - 1.13.2-4 +- Rebuilt for Python 3.11 + * Sat Jun 18 2022 Richard W.M. Jones - 1.13.2-3 - OCaml 4.14.0 rebuild From 5048e5e810a0091b154b9a04ee611758267cb492 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 20 Jun 2022 10:18:59 +0100 Subject: [PATCH 097/224] Rebuild for OCaml 4.14.0 because of Python conflict --- libnbd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 6ccbd92..9d07ba3 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.13.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 20 2022 Richard W.M. Jones - 1.13.2-5 +- Rebuild for OCaml 4.14.0 because of Python conflict + * Mon Jun 20 2022 Python Maint - 1.13.2-4 - Rebuilt for Python 3.11 From 3a1b3b1576abe8cb6aa4638a08973fe5b055a450 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 27 Jun 2022 15:23:31 +0100 Subject: [PATCH 098/224] New upstream development version 1.13.3 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 9d07ba3..e6c651a 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,8 +11,8 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.2 -Release: 5%{?dist} +Version: 1.13.3 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -320,6 +320,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Jun 27 2022 Richard W.M. Jones - 1.13.3-1 +- New upstream development version 1.13.3 + * Mon Jun 20 2022 Richard W.M. Jones - 1.13.2-5 - Rebuild for OCaml 4.14.0 because of Python conflict diff --git a/sources b/sources index c6dbd31..04cedcb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.2.tar.gz) = 5c4109d603a2a0d4bd9b8db618132beb8ca53e9db57cdca488ecceb08d0c9c64dc7bc72c605ee33f5378d6ccf2877e72f96740b98bbf2b82b5628af9b2bd0210 -SHA512 (libnbd-1.13.2.tar.gz.sig) = 431ef4de300de5c90cd22acec49b7b78f6d5121cdb7d1fa8d68031c008c880fc9d8f6ca96e9278f3ddaed8cc5ccda52efa32eb215415d0449efddfa89263136a +SHA512 (libnbd-1.13.3.tar.gz) = fe75c91d4f12a0a29b42bb94918cca2498f866e400168be8ce7c3059fcf9b88831676342445de886f970833fb22c41ae5c50b363c1c6ac4cd2c7cf194384f3b2 +SHA512 (libnbd-1.13.3.tar.gz.sig) = cc2bb708c94cee81015f8535ae03dcf0521a29877aee8d6c576186d81cddaefb5aaae56282dec13a0b944a6ef7c88d4e89a33d4236a587b92a450ef37d263b5c From ecbcec1d100218fdac984f0ba9a3bd66c54da7c0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 30 Jun 2022 12:58:43 +0100 Subject: [PATCH 099/224] New upstream development version 1.13.4 New tool: nbddump --- libnbd.spec | 9 ++++++++- sources | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index e6c651a..60bd2e8 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.3 +Version: 1.13.4 Release: 1%{?dist} Summary: NBD client library in userspace @@ -257,9 +257,11 @@ make %{?_smp_mflags} check || { %doc README.md %license COPYING.LIB %{_bindir}/nbdcopy +%{_bindir}/nbddump %{_bindir}/nbdinfo %{_libdir}/libnbd.so.* %{_mandir}/man1/nbdcopy.1* +%{_mandir}/man1/nbddump.1* %{_mandir}/man1/nbdinfo.1* @@ -314,12 +316,17 @@ 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 %changelog +* Thu Jun 30 2022 Richard W.M. Jones - 1.13.4-1 +- New upstream development version 1.13.4 +- New tool: nbddump + * Mon Jun 27 2022 Richard W.M. Jones - 1.13.3-1 - New upstream development version 1.13.3 diff --git a/sources b/sources index 04cedcb..9f256c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.3.tar.gz) = fe75c91d4f12a0a29b42bb94918cca2498f866e400168be8ce7c3059fcf9b88831676342445de886f970833fb22c41ae5c50b363c1c6ac4cd2c7cf194384f3b2 -SHA512 (libnbd-1.13.3.tar.gz.sig) = cc2bb708c94cee81015f8535ae03dcf0521a29877aee8d6c576186d81cddaefb5aaae56282dec13a0b944a6ef7c88d4e89a33d4236a587b92a450ef37d263b5c +SHA512 (libnbd-1.13.4.tar.gz) = 9d2aeeef6758280a661e5279c8a6d3217470fb93a07e5ba9c961815441342fb9225f2fa301ab80302f55673e5b592edea26ae030d269a3223bd8b411095c0b4e +SHA512 (libnbd-1.13.4.tar.gz.sig) = a0be22fb93253f28918fd45a89bcadb5d8e38aa05a70b599253dc67c3d51a12105c2ab8913143faec9f7aa10156b76cc858b67e973b94715f17c972a9bd1746c From 156655dcb86b59c8442383a8b79848ea93a940fa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 1 Jul 2022 10:45:18 +0100 Subject: [PATCH 100/224] New upstream development version 1.13.5 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 60bd2e8..ae9643c 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.4 +Version: 1.13.5 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jul 01 2022 Richard W.M. Jones - 1.13.5-1 +- New upstream development version 1.13.5 + * Thu Jun 30 2022 Richard W.M. Jones - 1.13.4-1 - New upstream development version 1.13.4 - New tool: nbddump diff --git a/sources b/sources index 9f256c0..7f1fb26 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.4.tar.gz) = 9d2aeeef6758280a661e5279c8a6d3217470fb93a07e5ba9c961815441342fb9225f2fa301ab80302f55673e5b592edea26ae030d269a3223bd8b411095c0b4e -SHA512 (libnbd-1.13.4.tar.gz.sig) = a0be22fb93253f28918fd45a89bcadb5d8e38aa05a70b599253dc67c3d51a12105c2ab8913143faec9f7aa10156b76cc858b67e973b94715f17c972a9bd1746c +SHA512 (libnbd-1.13.5.tar.gz) = f8a92f27bceaede46a412b0a68fdc9ad88a25e7658b852028469011961254fe2e8452eb0e769189b26245b1c1635d8dd896994290c7740d15ee26fc9494e9f5f +SHA512 (libnbd-1.13.5.tar.gz.sig) = 6abd99d8a1992ae06a31f2098e63bc9f77352cda8f82023d5b661ed2daf002a99de17655162cf5b34655948e0f5abfc44bf241d4808f7ea8998f865ea6dc8e45 From 7f3b2face17ff8974f13943629f9fd96864bbcfa Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 10 Jul 2022 16:14:12 +0100 Subject: [PATCH 101/224] New upstream development version 1.13.6 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index ae9643c..03722d3 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.5 +Version: 1.13.6 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Sun Jul 10 2022 Richard W.M. Jones - 1.13.6-1 +- New upstream development version 1.13.6 + * Fri Jul 01 2022 Richard W.M. Jones - 1.13.5-1 - New upstream development version 1.13.5 diff --git a/sources b/sources index 7f1fb26..fcb03ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.5.tar.gz) = f8a92f27bceaede46a412b0a68fdc9ad88a25e7658b852028469011961254fe2e8452eb0e769189b26245b1c1635d8dd896994290c7740d15ee26fc9494e9f5f -SHA512 (libnbd-1.13.5.tar.gz.sig) = 6abd99d8a1992ae06a31f2098e63bc9f77352cda8f82023d5b661ed2daf002a99de17655162cf5b34655948e0f5abfc44bf241d4808f7ea8998f865ea6dc8e45 +SHA512 (libnbd-1.13.6.tar.gz) = 5809a28045f1b0f42746c724f2b44d2a7144cb6edfee6a9cef750b581c1f37cda41bee30c32224cafd1e11a3ef1fce6d8132de721a0a5536783fbca43b6d9e86 +SHA512 (libnbd-1.13.6.tar.gz.sig) = bdfce165bd6dcdf8f5df334254b563f1bc48c9d5b2c255748c2905bf3beefa67083c8aa241c3aeefb1fe47d0fa0264fddf62fb1508c4ba2ff3489903de8b0916 From 5fd28d2eae69a5dea3f610639d829f47968e1007 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 17 Jul 2022 20:18:16 +0100 Subject: [PATCH 102/224] New upstream development version 1.13.7 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 03722d3..b4b3138 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.6 +Version: 1.13.7 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Sun Jul 10 2022 Richard W.M. Jones - 1.13.7-1 +- New upstream development version 1.13.7 + * Sun Jul 10 2022 Richard W.M. Jones - 1.13.6-1 - New upstream development version 1.13.6 diff --git a/sources b/sources index fcb03ab..aacc634 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.6.tar.gz) = 5809a28045f1b0f42746c724f2b44d2a7144cb6edfee6a9cef750b581c1f37cda41bee30c32224cafd1e11a3ef1fce6d8132de721a0a5536783fbca43b6d9e86 -SHA512 (libnbd-1.13.6.tar.gz.sig) = bdfce165bd6dcdf8f5df334254b563f1bc48c9d5b2c255748c2905bf3beefa67083c8aa241c3aeefb1fe47d0fa0264fddf62fb1508c4ba2ff3489903de8b0916 +SHA512 (libnbd-1.13.7.tar.gz) = c14f03eb86a4445bbd8fcc295faa9780d30642301336a8b66f941416d722969f01208e8ffd7fc4a97555b59a5ebebd4e49b0935d2e6d37b426fda31685df6924 +SHA512 (libnbd-1.13.7.tar.gz.sig) = 05e0a6ed9daa9cf6a43734d59c34f9f7b0795b52ca0a67cc6eae0b26e3412b8513c5f0bc511ecaf8fd84807e51b8f8dd44923eaa830cd4ca24b73a62968c05a6 From 5291815656178486c40d899fd3535e51a7d7e3cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 18:27:33 +0000 Subject: [PATCH 103/224] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 b4b3138..ab32dcc 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.13.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.13.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jul 10 2022 Richard W.M. Jones - 1.13.7-1 - New upstream development version 1.13.7 From 949a638b64d99700a0720edcb85985b50902eb5b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Jul 2022 14:02:07 +0100 Subject: [PATCH 104/224] New upstream development version 1.13.8 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index ab32dcc..8516913 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,8 +11,8 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.7 -Release: 2%{?dist} +Version: 1.13.8 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Wed Jul 27 2022 Richard W.M. Jones - 1.13.8-1 +- New upstream development version 1.13.8 + * Thu Jul 21 2022 Fedora Release Engineering - 1.13.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index aacc634..c02b7ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.7.tar.gz) = c14f03eb86a4445bbd8fcc295faa9780d30642301336a8b66f941416d722969f01208e8ffd7fc4a97555b59a5ebebd4e49b0935d2e6d37b426fda31685df6924 -SHA512 (libnbd-1.13.7.tar.gz.sig) = 05e0a6ed9daa9cf6a43734d59c34f9f7b0795b52ca0a67cc6eae0b26e3412b8513c5f0bc511ecaf8fd84807e51b8f8dd44923eaa830cd4ca24b73a62968c05a6 +SHA512 (libnbd-1.13.8.tar.gz) = c47c5d32e3a9a61cb938314c711e2aa4627a2a8e8ff33ec5d4b396041bfe1eacaa4fae6ad1b05b97e53bab1eea37ec1698075bb170b1aa5cc6d62e11d921faa5 +SHA512 (libnbd-1.13.8.tar.gz.sig) = 819d4b590969600a3bf9845704a8da11285f0da37a6ca0b2cc096ce0ac842cd36b8ff46a30f731bae414b54089c247efa8d697038ac2d380e14f7dbfddef8719 From 37f8da7463d8fdd6c8f213589be52d6ca4ec879f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 29 Jul 2022 13:40:48 +0100 Subject: [PATCH 105/224] New upstream development version 1.13.9 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 8516913..af97bd4 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -11,7 +11,7 @@ %global source_directory 1.13-development Name: libnbd -Version: 1.13.8 +Version: 1.13.9 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Jul 29 2022 Richard W.M. Jones - 1.13.9-1 +- New upstream development version 1.13.9 + * Wed Jul 27 2022 Richard W.M. Jones - 1.13.8-1 - New upstream development version 1.13.8 diff --git a/sources b/sources index c02b7ca..7c8a17d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.8.tar.gz) = c47c5d32e3a9a61cb938314c711e2aa4627a2a8e8ff33ec5d4b396041bfe1eacaa4fae6ad1b05b97e53bab1eea37ec1698075bb170b1aa5cc6d62e11d921faa5 -SHA512 (libnbd-1.13.8.tar.gz.sig) = 819d4b590969600a3bf9845704a8da11285f0da37a6ca0b2cc096ce0ac842cd36b8ff46a30f731bae414b54089c247efa8d697038ac2d380e14f7dbfddef8719 +SHA512 (libnbd-1.13.9.tar.gz) = 8ce60f761f7b8ec0422ffff76a8130a69ec870b0a5b3764881518ca0a8a87f521c0b65b162c9c38ef6b3c3c4bb26286012451c594fe97f57504c6d5366e8fa72 +SHA512 (libnbd-1.13.9.tar.gz.sig) = 6c3108d19ae61ac81a76dbc01daac4f094ebe27dbbddde3759926ca3a331c1a64d00a2421af3bb15218953ddf452cfb4ca11fceb2a9042b8fd2209d9427178fa From 8a2827c5c401e062c4923b9795171a0ee396d691 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Aug 2022 17:19:02 +0100 Subject: [PATCH 106/224] New upstream stable version 1.14.0 --- libnbd.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index af97bd4..59d760e 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -8,10 +8,10 @@ %global patches_touch_autotools %{nil} # The source directory. -%global source_directory 1.13-development +%global source_directory 1.14-stable Name: libnbd -Version: 1.13.9 +Version: 1.14.0 Release: 1%{?dist} Summary: NBD client library in userspace @@ -323,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Mon Aug 01 2022 Richard W.M. Jones - 1.14.0-1 +- New upstream stable version 1.14.0 + * Fri Jul 29 2022 Richard W.M. Jones - 1.13.9-1 - New upstream development version 1.13.9 diff --git a/sources b/sources index 7c8a17d..db1696c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.13.9.tar.gz) = 8ce60f761f7b8ec0422ffff76a8130a69ec870b0a5b3764881518ca0a8a87f521c0b65b162c9c38ef6b3c3c4bb26286012451c594fe97f57504c6d5366e8fa72 -SHA512 (libnbd-1.13.9.tar.gz.sig) = 6c3108d19ae61ac81a76dbc01daac4f094ebe27dbbddde3759926ca3a331c1a64d00a2421af3bb15218953ddf452cfb4ca11fceb2a9042b8fd2209d9427178fa +SHA512 (libnbd-1.14.0.tar.gz) = 6e0a74719e5cba5dedcacf5806f4c55bffcfd850c8743fc5a01565b9e91d912014b2208bec9ca2015abbdb857e8a58fce781266bb14541927e12cadde39bc099 +SHA512 (libnbd-1.14.0.tar.gz.sig) = 4a5ab5a5056dc457af12ba8628432d45823a102e8cbf0511fcf82a6e28f1dea9f0344481f3277a3249fce82be611c929e0676d270f0382f2f677ba94d4259dc2 From cccba16e0c515b44e8c0e7098ac92b15ddbd495a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Aug 2022 15:58:29 +0100 Subject: [PATCH 107/224] Add some small upstream patches since 1.14.0 --- ...olours-to-separate-library-under-com.patch | 267 ++++++++++++ 0002-info-Add-limited-colourized-output.patch | 400 ++++++++++++++++++ ...or-message-when-the-export-may-be-un.patch | 65 +++ libnbd.spec | 10 +- 4 files changed, 741 insertions(+), 1 deletion(-) create mode 100644 0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch create mode 100644 0002-info-Add-limited-colourized-output.patch create mode 100644 0003-info-Improve-error-message-when-the-export-may-be-un.patch diff --git a/0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch b/0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch new file mode 100644 index 0000000..d901a46 --- /dev/null +++ b/0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch @@ -0,0 +1,267 @@ +From 714971885128e7ce657022e8cec665d115186dae Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 2 Aug 2022 09:08:50 +0100 +Subject: [PATCH 1/3] dump: Move ANSI colours to separate library under + common/include + +I've also relicensed the code (which I wrote originally) as BSD, so +that we can reuse it in nbdkit. +--- + common/include/Makefile.am | 1 + + common/include/ansi-colours.h | 98 +++++++++++++++++++++++++++++++++++ + dump/dump.c | 68 +++++------------------- + 3 files changed, 112 insertions(+), 55 deletions(-) + create mode 100644 common/include/ansi-colours.h + +diff --git a/common/include/Makefile.am b/common/include/Makefile.am +index 4f39c3e8c5..8ff4295e02 100644 +--- a/common/include/Makefile.am ++++ b/common/include/Makefile.am +@@ -18,6 +18,7 @@ + include $(top_srcdir)/subdir-rules.mk + + EXTRA_DIST = \ ++ ansi-colours.h \ + array-size.h \ + byte-swapping.h \ + checked-overflow.h \ +diff --git a/common/include/ansi-colours.h b/common/include/ansi-colours.h +new file mode 100644 +index 0000000000..ebb0b26f6e +--- /dev/null ++++ b/common/include/ansi-colours.h +@@ -0,0 +1,98 @@ ++/* nbdkit ++ * Copyright (C) 2022 Red Hat Inc. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are ++ * met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * * Neither the name of Red Hat nor the names of its contributors may be ++ * used to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ++ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#ifndef NBDKIT_ANSI_COLOURS_H ++#define NBDKIT_ANSI_COLOURS_H ++ ++#include ++ ++/* For the ansi_* functions, the main program should declare this ++ * variable, and initialize it in main() / option parsing. See ++ * libnbd.git/dump/dump.c for an example of how to initialize it. ++ */ ++extern bool colour; ++ ++/* Restore the terminal colours to the default. ++ * ++ * As well as doing this before normal exit, you should also set a ++ * signal handler which calls this and fflush(fp). See ++ * libnbd.git/dump/dump.c for an example. ++ */ ++static inline void ++ansi_restore (FILE *fp) ++{ ++ if (colour) ++ fputs ("\033[0m", fp); ++} ++ ++/* Set the terminal colour. */ ++static inline void ++ansi_colour (const char *c, FILE *fp) ++{ ++ if (colour) ++ fprintf (fp, "\033[%sm", c); ++} ++ ++#define ANSI_FG_BOLD_BLACK "1;30" ++#define ANSI_FG_BLUE "22;34" ++#define ANSI_FG_BRIGHT_BLUE "1;34" ++#define ANSI_FG_BRIGHT_CYAN "1;36" ++#define ANSI_FG_BRIGHT_GREEN "1;32" ++#define ANSI_FG_BRIGHT_MAGENTA "1;35" ++#define ANSI_FG_BRIGHT_RED "1;31" ++#define ANSI_FG_BRIGHT_WHITE "1;37" ++#define ANSI_FG_BRIGHT_YELLOW "1;33" ++#define ANSI_FG_CYAN "22;36" ++#define ANSI_FG_GREEN "22;32" ++#define ANSI_FG_GREY "22;90" ++#define ANSI_FG_MAGENTA "22;35" ++#define ANSI_FG_RED "22;31" ++#define ANSI_FG_YELLOW "22;33" ++ ++#define ANSI_BG_BLACK "40" ++#define ANSI_BG_LIGHT_GREY "47" ++#define ANSI_BG_GREY "100" ++ ++/* Unconditional versions of above (don't depend on global ‘colour’). */ ++static inline void ++ansi_force_restore (FILE *fp) ++{ ++ fputs ("\033[0m", fp); ++} ++ ++static inline void ++ansi_force_colour (const char *c, FILE *fp) ++{ ++ fprintf (fp, "\033[%sm", c); ++} ++ ++#endif /* NBDKIT_ANSI_COLOURS_H */ +diff --git a/dump/dump.c b/dump/dump.c +index 8bf62f9329..7f0e86e987 100644 +--- a/dump/dump.c ++++ b/dump/dump.c +@@ -32,6 +32,7 @@ + + #include + ++#include "ansi-colours.h" + #include "minmax.h" + #include "rounding.h" + #include "version.h" +@@ -41,7 +42,7 @@ DEFINE_VECTOR_TYPE (uint32_vector, uint32_t) + + static const char *progname; + static struct nbd_handle *nbd; +-static bool colour; ++bool colour; + static uint64_t limit = UINT64_MAX; /* --length (unlimited by default) */ + static int64_t size; /* actual size */ + static bool can_meta_context; /* did we get extent data? */ +@@ -244,54 +245,11 @@ do_connect (void) + } + } + +-/* Various ANSI colours, suppressed if --no-colour / not tty output. */ +-static void +-ansi_restore (void) +-{ +- if (colour) +- fputs ("\033[0m", stdout); +-} +- +-static void +-ansi_blue (void) +-{ +- if (colour) +- fputs ("\033[1;34m", stdout); +-} +- +-static void +-ansi_green (void) +-{ +- if (colour) +- fputs ("\033[0;32m", stdout); +-} +- +-static void +-ansi_magenta (void) +-{ +- if (colour) +- fputs ("\033[1;35m", stdout); +-} +- +-static void +-ansi_red (void) +-{ +- if (colour) +- fputs ("\033[1;31m", stdout); +-} +- +-static void +-ansi_grey (void) +-{ +- if (colour) +- fputs ("\033[0;90m", stdout); +-} +- + static void + catch_signal (int sig) + { + printf ("\n"); +- ansi_restore (); ++ ansi_restore (stdout); + fflush (stdout); + _exit (EXIT_FAILURE); + } +@@ -417,21 +375,21 @@ do_dump (void) + memcpy (last, &buffer[i], 16); /* Save the current line. */ + + /* Print the offset. */ +- ansi_green (); ++ ansi_colour (ANSI_FG_GREEN, stdout); + printf ("%010" PRIx64, offset + i); +- ansi_grey (); ++ ansi_colour (ANSI_FG_GREY, stdout); + printf (": "); + + /* Print the hex codes. */ + for (j = i; j < MIN (i+16, n); ++j) { + if (buffer[j]) +- ansi_blue (); ++ ansi_colour (ANSI_FG_BRIGHT_BLUE, stdout); + else +- ansi_grey (); ++ ansi_colour (ANSI_FG_GREY, stdout); + printf ("%02x ", buffer[j]); + if ((j - i) == 7) printf (" "); + } +- ansi_grey (); ++ ansi_colour (ANSI_FG_GREY, stdout); + for (; j < i+16; ++j) { + printf (" "); + if ((j - i) == 7) printf (" "); +@@ -442,23 +400,23 @@ do_dump (void) + for (j = i; j < MIN (i+16, n); ++j) { + char c = (char) buffer[j]; + if (isalnum (c)) { +- ansi_red (); ++ ansi_colour (ANSI_FG_BRIGHT_RED, stdout); + printf ("%c", c); + } + else if (isprint (c)) { +- ansi_magenta (); ++ ansi_colour (ANSI_FG_BRIGHT_MAGENTA, stdout); + printf ("%c", c); + } + else { +- ansi_grey (); ++ ansi_colour (ANSI_FG_GREY, stdout); + printf ("%s", dot); + } + } +- ansi_grey (); ++ ansi_colour (ANSI_FG_GREY, stdout); + for (; j < i+16; ++j) + printf (" "); + printf ("%s\n", pipe); +- ansi_restore (); ++ ansi_restore (stdout); + } + + offset += n; +-- +2.37.0.rc2 + diff --git a/0002-info-Add-limited-colourized-output.patch b/0002-info-Add-limited-colourized-output.patch new file mode 100644 index 0000000..b7643f2 --- /dev/null +++ b/0002-info-Add-limited-colourized-output.patch @@ -0,0 +1,400 @@ +From bf4a8911c992291e6943d5e936732c290ea2abb9 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 2 Aug 2022 10:38:56 +0100 +Subject: [PATCH 2/3] info: Add limited colourized output + +For terminal, non-JSON output, colourize some of the output. We can +work on making this better later. Use --no-colour (or output to a +non-terminal) to disable colours. +--- + info/main.c | 25 ++++++++++++- + info/map.c | 95 ++++++++++++++++++++++++++++++++++++++---------- + info/nbdinfo.pod | 11 ++++++ + info/show.c | 38 ++++++++++++++----- + 4 files changed, 138 insertions(+), 31 deletions(-) + +diff --git a/info/main.c b/info/main.c +index 870abb4623..a4550e2294 100644 +--- a/info/main.c ++++ b/info/main.c +@@ -1,5 +1,5 @@ + /* NBD client library in userspace +- * Copyright (C) 2020-2021 Red Hat Inc. ++ * Copyright (C) 2020-2022 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -30,6 +30,7 @@ + + #include + ++#include "ansi-colours.h" + #include "version.h" + + #include "nbdinfo.h" +@@ -37,6 +38,7 @@ + const char *progname; + struct nbd_handle *nbd; + FILE *fp; /* output file descriptor */ ++bool colour; /* --colour / --no-colour option */ + bool list_all = false; /* --list option */ + bool probe_content = false; /* --content / --no-content option */ + bool json_output = false; /* --json option */ +@@ -93,6 +95,8 @@ main (int argc, char *argv[]) + HELP_OPTION = CHAR_MAX + 1, + LONG_OPTIONS, + SHORT_OPTIONS, ++ COLOUR_OPTION, ++ NO_COLOUR_OPTION, + CONTENT_OPTION, + NO_CONTENT_OPTION, + JSON_OPTION, +@@ -105,6 +109,14 @@ main (int argc, char *argv[]) + const struct option long_options[] = { + { "help", no_argument, NULL, HELP_OPTION }, + { "can", required_argument, NULL, CAN_OPTION }, ++ { "color", no_argument, NULL, COLOUR_OPTION }, ++ { "colors", no_argument, NULL, COLOUR_OPTION }, ++ { "colour", no_argument, NULL, COLOUR_OPTION }, ++ { "colours", no_argument, NULL, COLOUR_OPTION }, ++ { "no-color", no_argument, NULL, NO_COLOUR_OPTION }, ++ { "no-colors", no_argument, NULL, NO_COLOUR_OPTION }, ++ { "no-colour", no_argument, NULL, NO_COLOUR_OPTION }, ++ { "no-colours", no_argument, NULL, NO_COLOUR_OPTION }, + { "content", no_argument, NULL, CONTENT_OPTION }, + { "no-content", no_argument, NULL, NO_CONTENT_OPTION }, + { "is", required_argument, NULL, CAN_OPTION }, +@@ -127,6 +139,7 @@ main (int argc, char *argv[]) + bool list_okay = true; + + progname = argv[0]; ++ colour = isatty (STDOUT_FILENO); + + for (;;) { + c = getopt_long (argc, argv, short_options, long_options, NULL); +@@ -156,6 +169,14 @@ main (int argc, char *argv[]) + json_output = true; + break; + ++ case COLOUR_OPTION: ++ colour = true; ++ break; ++ ++ case NO_COLOUR_OPTION: ++ colour = false; ++ break; ++ + case CONTENT_OPTION: + content_flag = true; + break; +@@ -288,10 +309,12 @@ main (int argc, char *argv[]) + + if (!json_output) { + if (protocol) { ++ ansi_colour (ANSI_FG_MAGENTA, fp); + fprintf (fp, "protocol: %s", protocol); + if (tls_negotiated >= 0) + fprintf (fp, " %s TLS", tls_negotiated ? "with" : "without"); + fprintf (fp, "\n"); ++ ansi_restore (fp); + } + } + else { +diff --git a/info/map.c b/info/map.c +index 39c5933bf5..a5aad95522 100644 +--- a/info/map.c ++++ b/info/map.c +@@ -30,6 +30,7 @@ + + #include + ++#include "ansi-colours.h" + #include "minmax.h" + #include "vector.h" + +@@ -99,7 +100,9 @@ do_map (void) + + /* Callback handling --map. */ + static void print_one_extent (uint64_t offset, uint64_t len, uint32_t type); +-static char *extent_description (const char *metacontext, uint32_t type); ++static void extent_description (const char *metacontext, uint32_t type, ++ char **descr, bool *free_descr, ++ const char **fg, const char **bg); + + static int + extent_callback (void *user_data, const char *metacontext, +@@ -169,15 +172,25 @@ static void + print_one_extent (uint64_t offset, uint64_t len, uint32_t type) + { + static bool comma = false; +- char *descr = extent_description (map, type); ++ char *descr; ++ bool free_descr; ++ const char *fg, *bg; ++ ++ extent_description (map, type, &descr, &free_descr, &fg, &bg); + + if (!json_output) { ++ if (fg) ++ ansi_colour (fg, fp); ++ if (bg) ++ ansi_colour (bg, fp); + fprintf (fp, "%10" PRIu64 " " + "%10" PRIu64 " " + "%3" PRIu32, + offset, len, type); + if (descr) + fprintf (fp, " %s", descr); ++ if (fg || bg) ++ ansi_restore (fp); + fprintf (fp, "\n"); + } + else { +@@ -196,7 +209,8 @@ print_one_extent (uint64_t offset, uint64_t len, uint32_t type) + comma = true; + } + +- free (descr); ++ if (free_descr) ++ free (descr); + } + + /* --map --totals suboption */ +@@ -237,14 +251,24 @@ print_totals (uint32_vector *entries, int64_t size) + } + + if (c > 0) { +- char *descr = extent_description (map, type); ++ char *descr; ++ bool free_descr; ++ const char *fg, *bg; + double percent = 100.0 * c / size; + ++ extent_description (map, type, &descr, &free_descr, &fg, &bg); ++ + if (!json_output) { ++ if (fg) ++ ansi_colour (fg, fp); ++ if (bg) ++ ansi_colour (bg, fp); + fprintf (fp, "%10" PRIu64 " %5.1f%% %3" PRIu32, + c, percent, type); + if (descr) + fprintf (fp, " %s", descr); ++ if (fg || bg) ++ ansi_restore (fp); + fprintf (fp, "\n"); + } + else { +@@ -264,7 +288,8 @@ print_totals (uint32_vector *entries, int64_t size) + comma = true; + } + +- free (descr); ++ if (free_descr) ++ free (descr); + } + + if (next_type == (uint64_t)UINT32_MAX + 1) +@@ -275,37 +300,67 @@ print_totals (uint32_vector *entries, int64_t size) + if (json_output) fprintf (fp, "\n]\n"); + } + +-static char * +-extent_description (const char *metacontext, uint32_t type) ++static void ++extent_description (const char *metacontext, uint32_t type, ++ char **descr, bool *free_descr, ++ const char **fg, const char **bg) + { +- char *ret; +- + if (strcmp (metacontext, "base:allocation") == 0) { + switch (type) { +- case 0: return strdup ("data"); +- case 1: return strdup ("hole"); +- case 2: return strdup ("zero"); +- case 3: return strdup ("hole,zero"); ++ case 0: ++ *descr = "data"; *free_descr = false; ++ *fg = ANSI_FG_BOLD_BLACK; *bg = NULL; ++ return; ++ case 1: ++ *descr = "hole"; *free_descr = false; ++ *fg = *bg = NULL; ++ return; ++ case 2: ++ *descr = "zero"; *free_descr = false; ++ *fg = *bg = NULL; ++ return; ++ case 3: ++ *descr = "hole,zero"; *free_descr = false; ++ *fg = *bg = NULL; ++ return; + } + } + else if (strncmp (metacontext, "qemu:dirty-bitmap:", 18) == 0) { + switch (type) { +- case 0: return strdup ("clean"); +- case 1: return strdup ("dirty"); ++ case 0: ++ *descr = "clean"; *free_descr = false; ++ *fg = ANSI_FG_GREEN; *bg = NULL; ++ return; ++ case 1: ++ *descr = "dirty"; *free_descr = false; ++ *fg = ANSI_FG_RED; *bg = NULL; ++ return; + } + } + else if (strcmp (metacontext, "qemu:allocation-depth") == 0) { + switch (type) { +- case 0: return strdup ("absent"); +- case 1: return strdup ("local"); ++ case 0: ++ *descr = "absent"; *free_descr = false; ++ *fg = *bg = NULL; ++ return; ++ case 1: ++ *descr = "local"; *free_descr = false; ++ *fg = ANSI_FG_BRIGHT_WHITE; *bg = ANSI_BG_BLACK; ++ return; + default: +- if (asprintf (&ret, "backing depth %u", type) == -1) { ++ if (asprintf (descr, "backing depth %u", type) == -1) { + perror ("asprintf"); + exit (EXIT_FAILURE); + } +- return ret; ++ *free_descr = true; ++ *fg = NULL; *bg = ANSI_BG_LIGHT_GREY; ++ return; + } + } + +- return NULL; /* Don't know - description field will be omitted. */ ++ /* Don't know - description field will be omitted. */ ++ *descr = NULL; ++ *free_descr = false; ++ *fg = NULL; ++ *bg = NULL; + } +diff --git a/info/nbdinfo.pod b/info/nbdinfo.pod +index 4733ecd1f7..7dfb9edb60 100644 +--- a/info/nbdinfo.pod ++++ b/info/nbdinfo.pod +@@ -330,6 +330,17 @@ L, L, L, + L, L, L, + L, L. + ++=item B<--color> ++ ++=item B<--colour> ++ ++=item B<--no-color> ++ ++=item B<--no-colour> ++ ++Enable or disable ANSI colours in output. By default we use colours ++if the output seems to be a terminal, and disable them if not. ++ + =item B<--content> + + =item B<--no-content> +diff --git a/info/show.c b/info/show.c +index 3a436665bf..140220d8c6 100644 +--- a/info/show.c ++++ b/info/show.c +@@ -28,11 +28,13 @@ + + #include + ++#include "ansi-colours.h" + #include "human-size.h" + #include "string-vector.h" + + #include "nbdinfo.h" + ++static void show_boolean (const char *name, bool cond); + static int collect_context (void *opaque, const char *name); + static char *get_content (struct nbd_handle *, int64_t size); + +@@ -119,6 +121,7 @@ show_one_export (struct nbd_handle *nbd, const char *desc, + content = get_content (nbd, size); + + if (!json_output) { ++ ansi_colour (ANSI_FG_BRIGHT_BLUE, fp); + fprintf (fp, "export="); + /* Might as well use the JSON function to get an escaped string here ... */ + print_json_string (export_name); +@@ -133,35 +136,38 @@ show_one_export (struct nbd_handle *nbd, const char *desc, + fprintf (fp, "\tcontent: %s\n", content); + if (uri) + fprintf (fp, "\turi: %s\n", uri); ++ ansi_restore (fp); ++ ansi_colour (ANSI_FG_BLUE, fp); + if (show_context) { + fprintf (fp, "\tcontexts:\n"); + for (i = 0; i < contexts.len; ++i) + fprintf (fp, "\t\t%s\n", contexts.ptr[i]); + } ++ ansi_restore (fp); ++ ansi_colour (ANSI_FG_MAGENTA, fp); + if (is_rotational >= 0) + fprintf (fp, "\t%s: %s\n", "is_rotational", + is_rotational ? "true" : "false"); + if (is_read_only >= 0) + fprintf (fp, "\t%s: %s\n", "is_read_only", + is_read_only ? "true" : "false"); ++ ansi_restore (fp); + if (can_cache >= 0) +- fprintf (fp, "\t%s: %s\n", "can_cache", can_cache ? "true" : "false"); ++ show_boolean ("can_cache", can_cache); + if (can_df >= 0) +- fprintf (fp, "\t%s: %s\n", "can_df", can_df ? "true" : "false"); ++ show_boolean ("can_df", can_df); + if (can_fast_zero >= 0) +- fprintf (fp, "\t%s: %s\n", "can_fast_zero", +- can_fast_zero ? "true" : "false"); ++ show_boolean ("can_fast_zero", can_fast_zero); + if (can_flush >= 0) +- fprintf (fp, "\t%s: %s\n", "can_flush", can_flush ? "true" : "false"); ++ show_boolean ("can_flush", can_flush); + if (can_fua >= 0) +- fprintf (fp, "\t%s: %s\n", "can_fua", can_fua ? "true" : "false"); ++ show_boolean ("can_fua", can_fua); + if (can_multi_conn >= 0) +- fprintf (fp, "\t%s: %s\n", "can_multi_conn", +- can_multi_conn ? "true" : "false"); ++ show_boolean ("can_multi_conn", can_multi_conn); + if (can_trim >= 0) +- fprintf (fp, "\t%s: %s\n", "can_trim", can_trim ? "true" : "false"); ++ show_boolean ("can_trim", can_trim); + if (can_zero >= 0) +- fprintf (fp, "\t%s: %s\n", "can_zero", can_zero ? "true" : "false"); ++ show_boolean ("can_zero", can_zero); + if (block_minimum > 0) + fprintf (fp, "\t%s: %" PRId64 "\n", "block_size_minimum", block_minimum); + if (block_preferred > 0) +@@ -269,6 +275,18 @@ show_one_export (struct nbd_handle *nbd, const char *desc, + return true; + } + ++/* Used for displaying booleans in non-JSON output. */ ++static void ++show_boolean (const char *name, bool cond) ++{ ++ if (cond) ++ ansi_colour (ANSI_FG_GREEN, fp); ++ else ++ ansi_colour (ANSI_FG_RED, fp); ++ fprintf (fp, "\t%s: %s\n", name, cond ? "true" : "false"); ++ ansi_restore (fp); ++} ++ + static int + collect_context (void *opaque, const char *name) + { +-- +2.37.0.rc2 + diff --git a/0003-info-Improve-error-message-when-the-export-may-be-un.patch b/0003-info-Improve-error-message-when-the-export-may-be-un.patch new file mode 100644 index 0000000..d8dca1f --- /dev/null +++ b/0003-info-Improve-error-message-when-the-export-may-be-un.patch @@ -0,0 +1,65 @@ +From 74d5818d42a1e09e6f6f1dccda8254fb8b2c6d57 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Tue, 2 Aug 2022 12:38:57 +0100 +Subject: [PATCH 3/3] info: Improve error message when the export may be + unknown to the server + +For example: + + $ nbdkit -r file dir=/var/tmp/disks --run 'nbdinfo $uri' + nbdkit: file[1]: error: open: : No such file or directory + nbdkit: file[1]: error: open: : No such file or directory + nbdinfo: nbd_opt_go: server replied with error to opt_go request: No such file or directory for export: + +What happened here is we requested the default export (because the +nbdkit-provided $uri points to that). nbdkit-file-plugin doesn't +provide a default export so that's an error. + +However the error message is weird and unactionable. We print the +default export name, but as that is an empty string we end up printing +"for export: ". And we don't tell the user what they can do to +recover from this. + +After this commit the message has been improved: + + $ nbdkit -r file dir=/var/tmp/disks --run 'nbdinfo $uri ' + nbdkit: file[1]: error: open: : No such file or directory + nbdkit: file[1]: error: open: : No such file or directory + nbdinfo: nbd_opt_go: server replied with error to opt_go request: No such file or directory for the default export + nbdinfo: suggestion: to list all exports on the server, use --list + +We now print "default export" if we spot that the default export was +requested, and we print an actionable suggestion. +--- + info/show.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/info/show.c b/info/show.c +index 140220d8c6..df647f3d56 100644 +--- a/info/show.c ++++ b/info/show.c +@@ -71,10 +71,20 @@ show_one_export (struct nbd_handle *nbd, const char *desc, + fprintf (stderr, "%s: %s", progname, nbd_get_error ()); + + char *e = nbd_get_export_name (nbd); +- if (e) fprintf (stderr, " for export: %s", e); ++ if (e) { ++ if (e[0] == '\0') ++ fprintf (stderr, " for the default export"); ++ else ++ fprintf (stderr, " for export: %s", e); ++ } + free (e); + fprintf (stderr, "\n"); + ++ if (!list_all) ++ fprintf (stderr, "%s: suggestion: " ++ "to list all exports on the server, use --list\n", ++ progname); ++ + return false; + } + size = nbd_get_size (nbd); +-- +2.37.0.rc2 + diff --git a/libnbd.spec b/libnbd.spec index 59d760e..5b0afcf 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.14-stable @@ -28,6 +28,11 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh +# Patches, all upstream after 1.14.0 +Patch1: 0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch +Patch2: 0002-info-Add-limited-colourized-output.patch +Patch3: 0003-info-Improve-error-message-when-the-export-may-be-un.patch + %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -323,6 +328,9 @@ make %{?_smp_mflags} check || { %changelog +* Tue Aug 02 2022 Richard W.M. Jones - 1.14.0-2 +- Add some small upstream patches since 1.14.0 + * Mon Aug 01 2022 Richard W.M. Jones - 1.14.0-1 - New upstream stable version 1.14.0 From 03ce2d731b504ff60aa9ff8ef4dda28bd5a0df3e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 2 Aug 2022 16:01:11 +0100 Subject: [PATCH 108/224] Remember to bump Release field --- libnbd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnbd.spec b/libnbd.spec index 5b0afcf..5e6e76f 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -12,7 +12,7 @@ Name: libnbd Version: 1.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD client library in userspace License: LGPLv2+ From df49bfbfb1a523cbceac14bf5ab7129a962e3522 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 11 Aug 2022 13:25:24 +0100 Subject: [PATCH 109/224] New upstream stable version 1.14.1 --- ...olours-to-separate-library-under-com.patch | 267 ------------ 0002-info-Add-limited-colourized-output.patch | 400 ------------------ ...or-message-when-the-export-may-be-un.patch | 65 --- libnbd.spec | 14 +- sources | 4 +- 5 files changed, 8 insertions(+), 742 deletions(-) delete mode 100644 0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch delete mode 100644 0002-info-Add-limited-colourized-output.patch delete mode 100644 0003-info-Improve-error-message-when-the-export-may-be-un.patch diff --git a/0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch b/0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch deleted file mode 100644 index d901a46..0000000 --- a/0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch +++ /dev/null @@ -1,267 +0,0 @@ -From 714971885128e7ce657022e8cec665d115186dae Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 2 Aug 2022 09:08:50 +0100 -Subject: [PATCH 1/3] dump: Move ANSI colours to separate library under - common/include - -I've also relicensed the code (which I wrote originally) as BSD, so -that we can reuse it in nbdkit. ---- - common/include/Makefile.am | 1 + - common/include/ansi-colours.h | 98 +++++++++++++++++++++++++++++++++++ - dump/dump.c | 68 +++++------------------- - 3 files changed, 112 insertions(+), 55 deletions(-) - create mode 100644 common/include/ansi-colours.h - -diff --git a/common/include/Makefile.am b/common/include/Makefile.am -index 4f39c3e8c5..8ff4295e02 100644 ---- a/common/include/Makefile.am -+++ b/common/include/Makefile.am -@@ -18,6 +18,7 @@ - include $(top_srcdir)/subdir-rules.mk - - EXTRA_DIST = \ -+ ansi-colours.h \ - array-size.h \ - byte-swapping.h \ - checked-overflow.h \ -diff --git a/common/include/ansi-colours.h b/common/include/ansi-colours.h -new file mode 100644 -index 0000000000..ebb0b26f6e ---- /dev/null -+++ b/common/include/ansi-colours.h -@@ -0,0 +1,98 @@ -+/* nbdkit -+ * Copyright (C) 2022 Red Hat Inc. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are -+ * met: -+ * -+ * * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * * Neither the name of Red Hat nor the names of its contributors may be -+ * used to endorse or promote products derived from this software without -+ * specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR -+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#ifndef NBDKIT_ANSI_COLOURS_H -+#define NBDKIT_ANSI_COLOURS_H -+ -+#include -+ -+/* For the ansi_* functions, the main program should declare this -+ * variable, and initialize it in main() / option parsing. See -+ * libnbd.git/dump/dump.c for an example of how to initialize it. -+ */ -+extern bool colour; -+ -+/* Restore the terminal colours to the default. -+ * -+ * As well as doing this before normal exit, you should also set a -+ * signal handler which calls this and fflush(fp). See -+ * libnbd.git/dump/dump.c for an example. -+ */ -+static inline void -+ansi_restore (FILE *fp) -+{ -+ if (colour) -+ fputs ("\033[0m", fp); -+} -+ -+/* Set the terminal colour. */ -+static inline void -+ansi_colour (const char *c, FILE *fp) -+{ -+ if (colour) -+ fprintf (fp, "\033[%sm", c); -+} -+ -+#define ANSI_FG_BOLD_BLACK "1;30" -+#define ANSI_FG_BLUE "22;34" -+#define ANSI_FG_BRIGHT_BLUE "1;34" -+#define ANSI_FG_BRIGHT_CYAN "1;36" -+#define ANSI_FG_BRIGHT_GREEN "1;32" -+#define ANSI_FG_BRIGHT_MAGENTA "1;35" -+#define ANSI_FG_BRIGHT_RED "1;31" -+#define ANSI_FG_BRIGHT_WHITE "1;37" -+#define ANSI_FG_BRIGHT_YELLOW "1;33" -+#define ANSI_FG_CYAN "22;36" -+#define ANSI_FG_GREEN "22;32" -+#define ANSI_FG_GREY "22;90" -+#define ANSI_FG_MAGENTA "22;35" -+#define ANSI_FG_RED "22;31" -+#define ANSI_FG_YELLOW "22;33" -+ -+#define ANSI_BG_BLACK "40" -+#define ANSI_BG_LIGHT_GREY "47" -+#define ANSI_BG_GREY "100" -+ -+/* Unconditional versions of above (don't depend on global ‘colour’). */ -+static inline void -+ansi_force_restore (FILE *fp) -+{ -+ fputs ("\033[0m", fp); -+} -+ -+static inline void -+ansi_force_colour (const char *c, FILE *fp) -+{ -+ fprintf (fp, "\033[%sm", c); -+} -+ -+#endif /* NBDKIT_ANSI_COLOURS_H */ -diff --git a/dump/dump.c b/dump/dump.c -index 8bf62f9329..7f0e86e987 100644 ---- a/dump/dump.c -+++ b/dump/dump.c -@@ -32,6 +32,7 @@ - - #include - -+#include "ansi-colours.h" - #include "minmax.h" - #include "rounding.h" - #include "version.h" -@@ -41,7 +42,7 @@ DEFINE_VECTOR_TYPE (uint32_vector, uint32_t) - - static const char *progname; - static struct nbd_handle *nbd; --static bool colour; -+bool colour; - static uint64_t limit = UINT64_MAX; /* --length (unlimited by default) */ - static int64_t size; /* actual size */ - static bool can_meta_context; /* did we get extent data? */ -@@ -244,54 +245,11 @@ do_connect (void) - } - } - --/* Various ANSI colours, suppressed if --no-colour / not tty output. */ --static void --ansi_restore (void) --{ -- if (colour) -- fputs ("\033[0m", stdout); --} -- --static void --ansi_blue (void) --{ -- if (colour) -- fputs ("\033[1;34m", stdout); --} -- --static void --ansi_green (void) --{ -- if (colour) -- fputs ("\033[0;32m", stdout); --} -- --static void --ansi_magenta (void) --{ -- if (colour) -- fputs ("\033[1;35m", stdout); --} -- --static void --ansi_red (void) --{ -- if (colour) -- fputs ("\033[1;31m", stdout); --} -- --static void --ansi_grey (void) --{ -- if (colour) -- fputs ("\033[0;90m", stdout); --} -- - static void - catch_signal (int sig) - { - printf ("\n"); -- ansi_restore (); -+ ansi_restore (stdout); - fflush (stdout); - _exit (EXIT_FAILURE); - } -@@ -417,21 +375,21 @@ do_dump (void) - memcpy (last, &buffer[i], 16); /* Save the current line. */ - - /* Print the offset. */ -- ansi_green (); -+ ansi_colour (ANSI_FG_GREEN, stdout); - printf ("%010" PRIx64, offset + i); -- ansi_grey (); -+ ansi_colour (ANSI_FG_GREY, stdout); - printf (": "); - - /* Print the hex codes. */ - for (j = i; j < MIN (i+16, n); ++j) { - if (buffer[j]) -- ansi_blue (); -+ ansi_colour (ANSI_FG_BRIGHT_BLUE, stdout); - else -- ansi_grey (); -+ ansi_colour (ANSI_FG_GREY, stdout); - printf ("%02x ", buffer[j]); - if ((j - i) == 7) printf (" "); - } -- ansi_grey (); -+ ansi_colour (ANSI_FG_GREY, stdout); - for (; j < i+16; ++j) { - printf (" "); - if ((j - i) == 7) printf (" "); -@@ -442,23 +400,23 @@ do_dump (void) - for (j = i; j < MIN (i+16, n); ++j) { - char c = (char) buffer[j]; - if (isalnum (c)) { -- ansi_red (); -+ ansi_colour (ANSI_FG_BRIGHT_RED, stdout); - printf ("%c", c); - } - else if (isprint (c)) { -- ansi_magenta (); -+ ansi_colour (ANSI_FG_BRIGHT_MAGENTA, stdout); - printf ("%c", c); - } - else { -- ansi_grey (); -+ ansi_colour (ANSI_FG_GREY, stdout); - printf ("%s", dot); - } - } -- ansi_grey (); -+ ansi_colour (ANSI_FG_GREY, stdout); - for (; j < i+16; ++j) - printf (" "); - printf ("%s\n", pipe); -- ansi_restore (); -+ ansi_restore (stdout); - } - - offset += n; --- -2.37.0.rc2 - diff --git a/0002-info-Add-limited-colourized-output.patch b/0002-info-Add-limited-colourized-output.patch deleted file mode 100644 index b7643f2..0000000 --- a/0002-info-Add-limited-colourized-output.patch +++ /dev/null @@ -1,400 +0,0 @@ -From bf4a8911c992291e6943d5e936732c290ea2abb9 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 2 Aug 2022 10:38:56 +0100 -Subject: [PATCH 2/3] info: Add limited colourized output - -For terminal, non-JSON output, colourize some of the output. We can -work on making this better later. Use --no-colour (or output to a -non-terminal) to disable colours. ---- - info/main.c | 25 ++++++++++++- - info/map.c | 95 ++++++++++++++++++++++++++++++++++++++---------- - info/nbdinfo.pod | 11 ++++++ - info/show.c | 38 ++++++++++++++----- - 4 files changed, 138 insertions(+), 31 deletions(-) - -diff --git a/info/main.c b/info/main.c -index 870abb4623..a4550e2294 100644 ---- a/info/main.c -+++ b/info/main.c -@@ -1,5 +1,5 @@ - /* NBD client library in userspace -- * Copyright (C) 2020-2021 Red Hat Inc. -+ * Copyright (C) 2020-2022 Red Hat Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -30,6 +30,7 @@ - - #include - -+#include "ansi-colours.h" - #include "version.h" - - #include "nbdinfo.h" -@@ -37,6 +38,7 @@ - const char *progname; - struct nbd_handle *nbd; - FILE *fp; /* output file descriptor */ -+bool colour; /* --colour / --no-colour option */ - bool list_all = false; /* --list option */ - bool probe_content = false; /* --content / --no-content option */ - bool json_output = false; /* --json option */ -@@ -93,6 +95,8 @@ main (int argc, char *argv[]) - HELP_OPTION = CHAR_MAX + 1, - LONG_OPTIONS, - SHORT_OPTIONS, -+ COLOUR_OPTION, -+ NO_COLOUR_OPTION, - CONTENT_OPTION, - NO_CONTENT_OPTION, - JSON_OPTION, -@@ -105,6 +109,14 @@ main (int argc, char *argv[]) - const struct option long_options[] = { - { "help", no_argument, NULL, HELP_OPTION }, - { "can", required_argument, NULL, CAN_OPTION }, -+ { "color", no_argument, NULL, COLOUR_OPTION }, -+ { "colors", no_argument, NULL, COLOUR_OPTION }, -+ { "colour", no_argument, NULL, COLOUR_OPTION }, -+ { "colours", no_argument, NULL, COLOUR_OPTION }, -+ { "no-color", no_argument, NULL, NO_COLOUR_OPTION }, -+ { "no-colors", no_argument, NULL, NO_COLOUR_OPTION }, -+ { "no-colour", no_argument, NULL, NO_COLOUR_OPTION }, -+ { "no-colours", no_argument, NULL, NO_COLOUR_OPTION }, - { "content", no_argument, NULL, CONTENT_OPTION }, - { "no-content", no_argument, NULL, NO_CONTENT_OPTION }, - { "is", required_argument, NULL, CAN_OPTION }, -@@ -127,6 +139,7 @@ main (int argc, char *argv[]) - bool list_okay = true; - - progname = argv[0]; -+ colour = isatty (STDOUT_FILENO); - - for (;;) { - c = getopt_long (argc, argv, short_options, long_options, NULL); -@@ -156,6 +169,14 @@ main (int argc, char *argv[]) - json_output = true; - break; - -+ case COLOUR_OPTION: -+ colour = true; -+ break; -+ -+ case NO_COLOUR_OPTION: -+ colour = false; -+ break; -+ - case CONTENT_OPTION: - content_flag = true; - break; -@@ -288,10 +309,12 @@ main (int argc, char *argv[]) - - if (!json_output) { - if (protocol) { -+ ansi_colour (ANSI_FG_MAGENTA, fp); - fprintf (fp, "protocol: %s", protocol); - if (tls_negotiated >= 0) - fprintf (fp, " %s TLS", tls_negotiated ? "with" : "without"); - fprintf (fp, "\n"); -+ ansi_restore (fp); - } - } - else { -diff --git a/info/map.c b/info/map.c -index 39c5933bf5..a5aad95522 100644 ---- a/info/map.c -+++ b/info/map.c -@@ -30,6 +30,7 @@ - - #include - -+#include "ansi-colours.h" - #include "minmax.h" - #include "vector.h" - -@@ -99,7 +100,9 @@ do_map (void) - - /* Callback handling --map. */ - static void print_one_extent (uint64_t offset, uint64_t len, uint32_t type); --static char *extent_description (const char *metacontext, uint32_t type); -+static void extent_description (const char *metacontext, uint32_t type, -+ char **descr, bool *free_descr, -+ const char **fg, const char **bg); - - static int - extent_callback (void *user_data, const char *metacontext, -@@ -169,15 +172,25 @@ static void - print_one_extent (uint64_t offset, uint64_t len, uint32_t type) - { - static bool comma = false; -- char *descr = extent_description (map, type); -+ char *descr; -+ bool free_descr; -+ const char *fg, *bg; -+ -+ extent_description (map, type, &descr, &free_descr, &fg, &bg); - - if (!json_output) { -+ if (fg) -+ ansi_colour (fg, fp); -+ if (bg) -+ ansi_colour (bg, fp); - fprintf (fp, "%10" PRIu64 " " - "%10" PRIu64 " " - "%3" PRIu32, - offset, len, type); - if (descr) - fprintf (fp, " %s", descr); -+ if (fg || bg) -+ ansi_restore (fp); - fprintf (fp, "\n"); - } - else { -@@ -196,7 +209,8 @@ print_one_extent (uint64_t offset, uint64_t len, uint32_t type) - comma = true; - } - -- free (descr); -+ if (free_descr) -+ free (descr); - } - - /* --map --totals suboption */ -@@ -237,14 +251,24 @@ print_totals (uint32_vector *entries, int64_t size) - } - - if (c > 0) { -- char *descr = extent_description (map, type); -+ char *descr; -+ bool free_descr; -+ const char *fg, *bg; - double percent = 100.0 * c / size; - -+ extent_description (map, type, &descr, &free_descr, &fg, &bg); -+ - if (!json_output) { -+ if (fg) -+ ansi_colour (fg, fp); -+ if (bg) -+ ansi_colour (bg, fp); - fprintf (fp, "%10" PRIu64 " %5.1f%% %3" PRIu32, - c, percent, type); - if (descr) - fprintf (fp, " %s", descr); -+ if (fg || bg) -+ ansi_restore (fp); - fprintf (fp, "\n"); - } - else { -@@ -264,7 +288,8 @@ print_totals (uint32_vector *entries, int64_t size) - comma = true; - } - -- free (descr); -+ if (free_descr) -+ free (descr); - } - - if (next_type == (uint64_t)UINT32_MAX + 1) -@@ -275,37 +300,67 @@ print_totals (uint32_vector *entries, int64_t size) - if (json_output) fprintf (fp, "\n]\n"); - } - --static char * --extent_description (const char *metacontext, uint32_t type) -+static void -+extent_description (const char *metacontext, uint32_t type, -+ char **descr, bool *free_descr, -+ const char **fg, const char **bg) - { -- char *ret; -- - if (strcmp (metacontext, "base:allocation") == 0) { - switch (type) { -- case 0: return strdup ("data"); -- case 1: return strdup ("hole"); -- case 2: return strdup ("zero"); -- case 3: return strdup ("hole,zero"); -+ case 0: -+ *descr = "data"; *free_descr = false; -+ *fg = ANSI_FG_BOLD_BLACK; *bg = NULL; -+ return; -+ case 1: -+ *descr = "hole"; *free_descr = false; -+ *fg = *bg = NULL; -+ return; -+ case 2: -+ *descr = "zero"; *free_descr = false; -+ *fg = *bg = NULL; -+ return; -+ case 3: -+ *descr = "hole,zero"; *free_descr = false; -+ *fg = *bg = NULL; -+ return; - } - } - else if (strncmp (metacontext, "qemu:dirty-bitmap:", 18) == 0) { - switch (type) { -- case 0: return strdup ("clean"); -- case 1: return strdup ("dirty"); -+ case 0: -+ *descr = "clean"; *free_descr = false; -+ *fg = ANSI_FG_GREEN; *bg = NULL; -+ return; -+ case 1: -+ *descr = "dirty"; *free_descr = false; -+ *fg = ANSI_FG_RED; *bg = NULL; -+ return; - } - } - else if (strcmp (metacontext, "qemu:allocation-depth") == 0) { - switch (type) { -- case 0: return strdup ("absent"); -- case 1: return strdup ("local"); -+ case 0: -+ *descr = "absent"; *free_descr = false; -+ *fg = *bg = NULL; -+ return; -+ case 1: -+ *descr = "local"; *free_descr = false; -+ *fg = ANSI_FG_BRIGHT_WHITE; *bg = ANSI_BG_BLACK; -+ return; - default: -- if (asprintf (&ret, "backing depth %u", type) == -1) { -+ if (asprintf (descr, "backing depth %u", type) == -1) { - perror ("asprintf"); - exit (EXIT_FAILURE); - } -- return ret; -+ *free_descr = true; -+ *fg = NULL; *bg = ANSI_BG_LIGHT_GREY; -+ return; - } - } - -- return NULL; /* Don't know - description field will be omitted. */ -+ /* Don't know - description field will be omitted. */ -+ *descr = NULL; -+ *free_descr = false; -+ *fg = NULL; -+ *bg = NULL; - } -diff --git a/info/nbdinfo.pod b/info/nbdinfo.pod -index 4733ecd1f7..7dfb9edb60 100644 ---- a/info/nbdinfo.pod -+++ b/info/nbdinfo.pod -@@ -330,6 +330,17 @@ L, L, L, - L, L, L, - L, L. - -+=item B<--color> -+ -+=item B<--colour> -+ -+=item B<--no-color> -+ -+=item B<--no-colour> -+ -+Enable or disable ANSI colours in output. By default we use colours -+if the output seems to be a terminal, and disable them if not. -+ - =item B<--content> - - =item B<--no-content> -diff --git a/info/show.c b/info/show.c -index 3a436665bf..140220d8c6 100644 ---- a/info/show.c -+++ b/info/show.c -@@ -28,11 +28,13 @@ - - #include - -+#include "ansi-colours.h" - #include "human-size.h" - #include "string-vector.h" - - #include "nbdinfo.h" - -+static void show_boolean (const char *name, bool cond); - static int collect_context (void *opaque, const char *name); - static char *get_content (struct nbd_handle *, int64_t size); - -@@ -119,6 +121,7 @@ show_one_export (struct nbd_handle *nbd, const char *desc, - content = get_content (nbd, size); - - if (!json_output) { -+ ansi_colour (ANSI_FG_BRIGHT_BLUE, fp); - fprintf (fp, "export="); - /* Might as well use the JSON function to get an escaped string here ... */ - print_json_string (export_name); -@@ -133,35 +136,38 @@ show_one_export (struct nbd_handle *nbd, const char *desc, - fprintf (fp, "\tcontent: %s\n", content); - if (uri) - fprintf (fp, "\turi: %s\n", uri); -+ ansi_restore (fp); -+ ansi_colour (ANSI_FG_BLUE, fp); - if (show_context) { - fprintf (fp, "\tcontexts:\n"); - for (i = 0; i < contexts.len; ++i) - fprintf (fp, "\t\t%s\n", contexts.ptr[i]); - } -+ ansi_restore (fp); -+ ansi_colour (ANSI_FG_MAGENTA, fp); - if (is_rotational >= 0) - fprintf (fp, "\t%s: %s\n", "is_rotational", - is_rotational ? "true" : "false"); - if (is_read_only >= 0) - fprintf (fp, "\t%s: %s\n", "is_read_only", - is_read_only ? "true" : "false"); -+ ansi_restore (fp); - if (can_cache >= 0) -- fprintf (fp, "\t%s: %s\n", "can_cache", can_cache ? "true" : "false"); -+ show_boolean ("can_cache", can_cache); - if (can_df >= 0) -- fprintf (fp, "\t%s: %s\n", "can_df", can_df ? "true" : "false"); -+ show_boolean ("can_df", can_df); - if (can_fast_zero >= 0) -- fprintf (fp, "\t%s: %s\n", "can_fast_zero", -- can_fast_zero ? "true" : "false"); -+ show_boolean ("can_fast_zero", can_fast_zero); - if (can_flush >= 0) -- fprintf (fp, "\t%s: %s\n", "can_flush", can_flush ? "true" : "false"); -+ show_boolean ("can_flush", can_flush); - if (can_fua >= 0) -- fprintf (fp, "\t%s: %s\n", "can_fua", can_fua ? "true" : "false"); -+ show_boolean ("can_fua", can_fua); - if (can_multi_conn >= 0) -- fprintf (fp, "\t%s: %s\n", "can_multi_conn", -- can_multi_conn ? "true" : "false"); -+ show_boolean ("can_multi_conn", can_multi_conn); - if (can_trim >= 0) -- fprintf (fp, "\t%s: %s\n", "can_trim", can_trim ? "true" : "false"); -+ show_boolean ("can_trim", can_trim); - if (can_zero >= 0) -- fprintf (fp, "\t%s: %s\n", "can_zero", can_zero ? "true" : "false"); -+ show_boolean ("can_zero", can_zero); - if (block_minimum > 0) - fprintf (fp, "\t%s: %" PRId64 "\n", "block_size_minimum", block_minimum); - if (block_preferred > 0) -@@ -269,6 +275,18 @@ show_one_export (struct nbd_handle *nbd, const char *desc, - return true; - } - -+/* Used for displaying booleans in non-JSON output. */ -+static void -+show_boolean (const char *name, bool cond) -+{ -+ if (cond) -+ ansi_colour (ANSI_FG_GREEN, fp); -+ else -+ ansi_colour (ANSI_FG_RED, fp); -+ fprintf (fp, "\t%s: %s\n", name, cond ? "true" : "false"); -+ ansi_restore (fp); -+} -+ - static int - collect_context (void *opaque, const char *name) - { --- -2.37.0.rc2 - diff --git a/0003-info-Improve-error-message-when-the-export-may-be-un.patch b/0003-info-Improve-error-message-when-the-export-may-be-un.patch deleted file mode 100644 index d8dca1f..0000000 --- a/0003-info-Improve-error-message-when-the-export-may-be-un.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 74d5818d42a1e09e6f6f1dccda8254fb8b2c6d57 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 2 Aug 2022 12:38:57 +0100 -Subject: [PATCH 3/3] info: Improve error message when the export may be - unknown to the server - -For example: - - $ nbdkit -r file dir=/var/tmp/disks --run 'nbdinfo $uri' - nbdkit: file[1]: error: open: : No such file or directory - nbdkit: file[1]: error: open: : No such file or directory - nbdinfo: nbd_opt_go: server replied with error to opt_go request: No such file or directory for export: - -What happened here is we requested the default export (because the -nbdkit-provided $uri points to that). nbdkit-file-plugin doesn't -provide a default export so that's an error. - -However the error message is weird and unactionable. We print the -default export name, but as that is an empty string we end up printing -"for export: ". And we don't tell the user what they can do to -recover from this. - -After this commit the message has been improved: - - $ nbdkit -r file dir=/var/tmp/disks --run 'nbdinfo $uri ' - nbdkit: file[1]: error: open: : No such file or directory - nbdkit: file[1]: error: open: : No such file or directory - nbdinfo: nbd_opt_go: server replied with error to opt_go request: No such file or directory for the default export - nbdinfo: suggestion: to list all exports on the server, use --list - -We now print "default export" if we spot that the default export was -requested, and we print an actionable suggestion. ---- - info/show.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/info/show.c b/info/show.c -index 140220d8c6..df647f3d56 100644 ---- a/info/show.c -+++ b/info/show.c -@@ -71,10 +71,20 @@ show_one_export (struct nbd_handle *nbd, const char *desc, - fprintf (stderr, "%s: %s", progname, nbd_get_error ()); - - char *e = nbd_get_export_name (nbd); -- if (e) fprintf (stderr, " for export: %s", e); -+ if (e) { -+ if (e[0] == '\0') -+ fprintf (stderr, " for the default export"); -+ else -+ fprintf (stderr, " for export: %s", e); -+ } - free (e); - fprintf (stderr, "\n"); - -+ if (!list_all) -+ fprintf (stderr, "%s: suggestion: " -+ "to list all exports on the server, use --list\n", -+ progname); -+ - return false; - } - size = nbd_get_size (nbd); --- -2.37.0.rc2 - diff --git a/libnbd.spec b/libnbd.spec index 5e6e76f..bac72cd 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.14-stable Name: libnbd -Version: 1.14.0 -Release: 2%{?dist} +Version: 1.14.1 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPLv2+ @@ -28,11 +28,6 @@ Source2: libguestfs.keyring # Maintainer script which helps with handling patches. Source3: copy-patches.sh -# Patches, all upstream after 1.14.0 -Patch1: 0001-dump-Move-ANSI-colours-to-separate-library-under-com.patch -Patch2: 0002-info-Add-limited-colourized-output.patch -Patch3: 0003-info-Improve-error-message-when-the-export-may-be-un.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -328,6 +323,9 @@ make %{?_smp_mflags} check || { %changelog +* Thu Aug 11 2022 Richard W.M. Jones - 1.14.1-1 +- New upstream stable version 1.14.1 + * Tue Aug 02 2022 Richard W.M. Jones - 1.14.0-2 - Add some small upstream patches since 1.14.0 diff --git a/sources b/sources index db1696c..439771a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.14.0.tar.gz) = 6e0a74719e5cba5dedcacf5806f4c55bffcfd850c8743fc5a01565b9e91d912014b2208bec9ca2015abbdb857e8a58fce781266bb14541927e12cadde39bc099 -SHA512 (libnbd-1.14.0.tar.gz.sig) = 4a5ab5a5056dc457af12ba8628432d45823a102e8cbf0511fcf82a6e28f1dea9f0344481f3277a3249fce82be611c929e0676d270f0382f2f677ba94d4259dc2 +SHA512 (libnbd-1.14.1.tar.gz) = 9d95cf7a66926d00ec9aacfc6d04f2dc885ccfed07c78f1e6693190dd14132d30d6d1ff7d46e46007732a8a20a9fbf648775bc0b3371ad49eff4ce1e44e47209 +SHA512 (libnbd-1.14.1.tar.gz.sig) = 2c7be46babfdf7bddb3aed35f510ab9b1e7ef11a6fc4948ecb5a49f0db1f1c01651262c749ce5846d401feb831f1becd6d9717d3a42be58c7ff30fb137f00e40 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 110/224] 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 111/224] 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 112/224] 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 113/224] 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 114/224] 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 115/224] 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 116/224] 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 117/224] 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 118/224] 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 119/224] 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 120/224] 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 89aee3bed6bbc3d3747340ec824a10f14fbb8573 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:57:08 +0000 Subject: [PATCH 121/224] 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 122/224] 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 123/224] 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 124/224] 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 125/224] 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 126/224] 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 127/224] 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 128/224] 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 129/224] 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 130/224] 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 131/224] 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 132/224] 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 133/224] 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 134/224] 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 135/224] 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 136/224] 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 137/224] 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 138/224] 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 139/224] 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 140/224] 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 141/224] 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 142/224] 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 143/224] 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 144/224] 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 145/224] 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 146/224] 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 147/224] 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 148/224] 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 149/224] 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 150/224] 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 151/224] 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 152/224] 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 153/224] 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 154/224] 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 155/224] 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 156/224] 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 157/224] 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 158/224] 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 159/224] 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 160/224] 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 161/224] 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 162/224] 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 163/224] 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 164/224] 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 165/224] 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 166/224] 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 167/224] 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 168/224] 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 169/224] 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 170/224] 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 171/224] 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 172/224] +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 173/224] 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 174/224] 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 175/224] 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 176/224] 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 177/224] 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 178/224] 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 179/224] 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 180/224] 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 181/224] 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 182/224] 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 183/224] 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 184/224] 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 185/224] 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 186/224] 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 187/224] 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 188/224] 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 189/224] 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 190/224] 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 191/224] 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 192/224] 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 193/224] 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 194/224] 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 195/224] 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 196/224] 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 197/224] 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 198/224] 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 199/224] 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 200/224] 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 201/224] 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 202/224] 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 203/224] 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 204/224] 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 205/224] 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 206/224] 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 207/224] 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 208/224] 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 209/224] 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 210/224] 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 211/224] 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 212/224] 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 213/224] 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 214/224] 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 215/224] 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 216/224] 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 217/224] 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 218/224] 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 219/224] 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 220/224] 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 221/224] 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 222/224] 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 223/224] 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 224/224] 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