[rpms/rust-hickory-resolver] f43: Update to version 0.26.1; Fixes RHBZ#2458903

[rpms/rust-hickory-resolver] f43: Update to version 0.26.1; Fixes RHBZ#2458903

[Fabio Valentini]

A new commit has been pushed.

Repo   : rpms/rust-hickory-resolver
Branch : f43
Commit : e21dc4064867cb9a74aadd65013bd31cd812b98b
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2026-07-03T20:13:19+02:00
Stats  : +81/-283 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-hickory-resolver/c/e21dc4064867cb9a74aadd65013bd31cd812b98b?branch=f43

Log:
Update to version 0.26.1; Fixes RHBZ#2458903

---
diff --git a/.gitignore b/.gitignore
index 7c459de..d905880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /hickory-resolver-0.24.2.crate
 /hickory-resolver-0.24.4.crate
 /hickory-resolver-0.25.2.crate
+/hickory-resolver-0.26.1.crate

diff --git a/0001-Omit-tests-that-require-test_support-not-in-the-crat.patch b/0001-Omit-tests-that-require-test_support-not-in-the-crat.patch
deleted file mode 100644
index 2d6285a..0000000
--- a/0001-Omit-tests-that-require-test_support-not-in-the-crat.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From f0e6edd883dca23ad1c31b5312f1507120242c3c Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Sun, 7 Sep 2025 08:13:58 +0100
-Subject: [PATCH 1/2] Omit tests that require test_support, not in the crate
-
----
- examples/custom_provider.rs         | 1 +
- examples/flush_cache.rs             | 1 +
- examples/global_resolver.rs         | 1 +
- examples/multithreaded_runtime.rs   | 1 +
- src/caching_client.rs               | 1 +
- src/h2.rs                           | 1 +
- src/h3.rs                           | 1 +
- src/lookup_ip.rs                    | 1 +
- src/name_server/name_server.rs      | 1 +
- src/name_server/name_server_pool.rs | 1 +
- src/quic.rs                         | 1 +
- src/resolver.rs                     | 1 +
- src/tests.rs                        | 2 ++
- src/tls.rs                          | 1 +
- 14 files changed, 15 insertions(+)
-
-diff --git a/examples/custom_provider.rs b/examples/custom_provider.rs
-index 162bc64e2..46d90fc0b 100644
---- a/examples/custom_provider.rs
-+++ b/examples/custom_provider.rs
-@@ -122,6 +122,7 @@ fn main() {
- 
- #[cfg(any(feature = "webpki-roots", feature = "rustls-platform-verifier"))]
- #[tokio::test]
-+#[cfg(any())]
- async fn test_custom_provider() {
-     test_support::subscribe();
-     run().await;
-diff --git a/examples/flush_cache.rs b/examples/flush_cache.rs
-index 00fa79d58..23588b6d1 100644
---- a/examples/flush_cache.rs
-+++ b/examples/flush_cache.rs
-@@ -92,6 +92,7 @@ async fn resolve_list<P: hickory_resolver::name_server::ConnectionProvider>(
- }
- 
- #[tokio::test]
-+#[cfg(any())]
- async fn test_flush_cache() {
-     test_support::subscribe();
-     tokio_main().await;
-diff --git a/examples/global_resolver.rs b/examples/global_resolver.rs
-index 60ea6bf37..4df7b374b 100644
---- a/examples/global_resolver.rs
-+++ b/examples/global_resolver.rs
-@@ -143,6 +143,7 @@ fn run() {
- }
- 
- #[test]
-+#[cfg(any())]
- fn test_global_resolver() {
-     test_support::subscribe();
-     run()
-diff --git a/examples/multithreaded_runtime.rs b/examples/multithreaded_runtime.rs
-index c189f00d0..ab1e90bf1 100644
---- a/examples/multithreaded_runtime.rs
-+++ b/examples/multithreaded_runtime.rs
-@@ -63,6 +63,7 @@ fn run() {
- }
- 
- #[test]
-+#[cfg(any())]
- fn test_multithreaded_runtime() {
-     test_support::subscribe();
-     run()
-diff --git a/src/caching_client.rs b/src/caching_client.rs
-index 51d4973d3..0ab5feca6 100644
---- a/src/caching_client.rs
-+++ b/src/caching_client.rs
-@@ -510,6 +510,7 @@ enum Records {
- 
- // see also the lookup_tests.rs in integration-tests crate
- #[cfg(test)]
-+#[cfg(any())]
- mod tests {
-     use std::net::*;
-     use std::str::FromStr;
-diff --git a/src/h2.rs b/src/h2.rs
-index 7067b3260..f8d5a36e2 100644
---- a/src/h2.rs
-+++ b/src/h2.rs
-@@ -54,6 +54,7 @@ where
- 
- #[cfg(any(feature = "webpki-roots", feature = "rustls-platform-verifier"))]
- #[cfg(test)]
-+#[cfg(any())]
- mod tests {
-     use test_support::subscribe;
- 
-diff --git a/src/h3.rs b/src/h3.rs
-index 5dafa3613..907c8f90b 100644
---- a/src/h3.rs
-+++ b/src/h3.rs
-@@ -48,6 +48,7 @@ pub(crate) fn new_h3_stream_with_future(
-     test,
-     any(feature = "rustls-platform-verifier", feature = "webpki-roots")
- ))]
-+#[cfg(any())]
- mod tests {
-     use test_support::subscribe;
- 
-diff --git a/src/lookup_ip.rs b/src/lookup_ip.rs
-index ebe659eb1..649d49a35 100644
---- a/src/lookup_ip.rs
-+++ b/src/lookup_ip.rs
-@@ -343,6 +343,7 @@ impl<C: DnsHandle> LookupContext<C> {
- }
- 
- #[cfg(test)]
-+#[cfg(any())]
- pub(crate) mod tests {
-     use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-     use std::sync::{Arc, Mutex};
-diff --git a/src/name_server/name_server.rs b/src/name_server/name_server.rs
-index e1356a575..13ac24148 100644
---- a/src/name_server/name_server.rs
-+++ b/src/name_server/name_server.rs
-@@ -186,6 +186,7 @@ where
- 
- #[cfg(test)]
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- mod tests {
-     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-     use std::str::FromStr;
-diff --git a/src/name_server/name_server_pool.rs b/src/name_server/name_server_pool.rs
-index f3a8744a7..3ac405535 100644
---- a/src/name_server/name_server_pool.rs
-+++ b/src/name_server/name_server_pool.rs
-@@ -377,6 +377,7 @@ impl Stream for Local {
- 
- #[cfg(test)]
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- mod tests {
-     use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-     use std::str::FromStr;
-diff --git a/src/quic.rs b/src/quic.rs
-index bd3504f41..96af01dbe 100644
---- a/src/quic.rs
-+++ b/src/quic.rs
-@@ -46,6 +46,7 @@ pub(crate) fn new_quic_stream_with_future(
-     test,
-     any(feature = "rustls-platform-verifier", feature = "webpki-roots")
- ))]
-+#[cfg(any())]
- mod tests {
-     use std::net::IpAddr;
- 
-diff --git a/src/resolver.rs b/src/resolver.rs
-index 4179f122b..e05fed2be 100644
---- a/src/resolver.rs
-+++ b/src/resolver.rs
-@@ -1043,6 +1043,7 @@ pub(crate) mod testing {
- #[cfg(test)]
- #[cfg(feature = "tokio")]
- #[allow(clippy::extra_unused_type_parameters)]
-+#[cfg(any())]
- mod tests {
-     use std::net::{IpAddr, Ipv4Addr};
-     use std::sync::Mutex;
-diff --git a/src/tests.rs b/src/tests.rs
-index 2e3f49501..de23499b1 100644
---- a/src/tests.rs
-+++ b/src/tests.rs
-@@ -1,9 +1,11 @@
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- use test_support::subscribe;
- 
- // Keep this in sync with the example in the README.
- #[cfg(feature = "tokio")]
- #[tokio::test]
-+#[cfg(any())]
- async fn readme_example() {
-     subscribe();
- 
-diff --git a/src/tls.rs b/src/tls.rs
-index 21a700998..309ffbed6 100644
---- a/src/tls.rs
-+++ b/src/tls.rs
-@@ -42,6 +42,7 @@ where
- #[cfg(feature = "__tls")]
- #[cfg(any(feature = "webpki-roots", feature = "rustls-platform-verifier"))]
- #[cfg(test)]
-+#[cfg(any())]
- mod tests {
-     use test_support::subscribe;
- 
--- 
-2.51.0
-

diff --git a/0002-Omit-doctests-that-require-network-access.patch b/0002-Omit-doctests-that-require-network-access.patch
deleted file mode 100644
index ec4fe11..0000000
--- a/0002-Omit-doctests-that-require-network-access.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5e350e07f489e0308b621ef0cf028ce1d1e06753 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Sun, 7 Sep 2025 23:56:56 +0100
-Subject: [PATCH 2/2] Omit doctests that require network access
-
----
- src/lib.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib.rs b/src/lib.rs
-index 4e30537f6..0e9d5ead3 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -53,7 +53,7 @@
- //!
- //! ## Using the Tokio/Async Resolver
- //!
--//! ```rust
-+//! ```rust,ignore
- //! # fn main() {
- //! # #[cfg(feature = "tokio")]
- //! # {
--- 
-2.51.0
-

diff --git a/hickory-resolver-fix-metadata-auto.diff b/hickory-resolver-fix-metadata-auto.diff
index 785392b..b5ffdf3 100644
--- a/hickory-resolver-fix-metadata-auto.diff
+++ b/hickory-resolver-fix-metadata-auto.diff
@@ -1,22 +1,41 @@
---- hickory-resolver-0.25.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ hickory-resolver-0.25.2/Cargo.toml	2025-09-09T22:22:51.515992+00:00
-@@ -122,7 +122,6 @@
+--- hickory-resolver-0.26.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ hickory-resolver-0.26.1/Cargo.toml	2026-05-26T14:16:40.895622+00:00
+@@ -123,11 +123,7 @@
      "hickory-proto/serde",
  ]
  system-config = [
 -    "dep:ipconfig",
      "dep:resolv-conf",
+-    "dep:jni",
+-    "dep:ndk-context",
+-    "dep:system-configuration",
  ]
  tls-aws-lc-rs = [
-@@ -293,11 +292,8 @@
+     "hickory-net/tls-aws-lc-rs",
+@@ -348,22 +344,6 @@
+     "std",
  ]
  default-features = false
- 
+-
+-[target.'cfg(target_os = "android")'.dependencies.jni]
+-version = "0.22.1"
+-optional = true
+-
+-[target.'cfg(target_os = "android")'.dependencies.ndk-context]
+-version = "0.1.1"
+-optional = true
+-
+-[target.'cfg(target_vendor = "apple")'.dependencies.system-configuration]
+-version = "0.7"
+-optional = true
+-
 -[target."cfg(windows)".dependencies.ipconfig]
 -version = "0.3.0"
 -optional = true
--
- [lints.rust.unexpected_cfgs]
+ 
+ [lints.clippy]
+ bool_to_int_with_if = "allow"
+@@ -389,3 +369,4 @@
  level = "warn"
  priority = 0
  check-cfg = ["cfg(nightly)"]

diff --git a/hickory-resolver-fix-metadata.diff b/hickory-resolver-fix-metadata.diff
new file mode 100644
index 0000000..5e134dd
--- /dev/null
+++ b/hickory-resolver-fix-metadata.diff
@@ -0,0 +1,13 @@
+--- hickory-resolver-0.26.1/Cargo.toml	2006-07-24T01:21:28+00:00
++++ hickory-resolver-0.26.1/Cargo.toml	2026-05-26T14:16:40.897196+00:00
+@@ -304,10 +304,6 @@
+ version = "1"
+ optional = true
+ 
+-[dev-dependencies.criterion]
+-version = "0.8.2"
+-features = ["async_tokio"]
+-
+ [dev-dependencies.futures-executor]
+ version = "0.3.5"
+ features = ["std"]

diff --git a/rust-hickory-resolver.spec b/rust-hickory-resolver.spec
index 73aa386..65e2a7e 100644
--- a/rust-hickory-resolver.spec
+++ b/rust-hickory-resolver.spec
@@ -1,33 +1,29 @@
-# Generated by rust2rpm 27
-%bcond check 1
+# Generated by rust2rpm 28
+# * tests can only be compiled and run in-tree
+%bcond check 0
 %global debug_package %{nil}
 
 %global crate hickory-resolver
 
 Name:           rust-hickory-resolver
-Version:        0.25.2
+Version:        0.26.1
 Release:        %autorelease
-Summary:        Hickory DNS is a safe and secure DNS library
+Summary:        Hickory-resolver is a safe and secure DNS stub resolver library
 
 License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/hickory-resolver
 Source:         %{crates_source}
 # Automatically generated patch to strip dependencies and normalize metadata
 Patch:          hickory-resolver-fix-metadata-auto.diff
-# * Downstream-only: omit tests that import from test_support, which is not
-#   included in the crate.
-Patch10:        0001-Omit-tests-that-require-test_support-not-in-the-crat.patch
-# * Downstream-only: omit doctests that require network access
-Patch11:        0002-Omit-doctests-that-require-network-access.patch
+# Manually created patch for downstream crate metadata changes
+# * drop unused, benchmark-only criterion dev-dependency
+Patch:          hickory-resolver-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
-Hickory 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
-for supported resolution types. The Client can be used for other
-queries.}
+Hickory-resolver is a safe and secure DNS stub resolver library intended
+to be a high-level library for DNS record resolution.}
 
 %description %{_description}
 
@@ -58,28 +54,28 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+backtrace-devel
+%package     -n %{name}+metrics-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+backtrace-devel %{_description}
+%description -n %{name}+metrics-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "backtrace" feature of the "%{crate}" crate.
+use the "metrics" feature of the "%{crate}" crate.
 
-%files       -n %{name}+backtrace-devel
+%files       -n %{name}+metrics-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+rustls-platform-verifier-devel
+%package     -n %{name}+recursor-devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description -n %{name}+rustls-platform-verifier-devel %{_description}
+%description -n %{name}+recursor-devel %{_description}
 
 This package contains library source intended for building other packages which
-use the "rustls-platform-verifier" feature of the "%{crate}" crate.
+use the "recursor" feature of the "%{crate}" crate.
 
-%files       -n %{name}+rustls-platform-verifier-devel
+%files       -n %{name}+recursor-devel
 %ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+serde-devel
@@ -118,6 +114,18 @@ use the "tokio" feature of the "%{crate}" crate.
 %files       -n %{name}+tokio-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+toml-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+toml-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "toml" feature of the "%{crate}" crate.
+
+%files       -n %{name}+toml-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+webpki-roots-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -145,12 +153,7 @@ use the "webpki-roots" feature of the "%{crate}" crate.
 
 %if %{with check}
 %check
-# * We must skip tests that try to read hosts.conf or resolv.conf, which are not
-#   present in the offline mock environment.
-%{cargo_test -- -- --exact %{shrink:
-    --skip hosts::tests::test_read_hosts_conf
-    --skip system_conf::unix::tests::test_read_resolv_conf
-}}
+%cargo_test
 %endif
 
 %changelog

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 6461376..48a2a3f 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,21 +1,13 @@
-[[package.extra-patches]]
-number = 10
-file = "0001-Omit-tests-that-require-test_support-not-in-the-crat.patch"
-comments = [
-    """\
-    Downstream-only: omit tests that import from test_support, which is not \
-    included in the crate.\
-    """,
-]
-[[package.extra-patches]]
-number = 11
-file = "0002-Omit-doctests-that-require-network-access.patch"
-comments = [
-    "Downstream-only: omit doctests that require network access",
+[package]
+summary = "Hickory-resolver is a safe and secure DNS stub resolver library"
+cargo-toml-patch-comments = [
+    "drop unused, benchmark-only criterion dev-dependency",
 ]
 
 [features]
 hide = [
+    # rustls-platform-verifier is packaged but outdated
+    "rustls-platform-verifier",
     # aws-lc-rs is not yet packaged
     "dnssec-aws-lc-rs",
     "h3-aws-lc-rs",
@@ -39,14 +31,6 @@ hide = [
 ]
 
 [tests]
-comments = [
-    """\
-    We must skip tests that try to read hosts.conf or resolv.conf, which are \
-    not present in the offline mock environment.\
-    """,
-]
-skip-exact = true
-skip = [
-    "hosts::tests::test_read_hosts_conf",
-    "system_conf::unix::tests::test_read_resolv_conf",
-]
+run = false
+comments = ["tests can only be compiled and run in-tree"]
+

diff --git a/sources b/sources
index b2b2e3c..70ffe0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hickory-resolver-0.25.2.crate) = 73fde63c4237a6cc05a069c89b27a660446ae17cb5cad6e52ddad907f2c0d8faa116689a4c6e4a09f1759b220522d4e5b138cacd91f0bc5ad9230bb82e72b721
+SHA512 (hickory-resolver-0.26.1.crate) = d21d1385e1d6151a03e756d2c6cff5d0811de7ede0fe8851cdbb7f4a06ff1ae8f651c764aa3e54c00ec77f669842121b8983d5c96f580a065895d99e6a8f6509