diff --git a/.gitignore b/.gitignore index b57bf3b..8fcf4c7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /trust-dns-proto-0.20.0.crate /trust-dns-proto-0.20.1.crate /trust-dns-proto-0.20.3.crate +/trust-dns-proto-0.21.2.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..77f87a3 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,14 @@ +[DEFAULT] +unwanted-features = + js-sys + ring + rustls + rustls-pemfile + tokio-rustls + wasm-bindgen-crate + webpki + webpki-roots + dns-over-https-rustls + dns-over-rustls + dnssec-ring + wasm-bindgen diff --git a/rust-trust-dns-proto.spec b/rust-trust-dns-proto.spec index efae7be..5c86d09 100644 --- a/rust-trust-dns-proto.spec +++ b/rust-trust-dns-proto.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate trust-dns-proto Name: rust-%{crate} -Version: 0.20.3 +Version: 0.21.2 Release: %autorelease Summary: Trust-DNS is a safe and secure DNS library @@ -13,13 +13,13 @@ Summary: Trust-DNS is a safe and secure DNS library License: MIT or ASL 2.0 URL: https://crates.io/crates/trust-dns-proto Source: %{crates_source} +# Initial patched metadata +# * add missing "tokio/io-util" feature +Patch0: trust-dns-proto-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 is the foundational DNS @@ -33,13 +33,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} @@ -47,11 +48,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} @@ -59,11 +60,71 @@ 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}+bytes-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+bytes-devel %{_description} + +This package contains library source intended for building other packages which +use the "bytes" feature of the "%{crate}" crate. + +%files -n %{name}+bytes-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+dns-over-https-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-https-devel %{_description} + +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 %{crate_instdir}/Cargo.toml + +%package -n %{name}+dns-over-native-tls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-native-tls-devel %{_description} + +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 %{crate_instdir}/Cargo.toml + +%package -n %{name}+dns-over-openssl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-openssl-devel %{_description} + +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 %{crate_instdir}/Cargo.toml + +%package -n %{name}+dns-over-tls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-tls-devel %{_description} + +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 %{crate_instdir}/Cargo.toml %package -n %{name}+dnssec-devel Summary: %{summary} @@ -71,11 +132,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} @@ -83,37 +144,35 @@ 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 +%ghost %{crate_instdir}/Cargo.toml -%ifnarch ppc64le s390x -%package -n %{name}+dnssec-ring-devel +%package -n %{name}+h2-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+dnssec-ring-devel %{_description} +%description -n %{name}+h2-devel %{_description} -This package contains library source intended for building other packages -which use "dnssec-ring" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "h2" feature of the "%{crate}" crate. -%files -n %{name}+dnssec-ring-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%endif +%files -n %{name}+h2-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+js-sys-devel +%package -n %{name}+http-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+js-sys-devel %{_description} +%description -n %{name}+http-devel %{_description} -This package contains library source intended for building other packages -which use "js-sys" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "http" feature of the "%{crate}" crate. -%files -n %{name}+js-sys-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+http-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+mdns-devel Summary: %{summary} @@ -121,37 +180,35 @@ 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. +This package contains library source intended for building other packages which +use the "mdns" feature of the "%{crate}" crate. %files -n %{name}+mdns-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+openssl-devel +%package -n %{name}+native-tls-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+openssl-devel %{_description} +%description -n %{name}+native-tls-devel %{_description} -This package contains library source intended for building other packages -which use "openssl" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "native-tls" feature of the "%{crate}" crate. -%files -n %{name}+openssl-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+native-tls-devel +%ghost %{crate_instdir}/Cargo.toml -%ifnarch ppc64le s390x -%package -n %{name}+ring-devel +%package -n %{name}+openssl-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+ring-devel %{_description} +%description -n %{name}+openssl-devel %{_description} -This package contains library source intended for building other packages -which use "ring" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "openssl" feature of the "%{crate}" crate. -%files -n %{name}+ring-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%endif +%files -n %{name}+openssl-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -159,11 +216,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} @@ -171,11 +228,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}+socket2-devel Summary: %{summary} @@ -183,11 +240,11 @@ BuildArch: noarch %description -n %{name}+socket2-devel %{_description} -This package contains library source intended for building other packages -which use "socket2" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+testing-devel Summary: %{summary} @@ -195,11 +252,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} @@ -207,47 +264,47 @@ 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-runtime-devel +%package -n %{name}+tokio-native-tls-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+tokio-runtime-devel %{_description} +%description -n %{name}+tokio-native-tls-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-native-tls" feature of the "%{crate}" crate. -%files -n %{name}+tokio-runtime-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+tokio-native-tls-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+wasm-bindgen-devel +%package -n %{name}+tokio-openssl-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+wasm-bindgen-devel %{_description} +%description -n %{name}+tokio-openssl-devel %{_description} -This package contains library source intended for building other packages -which use "wasm-bindgen" 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}+wasm-bindgen-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+tokio-openssl-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+wasm-bindgen-crate-devel +%package -n %{name}+tokio-runtime-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+wasm-bindgen-crate-devel %{_description} +%description -n %{name}+tokio-runtime-devel %{_description} -This package contains library source intended for building other packages -which use "wasm-bindgen-crate" 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}+wasm-bindgen-crate-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+tokio-runtime-devel +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index fc89fe0..0a0f93f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trust-dns-proto-0.20.3.crate) = 0a9366bea38d52498fbf1dc7250c07c8c4fe9fb95df3756680905b539352bebb13cd3c5cae404c48f00cf8ebb49ede11b86386a509a35a841744d88b05bd0bde +SHA512 (trust-dns-proto-0.21.2.crate) = e27b2bef0d4bfc90ffe19cd4f998b9d654447b41317ec9b013db628dc09e589b8496adef769575bc7f5b0451dbff912d26cb6aa067b74c2070f6ee9dac5e4ef6 diff --git a/trust-dns-proto-fix-metadata.diff b/trust-dns-proto-fix-metadata.diff new file mode 100644 index 0000000..bc60f2b --- /dev/null +++ b/trust-dns-proto-fix-metadata.diff @@ -0,0 +1,20 @@ +--- trust-dns-proto-0.21.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ trust-dns-proto-0.21.2/Cargo.toml 2022-07-17T12:50:16.412525+00:00 +@@ -182,7 +182,7 @@ + + [dev-dependencies.tokio] + version = "1.0" +-features = ["rt", "time", "macros"] ++features = ["io-util", "rt", "time", "macros"] + + [features] + default = ["tokio-runtime"] +@@ -198,7 +198,7 @@ + mdns = ["socket2/all"] + serde-config = ["serde", "url/serde"] + testing = [] +-tokio-runtime = ["tokio/net", "tokio/rt", "tokio/time", "tokio/rt-multi-thread"] ++tokio-runtime = ["tokio/io-util", "tokio/net", "tokio/rt", "tokio/time", "tokio/rt-multi-thread"] + wasm-bindgen = ["wasm-bindgen-crate", "js-sys"] + [badges.codecov] + branch = "main"