rpms/libnbd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to libnbd 1.20.3

Browse Source
This commit is contained in:
Richard W.M. Jones 2024-09-28 09:53:36 +01:00
parent 6df888fabb
commit 0ce2ddf562
8 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-generator-Print-full-error-in-handle_reply_error.patch
View File

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

2
0002-lib-Don-t-overwrite-error-in-nbd_opt_-go-info.patch
View File

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

2
0003-generator-Restore-assignment-to-local-err.patch
View File

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

2
0004-generator-states-newstyle.c-Quote-untrusted-string-f.patch
View File

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

2
0005-generator-states-newstyle.c-Don-t-sign-extend-escape.patch
View File

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

2
copy-patches.sh
View File

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

10
libnbd.spec
View File

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

4
sources
View File

@ -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