Package: rust-rustls-webpki
Version: 0.101.4-1
Severity: serious
Tags: patch

It seems that in addition to the security fix, the new version of rustls-webpki added some new tests, these depend on "rcgen" which is currently patched away by 2001_bencher.patch.

After reinstating the dependency (but NOT the "patch.crates-io" section) and adding corresponding build and test dependencies I was able to successfully build the package and run it's autopkgtests.

Debdiff attatched, I may NMU this later (but I'd appreciate a prompt maintainer upload).
diff -Nru rust-rustls-webpki-0.101.4/debian/changelog 
rust-rustls-webpki-0.101.4/debian/changelog
--- rust-rustls-webpki-0.101.4/debian/changelog 2023-08-24 08:06:53.000000000 
+0000
+++ rust-rustls-webpki-0.101.4/debian/changelog 2023-08-25 18:57:05.000000000 
+0000
@@ -1,3 +1,13 @@
+rust-rustls-webpki (0.101.4-1.1) UNRELEASED; urgency=high
+
+  * Non-maintainer upload.
+  * Adjust patch 2001, reinstate rcgen dependency, some newly added tests need
+    it. Do not reinstate the "patch.crates-io" section since we want to build
+    against debian packaged crates, not stuff from github.
+  * Add build and test dependencies on librust-rcgen-0.11+default-dev (>= 
0.11.1-2)
+
+ -- Peter Michael Green <plugw...@debian.org>  Fri, 25 Aug 2023 18:57:05 +0000
+
 rust-rustls-webpki (0.101.4-1) unstable; urgency=high
 
   * bump project version in virtual packages and autopkgtests;
diff -Nru rust-rustls-webpki-0.101.4/debian/control 
rust-rustls-webpki-0.101.4/debian/control
--- rust-rustls-webpki-0.101.4/debian/control   2023-08-24 08:05:29.000000000 
+0000
+++ rust-rustls-webpki-0.101.4/debian/control   2023-08-25 18:57:05.000000000 
+0000
@@ -6,6 +6,7 @@
  dh-cargo,
  librust-base64-0.21+default-dev <!nocheck>,
  librust-ring-0.16+default-dev <!nocheck>,
+ librust-rcgen-0.11+default-dev (>= 0.11.1-2) <!nocheck>,
  librust-serde-1+default-dev <!nocheck>,
  librust-serde-1+derive-dev <!nocheck>,
  librust-serde-json-1+default-dev <!nocheck>,
diff -Nru rust-rustls-webpki-0.101.4/debian/patches/2001_bencher.patch 
rust-rustls-webpki-0.101.4/debian/patches/2001_bencher.patch
--- rust-rustls-webpki-0.101.4/debian/patches/2001_bencher.patch        
2023-08-24 08:06:28.000000000 +0000
+++ rust-rustls-webpki-0.101.4/debian/patches/2001_bencher.patch        
2023-08-25 18:56:43.000000000 +0000
@@ -15,16 +15,15 @@
  
  include = [
      "Cargo.toml",
-@@ -72,9 +73,6 @@
+@@ -72,8 +73,6 @@
  
  [dev-dependencies]
  base64 = "0.21"
 -bencher = "0.1.5"
 -once_cell = "1.17.2"
--rcgen = { version = "0.11.1", default-features = false }
+ rcgen = { version = "0.11.1", default-features = false }
  serde = { version = "1.0", features = ["derive"] }
  serde_json = "1.0"
- 
 @@ -93,12 +91,3 @@
  lto = true
  debug-assertions = false
diff -Nru rust-rustls-webpki-0.101.4/debian/tests/control 
rust-rustls-webpki-0.101.4/debian/tests/control
--- rust-rustls-webpki-0.101.4/debian/tests/control     2023-08-24 
08:05:35.000000000 +0000
+++ rust-rustls-webpki-0.101.4/debian/tests/control     2023-08-25 
18:57:05.000000000 +0000
@@ -8,6 +8,7 @@
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
+ librust-rcgen-0.11+default-dev (>= 0.11.1-2),
 Restrictions: allow-stderr
 
 Test-Command: SOURCEPACKAGEDIR=$PWD /usr/share/cargo/bin/cargo-auto-test 
rustls-webpki 0.101.4
@@ -20,6 +21,7 @@
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
+ librust-rcgen-0.11+default-dev (>= 0.11.1-2),
 Restrictions: allow-stderr
 
 Test-Command: SOURCEPACKAGEDIR=$PWD /usr/share/cargo/bin/cargo-auto-test 
rustls-webpki 0.101.4
@@ -32,6 +34,7 @@
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
+ librust-rcgen-0.11+default-dev (>= 0.11.1-2),
 Restrictions: allow-stderr
 
 Test-Command: SOURCEPACKAGEDIR=$PWD /usr/share/cargo/bin/cargo-auto-test 
rustls-webpki 0.101.4
@@ -44,6 +47,7 @@
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
+ librust-rcgen-0.11+default-dev (>= 0.11.1-2),
 Restrictions: allow-stderr
 
 Test-Command: SOURCEPACKAGEDIR=$PWD /usr/share/cargo/bin/cargo-auto-test 
rustls-webpki 0.101.4
@@ -56,4 +60,5 @@
  librust-serde-1+default-dev,
  librust-serde-1+derive-dev,
  librust-serde-json-1+default-dev,
+ librust-rcgen-0.11+default-dev (>= 0.11.1-2),
 Restrictions: allow-stderr

Reply via email to