From 2f477140c19139c4a45c57daf35f41b496197fd8 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 3 Jul 2024 23:20:29 +0200
Subject: [PATCH] Update to version 0.26.0; Fixes RHBZ#2252920

---
 .gitignore                     |  1 +
 rust-tokio-rustls.spec         |  7 +++++--
 rust2rpm.toml                  |  7 +++++++
 sources                        |  2 +-
 tokio-rustls-fix-metadata.diff | 19 +++++++++++++++++++
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 tokio-rustls-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index acf7826..11b398e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /tokio-rustls-0.23.4.crate
 /tokio-rustls-0.24.1.crate
 /tokio-rustls-0.25.0.crate
+/tokio-rustls-0.26.0.crate
diff --git a/rust-tokio-rustls.spec b/rust-tokio-rustls.spec
index 28286c7..475481c 100644
--- a/rust-tokio-rustls.spec
+++ b/rust-tokio-rustls.spec
@@ -5,7 +5,7 @@
 %global crate tokio-rustls
 
 Name:           rust-tokio-rustls
-Version:        0.25.0
+Version:        0.26.0
 Release:        %autorelease
 Summary:        Asynchronous TLS/SSL streams for Tokio using Rustls
 
@@ -13,6 +13,9 @@ Summary:        Asynchronous TLS/SSL streams for Tokio using Rustls
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/tokio-rustls
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * default to "ring" crypto backend and drop "aws-lc-rs" backend
+Patch:          tokio-rustls-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -112,7 +115,7 @@ use the "tls12" feature of the "%{crate}" crate.
 %if %{with check}
 %check
 # * skip tests that require internet access
-%cargo_test -- -- --exact --skip common::test_stream::stream_handshake_regression_issues_77 --skip test_modern --skip test_tls12
+%cargo_test -- -- --exact --skip common::test_stream::stream_handshake_regression_issues_77 --skip test_modern --skip test_tls12 --skip test_modern_vectored --skip test_tls12_vectored
 %endif
 
 %changelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 26bebf2..3e31167 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,8 +1,15 @@
+[package]
+cargo-toml-patch-comments = [
+    "default to \"ring\" crypto backend and drop \"aws-lc-rs\" backend",
+]
+
 [tests]
 skip = [
     "common::test_stream::stream_handshake_regression_issues_77",
     "test_modern",
     "test_tls12",
+    "test_tls12_vectored",
+    "test_modern_vectored",
 ]
 skip-exact = true
 comments = ["skip tests that require internet access"]
diff --git a/sources b/sources
index 0c1ee3a..398222c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tokio-rustls-0.25.0.crate) = 4e04669ecdd8235edd438075e6b125f6473e117adc2ae13ceaee7668705e81a87f97242253f51dea204fa1bb3b9f8f9f21b587b4edc7c2e58e375f5537ee5f95
+SHA512 (tokio-rustls-0.26.0.crate) = 101f2083e04feffec48204388c4be3d51fd6dc45bdd04bb75bdfaba48cbdd89529e14dda194ef45b2d78530cc74f128a763fb09165a52d738eb17adff7c56664
diff --git a/tokio-rustls-fix-metadata.diff b/tokio-rustls-fix-metadata.diff
new file mode 100644
index 0000000..bbef8d4
--- /dev/null
+++ b/tokio-rustls-fix-metadata.diff
@@ -0,0 +1,19 @@
+--- tokio-rustls-0.26.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ tokio-rustls-0.26.0/Cargo.toml	2024-06-28T09:37:31.568922+00:00
+@@ -63,15 +63,12 @@
+ version = "0.26"
+ 
+ [features]
+-aws-lc-rs = ["aws_lc_rs"]
+-aws_lc_rs = ["rustls/aws_lc_rs"]
+ default = [
+     "logging",
+     "tls12",
+-    "aws_lc_rs",
++    "ring",
+ ]
+ early-data = []
+-fips = ["rustls/fips"]
+ logging = ["rustls/logging"]
+ ring = ["rustls/ring"]
+ tls12 = ["rustls/tls12"]