From a8884b45ff43d14bc3f9e7905a0d6cdaf52845ff Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Mar 2024 18:33:22 +0000 Subject: [PATCH 01/11] New upstream development version 1.19.8 (cherry picked from commit af896bec5c64a26bacf27ccdf54692b4681145a9) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 7a93747..a0f3bbf 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 @@ -385,6 +385,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 e8278236579d36e0c0eb3f1fbb4502715b2745a8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 11 Mar 2024 10:39:20 +0000 Subject: [PATCH 02/11] New upstream development version 1.19.9 (cherry picked from commit 0b21d0faef76e69441c871a1a699082ad7e4d568) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a0f3bbf..a0bf45c 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 @@ -385,6 +385,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 a39ccfa8064af4faf35906ac04e54363113539de Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 15 Mar 2024 09:41:26 +0000 Subject: [PATCH 03/11] New upstream development version 1.19.10 (cherry picked from commit 335d1d6234b7be7eeaa7646b2e77c43401127b2d) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index a0bf45c..ff78abe 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 @@ -385,6 +385,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 f2e60ebdef425f2dbb41cbd8c3d17e6d4730f4eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Mar 2024 11:12:54 +0000 Subject: [PATCH 04/11] Use %{bash_completions_dir} macro (cherry picked from commit 5b53adfdeb8d24f83b2f79e8443477387eed954e) --- libnbd.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index ff78abe..809963f 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 @@ -373,18 +373,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 756b4b445e8071ea85075cdd60164c47c6115832 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 25 Mar 2024 11:25:50 +0000 Subject: [PATCH 05/11] New upstream development version 1.19.11 Use %{bash_completions_dir} macro (cherry picked from commit 000f65654273b06e339dd87116211279b4cf7b40) --- libnbd.spec | 7 ++++--- sources | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 809963f..47245dd 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 @@ -385,7 +385,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 a154d918f399d010968f949a6c28e732d3679e5e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Apr 2024 21:23:56 +0100 Subject: [PATCH 06/11] Rebuild autoconf cruft unconditionally (cherry picked from commit 11a78d929de957995cf127e70c2762326132a263) --- libnbd.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 47245dd..f2314e6 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 26205aa4aa65c97c6e3fd23a2100dad4d46d1b45 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Apr 2024 21:27:20 +0100 Subject: [PATCH 07/11] New stable branch version 1.20.0 (cherry picked from commit ef2af37ed73235afe9161aa74ceef0bb7e56282b) --- libnbd.spec | 8 ++++++-- sources | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index f2314e6..bc8c6be 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 @@ -379,6 +379,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 8183542e9d749f55afa0c2b56b2fc890a41c8b84 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Apr 2024 11:26:53 +0100 Subject: [PATCH 08/11] gating: Match any version of RHEL (cherry picked from commit c87ac3e4a5cc32c36a525d49389c2460973bbecf) --- 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 5aa20531c76a8995c2c28983597d35bbee7f2964 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 May 2024 15:56:29 +0100 Subject: [PATCH 09/11] New stable branch version 1.20.1 (cherry picked from commit 46f219c79e41822a45bea57b46d1e6c7f43cec3f) --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index bc8c6be..0074b77 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 @@ -379,6 +379,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 945d069d3dd3484e0eaf7c2c294573eaa5f8aa08 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 25 Jun 2024 21:48:25 +0100 Subject: [PATCH 10/11] New stable branch version 1.20.2 Fix: multiple flaws in TLS server certificate checking --- libnbd.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 0074b77..4a51063 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.20-stable Name: libnbd -Version: 1.20.1 +Version: 1.20.2 Release: 1%{?dist} Summary: NBD client library in userspace @@ -379,6 +379,10 @@ make %{?_smp_mflags} check || { %changelog +* Tue Jun 25 2024 Richard W.M. Jones - 1.20.2-1 +- New stable branch version 1.20.2 +- Fix: multiple flaws in TLS server certificate checking + * Tue May 7 2024 Richard W.M. Jones - 1.20.1-1 - New stable branch version 1.20.1 diff --git a/sources b/sources index 1b82619..2a87c66 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.20.2.tar.gz) = e390dc57080e9c7b246d1a4c21b80fd9479f7b5eeeaa7a36615c5d6ebf6df2e14f9b2fbebfb9102de282160d531277c6364c74a47619a20fb0646f8222054852 +SHA512 (libnbd-1.20.2.tar.gz.sig) = 84e3d3df8090d451ddbe547712ed606958f1181b91cbaf8c613229677484bce1f2654aea6f7d6efd78982b285553184f7fb5544d212159692c871a9c2567e929 From e4f8396faadb387e6b15ea3dc4b0ba396e7a5c2f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 27 Sep 2024 14:43:31 +0100 Subject: [PATCH 11/11] New stable branch version 1.20.3 --- libnbd.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libnbd.spec b/libnbd.spec index 4a51063..eba8bba 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,7 +20,7 @@ %global source_directory 1.20-stable Name: libnbd -Version: 1.20.2 +Version: 1.20.3 Release: 1%{?dist} Summary: NBD client library in userspace @@ -379,6 +379,9 @@ make %{?_smp_mflags} check || { %changelog +* Fri Sep 27 2024 Richard W.M. Jones - 1.20.3-1 +- New stable branch version 1.20.3 + * Tue Jun 25 2024 Richard W.M. Jones - 1.20.2-1 - New stable branch version 1.20.2 - Fix: multiple flaws in TLS server certificate checking diff --git a/sources b/sources index 2a87c66..20de521 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libnbd-1.20.2.tar.gz) = e390dc57080e9c7b246d1a4c21b80fd9479f7b5eeeaa7a36615c5d6ebf6df2e14f9b2fbebfb9102de282160d531277c6364c74a47619a20fb0646f8222054852 -SHA512 (libnbd-1.20.2.tar.gz.sig) = 84e3d3df8090d451ddbe547712ed606958f1181b91cbaf8c613229677484bce1f2654aea6f7d6efd78982b285553184f7fb5544d212159692c871a9c2567e929 +SHA512 (libnbd-1.20.3.tar.gz) = 31c23f91892719d3d109c24bdce559005057f6469c930c9eee7c3241f001c92ec37d75d5e999fe76e9d6afd045458a7e25b694d4b4044b9df74d2ff2cab63dc9 +SHA512 (libnbd-1.20.3.tar.gz.sig) = 33a20f04652136de62263dceff2798bc261267818553fae9ec313d0756bce0817a5523086ca493fca4a673136d8453a62e5cc0475eed84556ce0158e6fead52c