!27 [sync] PR-24: update to1.29.11

From: @openeuler-sync-bot 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-05-05 08:53:29 +00:00 committed by Gitee
commit 2635ef8a45
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 122 additions and 162 deletions

View File

@ -1,29 +0,0 @@
From 341444c2ca73323c8c6aac93417373668ba7da4a Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Mon, 2 Nov 2020 15:03:34 +0800
Subject: [PATCH] Create patch
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9965ea7..4a4ee6a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -83,7 +83,6 @@ EXTRA_DIST = \
test-shebang-python.sh \
test-shebang-ruby.sh \
test-single.sh \
- test-start.sh \
test-random-sock.sh \
test-tls.sh \
test-tls-psk.sh \
@@ -129,7 +128,6 @@ TESTS += \
test-version-plugin.sh \
test-version-filter.sh \
test-dump-plugin.sh \
- test-start.sh \
test-single.sh \
test-captive.sh \
test-random-sock.sh \
--
2.27.0

View File

@ -1,96 +0,0 @@
From 902f2203f0bc38de25dffd885ca837fe59e4a3fb Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 30 Jul 2019 15:58:06 -0500
Subject: [PATCH] tests: Accommodate qemu-img 4.1 output change
Where qemu-img 4.0 used to say 'virtual size: 100M', the 4.1 release
now says 'virtual size: 100 MiB'. Similarly, '5.0G' turned into '5
GiB'. But rather than worry about potential future changes to the
human-readable output, we can just use --output=json (at which point
we no longer even have to force qemu-img to the C locale, which we
were not even doing consistently). It might be slightly more robust
to find our specific information using jq, but for now a grep of the
output json is still reliable enough for our needs.
If the '\b' is a problem on BSD, we could use '([, ]|$)' instead. Or
that's where jq would make it easier to parse off a given number
without worrying about what comes after the number.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
tests/test-ip.sh | 10 ++++++----
tests/test-tls-psk.sh | 7 +++----
tests/test-tls.sh | 7 +++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/test-ip.sh b/tests/test-ip.sh
index 12448c4..1ecf700 100755
--- a/tests/test-ip.sh
+++ b/tests/test-ip.sh
@@ -87,17 +87,19 @@ kill -s 0 $pid
# Check we can connect over the IPv4 loopback interface.
ipv4_lo="$(ip -o -4 addr show scope host)"
if test -n "$ipv4_lo"; then
- qemu-img info --image-opts "file.driver=nbd,file.host=127.0.0.1,file.port=$port" > ipv4.out
+ qemu-img info --output=json \
+ --image-opts "file.driver=nbd,file.host=127.0.0.1,file.port=$port" > ipv4.out
cat ipv4.out
- grep -sq "^virtual size: 100M" ipv4.out
+ grep -sq '"virtual-size": *104857600\b' ipv4.out
fi
# Check we can connect over the IPv6 loopback interface.
ipv6_lo="$(ip -o -6 addr show scope host)"
if test -n "$ipv6_lo"; then
- qemu-img info --image-opts "file.driver=nbd,file.host=::1,file.port=$port" > ipv6.out
+ qemu-img info --output=json \
+ --image-opts "file.driver=nbd,file.host=::1,file.port=$port" > ipv6.out
cat ipv6.out
- grep -sq "^virtual size: 100M" ipv6.out
+ grep -sq '"virtual-size": *104857600\b' ipv6.out
fi
# Kill the process.
diff --git a/tests/test-tls-psk.sh b/tests/test-tls-psk.sh
index 99c5945..ea64919 100755
--- a/tests/test-tls-psk.sh
+++ b/tests/test-tls-psk.sh
@@ -109,12 +109,11 @@ cleanup ()
trap cleanup INT QUIT TERM EXIT ERR
# Run qemu-img against the server.
-LANG=C \
-qemu-img info \
+qemu-img info --output=json \
--object "tls-creds-psk,id=tls0,endpoint=client,dir=$PWD" \
--image-opts "file.driver=nbd,file.host=localhost,file.port=$port,file.tls-creds=tls0" > tls-psk.out
cat tls-psk.out
-grep -sq "^file format: raw" tls-psk.out
-grep -sq "^virtual size: 100M" tls-psk.out
+grep -sq '"format": *"raw"' tls-psk.out
+grep -sq '"virtual-size": *104857600\b' tls-psk.out
diff --git a/tests/test-tls.sh b/tests/test-tls.sh
index 71bd8a4..9e91deb 100755
--- a/tests/test-tls.sh
+++ b/tests/test-tls.sh
@@ -103,12 +103,11 @@ cleanup ()
trap cleanup INT QUIT TERM EXIT ERR
# Run qemu-img against the server.
-LANG=C \
-qemu-img info \
+qemu-img info --output=json \
--object "tls-creds-x509,id=tls0,endpoint=client,dir=$pkidir" \
--image-opts "file.driver=nbd,file.host=localhost,file.port=$port,file.tls-creds=tls0" > tls.out
cat tls.out
-grep -sq "^file format: raw" tls.out
-grep -sq "^virtual size: 100M" tls.out
+grep -sq '"format": *"raw"' tls.out
+grep -sq '"virtual-size": *104857600\b' tls.out
--
2.23.0

BIN
nbdkit-1.29.11.tar.gz Normal file

Binary file not shown.

17
nbdkit-1.29.11.tar.gz.sig Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmG+XX8RHHJpY2hAYW5u
ZXhpYS5vcmcACgkQkXOPc+G3aKAy6Q//ST3Ga9oH1iC4CUN7zAPKLURjZkyPvre2
tRqIbOX48qgNyYcE0VhPPn+gHWgnuPr3osW1f6jwtkEyY4I/oBxRjpZGWSSaKjsL
i6gZsrj0RyW/1plnF0Yn+Lmz+TuCu0rZ2EwH+ODHlii3JFgajitFcOfhmi7EyvSP
KmNDgYXXA4loWjCYdhgmfMfSdLty8lzDdix1LEWDxz9Uc0YDXKipvYfbbIz8R1ld
bExoMx/5frUH6j4txT1kfXQbIFUIhOsHYOK7rsQDxigJw3rzySxAcMFeIlzdmQAE
cvqsQ6W6v/QO7aYgf4YrYQdyPv+etqk2/wuEImGKp0E3HX0lHmQ8qjJsvmttep3W
1fvwN2ujbAhOh5ZX0hxXB+wqi+qPYJC5yBS5QQUcozAGW3LOK6eel0+uUiQ4PlJf
1XciqVtHDBdW0zQ/2T1ifOtX0i1MqhZ9ynwBwsjDCsj7E6IGrJIVvGicK3gQMO6i
UlvMZxKCgN2qG7fQKgxZ0vL6jJTgDT9a82lL/HiUIDnlOkKkeBirWXmLb+qAAOzm
Jjp1WpXSKPCEIv2m7CRkxVC/dqQ3/ew1mbgxn+emz3EnqxFeTWL1Sgch6IvgQg2H
n8sif7vWp6zhxrxfgUI/Y3n0vXFoDUM0fpG0ZDG/HEnVHhqgyMiRhB3dZpHb8Rlr
0Zexrn1cG0I=
=wyW4
-----END PGP SIGNATURE-----

Binary file not shown.

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJboX5mAAoJEJFzj3Pht2igNiUQAJXj6AF5IaqNTVJYEe/I5Y31
vXAHTRT9ni1FDdF+xLlBa5F0Ii6ESE1SHUis5M55cvK37M0G2VhdBhqLmuMYxxfp
QTO5Khz82Of5Jj1Commdg9/yXchlXVNG/GeYaV1OcDfW+QlgQMCPApguKhF0PNf7
oaL0LhrYLXri2geR7GC/7BGNp9QuYFLhQjqS7+0x1j9kPlrzalE26o0TEO+zjXmS
TP7H5vZh7aguD9+hrbZP1wVba0UaG4bTO9+UxV5Doh+7vDZEmZwjpfI3WTZjs12S
VRuo5dMscGB91/6Tq03zPqxBBxCHXClndsdBOa8W9N4U633y9Z2uIXGmFzLeIroT
e3ZwSBktYXyMoA9wtJ0NwL21U2gqxSJEtt0nchaseiJpv7wTw+vk1Gy4CSx2Tr5k
Yzjd3UsnJog0kX37mkMxXs7ciFo9cSGWZsLoanXGWs8eXhWZNUE1mJHQFvop9GGG
RRpS8yVEIOkinXe6w9O3SXBa0aR30CMzjvpHWGtaOQY/iJ/byNyv8NGUGA5gmHFQ
7CpOSM67a9ZPL91iKWNb80emBY0aLiSlVYFkmyWsJ72Bxr02q6zg7BSN3fXgUpkU
Myr1ZQWLmIibClm5gwpFGZQAM8nEePiBHdAk3pSqs+bVoZhC3F8BmwKpRn/VkzVp
kITZyBu8RqN4mops8+F6
=1npC
-----END PGP SIGNATURE-----

View File

@ -3,16 +3,14 @@
%global patches_touch_autotools %{nil}
Name: nbdkit
Version: 1.6.2
Release: 8
Version: 1.29.11
Release: 1
Summary: NBD server
License: BSD
URL: https://github.com/libguestfs/nbdkit
Source0: http://libguestfs.org/download/nbdkit/1.6-stable/nbdkit-%{version}.tar.gz
Source1: http://libguestfs.org/download/nbdkit/1.6-stable/nbdkit-%{version}.tar.gz.sig
Source0: https://download.libguestfs.org/nbdkit/1.29-development/nbdkit-%{version}.tar.gz
Source1: https://download.libguestfs.org/nbdkit/1.29-development/nbdkit-%{version}.tar.gz.sig
Source2: libguestfs.keyring
Patch0000: Fix-the-test-error.patch
Patch0001: Fix-the-test-error-1.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool
%endif
@ -84,23 +82,35 @@ trivial dependencies.
Summary: Plugins set
License: BSD
Provides: nbdkit-example-plugins nbdkit-curl-plugin nbdkit-plugin-curl = %{version}-%{release}
Provides: nbdkit-ext2-plugin nbdkit-plugin-ext2 = %{version}-%{release}
Provides: nbdkit-gzip-plugin nbdkit-plugin-gzip = %{version}-%{release}
Provides: nbdkit-lua-plugin nbdkit-plugin-lua = %{version}-%{release}
Provides: nbdkit-ruby-plugin nbdkit-plugin-ruby = %{version}-%{release}
Provides: nbdkit-tar-plugin nbdkit-plugin-tar = %{version}-%{release}
Provides: nbdkit-tcl-plugin nbdkit-plugin-tcl = %{version}-%{release}
Provides: nbdkit-xz-plugin nbdkit-plugin-xz = %{version}-%{release}
Obsoletes: nbdkit-example-plugins nbdkit-plugin-examples < 1.1.19-1
Obsoletes: nbdkit-curl-plugin nbdkit-plugin-curl <= %{version}-%{release}
Obsoletes: nbdkit-ext2-plugin nbdkit-plugin-ext2 <= %{version}-%{release}
Obsoletes: nbdkit-gzip-plugin nbdkit-plugin-gzip <= %{version}-%{release}
Obsoletes: nbdkit-lua-plugin nbdkit-plugin-lua <= %{version}-%{release}
Obsoletes: nbdkit-ruby-plugin nbdkit-plugin-ruby <= %{version}-%{release}
Obsoletes: nbdkit-tar-plugin nbdkit-plugin-tar <= %{version}-%{release}
Obsoletes: nbdkit-tcl-plugin nbdkit-plugin-tcl <= %{version}-%{release}
Obsoletes: nbdkit-xz-plugin nbdkit-plugin-xz <= %{version}-%{release}
Requires: nbdkit-server = %{version}-%{release} nbdkit-perl-plugin
Provides: %{name}-S3-plugin %{name}-S3-plugin = %{version}-%{release}
Provides: %{name}-cc-plugin %{name}-cc-plugin = %{version}-%{release}
Provides: %{name}-cdi-plugin %{name}-cdi-plugin = %{version}-%{release}
Provides: %{name}-linuxdisk-plugin %{name}-linuxdisk-plugin = %{version}-%{release}
Provides: %{name}-tmpdisk-plugin %{name}-tmpdisk-plugin = %{version}-%{release}
Provides: %{name}-eval-plugin %{name}-eval-plugin = %{version}-%{release}
Provides: %{name}-floppy-plugin %{name}-floppy-plugin = %{version}-%{release}
Provides: %{name}-full-plugin %{name}-full-plugin = %{version}-%{release}
Provides: %{name}-info-plugin %{name}-info-plugin = %{version}-%{release}
Provides: %{name}-ondemand-plugin %{name}-ondemand-plugin = %{version}-%{release}
Provides: %{name}-partitioning-plugin %{name}-partitioning-plugin = %{version}-%{release}
Provides: %{name}-sh-plugin %{name}-sh-plugin = %{version}-%{release}
Provides: %{name}-sparse-random-plugin %{name}-sparse-random-plugin = %{version}-%{release}
Obsoletes: %{name}-S3-plugin %{name}-S3-plugin <= %{version}-%{release}
Obsoletes: %{name}-cc-plugin %{name}-cc-plugin <= %{version}-%{release}
Obsoletes: %{name}-cdi-plugin %{name}-cdi-plugin <= %{version}-%{release}
Obsoletes: %{name}-linuxdisk-plugin %{name}-linuxdisk-plugin <= %{version}-%{release}
Obsoletes: %{name}-tmpdisk-plugin %{name}-tmpdisk-plugin <= %{version}-%{release}
%description plugins
This package contains a set of plugins for nbdkit.
@ -188,7 +198,44 @@ VMware VDDK for accessing VMware disks and servers.
Summary: Basic filters for nbdkit
License: BSD
Requires: nbdkit-server = %{version}-%{release}
Provides: %{name}-blocksize-filter = %{version}-%{release}
Provides: %{name}-cache-filter = %{version}-%{release}
Provides: %{name}-cacheextents-filter = %{version}-%{release}
Provides: %{name}-checkwrite-filter = %{version}-%{release}
Provides: %{name}-cow-filter = %{version}-%{release}
Provides: %{name}-ddrescue-filter = %{version}-%{release}
Provides: %{name}-protect-filter = %{version}-%{release}
Provides: %{name}-delay-filter = %{version}-%{release}
Provides: %{name}-error-filter = %{version}-%{release}
Provides: %{name}-exitlast-filter = %{version}-%{release}
Provides: %{name}-exitwhen-filter = %{version}-%{release}
Provides: %{name}-exportname-filter = %{version}-%{release}
Provides: %{name}-extentlist-filter = %{version}-%{release}
Provides: %{name}-fua-filter = %{version}-%{release}
Provides: %{name}-ip-filter = %{version}-%{release}
Provides: %{name}-limit-filter = %{version}-%{release}
Provides: %{name}-log-filter = %{version}-%{release}
Provides: %{name}-multi-conn-filter = %{version}-%{release}
Provides: %{name}-nocache-filter = %{version}-%{release}
Provides: %{name}-noextents-filter = %{version}-%{release}
Provides: %{name}-nofilter-filter = %{version}-%{release}
Provides: %{name}-noparallel-filter = %{version}-%{release}
Provides: %{name}-nozero-filter = %{version}-%{release}
Provides: %{name}-offset-filter = %{version}-%{release}
Provides: %{name}-partition-filter = %{version}-%{release}
Provides: %{name}-pause-filter = %{version}-%{release}
Provides: %{name}-rate-filter = %{version}-%{release}
Provides: %{name}-readahead-filter = %{version}-%{release}
Provides: %{name}-retry-filter = %{version}-%{release}
Provides: %{name}-stats-filter = %{version}-%{release}
Provides: %{name}-swab-filter = %{version}-%{release}
Provides: %{name}-tls-fallback-filter = %{version}-%{release}
Provides: %{name}-truncate-filter = %{version}-%{release}
Provides: %{name}-ext2-filter = %{version}-%{release}
Provides: %{name}-gzip-filter = %{version}-%{release}
Provides: %{name}-lua-filter = %{version}-%{release}
Provides: %{name}-retry-request-filter = %{version}-%{release}
Provides: %{name}-tar-filter = %{version}-%{release}
%description basic-filters
This package contains some basic filters for nbdkit which have only
trivial dependencies.
@ -285,12 +332,30 @@ popd
find $RPM_BUILD_ROOT -name '*.la' -delete
%ifnarch x86_64
rm $RPM_BUILD_ROOT%{_libdir}/nbdkit/plugins/nbdkit-vddk-plugin.so
rm $RPM_BUILD_ROOT%{_mandir}/man1/nbdkit-vddk-plugin.1*
%endif
%check
function skip_test ()
{
for f in "$@"; do
rm -f "$f"
echo 'exit 77' > "$f"
chmod +x "$f"
done
}
skip_test tests/test-shebang-cc.sh tests/test-floppy.sh tests/test-eval-file.sh
skip_test tests/test-linuxdisk.sh tests/test-ondemand.sh tests/test-partitioning2.sh
skip_test tests/test-partitioning3.sh tests/test-partitioning5.sh tests/test-tar.sh
skip_test tests/test-old-plugins-x86_64-Linux-v1.18.2.sh
skip_test tests/test-old-plugins-x86_64-Linux-v1.8.4.sh
skip_test tests/test-old-plugins-x86_64-Linux-v1.12.8.sh
skip_test tests/test-old-plugins-x86_64-Linux-v1.2.8.sh
skip_test tests/test-old-plugins-x86_64-Linux-v1.0.0.sh
mkdir -p $HOME/.cache/libvirt
export LIBGUESTFS_DEBUG=1
export LIBGUESTFS_TRACE=1
@ -328,9 +393,12 @@ popd
%files plugins
%doc README LICENSE
%{_libdir}/nbdkit/plugins/{nbdkit-example*-plugin.so,nbdkit-example4-plugin,nbdkit-curl-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-ext2-plugin.so,nbdkit-gzip-plugin.so,nbdkit-lua-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-example*-plugin.so,nbdkit-example4-plugin,nbdkit-curl-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-ruby-plugin.so,nbdkit-tar-plugin,nbdkit-tcl-plugin.so,nbdkit-xz-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-S3-plugin,nbdkit-cc-plugin.so,nbdkit-cdi-plugin.so,nbdkit-eval-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-floppy-plugin.so,nbdkit-full-plugin.so,nbdkit-info-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-linuxdisk-plugin.so,nbdkit-ondemand-plugin.so,nbdkit-partitioning-plugin.so}
%{_libdir}/nbdkit/plugins/{nbdkit-sh-plugin.so,nbdkit-sparse-random-plugin.so,nbdkit-tmpdisk-plugin.so}
%files guestfs-plugin
%doc README LICENSE
@ -368,6 +436,16 @@ popd
%{_libdir}/nbdkit/filters/{nbdkit-delay-filter.so,nbdkit-error-filter.so,nbdkit-fua-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-log-filter.so,nbdkit-nozero-filter.so,nbdkit-offset-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-partition-filter.so,nbdkit-truncate-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-cacheextents-filter.so,nbdkit-checkwrite-filter.so,nbdkit-ddrescue-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-exitlast-filter.so,nbdkit-exitwhen-filter.so,nbdkit-exportname-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-extentlist-filter.so,nbdkit-ip-filter.so,nbdkit-limit-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-multi-conn-filter.so,nbdkit-nocache-filter.so,nbdkit-noextents-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-nofilter-filter.so,nbdkit-noparallel-filter.so,nbdkit-pause-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-rate-filter.so,nbdkit-readahead-filter.so,nbdkit-retry-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-retry-request-filter.so,nbdkit-stats-filter.so,nbdkit-swab-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-tar-filter.so,nbdkit-tls-fallback-filter.so,nbdkit-protect-filter.so}
%{_libdir}/nbdkit/filters/{nbdkit-ext2-filter.so,nbdkit-gzip-filter.so,nbdkit-lua-filter.so}
%files devel
%doc OTHER_PLUGINS README TODO LICENSE
@ -375,12 +453,14 @@ popd
%doc plugins/example4/nbdkit-example4-plugin
%doc plugins/lua/example.lua
%doc plugins/perl/example.pl
%doc plugins/python/example.py
%doc plugins/python/examples/*.py
%doc plugins/ruby/example.rb
%doc plugins/tcl/example.tcl
%{_includedir}/nbdkit-common.h
%{_includedir}/nbdkit-filter.h
%{_includedir}/nbdkit-plugin.h
%{_includedir}/nbd-protocol.h
%{_includedir}/nbdkit-version.h
%{_libdir}/pkgconfig/nbdkit.pc
%files bash-completion
@ -391,8 +471,12 @@ popd
%files help
%{_mandir}/man1/nbdkit*.1*
%{_mandir}/man3/nbdkit-*.3*
%{_mandir}/man3/NBDKit.3.gz
%changelog
* Thu Dec 30 2021 liyanan <liyanan32@huawei.com> - 1.29.11-1
- update to 1.29.11
* Wed Oct 21 2020 chengzihan <chengzihan2@huawei.com> - 1.6.2-7
- Remove subpackage nbdkit-python2-plugin