From 79eec795b1ecb18f8f4f8b01b0fa9f9e3249d2ef Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 28 Sep 2024 09:54:04 +0100 Subject: [PATCH] Rebase to libnbd 1.20.3 --- ...generator-Print-full-error-in-handle_reply_error.patch | 2 +- 0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch | 2 +- 0003-generator-Restore-assignment-to-local-err.patch | 2 +- ...rator-states-newstyle.c-Quote-untrusted-string-f.patch | 2 +- ...rator-states-newstyle.c-Don-t-sign-extend-escape.patch | 2 +- libnbd.spec | 8 ++++++-- sources | 4 ++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/0001-generator-Print-full-error-in-handle_reply_error.patch b/0001-generator-Print-full-error-in-handle_reply_error.patch index 460a9e3..d8f588e 100644 --- a/0001-generator-Print-full-error-in-handle_reply_error.patch +++ b/0001-generator-Print-full-error-in-handle_reply_error.patch @@ -1,4 +1,4 @@ -From 9e51ca3dc11b4abe2e5145837ae80863fc300646 Mon Sep 17 00:00:00 2001 +From adab173b12c3c33311736d8bf801beb7539ebf80 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Jul 2024 17:22:12 +0100 Subject: [PATCH] generator: Print full error in handle_reply_error diff --git a/0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch b/0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch index 8b6dd8b..9f52957 100644 --- a/0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch +++ b/0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch @@ -1,4 +1,4 @@ -From 6ef03cf2a1fe9f88c07c6f2d97afe9f82bfe03a8 Mon Sep 17 00:00:00 2001 +From 3e96626c70d172ff464f31547924537d957d5929 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Jul 2024 17:26:39 +0100 Subject: [PATCH] lib: Don't overwrite error in nbd_opt_{go,info} diff --git a/0003-generator-Restore-assignment-to-local-err.patch b/0003-generator-Restore-assignment-to-local-err.patch index 290b8c1..cbe87d2 100644 --- a/0003-generator-Restore-assignment-to-local-err.patch +++ b/0003-generator-Restore-assignment-to-local-err.patch @@ -1,4 +1,4 @@ -From 1357302046b5eaae09a8817ff050790b0285183d Mon Sep 17 00:00:00 2001 +From 72f72dede6a0dc7d56ce2660ca232db1a0de8145 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Jul 2024 13:39:28 +0100 Subject: [PATCH] generator: Restore assignment to local 'err' diff --git a/0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch b/0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch index bdc9946..34bb6e1 100644 --- a/0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch +++ b/0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch @@ -1,4 +1,4 @@ -From 1de017428047f1a8991285766b69b767ab895c24 Mon Sep 17 00:00:00 2001 +From 8b4c86f8a0457ae32ebb6abbb55cb5809842ee3f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Jul 2024 13:25:34 +0100 Subject: [PATCH] generator/states-newstyle.c: Quote untrusted string from the diff --git a/0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch b/0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch index f4c8f90..40ec59e 100644 --- a/0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch +++ b/0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch @@ -1,4 +1,4 @@ -From f24c7801aef0e2f8936d74ac5237c3391fb39d26 Mon Sep 17 00:00:00 2001 +From de5c0067d38d161fcaf6b94236468517bc168324 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Jul 2024 15:48:46 +0100 Subject: [PATCH] generator/states-newstyle.c: Don't sign extend escaped chars diff --git a/libnbd.spec b/libnbd.spec index a349036..ac06ed7 100644 --- a/libnbd.spec +++ b/libnbd.spec @@ -20,8 +20,8 @@ %global source_directory 1.20-stable Name: libnbd -Version: 1.20.2 -Release: 2%{?dist} +Version: 1.20.3 +Release: 1%{?dist} Summary: NBD client library in userspace License: LGPL-2.0-or-later AND BSD-3-Clause @@ -40,6 +40,7 @@ Source3: copy-patches.sh # Patches are stored in the upstream repository: # https://gitlab.com/nbdkit/libnbd/-/commits/rhel-10.0/ +# Patches. Patch0001: 0001-generator-Print-full-error-in-handle_reply_error.patch Patch0002: 0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch Patch0003: 0003-generator-Restore-assignment-to-local-err.patch @@ -385,6 +386,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Sep 28 2024 Richard W.M. Jones - 1.20.3-1 +- Rebase to libnbd 1.20.3 + * Fri Jul 26 2024 Richard W.M. Jones - 1.20.2-2 - Rebase to libnbd 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