1.34.1

5 files changed, 7 insertions, 202 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33543aef9cd0..faf83b9418aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nbdkit
 	pkgdesc = NBD server toolkit
-	pkgver = 1.32.5
+	pkgver = 1.34.1
 	pkgrel = 1
 	url = https://gitlab.com/nbdkit/nbdkit/
 	arch = x86_64
@@ -21,15 +21,11 @@ pkgbase = nbdkit
 	optdepends = libtorrent-rasterbar
 	optdepends = boost
 	optdepends = libselinux
-	source = http://download.libguestfs.org/nbdkit/1.32-stable/nbdkit-1.32.5.tar.gz
-	source = http://download.libguestfs.org/nbdkit/1.32-stable/nbdkit-1.32.5.tar.gz.sig
-	source = clippy.patch
-	source = 0001-data-don-t-ignore-SIGPIPE.patch
+	source = http://download.libguestfs.org/nbdkit/1.34-stable/nbdkit-1.34.1.tar.gz
+	source = http://download.libguestfs.org/nbdkit/1.34-stable/nbdkit-1.34.1.tar.gz.sig
 	validpgpkeys = F7774FB1AD074A7E8C8767EA91738F73E1B768A0
 	validpgpkeys = 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
-	sha256sums = 07921293f22bfaa121cff1ba3f13d75243f5cd4864abbb20aa9686ed5649dbf4
+	sha256sums = 6ed4b1791891482174e5209c7084f7e40549a1a4f6d778511c90b1a279f4aa48
 	sha256sums = SKIP
-	sha256sums = 3d26e9fab4bb240dcb5e19da9f9f7c74027de9ae486001a7d927fcf7be681be5
-	sha256sums = cafec77dd3e32567dd6aed27733a4fe84787751d805d27471eba66b438fa2396
 
 pkgname = nbdkit
diff --git a/0001-data-don-t-ignore-SIGPIPE.patch b/0001-data-don-t-ignore-SIGPIPE.patch
deleted file mode 100644
index dc17a5347b3a..000000000000
--- a/0001-data-don-t-ignore-SIGPIPE.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e8f93ba5745823d82008941f524faaf97d2f438c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Fri, 13 Jan 2023 05:46:26 +0000
-Subject: [nbdkit PATCH] data: don't ignore SIGPIPE
-To: libguestfs@redhat.com, "Richard W.M. Jones" <rjones@redhat.com>
-
-If all of the requested data has been read, the call to popen_close will
-close the scripts output pipe and on the next write a SIGPIPE is
-delivered.
-When the scripts inherited signalhandler is ignoring the singal, it
-won't be aborted by default.
-
-This happens in the test suite, as make 4.4 seems to ignore this signal.
-Therefore the executed scripts never stop and the testsuite never
-finishes.
----
- plugins/data/format.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/data/format.c b/plugins/data/format.c
-index 3667ead6790f..2319ea09475c 100644
---- a/plugins/data/format.c
-+++ b/plugins/data/format.c
-@@ -40,6 +40,7 @@
- #include <stdarg.h>
- #include <string.h>
- #include <assert.h>
-+#include <signal.h>
- 
- #define NBDKIT_API_VERSION 2
- #include <nbdkit-plugin.h>
-@@ -1951,6 +1952,9 @@ store_script_len (struct allocator *a,
-   char buf[BUFSIZ];
-   size_t n;
- 
-+  /* Restore SIGPIPE back to SIG_DFL, since shell can't undo SIG_IGN */
-+  signal (SIGPIPE, SIG_DFL);
-+
-   pp = popen (script, "r");
-   if (pp == NULL) {
-     nbdkit_error ("popen: %m");
-
-base-commit: 09a61a0a00d3036ebfbc2fbadb0ba3e10a778ff3
--- 
-2.39.0
-
diff --git a/0001-rust-prevent-dead_code-warning.patch b/0001-rust-prevent-dead_code-warning.patch
deleted file mode 100644
index 26beb4475af1..000000000000
--- a/0001-rust-prevent-dead_code-warning.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8a41274ae95fcc79d51743b0e46ff6923328573d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Fri, 14 Oct 2022 22:34:29 +0200
-Subject: [nbdkit PATCH] rust: prevent dead_code warning
-
-rustc 1.64.0 generates warnings for the mocked Server.
-This leads to a failure of test.sh.
-
-```
-warning: associated function `expect` is never used
-  --> tests/common/mod.rs:49:1
-   |
-49 | / mock!{
-50 | |     pub Server {}
-51 | |     impl Server for Server {
-52 | |         fn cache(&self, count: u32, offset: u64) -> Result<()>;
-...  |
-86 | |     }
-87 | | }
-   | |_^
-   |
-   = note: `#[warn(dead_code)]` on by default
-```
----
-
-Note: This also affects the maintenance branches.
-
- plugins/rust/tests/common/mod.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/rust/tests/common/mod.rs b/plugins/rust/tests/common/mod.rs
-index 61c30464..de26c89f 100644
---- a/plugins/rust/tests/common/mod.rs
-+++ b/plugins/rust/tests/common/mod.rs
-@@ -48,6 +48,7 @@ lazy_static! {
- 
- mock!{
-     pub Server {}
-+    #[allow(dead_code)]
-     impl Server for Server {
-         fn cache(&self, count: u32, offset: u64) -> Result<()>;
-         fn can_cache(&self) -> Result<CacheFlags>;
-
-base-commit: 20c2dc98b6bbde2f92e63d500d5e6015184bb105
--- 
-2.38.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 97d110f8c68f..61b63f1a4956 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Thomas Weißschuh <thomas t-8ch de>
 
 pkgname=nbdkit
-pkgver=1.32.5
+pkgver=1.34.1
 pkgrel=1
 pkgdesc="NBD server toolkit"
 arch=('x86_64')
@@ -31,14 +31,10 @@ _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"
-		clippy.patch
-		0001-data-don-t-ignore-SIGPIPE.patch
 )
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}"/clippy.patch
-  patch -p1 < "${srcdir}"/0001-data-don-t-ignore-SIGPIPE.patch
 }
 
 build() {
@@ -61,7 +57,5 @@ check() {
   make check
 }
 
-sha256sums=('07921293f22bfaa121cff1ba3f13d75243f5cd4864abbb20aa9686ed5649dbf4'
-            'SKIP'
-            '3d26e9fab4bb240dcb5e19da9f9f7c74027de9ae486001a7d927fcf7be681be5'
-            'cafec77dd3e32567dd6aed27733a4fe84787751d805d27471eba66b438fa2396')
+sha256sums=('6ed4b1791891482174e5209c7084f7e40549a1a4f6d778511c90b1a279f4aa48'
+            'SKIP')
diff --git a/clippy.patch b/clippy.patch
deleted file mode 100644
index 4ef79a01d9d1..000000000000
--- a/clippy.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 0bea254145636014e6c9defae1ed65ae07de65df Mon Sep 17 00:00:00 2001
-From: Alan Somers <asomers@gmail.com>
-Date: Tue, 1 Nov 2022 10:22:57 -0600
-Subject: [PATCH] Rust plugin: Clippy cleanup
-
-Fix lints in the latest clippy
-* box-default
-* explicit-auto-deref
----
- plugins/rust/examples/ramdisk.rs    | 2 +-
- plugins/rust/tests/bare_bones.rs    | 6 +++---
- plugins/rust/tests/full_featured.rs | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/rust/examples/ramdisk.rs b/plugins/rust/examples/ramdisk.rs
-index f7d998ca..552d36c6 100644
---- a/plugins/rust/examples/ramdisk.rs
-+++ b/plugins/rust/examples/ramdisk.rs
-@@ -52,7 +52,7 @@ impl Server for RamDisk {
-     }
- 
-     fn open(_readonly: bool) -> Box<dyn Server> {
--        Box::new(RamDisk::default())
-+        Box::<RamDisk>::default()
-     }
- 
-     fn read_at(&self, buf: &mut [u8], offset: u64) -> Result<()> {
-diff --git a/plugins/rust/tests/bare_bones.rs b/plugins/rust/tests/bare_bones.rs
-index ac3c5251..8a09cb57 100644
---- a/plugins/rust/tests/bare_bones.rs
-+++ b/plugins/rust/tests/bare_bones.rs
-@@ -73,7 +73,7 @@ fn with_fixture<F: FnMut(&mut Fixture)>(mut f: F) {
-     initialize();
-     let _m = MOCK_SERVER_MTX.lock().unwrap();
- 
--    let mut mock = Box::new(MockServer::default());
-+    let mut mock = Box::<MockServer>::default();
-     mock.expect_get_size()
-         .returning(|| Ok(0x4200));
-     let mockp = (&mut mock) as *mut Box<MockServer>;
-@@ -83,7 +83,7 @@ fn with_fixture<F: FnMut(&mut Fixture)>(mut f: F) {
- 
-     let pluginp = unsafe { PLUGIN.unwrap()};
-     let plugin = unsafe {&*pluginp};
--    let handle = ((*plugin).open)(0);
-+    let handle = (plugin.open)(0);
-     let mut fixture = Fixture {
-         mockp,
-         plugin,
-@@ -92,7 +92,7 @@ fn with_fixture<F: FnMut(&mut Fixture)>(mut f: F) {
- 
-     f(&mut fixture);
- 
--    ((*plugin).close)(handle);
-+    (plugin.close)(handle);
- }
- 
- 
-diff --git a/plugins/rust/tests/full_featured.rs b/plugins/rust/tests/full_featured.rs
-index 46aad9a4..d5f02e06 100644
---- a/plugins/rust/tests/full_featured.rs
-+++ b/plugins/rust/tests/full_featured.rs
-@@ -105,7 +105,7 @@ fn with_fixture<F: FnMut(&mut Fixture)>(mut f: F) {
-     initialize();
-     let _m = MOCK_SERVER_MTX.lock().unwrap();
- 
--    let mut mock = Box::new(MockServer::default());
-+    let mut mock = Box::<MockServer>::default();
-     mock.expect_get_size()
-         .returning(|| Ok(0x4200));
-     let mockp = (&mut mock) as *mut Box<MockServer>;
-@@ -115,7 +115,7 @@ fn with_fixture<F: FnMut(&mut Fixture)>(mut f: F) {
- 
-     let pluginp = unsafe { PLUGIN.unwrap()};
-     let plugin = unsafe {&*pluginp};
--    let handle = ((*plugin).open)(0);
-+    let handle = (plugin.open)(0);
-     open_ctx.checkpoint();              // clear expectations for MockServer::open
-     let mut fixture = Fixture {
-         mockp,
-@@ -125,7 +125,7 @@ fn with_fixture<F: FnMut(&mut Fixture)>(mut f: F) {
- 
-     f(&mut fixture);
- 
--    ((*plugin).close)(handle);
-+    (plugin.close)(handle);
- }
- 
- /// Helper for testing methods that take a handle and return a boolean
--- 
-GitLab
-