From 0521ee99b3816ea3a956dd44cd3fae9db2431c4a Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Fri, 20 Oct 2023 13:36:00 +0200
Subject: [PATCH] Update to version 0.23.1; Fixes RHBZ#2233603

---
 .gitignore                        |  1 +
 rust-trust-dns-proto.spec         | 28 ++++++++++++++------
 rust2rpm.conf                     | 16 -----------
 rust2rpm.toml                     | 18 +++++++++++++
 sources                           |  2 +-
 trust-dns-proto-fix-metadata.diff | 44 ++++++++++++++++++++++++-------
 6 files changed, 74 insertions(+), 35 deletions(-)
 delete mode 100644 rust2rpm.conf
 create mode 100644 rust2rpm.toml

diff --git a/.gitignore b/.gitignore
index 9b4704f..bd1d253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /trust-dns-proto-0.20.3.crate
 /trust-dns-proto-0.21.2.crate
 /trust-dns-proto-0.22.0.crate
+/trust-dns-proto-0.23.1.crate
diff --git a/rust-trust-dns-proto.spec b/rust-trust-dns-proto.spec
index 17a0403..dc064b8 100644
--- a/rust-trust-dns-proto.spec
+++ b/rust-trust-dns-proto.spec
@@ -1,24 +1,24 @@
-# Generated by rust2rpm 24
-# * missing dev-dependency: tracing-subscriber
-%bcond_with check
+# Generated by rust2rpm 25
+%bcond_without check
 %global debug_package %{nil}
 
 %global crate trust-dns-proto
 
 Name:           rust-trust-dns-proto
-Version:        0.22.0
+Version:        0.23.1
 Release:        %autorelease
 Summary:        Trust-DNS is a safe and secure DNS library
 
-# Upstream license specification: MIT/Apache-2.0
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/trust-dns-proto
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * add missing "tokio/io-util" feature
+# * remove unused tracing-subscriber dev-dependency
+# * add missing "tokio/io-util" dependency for the "tokio-runtime" feature
+# * move rustls-specific features from dns-over-https to dns-over-https-rustls
 Patch:          trust-dns-proto-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Trust-DNS is a safe and secure DNS library. This is the foundational DNS
@@ -257,6 +257,18 @@ use the "testing" feature of the "%{crate}" crate.
 %files       -n %{name}+testing-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+text-parsing-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+text-parsing-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "text-parsing" feature of the "%{crate}" crate.
+
+%files       -n %{name}+text-parsing-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+tokio-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -306,7 +318,7 @@ use the "tokio-runtime" 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
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index ee22023..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[DEFAULT]
-unwanted-features =
-  js-sys
-  quinn
-  ring
-  rustls
-  rustls-pemfile
-  tokio-rustls
-  wasm-bindgen-crate
-  webpki
-  webpki-roots
-  dns-over-https-rustls
-  dns-over-quic
-  dns-over-rustls
-  dnssec-ring
-  wasm-bindgen
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..c7749ce
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,18 @@
+[features]
+hide = [
+    "js-sys",
+    "quinn",
+    "ring",
+    "rustls",
+    "rustls-pemfile",
+    "tokio-rustls",
+    "wasm-bindgen-crate",
+    "webpki",
+    "webpki-roots",
+    "dns-over-https-rustls",
+    "dns-over-quic",
+    "dns-over-rustls",
+    "dnssec-ring",
+    "wasm-bindgen",
+]
+
diff --git a/sources b/sources
index 17eecc9..be2ff2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (trust-dns-proto-0.22.0.crate) = 7e4c8e3f2bbfb6a18a3fb6137861a5c0da49c51d3d372b795600f602a7643003eaac7c2a8ccc545ae3e57574a4d9badffa1b15806978f80a28171511ac264e5e
+SHA512 (trust-dns-proto-0.23.1.crate) = 4fcba616f02232e2172037e69bedf28f1a9e06f7639ec7640dc94404f7fc43eaf8829f8fe415a57cb71862e40907736a9c8c0ab89099386a46d8b1c236242acf
diff --git a/trust-dns-proto-fix-metadata.diff b/trust-dns-proto-fix-metadata.diff
index a61d301..a1bab1b 100644
--- a/trust-dns-proto-fix-metadata.diff
+++ b/trust-dns-proto-fix-metadata.diff
@@ -1,16 +1,40 @@
---- trust-dns-proto-0.22.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ trust-dns-proto-0.22.0/Cargo.toml	2023-02-23T16:31:28.739251+00:00
-@@ -207,6 +207,7 @@
- [dev-dependencies.tokio]
- version = "1.0"
- features = [
-+    "io-util",
-     "rt",
-     "time",
+--- trust-dns-proto-0.23.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ trust-dns-proto-0.23.1/Cargo.toml	2023-10-20T11:32:02.450133+00:00
+@@ -221,14 +221,6 @@
      "macros",
-@@ -274,6 +275,7 @@
  ]
+ 
+-[dev-dependencies.tracing-subscriber]
+-version = "0.3"
+-features = [
+-    "std",
+-    "fmt",
+-    "env-filter",
+-]
+-
+ [features]
+ backtrace = ["dep:backtrace"]
+ default = ["tokio-runtime"]
+@@ -236,11 +228,13 @@
+     "bytes",
+     "h2",
+     "http",
++    "tokio-runtime",
++]
++dns-over-https-rustls = [
++    "dns-over-https",
+     "dns-over-rustls",
+     "webpki-roots",
+-    "tokio-runtime",
+-]
+-dns-over-https-rustls = ["dns-over-https"]
++]
+ dns-over-native-tls = [
+     "dns-over-tls",
+     "native-tls",
+@@ -287,6 +281,7 @@
  testing = []
+ text-parsing = []
  tokio-runtime = [
 +    "tokio/io-util",
      "tokio/net",