Please upgrade to, or separately provide, at least v2.2.1.
Hi jonas.
I've uploaded this to experimental.
In terms of uploads to unstable, This needs to be updated together
together with at least polling (which James recently uploaded to
experimental).
A number of your packages will need either updates or patching
to go together with this update. I prepared patches for some of them
so I could use them for testing, but it may make more sense to update
these crates to new upstream releases too.
rdep list:
rust-async-executor - Jonas package, build/test dependency only, not
investigated.
rust-async-global-executor - Rust team package, fix uploaded.
rust-async-net - Jonas package, debdiff attached.
rust-async-process - Jonas package, debdiff attached.
rust-async-std - Jonas package, debdiff attached
rust-if-watch - Jonas package, debian build/test dependencies allow the new
version, cargo dependencies do not.
rust-isahc - Jonas package, not investigated, not in testing.
rust-smol - Jonas package, debdiff attatched.
rust-zbus - Rust team package, upstream still uses 1.x not investigated further.
rust-zbus-1 - old version of zbus, we will presumablly have to backport.
rust-expectrl - Rust team package, still uses 1.x upstream.
rust-netlink-sys - rust team package, I prepared a patch and it passes tests
but would preffer to get upstream's feedback as it's quite intrustive.
rust-prodash - rust team package, upstream seems to have updated.
rust-quinn - rust team package, upstream still on 1.x, not investigated further
rust-sqlx-core - rust team package, not in testing, still uses 1.x upstream.
diff -Nru rust-smol-1.3.0/debian/changelog rust-smol-1.3.0/debian/changelog
--- rust-smol-1.3.0/debian/changelog 2023-08-20 08:26:43.000000000 +0000
+++ rust-smol-1.3.0/debian/changelog 2024-02-01 14:15:48.000000000 +0000
@@ -1,3 +1,10 @@
+rust-smol (1.3.0-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump async-io dependency to 2.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 01 Feb 2024 14:15:48 +0000
+
rust-smol (1.3.0-4) unstable; urgency=medium
* drop patch 2002_async-io, obsoleted by Debian package updates
diff -Nru rust-smol-1.3.0/debian/control rust-smol-1.3.0/debian/control
--- rust-smol-1.3.0/debian/control 2023-02-03 09:29:58.000000000 +0000
+++ rust-smol-1.3.0/debian/control 2024-02-01 14:15:48.000000000 +0000
@@ -8,7 +8,7 @@
librust-async-channel-1+default-dev <!nocheck>,
librust-async-executor-1+default-dev (>= 1.5) <!nocheck>,
librust-async-fs-1+default-dev <!nocheck>,
- librust-async-io-1+default-dev (>= 1.11) <!nocheck>,
+ librust-async-io-2+default-dev (>= 1.11) <!nocheck>,
librust-async-lock-2+default-dev <!nocheck>,
librust-async-net-1+default-dev <!nocheck>,
librust-async-process-1+default-dev (>= 1.6) <!nocheck>,
@@ -46,7 +46,7 @@
librust-async-channel-1+default-dev,
librust-async-executor-1+default-dev (>= 1.5),
librust-async-fs-1+default-dev,
- librust-async-io-1+default-dev (>= 1.11),
+ librust-async-io-2+default-dev,
librust-async-lock-2+default-dev,
librust-async-net-1+default-dev,
librust-async-process-1+default-dev (>= 1.6),
diff -Nru rust-smol-1.3.0/debian/patches/2004-bump-async-io.patch
rust-smol-1.3.0/debian/patches/2004-bump-async-io.patch
--- rust-smol-1.3.0/debian/patches/2004-bump-async-io.patch 1970-01-01
00:00:00.000000000 +0000
+++ rust-smol-1.3.0/debian/patches/2004-bump-async-io.patch 2024-02-01
14:15:48.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Bump async-io dependency to 2.
+Author: Peter Michael Green <plugw...@debian.org>
+
+--- rust-smol-1.3.0.orig/Cargo.toml
++++ rust-smol-1.3.0/Cargo.toml
+@@ -21,7 +21,7 @@ autoexamples = false
+ async-channel = "1.4.2"
+ async-executor = "1.5.0"
+ async-fs = "1.3.0"
+-async-io = "1.12.0"
++async-io = "2"
+ async-lock = "2.6.0"
+ async-net = "1.4.3"
+ async-process = "1.6.0"
diff -Nru rust-smol-1.3.0/debian/patches/series
rust-smol-1.3.0/debian/patches/series
--- rust-smol-1.3.0/debian/patches/series 2023-08-13 12:03:01.000000000
+0000
+++ rust-smol-1.3.0/debian/patches/series 2024-02-01 14:15:48.000000000
+0000
@@ -3,3 +3,4 @@
2002_inotify.patch
2002_tests.patch
2003_network.patch
+2004-bump-async-io.patch
diff -Nru rust-async-process-1.7.0/debian/changelog
rust-async-process-1.7.0/debian/changelog
--- rust-async-process-1.7.0/debian/changelog 2023-10-10 18:08:32.000000000
+0000
+++ rust-async-process-1.7.0/debian/changelog 2024-02-01 14:27:49.000000000
+0000
@@ -1,3 +1,10 @@
+rust-async-process (1.7.0-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump async-io to 2.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 01 Feb 2024 14:27:49 +0000
+
rust-async-process (1.7.0-3) unstable; urgency=medium
* add patch cherry-picked upstream
diff -Nru rust-async-process-1.7.0/debian/control
rust-async-process-1.7.0/debian/control
--- rust-async-process-1.7.0/debian/control 2023-10-10 18:05:44.000000000
+0000
+++ rust-async-process-1.7.0/debian/control 2024-02-01 14:27:43.000000000
+0000
@@ -4,13 +4,13 @@
Build-Depends:
debhelper-compat (= 13),
dh-cargo (>= 25),
- librust-async-io-1+default-dev <!nocheck>,
+ librust-async-io-2+default-dev <!nocheck>,
librust-async-lock-2+default-dev <!nocheck>,
librust-autocfg-1+default-dev <!nocheck>,
librust-cfg-if-1+default-dev <!nocheck>,
librust-event-listener-2+default-dev <!nocheck>,
librust-futures-lite-1+default-dev <!nocheck>,
- librust-async-io-1+default-dev <!nocheck>,
+ librust-async-io-2+default-dev <!nocheck>,
librust-libc-0.2+default-dev <!nocheck>,
librust-rustix-0.38+fs-dev <!nocheck>,
librust-rustix-0.38+std-dev <!nocheck>,
@@ -32,7 +32,7 @@
librust-cfg-if-1+default-dev,
librust-event-listener-2+default-dev,
librust-futures-lite-1+default-dev,
- librust-async-io-1+default-dev,
+ librust-async-io-2+default-dev,
librust-libc-0.2+default-dev,
librust-rustix-0.38+fs-dev,
librust-rustix-0.38+std-dev,
diff -Nru rust-async-process-1.7.0/debian/patches/0000_async-io.patch
rust-async-process-1.7.0/debian/patches/0000_async-io.patch
--- rust-async-process-1.7.0/debian/patches/0000_async-io.patch 1970-01-01
00:00:00.000000000 +0000
+++ rust-async-process-1.7.0/debian/patches/0000_async-io.patch 2024-02-01
14:27:49.000000000 +0000
@@ -0,0 +1,43 @@
+This patch is based on portions of the upstream commit described below,
+adapted for use in the Debian package by Peter Michael Green.
+
+commit 65cde366d4b51ad1ba63146fe358a5d502b370c2
+Author: John Nunley <d...@notgull.net>
+Date: Sat Oct 28 19:04:54 2023 -0700
+
+ Bump async-io to v2.0.0 and async-channel to v2.0.0
+
+ Signed-off-by: John Nunley <d...@notgull.net>
+
+Index: rust-async-process-1.7.0/Cargo.toml
+===================================================================
+--- rust-async-process-1.7.0.orig/Cargo.toml
++++ rust-async-process-1.7.0/Cargo.toml
+@@ -24,7 +24,7 @@ futures-lite = "1.11.0"
+ autocfg = "1"
+
+ [target.'cfg(unix)'.dependencies]
+-async-io = "1.8"
++async-io = "2.1.0"
+ rustix = { version = "0.38", default-features = false, features = ["std",
"fs"] }
+
+ [target.'cfg(unix)'.dependencies.signal-hook]
+@@ -44,4 +44,4 @@ features = [
+ ]
+
+ [dev-dependencies]
+-async-io = "1.8"
++async-io = "2.1.0"
+Index: rust-async-process-1.7.0/src/lib.rs
+===================================================================
+--- rust-async-process-1.7.0.orig/src/lib.rs
++++ rust-async-process-1.7.0/src/lib.rs
+@@ -219,7 +219,7 @@ impl Child {
+ }
+
+ // Wraps a sync I/O type into an async I/O type.
+- fn wrap<T: std::os::unix::io::AsRawFd>(io: T) ->
io::Result<Async<T>> {
++ fn wrap<T: std::os::unix::io::AsFd>(io: T) ->
io::Result<Async<T>> {
+ Async::new(io)
+ }
+ }
diff -Nru rust-async-process-1.7.0/debian/patches/2001_windows.patch
rust-async-process-1.7.0/debian/patches/2001_windows.patch
--- rust-async-process-1.7.0/debian/patches/2001_windows.patch 2023-08-14
09:46:20.000000000 +0000
+++ rust-async-process-1.7.0/debian/patches/2001_windows.patch 2024-02-01
14:27:49.000000000 +0000
@@ -4,9 +4,11 @@
Last-Update: 2023-08-14
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -32,16 +32,5 @@
+Index: rust-async-process-1.7.0/Cargo.toml
+===================================================================
+--- rust-async-process-1.7.0.orig/Cargo.toml
++++ rust-async-process-1.7.0/Cargo.toml
+@@ -32,16 +32,5 @@ version = "0.3.0"
features = ["iterator"]
default-features = false
@@ -22,4 +24,4 @@
-]
-
[dev-dependencies]
- async-io = "1.8"
+ async-io = "2.1.0"
diff -Nru rust-async-process-1.7.0/debian/patches/series
rust-async-process-1.7.0/debian/patches/series
--- rust-async-process-1.7.0/debian/patches/series 2023-10-10
18:00:43.000000000 +0000
+++ rust-async-process-1.7.0/debian/patches/series 2024-02-01
14:27:49.000000000 +0000
@@ -1,2 +1,3 @@
020230702~1715616.patch
+0000_async-io.patch
2001_windows.patch
diff -Nru rust-async-std-1.12.0/debian/changelog
rust-async-std-1.12.0/debian/changelog
--- rust-async-std-1.12.0/debian/changelog 2023-08-31 07:37:25.000000000
+0000
+++ rust-async-std-1.12.0/debian/changelog 2024-02-01 15:35:17.000000000
+0000
@@ -1,3 +1,10 @@
+rust-async-std (1.12.0-15.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump async-io to version 2.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 01 Feb 2024 15:35:17 +0000
+
rust-async-std (1.12.0-15) unstable; urgency=medium
* revert to no longer avoid feature kv-log-macro:
diff -Nru rust-async-std-1.12.0/debian/control
rust-async-std-1.12.0/debian/control
--- rust-async-std-1.12.0/debian/control 2023-08-31 07:34:38.000000000
+0000
+++ rust-async-std-1.12.0/debian/control 2024-02-01 15:33:51.000000000
+0000
@@ -8,7 +8,7 @@
librust-async-channel-1+default-dev <!nocheck>,
librust-async-global-executor-2+async-io-dev <!nocheck>,
librust-async-global-executor-2+default-dev <!nocheck>,
- librust-async-io-1+default-dev <!nocheck>,
+ librust-async-io-2+default-dev <!nocheck>,
librust-async-lock-2+default-dev <!nocheck>,
librust-async-process-1+default-dev <!nocheck>,
librust-crossbeam-utils-0.8+default-dev <!nocheck>,
@@ -46,7 +46,7 @@
librust-async-global-executor-2+async-io-dev,
librust-async-global-executor-2+default-dev,
librust-async-global-executor-2+tokio-dev,
- librust-async-io-1+default-dev,
+ librust-async-io-2+default-dev,
librust-async-lock-2+default-dev,
librust-async-process-1+default-dev,
librust-crossbeam-utils-0.8+default-dev,
diff -Nru rust-async-std-1.12.0/debian/patches/2004_bump-async-io.patch
rust-async-std-1.12.0/debian/patches/2004_bump-async-io.patch
--- rust-async-std-1.12.0/debian/patches/2004_bump-async-io.patch
1970-01-01 00:00:00.000000000 +0000
+++ rust-async-std-1.12.0/debian/patches/2004_bump-async-io.patch
2024-02-01 15:35:17.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Bump async-io to version 2.
+Author: Peter Michael Green <plugw...@debian.org>
+
+--- rust-async-std-1.12.0.orig/Cargo.toml
++++ rust-async-std-1.12.0/Cargo.toml
+@@ -71,7 +71,7 @@ async-channel = { version = "1.5.1", opt
+
+ [target.'cfg(not(target_os = "unknown"))'.dependencies]
+ async-global-executor = { version = "2.0.0", optional = true, features =
["async-io"] }
+-async-io = { version = "1.0.1", optional = true }
++async-io = { version = "2.0", optional = true }
+ futures-lite = { version = "1.0.0", optional = true }
+ async-process = { version = "1.0.1", optional = true }
+
diff -Nru rust-async-std-1.12.0/debian/patches/series
rust-async-std-1.12.0/debian/patches/series
--- rust-async-std-1.12.0/debian/patches/series 2023-08-31 07:34:38.000000000
+0000
+++ rust-async-std-1.12.0/debian/patches/series 2024-02-01 15:35:17.000000000
+0000
@@ -1,3 +1,4 @@
2001_wasm.patch
2002_surf.patch
2003_no_feature_tokio0N.patch
+2004_bump-async-io.patch
diff -Nru rust-async-net-1.8.0/debian/changelog
rust-async-net-1.8.0/debian/changelog
--- rust-async-net-1.8.0/debian/changelog 2023-10-16 17:15:17.000000000
+0000
+++ rust-async-net-1.8.0/debian/changelog 2024-02-01 14:20:37.000000000
+0000
@@ -1,3 +1,10 @@
+rust-async-net (1.8.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump async-io to 2.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 01 Feb 2024 14:20:37 +0000
+
rust-async-net (1.8.0-1) unstable; urgency=medium
[ upstream ]
diff -Nru rust-async-net-1.8.0/debian/control
rust-async-net-1.8.0/debian/control
--- rust-async-net-1.8.0/debian/control 2023-10-16 17:14:43.000000000 +0000
+++ rust-async-net-1.8.0/debian/control 2024-02-01 14:20:37.000000000 +0000
@@ -4,7 +4,7 @@
Build-Depends:
debhelper-compat (= 13),
dh-cargo,
- librust-async-io-1+default-dev <!nocheck>,
+ librust-async-io-2+default-dev <!nocheck>,
librust-autocfg-1+default-dev <!nocheck>,
librust-blocking-1+default-dev <!nocheck>,
librust-futures-lite-1+default-dev <!nocheck>,
@@ -20,7 +20,7 @@
Architecture: all
Multi-Arch: foreign
Depends:
- librust-async-io-1+default-dev,
+ librust-async-io-2+default-dev,
librust-autocfg-1+default-dev,
librust-blocking-1+default-dev,
librust-futures-lite-1+default-dev,
diff -Nru rust-async-net-1.8.0/debian/patches/2000-bump-async-net.patch
rust-async-net-1.8.0/debian/patches/2000-bump-async-net.patch
--- rust-async-net-1.8.0/debian/patches/2000-bump-async-net.patch
1970-01-01 00:00:00.000000000 +0000
+++ rust-async-net-1.8.0/debian/patches/2000-bump-async-net.patch
2024-02-01 14:20:37.000000000 +0000
@@ -0,0 +1,13 @@
+Description: bump async-io to 2
+Author: Peter Michael Green <plugw...@debian.org>
+
+--- rust-async-net-1.8.0.orig/Cargo.toml
++++ rust-async-net-1.8.0/Cargo.toml
+@@ -17,6 +17,6 @@ categories = ["asynchronous", "network-p
+ exclude = ["/.*"]
+
+ [dependencies]
+-async-io = "1.6.0"
++async-io = "2"
+ blocking = "1.0.0"
+ futures-lite = "1.11.0"
diff -Nru rust-async-net-1.8.0/debian/patches/series
rust-async-net-1.8.0/debian/patches/series
--- rust-async-net-1.8.0/debian/patches/series 1970-01-01 00:00:00.000000000
+0000
+++ rust-async-net-1.8.0/debian/patches/series 2024-02-01 14:20:37.000000000
+0000
@@ -0,0 +1 @@
+2000-bump-async-net.patch
