public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-hickory-proto] rawhide: Update to version 0.26.1; Fixes RHBZ#2458902
@ 2026-06-18 16:14 Fabio Valentini
0 siblings, 0 replies; only message in thread
From: Fabio Valentini @ 2026-06-18 16:14 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-hickory-proto
Branch : rawhide
Commit : a392eecfc9338b44eef6bc3a44123f3cb2ecf38c
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-06-18T18:12:04+02:00
Stats : +31/-291 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/rust-hickory-proto/c/a392eecfc9338b44eef6bc3a44123f3cb2ecf38c?branch=rawhide
Log:
Update to version 0.26.1; Fixes RHBZ#2458902
---
diff --git a/.gitignore b/.gitignore
index 52ad3a3..a6ed105 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/hickory-proto-0.24.1.crate
/hickory-proto-0.24.4.crate
/hickory-proto-0.25.2.crate
+/hickory-proto-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 5678ab7..0000000
--- a/0001-Omit-tests-that-require-test_support-not-in-the-crat.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 7b06f5f591a0362e467d491cd6d5e35eaa2b16d3 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Fri, 5 Sep 2025 06:43:56 +0100
-Subject: [PATCH] Omit tests that require test_support, not in the crate
-
----
- src/h2/h2_client_stream.rs | 1 +
- src/h2/h2_server.rs | 1 +
- src/h3/h3_client_stream.rs | 1 +
- src/multicast/mdns_stream.rs | 1 +
- src/tcp/tcp_client_stream.rs | 1 +
- src/tcp/tcp_stream.rs | 1 +
- src/udp/udp_client_stream.rs | 1 +
- src/udp/udp_stream.rs | 1 +
- src/xfer/dns_multiplexer.rs | 1 +
- src/xfer/retry_dns_handle.rs | 1 +
- 10 files changed, 10 insertions(+)
-
-diff --git a/src/h2/h2_client_stream.rs b/src/h2/h2_client_stream.rs
-index debac04fa..a62d441eb 100644
---- a/src/h2/h2_client_stream.rs
-+++ b/src/h2/h2_client_stream.rs
-@@ -575,6 +575,7 @@ impl Future for HttpsClientResponse {
-
- #[cfg(any(feature = "webpki-roots", feature = "rustls-platform-verifier"))]
- #[cfg(test)]
-+#[cfg(any())]
- mod tests {
- use alloc::string::ToString;
- use std::net::SocketAddr;
-diff --git a/src/h2/h2_server.rs b/src/h2/h2_server.rs
-index 6bfe32e24..f2d743a2e 100644
---- a/src/h2/h2_server.rs
-+++ b/src/h2/h2_server.rs
-@@ -99,6 +99,7 @@ where
- }
-
- #[cfg(test)]
-+#[cfg(any())]
- mod tests {
- use alloc::vec::Vec;
- use core::pin::Pin;
-diff --git a/src/h3/h3_client_stream.rs b/src/h3/h3_client_stream.rs
-index 77eda73bc..fac112990 100644
---- a/src/h3/h3_client_stream.rs
-+++ b/src/h3/h3_client_stream.rs
-@@ -471,6 +471,7 @@ impl Future for H3ClientResponse {
- test,
- any(feature = "rustls-platform-verifier", feature = "webpki-roots")
- ))]
-+#[cfg(any())]
- mod tests {
- use alloc::string::ToString;
- use core::str::FromStr;
-diff --git a/src/multicast/mdns_stream.rs b/src/multicast/mdns_stream.rs
-index 277be8974..1106c29c6 100644
---- a/src/multicast/mdns_stream.rs
-+++ b/src/multicast/mdns_stream.rs
-@@ -417,6 +417,7 @@ impl Future for NextRandomUdpSocket {
- }
-
- #[cfg(test)]
-+#[cfg(any())]
- pub(crate) mod tests {
- #![allow(clippy::dbg_macro, clippy::print_stdout)]
-
-diff --git a/src/tcp/tcp_client_stream.rs b/src/tcp/tcp_client_stream.rs
-index 0e376308b..5720cd4cd 100644
---- a/src/tcp/tcp_client_stream.rs
-+++ b/src/tcp/tcp_client_stream.rs
-@@ -110,6 +110,7 @@ where
-
- #[cfg(test)]
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- mod tests {
- use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-
-diff --git a/src/tcp/tcp_stream.rs b/src/tcp/tcp_stream.rs
-index 3f9dfbbb7..8cfa125e5 100644
---- a/src/tcp/tcp_stream.rs
-+++ b/src/tcp/tcp_stream.rs
-@@ -383,6 +383,7 @@ impl<S: DnsTcpStream> Stream for TcpStream<S> {
-
- #[cfg(test)]
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- mod tests {
- use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-
-diff --git a/src/udp/udp_client_stream.rs b/src/udp/udp_client_stream.rs
-index d6f21ff49..8f94bcfa9 100644
---- a/src/udp/udp_client_stream.rs
-+++ b/src/udp/udp_client_stream.rs
-@@ -418,6 +418,7 @@ async fn send_serial_message_inner<S: DnsUdpSocket + Send>(
-
- #[cfg(test)]
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- mod tests {
- #![allow(clippy::dbg_macro, clippy::print_stdout)]
- use crate::{runtime::TokioRuntimeProvider, tests::udp_client_stream_test};
-diff --git a/src/udp/udp_stream.rs b/src/udp/udp_stream.rs
-index 905c9b4fc..cdc502e90 100644
---- a/src/udp/udp_stream.rs
-+++ b/src/udp/udp_stream.rs
-@@ -399,6 +399,7 @@ impl DnsUdpSocket for tokio::net::UdpSocket {
-
- #[cfg(test)]
- #[cfg(feature = "tokio")]
-+#[cfg(any())]
- mod tests {
- use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-
-diff --git a/src/xfer/dns_multiplexer.rs b/src/xfer/dns_multiplexer.rs
-index 0e29c75ab..c7c524630 100644
---- a/src/xfer/dns_multiplexer.rs
-+++ b/src/xfer/dns_multiplexer.rs
-@@ -430,6 +430,7 @@ where
- }
-
- #[cfg(test)]
-+#[cfg(any())]
- mod test {
- use alloc::vec::Vec;
- use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
-diff --git a/src/xfer/retry_dns_handle.rs b/src/xfer/retry_dns_handle.rs
-index c7b87ff2c..7bf89f88d 100644
---- a/src/xfer/retry_dns_handle.rs
-+++ b/src/xfer/retry_dns_handle.rs
-@@ -140,6 +140,7 @@ impl RetryableError for ProtoError {
- }
-
- #[cfg(all(test, feature = "std"))]
-+#[cfg(any())]
- mod test {
- use alloc::sync::Arc;
- use core::sync::atomic::{AtomicU16, Ordering};
---
-2.51.0
-
diff --git a/hickory-proto-fix-metadata-auto.diff b/hickory-proto-fix-metadata-auto.diff
new file mode 100644
index 0000000..f97eb12
--- /dev/null
+++ b/hickory-proto-fix-metadata-auto.diff
@@ -0,0 +1,17 @@
+--- hickory-proto-0.26.1/Cargo.toml 2006-07-24T01:21:28+00:00
++++ hickory-proto-0.26.1/Cargo.toml 2026-05-26T13:51:39.640185+00:00
+@@ -220,9 +220,6 @@
+
+ [dev-dependencies]
+
+-[target.'cfg(target_os = "android")'.dependencies.jni]
+-version = "0.22.1"
+-
+ [lints.clippy]
+ bool_to_int_with_if = "allow"
+ default_trait_access = "warn"
+@@ -247,3 +244,4 @@
+ level = "warn"
+ priority = 0
+ check-cfg = ["cfg(nightly)"]
++
diff --git a/hickory-proto-fix-metadata.diff b/hickory-proto-fix-metadata.diff
deleted file mode 100644
index db19dca..0000000
--- a/hickory-proto-fix-metadata.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- hickory-proto-0.25.2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ hickory-proto-0.25.2/Cargo.toml 2025-09-09T22:16:47.805185+00:00
-@@ -164,9 +164,6 @@
- "rand/thread_rng",
- "ring?/std",
- "thiserror/std",
-- "tracing-subscriber/env-filter",
-- "tracing-subscriber/fmt",
-- "tracing-subscriber/std",
- "tracing/std",
- "url/std",
- ]
-@@ -411,10 +408,6 @@
- "macros",
- ]
-
--[dev-dependencies.tracing-subscriber]
--version = "0.3"
--default-features = false
--
- [lints.rust.unexpected_cfgs]
- level = "warn"
- priority = 0
diff --git a/rust-hickory-proto.spec b/rust-hickory-proto.spec
index c9c5746..1a7dbcb 100644
--- a/rust-hickory-proto.spec
+++ b/rust-hickory-proto.spec
@@ -1,30 +1,26 @@
-# Generated by rust2rpm 27
+# Generated by rust2rpm 28
%bcond check 1
%global debug_package %{nil}
%global crate hickory-proto
Name: rust-hickory-proto
-Version: 0.25.2
+Version: 0.26.1
Release: %autorelease
-Summary: Hickory DNS is a safe and secure DNS library
+Summary: Hickory-proto is a safe and secure low-level DNS library
License: MIT OR Apache-2.0
URL: https://crates.io/crates/hickory-proto
Source: %{crates_source}
-# Manually created patch for downstream crate metadata changes
-# * Remove tracing-subscriber deps. from hickory-proto,
-# https://github.com/hickory-dns/hickory-dns/pull/3262
-Patch: hickory-proto-fix-metadata.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
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch: hickory-proto-fix-metadata-auto.diff
BuildRequires: cargo-rpm-macros >= 24
%global _description %{expand:
-Hickory DNS is a safe and secure DNS library. This is the foundational
-DNS protocol library for all Hickory DNS projects.}
+Hickory-proto is a safe and secure low-level DNS library. This is the
+foundational DNS protocol library used by the other higher-level Hickory
+DNS crates.}
%description %{_description}
@@ -55,28 +51,16 @@ 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}+access-control-devel
Summary: %{summary}
BuildArch: noarch
-%description -n %{name}+backtrace-devel %{_description}
+%description -n %{name}+access-control-devel %{_description}
This package contains library source intended for building other packages which
-use the "backtrace" feature of the "%{crate}" crate.
+use the "access-control" feature of the "%{crate}" crate.
-%files -n %{name}+backtrace-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+futures-io-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+futures-io-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "futures-io" feature of the "%{crate}" crate.
-
-%files -n %{name}+futures-io-devel
+%files -n %{name}+access-control-devel
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+mdns-devel
@@ -103,18 +87,6 @@ use the "no-std-rand" feature of the "%{crate}" crate.
%files -n %{name}+no-std-rand-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+rustls-platform-verifier-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+rustls-platform-verifier-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "rustls-platform-verifier" feature of the "%{crate}" crate.
-
-%files -n %{name}+rustls-platform-verifier-devel
-%ghost %{crate_instdir}/Cargo.toml
-
%package -n %{name}+serde-devel
Summary: %{summary}
BuildArch: noarch
@@ -127,18 +99,6 @@ use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel
%ghost %{crate_instdir}/Cargo.toml
-%package -n %{name}+socket2-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+socket2-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "socket2" feature of the "%{crate}" crate.
-
-%files -n %{name}+socket2-devel
-%ghost %{crate_instdir}/Cargo.toml
-
%package -n %{name}+std-devel
Summary: %{summary}
BuildArch: noarch
@@ -163,46 +123,8 @@ 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
-
-%description -n %{name}+tokio-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "tokio" feature of the "%{crate}" crate.
-
-%files -n %{name}+tokio-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package -n %{name}+webpki-roots-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+webpki-roots-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "webpki-roots" feature of the "%{crate}" crate.
-
-%files -n %{name}+webpki-roots-devel
-%ghost %{crate_instdir}/Cargo.toml
-
%prep
%autosetup -n %{crate}-%{version} -p1
-# Requires test_support, not published in the crate
-rm src/quic/tests.rs
%cargo_prep
%generate_buildrequires
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 8faf578..7a5f7a1 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,49 +1,13 @@
-[package]
-cargo-toml-patch-comments = [
- """\
- Remove tracing-subscriber deps. from hickory-proto, \
- https://github.com/hickory-dns/hickory-dns/pull/3262\
- """,
-]
-
-[[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.\
- """,
-]
-
-[scripts.prep]
-pre = [
- "# Requires test_support, not published in the crate",
- "rm src/quic/tests.rs",
-]
-
[features]
hide = [
# aws-lc-rs is not yet packaged
"dnssec-aws-lc-rs",
- "h3-aws-lc-rs",
- "https-aws-lc-rs",
- "quic-aws-lc-rs",
- "tls-aws-lc-rs",
# we would like to avoid unnecessary dependencies on ring in Fedora, hoping
# to migrate toward aws-lc-rs once it is available
"dnssec-ring",
- "h3-ring",
- "https-ring",
- "quic-ring",
- "tls-ring",
# for now, we provide neither the aws-lc-rs version nor the ring version of
# any of these:
"__dnssec",
- "__h3",
- "__https",
- "__quic",
- "__tls",
# WASM-specific
"wasm-bindgen",
]
diff --git a/sources b/sources
index 75c54dc..c74ba7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hickory-proto-0.25.2.crate) = 1a0994a47bf345cca75710566bd6ea57f0498b85838a9b8fd001660fc14cd66230def8cfd1e6f4639219b378a57555653c8dd91f22b8e4fd754035f9e7ea42a9
+SHA512 (hickory-proto-0.26.1.crate) = b5e7d31901bcac0fa8818dff1b0512f22bffd52dd0a87f53cd66a3bf2b55aa4138d519de0d134933fb3e024a884878362fba726f39e690e57527fc92c67f3649
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-18 16:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-18 16:14 [rpms/rust-hickory-proto] rawhide: Update to version 0.26.1; Fixes RHBZ#2458902 Fabio Valentini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox