From 6ad6d9aafc5da180b70734b2ae088901dee4632a Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 23 Feb 2023 19:25:58 +0100
Subject: [PATCH] Update to version 0.22.0; Fixes RHBZ#2123798

---
 .gitignore                                |  1 +
 README.md                                 |  3 --
 rust-trust-dns-resolver.spec              | 36 +++++++----------------
 .rust2rpm.conf => rust2rpm.conf           |  1 +
 sources                                   |  2 +-
 trust-dns-resolver-fix-metadata-auto.diff | 21 +++++++++++++
 6 files changed, 35 insertions(+), 29 deletions(-)
 delete mode 100644 README.md
 rename .rust2rpm.conf => rust2rpm.conf (88%)
 create mode 100644 trust-dns-resolver-fix-metadata-auto.diff

diff --git a/.gitignore b/.gitignore
index d5c69f8..f733a2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /trust-dns-resolver-0.20.1.crate
 /trust-dns-resolver-0.20.3.crate
 /trust-dns-resolver-0.21.2.crate
+/trust-dns-resolver-0.22.0.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index a7af446..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-trust-dns-resolver
-
-The rust-trust-dns-resolver package
\ No newline at end of file
diff --git a/rust-trust-dns-resolver.spec b/rust-trust-dns-resolver.spec
index 9e450af..d266c8f 100644
--- a/rust-trust-dns-resolver.spec
+++ b/rust-trust-dns-resolver.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 24
 # * /etc/hosts and /etc/resolv.conf are not available in mock
 # * no internet connectivity in mock
 %bcond_with check
@@ -6,28 +6,26 @@
 
 %global crate trust-dns-resolver
 
-Name:           rust-%{crate}
-Version:        0.21.2
+Name:           rust-trust-dns-resolver
+Version:        0.22.0
 Release:        %autorelease
 Summary:        Trust-DNS is a safe and secure DNS library
 
 # Upstream license specification: MIT/Apache-2.0
-License:        MIT or ASL 2.0
+License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/trust-dns-resolver
 Source:         %{crates_source}
-# Initial patched metadata
-# * drop windows-specific dependencies and features
-Patch0:         trust-dns-resolver-fix-metadata.diff
-
-ExclusiveArch:  %{rust_arches}
+# Automatically generated patch to strip foreign dependencies
+Patch:          trust-dns-resolver-fix-metadata-auto.diff
 
 BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
-Trust-DNS is a safe and secure DNS library. This Resolver library  uses the
-Client library to perform all DNS queries. The Resolver is intended to be a
-high-level library for any DNS record resolution see Resolver and AsyncResolver
-for supported resolution types. The Client can be used for other queries.}
+Trust-DNS is a safe and secure DNS library. This Resolver library  uses
+the Client library to perform all DNS queries. The Resolver is intended
+to be a high-level library for any DNS record resolution see Resolver
+and AsyncResolver for supported resolution types. The Client can be used
+for other queries.}
 
 %description %{_description}
 
@@ -58,18 +56,6 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+backtrace-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+backtrace-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "backtrace" feature of the "%{crate}" crate.
-
-%files       -n %{name}+backtrace-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+dns-over-https-devel
 Summary:        %{summary}
 BuildArch:      noarch
diff --git a/.rust2rpm.conf b/rust2rpm.conf
similarity index 88%
rename from .rust2rpm.conf
rename to rust2rpm.conf
index 781e933..145381a 100644
--- a/.rust2rpm.conf
+++ b/rust2rpm.conf
@@ -4,5 +4,6 @@ unwanted-features =
   tokio-rustls
   webpki-roots
   dns-over-https-rustls
+  dns-over-quic
   dns-over-rustls
   dnssec-ring
diff --git a/sources b/sources
index 327e1bd..6c356bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (trust-dns-resolver-0.21.2.crate) = 3570c4345dc7a561ecac3de48074f104191a3716a3872e176466834e5abfc77e29e29626d2d027f02b408c48fc426b52440525e12ec5f9a1d20c14eb0b353904
+SHA512 (trust-dns-resolver-0.22.0.crate) = d1a9687a4e50925933e8f2f3624877c543ac91e8139422a198ca02e18161e24c19606c35dba1d546e8a0e4b0ad15c85d985fa45726b587b586932119d6bd68a1
diff --git a/trust-dns-resolver-fix-metadata-auto.diff b/trust-dns-resolver-fix-metadata-auto.diff
new file mode 100644
index 0000000..16bf24a
--- /dev/null
+++ b/trust-dns-resolver-fix-metadata-auto.diff
@@ -0,0 +1,21 @@
+--- trust-dns-resolver-0.22.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ trust-dns-resolver-0.22.0/Cargo.toml	2023-02-23T16:17:52.517930+00:00
+@@ -172,7 +172,6 @@
+     "trust-dns-proto/serde-config",
+ ]
+ system-config = [
+-    "ipconfig",
+     "resolv-conf",
+ ]
+ testing = []
+@@ -181,10 +180,6 @@
+     "trust-dns-proto/tokio-runtime",
+ ]
+ 
+-[target."cfg(windows)".dependencies.ipconfig]
+-version = "0.3.0"
+-optional = true
+-
+ [badges.codecov]
+ branch = "main"
+ repository = "bluejekyll/trust-dns"