upgpkg: nbdkit 1.16.2-1

upstream release

2 files changed, 20 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2f05f304154..b9f213b51871 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nbdkit
 	pkgdesc = NBD server toolkit
-	pkgver = 1.14.2
+	pkgver = 1.16.2
 	pkgrel = 1
 	url = https://github.com/libguestfs/nbdkit
 	arch = i686
@@ -10,10 +10,11 @@ pkgbase = nbdkit
 	optdepends = lua
 	optdepends = tcl
 	optdepends = perl
-	source = http://download.libguestfs.org/nbdkit/1.14-stable/nbdkit-1.14.2.tar.gz
-	source = http://download.libguestfs.org/nbdkit/1.14-stable/nbdkit-1.14.2.tar.gz.sig
+	optdepends = rust
+	source = http://download.libguestfs.org/nbdkit/1.16-stable/nbdkit-1.16.2.tar.gz
+	source = http://download.libguestfs.org/nbdkit/1.16-stable/nbdkit-1.16.2.tar.gz.sig
 	validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0
-	sha256sums = 6fb187e604ea34dbec8a2d28892e603049fcd5fc4440617b80c2053e5e4e4e0b
+	sha256sums = 0267e3a3dbf1b2eff343c0cef16697db8e8777bd869eb6c75e60842516a5aa01
 	sha256sums = SKIP
 
 pkgname = nbdkit
diff --git a/PKGBUILD b/PKGBUILD
index dea91edb97c4..3efb767497e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,29 @@
 # Maintainer: Thomas Weißschuh <thomas t-8ch de>
 
 pkgname=nbdkit
-pkgver=1.14.2
+pkgver=1.16.2
 pkgrel=1
 pkgdesc="NBD server toolkit"
 arch=('i686' 'x86_64')
 url="https://github.com/libguestfs/nbdkit"
 license=('custom: BSD')
 depends=()
-optdepends=('libvirt' 'lua' 'tcl' 'perl')
+optdepends=('libvirt' 'lua' 'tcl' 'perl' 'rust')
 validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0')
 source=(
-		"http://download.libguestfs.org/nbdkit/1.14-stable/nbdkit-${pkgver}.tar.gz"
-		"http://download.libguestfs.org/nbdkit/1.14-stable/nbdkit-${pkgver}.tar.gz.sig"
+		"http://download.libguestfs.org/nbdkit/1.16-stable/nbdkit-${pkgver}.tar.gz"
+		"http://download.libguestfs.org/nbdkit/1.16-stable/nbdkit-${pkgver}.tar.gz.sig"
 )
 
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   autoreconf -i
+
+  # https://bugs.archlinux.org/index.php?do=details&task_id=64853
+  export GUESTFISH=no
+  sed -i 's/HAVE_LIBGUESTFS/HAVE_GUESTFISH/' tests/Makefile.am
+
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
 }
@@ -31,8 +36,12 @@ package() {
 
 check() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
+
+  # https://bugs.archlinux.org/index.php?do=details&task_id=64853
+  TMPPATH="$(mktemp -d --suffix -makepkg-nbdkit)"
+  ln -s /usr/bin/false "$TMPPATH"/guestfish
+  PATH="$TMPPATH:$PATH" make check
 }
 
-sha256sums=('6fb187e604ea34dbec8a2d28892e603049fcd5fc4440617b80c2053e5e4e4e0b'
+sha256sums=('0267e3a3dbf1b2eff343c0cef16697db8e8777bd869eb6c75e60842516a5aa01'
             'SKIP')