From 71a7d9cdcdab5c25326569c7e1eb1c400ba6d2c4 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 20 Oct 2023 14:51:35 +0200
Subject: [PATCH] Update to version 0.11.22; Fixes RHBZ#2241801

---
 .gitignore                     |  1 +
 reqwest-fix-metadata-auto.diff |  9 ++++++---
 rust-reqwest.spec              | 10 +++++-----
 rust2rpm.conf                  | 19 -------------------
 rust2rpm.toml                  | 31 +++++++++++++++++++++++++++++++
 sources                        |  2 +-
 6 files changed, 44 insertions(+), 28 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index 9423a09..714d3b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /reqwest-0.11.18.crate
 /reqwest-0.11.19.crate
 /reqwest-0.11.20.crate
+/reqwest-0.11.22.crate
diff --git a/reqwest-fix-metadata-auto.diff b/reqwest-fix-metadata-auto.diff
index de4a552..0f891b5 100644
--- a/reqwest-fix-metadata-auto.diff
+++ b/reqwest-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- reqwest-0.11.20/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ reqwest-0.11.20/Cargo.toml	2023-08-24T18:05:47.438274+00:00
+--- reqwest-0.11.22/Cargo.toml	1970-01-01T00:00:01+00:00
++++ reqwest-0.11.22/Cargo.toml	2023-10-07T13:12:01.568658+00:00
 @@ -221,7 +221,6 @@
  stream = [
      "tokio/fs",
@@ -8,7 +8,7 @@
  ]
  trust-dns = ["trust-dns-resolver"]
  
-@@ -402,48 +401,3 @@
+@@ -403,51 +402,3 @@
  ]
  default-features = false
  
@@ -55,5 +55,8 @@
 -[target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
 -version = "0.3"
 -
+-[target."cfg(target_os = \"macos\")".dependencies.system-configuration]
+-version = "0.5.1"
+-
 -[target."cfg(windows)".dependencies.winreg]
 -version = "0.50.0"
diff --git a/rust-reqwest.spec b/rust-reqwest.spec
index 51926e7..21d7d7f 100644
--- a/rust-reqwest.spec
+++ b/rust-reqwest.spec
@@ -1,18 +1,18 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate reqwest
 
 Name:           rust-reqwest
-Version:        0.11.20
+Version:        0.11.22
 Release:        %autorelease
 Summary:        Higher level HTTP client library
 
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/reqwest
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          reqwest-fix-metadata-auto.diff
 
 BuildRequires:  rust-packaging >= 21
@@ -363,7 +363,7 @@ use the "trust-dns-resolver" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -378,7 +378,7 @@ use the "trust-dns-resolver" feature of the "%{crate}" crate.
 %if %{with check}
 %check
 # * skip tests which require internet access
-%cargo_test -- -- --skip test_allowed_methods --skip test_badssl_modern --skip test_badssl_self_signed
+%cargo_test -- -- --exact --skip test_allowed_methods --skip test_badssl_modern --skip test_badssl_self_signed --skip test_tls_info
 %endif
 
 %changelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index b0e52a5..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  __rustls
-  futures-channel
-  h3
-  h3-quinn
-  http3
-  hyper-rustls
-  native-tls-vendored
-  quinn
-  rustls
-  rustls-native-certs
-  rustls-pemfile
-  rustls-tls
-  rustls-tls-manual-roots
-  rustls-tls-native-roots
-  rustls-tls-webpki-roots
-  tokio-rustls
-  webpki-roots
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..4758737
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,31 @@
+[features]
+hide = [
+    "__rustls",
+    "futures-channel",
+    "h3",
+    "h3-quinn",
+    "http3",
+    "hyper-rustls",
+    "native-tls-vendored",
+    "quinn",
+    "rustls",
+    "rustls-native-certs",
+    "rustls-pemfile",
+    "rustls-tls",
+    "rustls-tls-manual-roots",
+    "rustls-tls-native-roots",
+    "rustls-tls-webpki-roots",
+    "tokio-rustls",
+    "webpki-roots",
+]
+
+[tests]
+skip = [
+    "test_allowed_methods",
+    "test_badssl_modern",
+    "test_badssl_self_signed",
+    "test_tls_info",
+]
+skip-exact = true
+comments = ["skip tests which require internet access"]
+
diff --git a/sources b/sources
index 172966b..6f055e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (reqwest-0.11.20.crate) = 0cd5fcaf8f3997683f39aec422c3cd5f37a5f0b3b7ffacae7d97008b0de93e21ab7318fba9a9eebbb677a5bc4289610d5153e8ac1e8fe94aac9da2c2ede94c6d
+SHA512 (reqwest-0.11.22.crate) = aaf1218a239a9c979b7a14198bbc1ffada80237a0d05a63242f8486d416c3dce636dbaf205976da4655973ddc5168a3e8d4ad341e2f042c5f239a7af35c7c5d2