From d47ae4ef00485ba61e6e8f869c3a47b64e7c0c4e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 22 Nov 2023 00:50:14 +0100 Subject: [PATCH] Update to version 0.23.2; Fixes RHBZ#2245713 --- .gitignore | 1 + rust-trust-dns-resolver.spec | 86 ++++++++++++++++++++++- rust2rpm.toml | 11 --- sources | 2 +- trust-dns-resolver-fix-metadata-auto.diff | 4 +- trust-dns-resolver-fix-metadata.diff | 4 +- 6 files changed, 91 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index e5ad3c3..9158514 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /trust-dns-resolver-0.21.2.crate /trust-dns-resolver-0.22.0.crate /trust-dns-resolver-0.23.1.crate +/trust-dns-resolver-0.23.2.crate diff --git a/rust-trust-dns-resolver.spec b/rust-trust-dns-resolver.spec index d2905ee..fdc832c 100644 --- a/rust-trust-dns-resolver.spec +++ b/rust-trust-dns-resolver.spec @@ -7,7 +7,7 @@ %global crate trust-dns-resolver Name: rust-trust-dns-resolver -Version: 0.23.1 +Version: 0.23.2 Release: %autorelease Summary: Trust-DNS is a safe and secure DNS library @@ -70,6 +70,18 @@ use the "dns-over-https" feature of the "%{crate}" crate. %files -n %{name}+dns-over-https-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+dns-over-https-rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-https-rustls-devel %{_description} + +This package contains library source intended for building other packages which +use the "dns-over-https-rustls" feature of the "%{crate}" crate. + +%files -n %{name}+dns-over-https-rustls-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+dns-over-native-tls-devel Summary: %{summary} BuildArch: noarch @@ -94,6 +106,30 @@ use the "dns-over-openssl" feature of the "%{crate}" crate. %files -n %{name}+dns-over-openssl-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+dns-over-quic-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-quic-devel %{_description} + +This package contains library source intended for building other packages which +use the "dns-over-quic" feature of the "%{crate}" crate. + +%files -n %{name}+dns-over-quic-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+dns-over-rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-rustls-devel %{_description} + +This package contains library source intended for building other packages which +use the "dns-over-rustls" feature of the "%{crate}" crate. + +%files -n %{name}+dns-over-rustls-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+dns-over-tls-devel Summary: %{summary} BuildArch: noarch @@ -130,6 +166,18 @@ use the "dnssec-openssl" feature of the "%{crate}" crate. %files -n %{name}+dnssec-openssl-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+dnssec-ring-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dnssec-ring-devel %{_description} + +This package contains library source intended for building other packages which +use the "dnssec-ring" feature of the "%{crate}" crate. + +%files -n %{name}+dnssec-ring-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+resolv-conf-devel Summary: %{summary} BuildArch: noarch @@ -142,6 +190,18 @@ use the "resolv-conf" feature of the "%{crate}" crate. %files -n %{name}+resolv-conf-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rustls-devel %{_description} + +This package contains library source intended for building other packages which +use the "rustls" feature of the "%{crate}" crate. + +%files -n %{name}+rustls-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+serde-devel Summary: %{summary} BuildArch: noarch @@ -238,6 +298,30 @@ use the "tokio-runtime" feature of the "%{crate}" crate. %files -n %{name}+tokio-runtime-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+tokio-rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+tokio-rustls-devel %{_description} + +This package contains library source intended for building other packages which +use the "tokio-rustls" feature of the "%{crate}" crate. + +%files -n %{name}+tokio-rustls-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 %cargo_prep diff --git a/rust2rpm.toml b/rust2rpm.toml index 72a11e1..c244da2 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,14 +1,3 @@ -[features] -hide = [ - "rustls", - "tokio-rustls", - "webpki-roots", - "dns-over-https-rustls", - "dns-over-quic", - "dns-over-rustls", - "dnssec-ring", -] - [tests] run = ["none"] comments = [ diff --git a/sources b/sources index e9a9238..0cd63be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trust-dns-resolver-0.23.1.crate) = 0023652f2f513b05490e7274ec493d488d2e51f826f5c8caab91ce82d0271ff937de499b83746f12a44f4d6c314d6dae883d4220abe5f1347caeb4958de89642 +SHA512 (trust-dns-resolver-0.23.2.crate) = f7e4620c11ff13ee8ca68d50afcaf6c3085e7b58db366f7c7351d5789a93f146629994641bf1183e0e1f5322d01b958672f73009d5da24766a3b37abd1ab9c33 diff --git a/trust-dns-resolver-fix-metadata-auto.diff b/trust-dns-resolver-fix-metadata-auto.diff index 2e3d8da..932bb8f 100644 --- a/trust-dns-resolver-fix-metadata-auto.diff +++ b/trust-dns-resolver-fix-metadata-auto.diff @@ -1,5 +1,5 @@ ---- trust-dns-resolver-0.23.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ trust-dns-resolver-0.23.1/Cargo.toml 2023-10-20T11:42:59.201738+00:00 +--- trust-dns-resolver-0.23.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ trust-dns-resolver-0.23.2/Cargo.toml 2023-11-21T23:35:07.109856+00:00 @@ -184,7 +184,6 @@ "trust-dns-proto/serde-config", ] diff --git a/trust-dns-resolver-fix-metadata.diff b/trust-dns-resolver-fix-metadata.diff index f1cca5b..1fffed4 100644 --- a/trust-dns-resolver-fix-metadata.diff +++ b/trust-dns-resolver-fix-metadata.diff @@ -1,5 +1,5 @@ ---- trust-dns-resolver-0.23.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ trust-dns-resolver-0.23.1/Cargo.toml 2023-10-20T11:43:06.042766+00:00 +--- trust-dns-resolver-0.23.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ trust-dns-resolver-0.23.2/Cargo.toml 2023-11-21T23:35:17.275900+00:00 @@ -128,14 +128,6 @@ "test-util", ]