1.36.4

3 files changed, 34 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e3637d88b40..74621acf7962 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nbdkit
 	pkgdesc = NBD server toolkit
-	pkgver = 1.36.2
-	pkgrel = 3
+	pkgver = 1.36.4
+	pkgrel = 1
 	url = https://gitlab.com/nbdkit/nbdkit/
 	arch = x86_64
 	license = custom: BSD
@@ -21,11 +21,13 @@ 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.2.tar.gz
-	source = http://download.libguestfs.org/nbdkit/1.36-stable/nbdkit-1.36.2.tar.gz.sig
+	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 = broken-file.patch
 	validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0
 	validpgpkeys = 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
-	sha256sums = 6a9935f315d62e483b74c7aa28b8005e7fc903fba78bc9a5a41ec6dcce18ea62
+	sha256sums = 70720bc67a2404d4e50ca75afe49e07352686327f428f4c7706a9b55229b0e8e
 	sha256sums = SKIP
+	sha256sums = 7150a8b5849ef48c7e60a93cd461ee658df02a4184c182df305b2cd16371473e
 
 pkgname = nbdkit
diff --git a/PKGBUILD b/PKGBUILD
index 37b0cf518594..8ae586aef061 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Thomas Weißschuh <thomas t-8ch de>
 
 pkgname=nbdkit
-pkgver=1.36.2
-pkgrel=3
+pkgver=1.36.4
+pkgrel=1
 pkgdesc="NBD server toolkit"
 arch=('x86_64')
 url="https://gitlab.com/nbdkit/nbdkit/"
@@ -34,10 +34,14 @@ _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"
+		broken-file.patch
 )
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://github.com/file/file/pull/137
+  patch -p1 < "${srcdir}/broken-file.patch"
 }
 
 build() {
@@ -65,5 +69,6 @@ check() {
   make check
 }
 
-sha256sums=('6a9935f315d62e483b74c7aa28b8005e7fc903fba78bc9a5a41ec6dcce18ea62'
-            'SKIP')
+sha256sums=('70720bc67a2404d4e50ca75afe49e07352686327f428f4c7706a9b55229b0e8e'
+            'SKIP'
+            '7150a8b5849ef48c7e60a93cd461ee658df02a4184c182df305b2cd16371473e')
diff --git a/broken-file.patch b/broken-file.patch
new file mode 100644
index 000000000000..1b8b2cd3b4d1
--- /dev/null
+++ b/broken-file.patch
@@ -0,0 +1,18 @@
+--- a/tests/Makefile.am	2024-03-05 21:42:10.654493082 +0100
++++ b/tests/Makefile.am	2024-03-05 21:42:46.031436504 +0100
+@@ -1707,7 +1707,6 @@
+ test_ext2_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+ test_ext2_LDADD = libtest.la $(LIBGUESTFS_LIBS)
+ 
+-TESTS += test-ext2-exportname.sh
+ EXTRA_DIST += test-ext2-exportname.sh
+ 
+ check_DATA += ext2.img
+@@ -1788,7 +1788,6 @@
+ TESTS += \
+ 	test-luks-info.sh \
+ 	test-luks-copy.sh \
+-	test-luks-copy-zero.sh \
+ 	$(NULL)
+ endif
+ EXTRA_DIST += \