upgpkg: nbdkit 1.30.6-1

upstream release

3 files changed, 43 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0330c4e4d1de..c93f2861d1d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = nbdkit
 	pkgdesc = NBD server toolkit
-	pkgver = 1.30.4
+	pkgver = 1.30.6
 	pkgrel = 1
 	url = https://gitlab.com/nbdkit/nbdkit/
 	arch = i686
 	arch = x86_64
 	license = custom: BSD
-	checkdepends = qemu-headless
+	checkdepends = qemu
 	optdepends = lua
 	optdepends = tcl
 	optdepends = perl
@@ -21,11 +21,13 @@ pkgbase = nbdkit
 	optdepends = libssh
 	optdepends = libtorrent-rasterbar
 	optdepends = libselinux
-	source = http://download.libguestfs.org/nbdkit/1.30-stable/nbdkit-1.30.4.tar.gz
-	source = http://download.libguestfs.org/nbdkit/1.30-stable/nbdkit-1.30.4.tar.gz.sig
+	source = http://download.libguestfs.org/nbdkit/1.30-stable/nbdkit-1.30.6.tar.gz
+	source = http://download.libguestfs.org/nbdkit/1.30-stable/nbdkit-1.30.6.tar.gz.sig
+	source = fs74747.patch
 	validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0
 	validpgpkeys = 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
-	sha256sums = dff9a86d14ad783dbbe1b3b42bc3929387c7aaac2e33567e7c70bc2f6c49693d
+	sha256sums = 01dc92a46d98d84ea440ae9e2a9a32cae8025b9f164e4c6ccfa4e064f4b4db68
 	sha256sums = SKIP
+	sha256sums = 4ae58421aa6cc59868f6ca11c82d308ceb5972cbcbd3c09416837bb98377911e
 
 pkgname = nbdkit
diff --git a/PKGBUILD b/PKGBUILD
index 31f3815b1dc4..4b1500366540 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Thomas Weißschuh <thomas t-8ch de>
 
 pkgname=nbdkit
-pkgver=1.30.4
+pkgver=1.30.6
 pkgrel=1
 pkgdesc="NBD server toolkit"
 arch=('i686' 'x86_64')
@@ -25,20 +25,26 @@ optdepends=(
   'libtorrent-rasterbar'
   'libselinux'
 )
-checkdepends=('qemu-headless')
+checkdepends=('qemu')
 validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0' '71C2CC22B1C4602927D2F3AAA7A16B4A2527436A')
 _dldir="${pkgver%.*}"
 source=(
 		"http://download.libguestfs.org/nbdkit/${_dldir}-stable/nbdkit-${pkgver}.tar.gz"
 		"http://download.libguestfs.org/nbdkit/${_dldir}-stable/nbdkit-${pkgver}.tar.gz.sig"
+		fs74747.patch
 )
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < "${srcdir}/fs74747.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   autoreconf -i
 
   # disable guestfish tests because of https://bugs.archlinux.org/task/71746
-  ./configure --prefix=/usr --sbindir=/usr/bin GUESTFISH=no --without-libguestfs
+  ./configure --prefix=/usr --sbindir=/usr/bin GUESTFISH=no --without-libguestfs --without-rust
   make
 }
 
@@ -60,5 +66,6 @@ check() {
   make check
 }
 
-sha256sums=('dff9a86d14ad783dbbe1b3b42bc3929387c7aaac2e33567e7c70bc2f6c49693d'
-            'SKIP')
+sha256sums=('01dc92a46d98d84ea440ae9e2a9a32cae8025b9f164e4c6ccfa4e064f4b4db68'
+            'SKIP'
+            '4ae58421aa6cc59868f6ca11c82d308ceb5972cbcbd3c09416837bb98377911e')
diff --git a/fs74747.patch b/fs74747.patch
new file mode 100644
index 000000000000..f170d9838f0f
--- /dev/null
+++ b/fs74747.patch
@@ -0,0 +1,24 @@
+--- tests/test-tls.sh.orig	2022-07-01 07:34:40.834527560 +0200
++++ tests/test-tls.sh	2022-07-01 07:35:18.331771955 +0200
+@@ -34,6 +34,9 @@
+ set -e
+ set -x
+ 
++echo "$0: https://bugs.archlinux.org/task/74747"
++exit 77
++
+ requires qemu-img --version
+ 
+ if ! qemu-img --help | grep -- --object; then
+--- tests/test-tls-psk.sh.orig	2022-07-01 07:36:22.776098173 +0200
++++ tests/test-tls-psk.sh	2022-07-01 07:36:35.129621831 +0200
+@@ -34,6 +34,9 @@
+ set -e
+ set -x
+ 
++echo "$0: https://bugs.archlinux.org/task/74747"
++exit 77
++
+ requires qemu-img --version
+ 
+ if ! qemu-img --help | grep -- --object; then