Package: rust-tonic
Version: 0.12.3+dfsg-1
Severity: serious
rust-tonic's autopkgtests are failing due to a couple of issues.
1. Api differences between rustls-native-certs 0.8 (expected by upstream)
and 0.6 (currently in Debian)
2. Typos in debian/control and debian/tests/control.
A debdiff addressing these issues is attatched.
diff -Nru rust-tonic-0.12.3+dfsg/debian/changelog
rust-tonic-0.12.3+dfsg/debian/changelog
--- rust-tonic-0.12.3+dfsg/debian/changelog 2025-03-15 18:19:00.000000000
+0000
+++ rust-tonic-0.12.3+dfsg/debian/changelog 2025-03-16 12:28:58.000000000
+0000
@@ -1,3 +1,11 @@
+rust-tonic (0.12.3+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix tests with rustls-native-certs 0.6
+ * Fix typos in control files.
+
+ -- Peter Michel Green <plugw...@debian.org> Sun, 16 Mar 2025 12:28:58 +0000
+
rust-tonic (0.12.3+dfsg-1) unstable; urgency=medium
[ upstream ]
diff -Nru rust-tonic-0.12.3+dfsg/debian/control
rust-tonic-0.12.3+dfsg/debian/control
--- rust-tonic-0.12.3+dfsg/debian/control 2025-03-15 18:16:28.000000000
+0000
+++ rust-tonic-0.12.3+dfsg/debian/control 2025-03-16 12:28:58.000000000
+0000
@@ -37,7 +37,7 @@
librust-quickcheck-macros-1+default-dev,
librust-quote-1+default-dev,
librust-rand-0.8+default-dev,
- librust-rustls-native-certs-dev (<< 0.9),
+ librust-rustls-native-certs-0.6-dev (>= 0.6.3),
librust-rustls-pemfile-2+default-dev,
librust-socket2-0.5+all-dev,
librust-socket2-0.5+default-dev,
@@ -138,7 +138,7 @@
librust-percent-encoding-2+default-dev,
librust-pin-project-1+default-dev,
librust-prost-0.12+default-dev,
- librust-rustls-native-certs-dev (<< 0.9),
+ librust-rustls-native-certs-0.6-dev (>= 0.6.3),
librust-rustls-pemfile-2+default-dev,
librust-socket2-0.5+all-dev,
librust-socket2-0.5+default-dev,
@@ -174,7 +174,7 @@
librust-tonic-0.12+router-dev (= ${binary:Version}),
librust-tonic-0.12+server-dev (= ${binary:Version}),
librust-tonic-0.12+tls-dev (= ${binary:Version}),
- librust-tonic-0.12+tls-nativ-roots-dev (= ${binary:Version}),
+ librust-tonic-0.12+tls-native-roots-dev (= ${binary:Version}),
librust-tonic-0.12+tls-roots-dev (= ${binary:Version}),
librust-tonic-0.12+transport-dev (= ${binary:Version}),
librust-tonic-0.12+zstd-dev (= ${binary:Version}),
diff -Nru rust-tonic-0.12.3+dfsg/debian/patches/2001_rustls-native-certs.patch
rust-tonic-0.12.3+dfsg/debian/patches/2001_rustls-native-certs.patch
--- rust-tonic-0.12.3+dfsg/debian/patches/2001_rustls-native-certs.patch
2025-03-15 16:56:41.000000000 +0000
+++ rust-tonic-0.12.3+dfsg/debian/patches/2001_rustls-native-certs.patch
2025-03-16 12:28:07.000000000 +0000
@@ -1,17 +1,45 @@
Description: accept older branch of crate rustls-native-certs
+ Api changes in rustls-native-certs 0.8 were addressed by reverting part of
+
https://github.com/hyperium/tonic/commit/2289b50f07f56c4c051f66a7c87da0a8ffeb1531
+
+ Api changes in rustls-native-certs 0.7 were addressed manually.
Author: Jonas Smedegaard <d...@jones.dk>
+Author: Peter Michael Green <plugw...@debian.org>
Forwarded: not-needed
-Last-Update: 2025-03-15
+Last-Update: 2025-03-16
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tonic/Cargo.toml
-+++ b/tonic/Cargo.toml
-@@ -89,7 +89,7 @@
+Index: rust-tonic-0.12.3+dfsg/tonic/Cargo.toml
+===================================================================
+--- rust-tonic-0.12.3+dfsg.orig/tonic/Cargo.toml
++++ rust-tonic-0.12.3+dfsg/tonic/Cargo.toml
+@@ -89,7 +89,7 @@ axum = {version = "0.7", default-feature
# rustls
rustls-pemfile = { version = "2.0", optional = true }
-rustls-native-certs = { version = "0.8", optional = true }
-+rustls-native-certs = { version = ">= 0.6.3, <= 0.8", optional = true }
++rustls-native-certs = { version = "0.6.3", optional = true }
tokio-rustls = { version = "0.26", default-features = false, features =
["logging", "tls12", "ring"], optional = true }
webpki-roots = { version = "0.26", optional = true }
+Index: rust-tonic-0.12.3+dfsg/tonic/src/transport/channel/service/tls.rs
+===================================================================
+--- rust-tonic-0.12.3+dfsg.orig/tonic/src/transport/channel/service/tls.rs
++++ rust-tonic-0.12.3+dfsg/tonic/src/transport/channel/service/tls.rs
+@@ -38,15 +38,7 @@ impl TlsConnector {
+
+ #[cfg(feature = "tls-native-roots")]
+ if with_native_roots {
+- let rustls_native_certs::CertificateResult { certs, errors, .. } =
+- rustls_native_certs::load_native_certs();
+- if !errors.is_empty() {
+- tracing::debug!("errors occured when loading native certs:
{errors:?}");
+- }
+- if certs.is_empty() {
+- return Err(TlsError::NativeCertsNotFound.into());
+- }
+- roots.add_parsable_certificates(certs);
++
roots.add_parsable_certificates(rustls_native_certs::load_native_certs()?.into_iter().map(|cert|
cert.0.into()));
+ }
+
+ #[cfg(feature = "tls-webpki-roots")]
diff -Nru rust-tonic-0.12.3+dfsg/debian/patches/2002_no_webpki-roots.patch
rust-tonic-0.12.3+dfsg/debian/patches/2002_no_webpki-roots.patch
--- rust-tonic-0.12.3+dfsg/debian/patches/2002_no_webpki-roots.patch
2025-03-15 16:55:22.000000000 +0000
+++ rust-tonic-0.12.3+dfsg/debian/patches/2002_no_webpki-roots.patch
2025-03-16 12:23:14.000000000 +0000
@@ -16,7 +16,7 @@
"router",
@@ -91,7 +90,6 @@
rustls-pemfile = { version = "2.0", optional = true }
- rustls-native-certs = { version = ">= 0.6.3, <= 0.8", optional = true }
+ rustls-native-certs = { version = "0.6.3", optional = true }
tokio-rustls = { version = "0.26", default-features = false, features =
["logging", "tls12", "ring"], optional = true }
-webpki-roots = { version = "0.26", optional = true }
diff -Nru rust-tonic-0.12.3+dfsg/debian/tests/control
rust-tonic-0.12.3+dfsg/debian/tests/control
--- rust-tonic-0.12.3+dfsg/debian/tests/control 2025-03-15 18:16:28.000000000
+0000
+++ rust-tonic-0.12.3+dfsg/debian/tests/control 2025-03-16 12:28:58.000000000
+0000
@@ -218,7 +218,7 @@
Architecture: amd64
Test-Command: /usr/share/dh-rust/bin/cargo-auto-test tonic 0.12.3
- --all-targets --no-default-features --features tls-nativ-roots
+ --all-targets --no-default-features --features tls-native-roots
--
--skip codec::prost::tests::encode_too_big
Features: test-name=rust-tonic:tls-native-roots
