From 78019b4cd749ad5659cbf6b9dc824b50d3891359 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 17 Jul 2022 15:31:36 +0200 Subject: [PATCH] Update to version 0.21.2; Fixes RHBZ#2058876 --- .gitignore | 1 + .rust2rpm.conf | 8 + rust-trust-dns-resolver.spec | 254 +++++++-------------------- sources | 2 +- trust-dns-resolver-fix-metadata.diff | 10 +- 5 files changed, 75 insertions(+), 200 deletions(-) create mode 100644 .rust2rpm.conf diff --git a/.gitignore b/.gitignore index 1b56547..d5c69f8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /trust-dns-resolver-0.20.0.crate /trust-dns-resolver-0.20.1.crate /trust-dns-resolver-0.20.3.crate +/trust-dns-resolver-0.21.2.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..781e933 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,8 @@ +[DEFAULT] +unwanted-features = + rustls + tokio-rustls + webpki-roots + dns-over-https-rustls + dns-over-rustls + dnssec-ring diff --git a/rust-trust-dns-resolver.spec b/rust-trust-dns-resolver.spec index c528f47..9e450af 100644 --- a/rust-trust-dns-resolver.spec +++ b/rust-trust-dns-resolver.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 21 # * /etc/hosts and /etc/resolv.conf are not available in mock # * no internet connectivity in mock %bcond_with check @@ -7,7 +7,7 @@ %global crate trust-dns-resolver Name: rust-%{crate} -Version: 0.20.3 +Version: 0.21.2 Release: %autorelease Summary: Trust-DNS is a safe and secure DNS library @@ -20,11 +20,8 @@ Source: %{crates_source} Patch0: trust-dns-resolver-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Trust-DNS is a safe and secure DNS library. This Resolver library uses the @@ -40,13 +37,14 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -54,11 +52,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+backtrace-devel Summary: %{summary} @@ -66,11 +64,11 @@ BuildArch: noarch %description -n %{name}+backtrace-devel %{_description} -This package contains library source intended for building other packages -which use "backtrace" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dns-over-https-devel Summary: %{summary} @@ -78,23 +76,11 @@ BuildArch: noarch %description -n %{name}+dns-over-https-devel %{_description} -This package contains library source intended for building other packages -which use "dns-over-https" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dns-over-https" feature of the "%{crate}" crate. %files -n %{name}+dns-over-https-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/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 "dns-over-https-rustls" feature of "%{crate}" crate. - -%files -n %{name}+dns-over-https-rustls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dns-over-native-tls-devel Summary: %{summary} @@ -102,11 +88,11 @@ BuildArch: noarch %description -n %{name}+dns-over-native-tls-devel %{_description} -This package contains library source intended for building other packages -which use "dns-over-native-tls" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dns-over-native-tls" feature of the "%{crate}" crate. %files -n %{name}+dns-over-native-tls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dns-over-openssl-devel Summary: %{summary} @@ -114,23 +100,11 @@ BuildArch: noarch %description -n %{name}+dns-over-openssl-devel %{_description} -This package contains library source intended for building other packages -which use "dns-over-openssl" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dns-over-openssl" feature of the "%{crate}" crate. %files -n %{name}+dns-over-openssl-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/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 "dns-over-rustls" feature of "%{crate}" crate. - -%files -n %{name}+dns-over-rustls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dns-over-tls-devel Summary: %{summary} @@ -138,11 +112,11 @@ BuildArch: noarch %description -n %{name}+dns-over-tls-devel %{_description} -This package contains library source intended for building other packages -which use "dns-over-tls" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dns-over-tls" feature of the "%{crate}" crate. %files -n %{name}+dns-over-tls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dnssec-devel Summary: %{summary} @@ -150,11 +124,11 @@ BuildArch: noarch %description -n %{name}+dnssec-devel %{_description} -This package contains library source intended for building other packages -which use "dnssec" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dnssec" feature of the "%{crate}" crate. %files -n %{name}+dnssec-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+dnssec-openssl-devel Summary: %{summary} @@ -162,35 +136,11 @@ BuildArch: noarch %description -n %{name}+dnssec-openssl-devel %{_description} -This package contains library source intended for building other packages -which use "dnssec-openssl" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dnssec-openssl" feature of the "%{crate}" crate. %files -n %{name}+dnssec-openssl-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/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 "dnssec-ring" feature of "%{crate}" crate. - -%files -n %{name}+dnssec-ring-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+mdns-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+mdns-devel %{_description} - -This package contains library source intended for building other packages -which use "mdns" feature of "%{crate}" crate. - -%files -n %{name}+mdns-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+resolv-conf-devel Summary: %{summary} @@ -198,23 +148,11 @@ BuildArch: noarch %description -n %{name}+resolv-conf-devel %{_description} -This package contains library source intended for building other packages -which use "resolv-conf" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "resolv-conf" feature of the "%{crate}" crate. %files -n %{name}+resolv-conf-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/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 "rustls" feature of "%{crate}" crate. - -%files -n %{name}+rustls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -222,11 +160,11 @@ BuildArch: noarch %description -n %{name}+serde-devel %{_description} -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-config-devel Summary: %{summary} @@ -234,11 +172,11 @@ BuildArch: noarch %description -n %{name}+serde-config-devel %{_description} -This package contains library source intended for building other packages -which use "serde-config" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde-config" feature of the "%{crate}" crate. %files -n %{name}+serde-config-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+system-config-devel Summary: %{summary} @@ -246,11 +184,11 @@ BuildArch: noarch %description -n %{name}+system-config-devel %{_description} -This package contains library source intended for building other packages -which use "system-config" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "system-config" feature of the "%{crate}" crate. %files -n %{name}+system-config-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+testing-devel Summary: %{summary} @@ -258,11 +196,11 @@ BuildArch: noarch %description -n %{name}+testing-devel %{_description} -This package contains library source intended for building other packages -which use "testing" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "testing" feature of the "%{crate}" crate. %files -n %{name}+testing-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+tokio-devel Summary: %{summary} @@ -270,11 +208,11 @@ BuildArch: noarch %description -n %{name}+tokio-devel %{_description} -This package contains library source intended for building other packages -which use "tokio" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+tokio-native-tls-devel Summary: %{summary} @@ -282,11 +220,11 @@ BuildArch: noarch %description -n %{name}+tokio-native-tls-devel %{_description} -This package contains library source intended for building other packages -which use "tokio-native-tls" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio-native-tls" feature of the "%{crate}" crate. %files -n %{name}+tokio-native-tls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+tokio-openssl-devel Summary: %{summary} @@ -294,11 +232,11 @@ BuildArch: noarch %description -n %{name}+tokio-openssl-devel %{_description} -This package contains library source intended for building other packages -which use "tokio-openssl" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio-openssl" feature of the "%{crate}" crate. %files -n %{name}+tokio-openssl-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+tokio-runtime-devel Summary: %{summary} @@ -306,83 +244,11 @@ BuildArch: noarch %description -n %{name}+tokio-runtime-devel %{_description} -This package contains library source intended for building other packages -which use "tokio-runtime" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "tokio-runtime" feature of the "%{crate}" crate. %files -n %{name}+tokio-runtime-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/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 "tokio-rustls" feature of "%{crate}" crate. - -%files -n %{name}+tokio-rustls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+trust-dns-https-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+trust-dns-https-devel %{_description} - -This package contains library source intended for building other packages -which use "trust-dns-https" feature of "%{crate}" crate. - -%files -n %{name}+trust-dns-https-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+trust-dns-native-tls-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+trust-dns-native-tls-devel %{_description} - -This package contains library source intended for building other packages -which use "trust-dns-native-tls" feature of "%{crate}" crate. - -%files -n %{name}+trust-dns-native-tls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+trust-dns-openssl-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+trust-dns-openssl-devel %{_description} - -This package contains library source intended for building other packages -which use "trust-dns-openssl" feature of "%{crate}" crate. - -%files -n %{name}+trust-dns-openssl-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - -%package -n %{name}+trust-dns-rustls-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+trust-dns-rustls-devel %{_description} - -This package contains library source intended for building other packages -which use "trust-dns-rustls" feature of "%{crate}" crate. - -%files -n %{name}+trust-dns-rustls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/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 "webpki-roots" feature of "%{crate}" crate. - -%files -n %{name}+webpki-roots-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 37012e1..327e1bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trust-dns-resolver-0.20.3.crate) = ebb2fe01e1ea56d5cb120ebc6bae2a3d8c2344a219eadd24afba1744e83b4f381ab765ef9d64ccc27bfae5f02b92a8b357f35200cc74ce23734b8ebe5e418e05 +SHA512 (trust-dns-resolver-0.21.2.crate) = 3570c4345dc7a561ecac3de48074f104191a3716a3872e176466834e5abfc77e29e29626d2d027f02b408c48fc426b52440525e12ec5f9a1d20c14eb0b353904 diff --git a/trust-dns-resolver-fix-metadata.diff b/trust-dns-resolver-fix-metadata.diff index 0ec986f..39422f7 100644 --- a/trust-dns-resolver-fix-metadata.diff +++ b/trust-dns-resolver-fix-metadata.diff @@ -1,15 +1,15 @@ ---- trust-dns-resolver-0.20.3/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ trust-dns-resolver-0.20.3/Cargo.toml 2021-06-07T13:49:24.078244+00:00 -@@ -128,12 +128,9 @@ +--- trust-dns-resolver-0.21.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ trust-dns-resolver-0.21.2/Cargo.toml 2022-07-17T12:23:23.156278+00:00 +@@ -115,12 +115,9 @@ + dnssec-openssl = ["dnssec", "trust-dns-proto/dnssec-openssl"] dnssec-ring = ["dnssec", "trust-dns-proto/dnssec-ring"] - mdns = ["trust-dns-proto/mdns"] serde-config = ["serde", "trust-dns-proto/serde-config"] -system-config = ["ipconfig", "resolv-conf"] +system-config = ["resolv-conf"] testing = [] tokio-runtime = ["tokio/rt", "trust-dns-proto/tokio-runtime"] -[target."cfg(windows)".dependencies.ipconfig] --version = "0.2.2" +-version = "0.3.0" -optional = true [badges.codecov] branch = "main"