diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 0001-tests-gcs-skip-tests-without-google-cloud-module.patch | 34 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
3 files changed, 7 insertions, 44 deletions
@@ -1,6 +1,6 @@ pkgbase = nbdkit pkgdesc = NBD server toolkit - pkgver = 1.36.4 + pkgver = 1.38.2 pkgrel = 1 url = https://gitlab.com/nbdkit/nbdkit/ arch = x86_64 @@ -21,12 +21,12 @@ pkgbase = nbdkit optdepends = libtorrent-rasterbar: for libtorrent support optdepends = boost: for libtorrent support optdepends = libselinux - source = http://download.libguestfs.org/nbdkit/1.36-stable/nbdkit-1.36.4.tar.gz - source = http://download.libguestfs.org/nbdkit/1.36-stable/nbdkit-1.36.4.tar.gz.sig + source = http://download.libguestfs.org/nbdkit/1.38-stable/nbdkit-1.38.2.tar.gz + source = http://download.libguestfs.org/nbdkit/1.38-stable/nbdkit-1.38.2.tar.gz.sig source = broken-file.patch validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0 validpgpkeys = 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A - sha256sums = 70720bc67a2404d4e50ca75afe49e07352686327f428f4c7706a9b55229b0e8e + sha256sums = b5dbf13178c7f0285fc7b0282e6b1b7f300c24180afec317751923e2e9e32d4c sha256sums = SKIP sha256sums = 7150a8b5849ef48c7e60a93cd461ee658df02a4184c182df305b2cd16371473e diff --git a/0001-tests-gcs-skip-tests-without-google-cloud-module.patch b/0001-tests-gcs-skip-tests-without-google-cloud-module.patch deleted file mode 100644 index 57edb1d76aee..000000000000 --- a/0001-tests-gcs-skip-tests-without-google-cloud-module.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e5e1bb8c1320946bcf97cb5ee025b30b52c1fa94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Sun, 28 Apr 2024 17:32:37 +0200 -Subject: [PATCH nbdkit] tests: gcs: skip tests without google cloud module -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -To: libguestfs@redhat.com, "Richard W.M. Jones" <rjones@redhat.com> - -The gcs plugin uses the google cloud module and can't work without it. -Skip the test if the module is unavailable. - -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - tests/test-gcs.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/test-gcs.sh b/tests/test-gcs.sh -index ed823377dc5a..9b165e8159be 100755 ---- a/tests/test-gcs.sh -+++ b/tests/test-gcs.sh -@@ -40,6 +40,7 @@ requires $PYTHON --version - requires_nbdcopy - requires_plugin python - skip_if_valgrind "because Python code leaks memory" -+requires $PYTHON -c 'import google.cloud' - - # Skip this test if the real google-cloud-storage module is installed, - # since that module abuses pth files to insert itself into the module - -base-commit: ffa62d30fe6dcd29ae8e20df5c86d48505550614 --- -2.44.0 - @@ -1,7 +1,7 @@ # Maintainer: Thomas Weißschuh <thomas t-8ch de> pkgname=nbdkit -pkgver=1.38.1 +pkgver=1.38.2 pkgrel=1 pkgdesc="NBD server toolkit" arch=('x86_64') @@ -35,7 +35,6 @@ source=( "http://download.libguestfs.org/nbdkit/${_dldir}-stable/nbdkit-${pkgver}.tar.gz" "http://download.libguestfs.org/nbdkit/${_dldir}-stable/nbdkit-${pkgver}.tar.gz.sig" broken-file.patch - 0001-tests-gcs-skip-tests-without-google-cloud-module.patch ) prepare() { @@ -43,7 +42,6 @@ prepare() { # https://github.com/file/file/pull/137 patch -p1 < "${srcdir}/broken-file.patch" - patch -p1 < "${srcdir}/0001-tests-gcs-skip-tests-without-google-cloud-module.patch" } @@ -72,7 +70,6 @@ check() { make check } -sha256sums=('c6ee1d73fe033fff1168b61f64e03d796a0dfd4d5e81537069dd174cecdc78b3' +sha256sums=('b5dbf13178c7f0285fc7b0282e6b1b7f300c24180afec317751923e2e9e32d4c' 'SKIP' - '7150a8b5849ef48c7e60a93cd461ee658df02a4184c182df305b2cd16371473e' - 'e76cb0a6dfdd444689f957d56b0a5b07178f015d909418e1d859d04aaaf466e2') + '7150a8b5849ef48c7e60a93cd461ee658df02a4184c182df305b2cd16371473e') |