Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nbdkit for openSUSE:Factory checked in at 2021-07-02 13:27:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nbdkit (Old) and /work/SRC/openSUSE:Factory/.nbdkit.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nbdkit" Fri Jul 2 13:27:13 2021 rev:5 rq:903566 version:1.27.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nbdkit/nbdkit.changes 2021-06-11 00:19:13.273373993 +0200 +++ /work/SRC/openSUSE:Factory/.nbdkit.new.2625/nbdkit.changes 2021-07-02 13:28:02.384493992 +0200 @@ -1,0 +2,8 @@ +Thu Jul 01 12:24:31 UTC 2021 - rpm@fthiessen.de + +- Update to version 1.27.1: + * server: Add $tls shell variable for captive nbdkit + * server: When --tls is used, set captive $uri variable to nbds://... + * valgrind: Add OCaml suppression + +------------------------------------------------------------------- Old: ---- nbdkit-1.26.0.tar.xz New: ---- nbdkit-1.27.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbdkit.spec ++++++ --- /var/tmp/diff_new_pack.Eh50Gt/_old 2021-07-02 13:28:02.808490702 +0200 +++ /var/tmp/diff_new_pack.Eh50Gt/_new 2021-07-02 13:28:02.808490702 +0200 @@ -27,7 +27,7 @@ %global broken_test_arches %{arm} aarch64 Name: nbdkit -Version: 1.26.0 +Version: 1.27.1 Release: 0 Summary: Network Block Device server License: BSD-3-Clause @@ -168,9 +168,9 @@ + # The plugins below have non-trivial dependencies are so are # packaged separately. - %package cdi-plugin Summary: Containerized Data Import plugin for %{name} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Eh50Gt/_old 2021-07-02 13:28:02.836490484 +0200 +++ /var/tmp/diff_new_pack.Eh50Gt/_new 2021-07-02 13:28:02.836490484 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">nbdkit</param> - <param name="revision">v1.26.0</param> + <param name="revision">v1.27.1</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://gitlab.com/nbdkit/nbdkit.git</param> ++++++ nbdkit-1.26.0.tar.xz -> nbdkit-1.27.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/.gitignore new/nbdkit-1.27.1/.gitignore --- old/nbdkit-1.26.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/nbdkit-1.27.1/.gitignore 2021-06-11 15:25:34.000000000 +0200 @@ -0,0 +1,172 @@ +*~ +*.bak +*.cmi +*.cmx +*.dll +*.exe +*.la +*.lo +*.log +*.o +*.trs + +.deps +.dirstamp +.gdb_history +.libs +Makefile +Makefile.in + +/local* +/nbdkit-*.tar.gz +/nbdkit-*.*/ + +docs/*.1 +docs/*.3 +filters/*/*.1 +plugins/*/*.1 +plugins/*/*.3 + +.libs/*.so +/tests/*.so + +/aclocal.m4 +/autom4te.cache +/common/bitmap/test-bitmap +/common/include/test-ascii-ctype +/common/include/test-ascii-string +/common/include/test-byte-swapping +/common/include/test-isaligned +/common/include/test-ispowerof2 +/common/include/test-iszero +/common/include/test-minmax +/common/include/test-nextnonzero +/common/include/test-random +/common/include/test-tvdiff +/common/protocol/generate-protostrings.sh +/common/protocol/protostrings.c +/common/replacements/libcompat.a +/common/replacements/test-current-dir-name +/common/replacements/win32/MSG00001.bin +/common/replacements/win32/nbdkit-cat.h +/common/replacements/win32/nbdkit-cat.rc +/common/utils/test-quotes +/common/utils/test-vector +/common/utils/windows-errors.c +/compile +/config.cache +/config.guess +/config.h +/config.h.in +/config.log +/config.status +/config.sub +/configure +/depcomp +/docs/filter-links.pod +/docs/lang-plugin-links.pod +/docs/plugin-links.pod +/fuzzing/sync_dir/ +/fuzzing/testcase_dir/[0-f]* +/html/*.html +/include/nbdkit-version.h +/INSTALL +/install-sh +/libtool +/ltmain.sh +/missing +/nbdkit +/plugins/example4/nbdkit-example4-plugin +/plugins/eval/call.c +/plugins/eval/methods.c +/plugins/golang/examples/*/nbdkit-*-plugin.h +/plugins/golang/examples/*/nbdkit-*-plugin.so +/plugins/ocaml/nbdkit-ocamlexample-plugin.so +/plugins/ondemand/default-command.c +/plugins/rust/Cargo.lock +/plugins/rust/target +/plugins/S3/nbdkit-S3-plugin +/plugins/tmpdisk/default-command.c +/podwrapper.pl +/server/libnbdkit.a +/server/local/nbdkit.pc +/server/nbdkit +/server/nbdkit.def +/server/nbdkit.pc +/server/synopsis.c +/server/test-public +/stamp-h1 +/tests/__pycache__/ +/tests/disk +/tests/disk.gz +/tests/disk.tar +/tests/disk.tar.gz +/tests/disk.tar.xz +/tests/disk.xz +/tests/ext2.img +/tests/file-data +/tests/functions.sh +/tests/keys.psk +/tests/nbdkit +/tests/partition-disk +/tests/pki +/tests/split1 +/tests/split2 +/tests/split3 +/tests/ssh/authorized_keys +/tests/ssh/id_rsa +/tests/ssh/id_rsa.pub +/tests/ssh/ssh_host_rsa_key +/tests/ssh/ssh_host_rsa_key.pub +/tests/ssh/sshd_config +/tests/stamp-ssh-host-key +/tests/stamp-ssh-user-key +/tests/test-connect +/tests/test-curl +/tests/test-curl-cookie-script +/tests/test-curl-header-script +/tests/test-data +/tests/test-delay +/tests/test-exit-with-parent +/tests/test-exitwhen-pipe-closed +/tests/test-ext2 +/tests/test-file-block +/tests/test-golang +/tests/test-gzip +/tests/test-gzip-curl +/tests/test-just-filter-header +/tests/test-just-plugin-header +/tests/test-layers +/tests/test-lua +/tests/test-memory +/tests/test-memory-allocator-malloc +/tests/test-memory-allocator-zstd +/tests/test-newstyle +/tests/test-nbd +/tests/test-null +/tests/test-ocaml +/tests/test-offset +/tests/test-oldstyle +/tests/test-old-plugins-*.sh +/tests/test-partition +/tests/test-pause +/tests/test-perl +/tests/test-python +/tests/test-random +/tests/test-readahead +/tests/test-ruby +/tests/test-S3/boto3/__pycache__/ +/tests/test-shell +/tests/test-shell.img +/tests/test-socket-activation +/tests/test-split +/tests/test-streaming +/tests/test-tar-gzip-curl +/tests/test-tar-xz-curl +/tests/test-tcl +/tests/test-tmpdisk +/tests/test-vddk +/tests/test-xz +/tests/test-xz-curl +/test-driver +/valgrind/suppressions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/configure.ac new/nbdkit-1.27.1/configure.ac --- old/nbdkit-1.26.0/configure.ac 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/configure.ac 2021-06-11 15:25:34.000000000 +0200 @@ -30,8 +30,8 @@ # SUCH DAMAGE. m4_define([NBDKIT_VERSION_MAJOR], [1]) -m4_define([NBDKIT_VERSION_MINOR], [26]) -m4_define([NBDKIT_VERSION_MICRO], [0]) +m4_define([NBDKIT_VERSION_MINOR], [27]) +m4_define([NBDKIT_VERSION_MICRO], [1]) AC_INIT([nbdkit], NBDKIT_VERSION_MAJOR.NBDKIT_VERSION_MINOR.NBDKIT_VERSION_MICRO) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/docs/nbdkit-captive.pod new/nbdkit-1.27.1/docs/nbdkit-captive.pod --- old/nbdkit-1.26.0/docs/nbdkit-captive.pod 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/docs/nbdkit-captive.pod 2021-06-11 15:25:34.000000000 +0200 @@ -67,6 +67,12 @@ supported this magic is no longer necessary. In nbdkit E<ge> 1.24 both variables expand to the same URI. +=item C<$tls> + +Corresponds to the I<--tls> option passed to nbdkit. If I<--tls=off> +this is not set. If I<--tls=on> this is set to C<"1">. If +I<--tls=require> this is set to C<"2">. + =item C<$port> If E<ne> "", the port number that nbdkit is listening on. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/m4/.gitignore new/nbdkit-1.27.1/m4/.gitignore --- old/nbdkit-1.26.0/m4/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/nbdkit-1.27.1/m4/.gitignore 2021-06-11 15:25:34.000000000 +0200 @@ -0,0 +1,5 @@ +libtool.m4 +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/server/captive.c new/nbdkit-1.27.1/server/captive.c --- old/nbdkit-1.26.0/server/captive.c 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/server/captive.c 2021-06-11 15:25:34.000000000 +0200 @@ -77,9 +77,13 @@ /* Construct $uri. */ fprintf (fp, "uri="); + if (tls == 2) /* --tls=require */ + fprintf (fp, "nbds"); + else + fprintf (fp, "nbd"); if (port) { if (!vsock) { - fprintf (fp, "nbd://localhost:"); + fprintf (fp, "://localhost:"); shell_quote (port, fp); if (strcmp (export_name, "") != 0) { putc ('/', fp); @@ -87,7 +91,7 @@ } } else { - fprintf (fp, "nbd+vsock://1:"); /* 1 = VMADDR_CID_LOCAL */ + fprintf (fp, "+vsock://1:"); /* 1 = VMADDR_CID_LOCAL */ shell_quote (port, fp); if (strcmp (export_name, "") != 0) { putc ('/', fp); @@ -96,7 +100,7 @@ } } else if (unixsocket) { - fprintf (fp, "nbd+unix://"); + fprintf (fp, "+unix://"); if (strcmp (export_name, "") != 0) { putc ('/', fp); uri_quote (export_name, fp); @@ -114,7 +118,9 @@ shell_quote (export_name, fp); putc ('\n', fp); - /* Construct $port and $unixsocket. */ + /* Construct $tls, $port and $unixsocket. */ + if (tls > 0) + fprintf (fp, "tls=%d\n", tls); fprintf (fp, "port="); if (port) shell_quote (port, fp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/tests/Makefile.am new/nbdkit-1.27.1/tests/Makefile.am --- old/nbdkit-1.26.0/tests/Makefile.am 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/tests/Makefile.am 2021-06-11 15:25:34.000000000 +0200 @@ -216,6 +216,7 @@ test-single-from-file.sh \ test-single-sh.sh \ test-captive.sh \ + test-captive-tls.sh \ test-random-sock.sh \ test-tls.sh \ test-tls-psk.sh \ @@ -237,6 +238,7 @@ endif EXTRA_DIST += \ test-captive.sh \ + test-captive-tls.sh \ test-ddrescue-filter.sh \ test-debug-flags.sh \ test-dump-plugin-and-single.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/tests/functions.sh.in new/nbdkit-1.27.1/tests/functions.sh.in --- old/nbdkit-1.26.0/tests/functions.sh.in 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/tests/functions.sh.in 2021-06-11 15:25:34.000000000 +0200 @@ -226,6 +226,19 @@ '; then exit 77; fi } +# Tests may fail when the test suite is run as root. While it's a bad +# idea to run the whole test suite as root (except for the specific +# "make check-root" tests), people do it anyway so for tests that we +# know cannot work if run as root we can use this to skip. +requires_non_root () +{ + if test $(id -u) -eq 0; then + echo "$0: test skipped because running as root" + echo "$0: tip: don't run the general test suite as root" + exit 77 + fi +} + # start_nbdkit -P pidfile args... # # Run nbdkit with args and wait for it to start up. If it fails to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/tests/test-captive-tls.sh new/nbdkit-1.27.1/tests/test-captive-tls.sh --- old/nbdkit-1.26.0/tests/test-captive-tls.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nbdkit-1.27.1/tests/test-captive-tls.sh 2021-06-11 15:25:34.000000000 +0200 @@ -0,0 +1,73 @@ +#!/usr/bin/env bash +# nbdkit +# Copyright (C) 2014-2021 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. + +# Test nbdkit --run (captive nbdkit) + --tls option + $uri + $tls +# shell variables. +# +# In nbdkit < 1.26 the $uri shell variable was not constructed +# correctly. +# +# Also in nbdkit < 1.26 there was no $tls shell variable. + +source ./functions.sh +set -e +set -x + +requires_run +requires nbdinfo --version + +# XXX Check that libnbd was built with TLS support. + +# Does the nbdkit binary support TLS? +if ! nbdkit --dump-config | grep -sq tls=yes; then + echo "$0: nbdkit built without TLS support" + exit 77 +fi + +# Did we create the PKI files? +# Probably 'certtool' is missing. +pkidir="$PWD/pki" +if [ ! -f "$pkidir/ca-cert.pem" ]; then + echo "$0: PKI files were not created by the test harness" + exit 77 +fi + +out=test-captive-tls.out +cleanup_fn rm -f $out +rm -f $out + +LANG=C \ +nbdkit -U - --tls=require --tls-certificates="$pkidir" \ + -D nbdkit.tls.session=1 \ + null \ + --run '[ "x$tls" = "x2" ] && nbdinfo "$uri"' > $out +grep "newstyle-fixed with TLS" $out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/tests/test-cow-extents1.sh new/nbdkit-1.27.1/tests/test-cow-extents1.sh --- old/nbdkit-1.26.0/tests/test-cow-extents1.sh 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/tests/test-cow-extents1.sh 2021-06-11 15:25:34.000000000 +0200 @@ -48,6 +48,7 @@ requires test -r /dev/urandom +requires cut --version requires dd --version requires nbdinfo --version requires nbdsh --version @@ -74,8 +75,8 @@ # The map should reflect the base image. nbdinfo --map "$uri" > $out cat $out -if [ "$(tr -s ' ' < $out)" != " 0 131072 0 allocated - 131072 131072 3 hole,zero" ]; then +if [ "$(tr -s ' ' < $out | cut -d' ' -f 1-4)" != " 0 131072 0 + 131072 131072 3" ]; then echo "$0: unexpected initial file map" exit 1 fi @@ -91,14 +92,14 @@ # The extents map should be fully allocated. nbdinfo --map "$uri" > $out cat $out -if [ "$(tr -s ' ' < $out)" != " 0 4096 0 allocated - 4096 4096 3 hole,zero - 8192 8192 0 allocated - 16384 4096 3 hole,zero - 20480 110592 0 allocated - 131072 65536 3 hole,zero - 196608 8192 0 allocated - 204800 57344 3 hole,zero" ]; then +if [ "$(tr -s ' ' < $out | cut -d' ' -f 1-4)" != " 0 4096 0 + 4096 4096 3 + 8192 8192 0 + 16384 4096 3 + 20480 110592 0 + 131072 65536 3 + 196608 8192 0 + 204800 57344 3" ]; then echo "$0: unexpected trimmed file map" exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/tests/test-file-readonly.sh new/nbdkit-1.27.1/tests/test-file-readonly.sh --- old/nbdkit-1.26.0/tests/test-file-readonly.sh 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/tests/test-file-readonly.sh 2021-06-11 15:25:34.000000000 +0200 @@ -36,6 +36,7 @@ set -e set -x +requires_non_root requires_plugin file requires_nbdsh_uri requires truncate --version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbdkit-1.26.0/wrapper.c new/nbdkit-1.27.1/wrapper.c --- old/nbdkit-1.26.0/wrapper.c 2021-06-07 17:57:26.000000000 +0200 +++ new/nbdkit-1.27.1/wrapper.c 2021-06-11 15:25:34.000000000 +0200 @@ -217,6 +217,11 @@ passthru ("--num-callers=100"); /* This is a temporary workaround until RHBZ#1662656 is fixed: */ passthru ("--read-inline-info=no"); + + /* Temporary workaround for this issue: + * https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/... + */ + unsetenv ("DEBUGINFOD_URLS"); } else { s = getenv ("NBDKIT_GDB");