From 0ba6e7abb7b40634d61de3c962a3b0315bd0cbf4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 14 Dec 2023 13:57:40 +0100 Subject: [PATCH] Update to version 0.9.0; Fixes RHBZ#2253296 --- .gitignore | 1 + rust-sequoia-wot.spec | 76 +++++++++++++++++++++++++----- sequoia-wot-fix-metadata-auto.diff | 14 ++++-- sequoia-wot-fix-metadata.diff | 49 ++++++++++--------- sources | 2 +- 5 files changed, 99 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 804fe23..9959450 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sequoia-wot-0.5.0.crate +/sequoia-wot-0.9.0.crate diff --git a/rust-sequoia-wot.spec b/rust-sequoia-wot.spec index 4645d92..52f877c 100644 --- a/rust-sequoia-wot.spec +++ b/rust-sequoia-wot.spec @@ -1,25 +1,24 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global crate sequoia-wot Name: rust-sequoia-wot -Version: 0.5.0 +Version: 0.9.0 Release: %autorelease Summary: Implementation of OpenPGP's web of trust License: LGPL-2.0-or-later URL: https://crates.io/crates/sequoia-wot Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: sequoia-wot-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes -# * bump sequoia-net dependency from 0.26 to 0.27 -# * bump sequoia-policy-config dependency from 0.5 to 0.6 # * expose features for crypto backends without setting a default +# * drop support for writing graphs in DOT format Patch: sequoia-wot-fix-metadata.diff -BuildRequires: rust-packaging >= 23 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: An implementation of OpenPGP's web of trust.} @@ -28,20 +27,23 @@ An implementation of OpenPGP's web of trust.} %package -n %{crate} Summary: %{summary} +# (Apache-2.0 OR MIT) AND BSD-3-Clause # (MIT OR Apache-2.0) AND Unicode-DFS-2016 # Apache-2.0 +# Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause OR Apache-2.0 OR MIT # BSL-1.0 # LGPL-2.0-or-later # LGPL-3.0 OR GPL-2.0 OR GPL-3.0 -# LGPL-3.0+ # MIT # MIT OR Apache-2.0 # MIT OR Apache-2.0 OR Zlib +# MPL-2.0 # Unlicense OR MIT # Zlib OR Apache-2.0 OR MIT -License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND LGPL-3.0+ AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) +License: LGPL-2.0-or-later AND Apache-2.0 AND BSD-3-Clause AND BSL-1.0 AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (LGPL-3.0 OR GPL-2.0 OR GPL-3.0) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -84,6 +86,54 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+clap-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+clap-devel %{_description} + +This package contains library source intended for building other packages which +use the "clap" feature of the "%{crate}" crate. + +%files -n %{name}+clap-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+clap_complete-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+clap_complete-devel %{_description} + +This package contains library source intended for building other packages which +use the "clap_complete" feature of the "%{crate}" crate. + +%files -n %{name}+clap_complete-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+clap_mangen-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+clap_mangen-devel %{_description} + +This package contains library source intended for building other packages which +use the "clap_mangen" feature of the "%{crate}" crate. + +%files -n %{name}+clap_mangen-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cli-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cli-devel %{_description} + +This package contains library source intended for building other packages which +use the "cli" feature of the "%{crate}" crate. + +%files -n %{name}+cli-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+crypto-nettle-devel Summary: %{summary} BuildArch: noarch @@ -109,15 +159,17 @@ use the "crypto-openssl" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep +# drop tests that use the disabled DOT output format +rm tests/tests.rs %generate_buildrequires %cargo_generate_buildrequires -f crypto-nettle,crypto-openssl %build %cargo_build -f crypto-nettle -%cargo_license_summary -f crypto-nettle +%{cargo_license_summary -f crypto-nettle} %{cargo_license -f crypto-nettle} > LICENSE.dependencies %install @@ -135,8 +187,8 @@ install -Dpm 0644 target/release/build/%{crate}-*/out/_sq-wot \ %if %{with check} %check -# run tests with both cryptographic backends -# skip test that requires a file which is not included in published crates +# * run tests with both cryptographic backends +# * skip test that requires a file which is not included in published crates %cargo_test -f crypto-nettle -- -- --skip gpg_trust_roots %cargo_test -f crypto-openssl -- -- --skip gpg_trust_roots %endif diff --git a/sequoia-wot-fix-metadata-auto.diff b/sequoia-wot-fix-metadata-auto.diff index 58a8f91..7b44103 100644 --- a/sequoia-wot-fix-metadata-auto.diff +++ b/sequoia-wot-fix-metadata-auto.diff @@ -1,13 +1,17 @@ ---- sequoia-wot-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sequoia-wot-0.5.0/Cargo.toml 2023-04-14T14:47:28.853432+00:00 -@@ -126,10 +126,5 @@ - features = ["crypto-nettle"] +--- sequoia-wot-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-wot-0.9.0/Cargo.toml 2023-12-14T10:00:59.571434+00:00 +@@ -137,13 +137,6 @@ + ] default-features = false -[target."cfg(windows)".dev-dependencies.sequoia-openpgp] -version = "1" --features = ["crypto-cng"] +-features = [ +- "crypto-cng", +- "__implicit-crypto-backend-for-tests", +-] -default-features = false - [badges.maintenance] status = "actively-developed" ++ diff --git a/sequoia-wot-fix-metadata.diff b/sequoia-wot-fix-metadata.diff index 88b197d..67e2887 100644 --- a/sequoia-wot-fix-metadata.diff +++ b/sequoia-wot-fix-metadata.diff @@ -1,34 +1,33 @@ ---- sequoia-wot-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sequoia-wot-0.5.0/Cargo.toml 2023-04-14T14:49:27.592927+00:00 -@@ -75,7 +75,7 @@ - version = "0.1" +--- sequoia-wot-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-wot-0.9.0/Cargo.toml 2023-12-14T10:02:17.948709+00:00 +@@ -63,10 +63,6 @@ + [dependencies.crossbeam] + version = "0.8.1" - [dependencies.sequoia-net] --version = "0.26" -+version = "0.27" - default-features = false - - [dependencies.sequoia-openpgp] -@@ -83,7 +83,7 @@ - default-features = false +-[dependencies.dot-writer] +-version = "0.1.3" +-optional = true +- + [dependencies.enumber] + version = "0.3" - [dependencies.sequoia-policy-config] --version = "0.5" -+version = "0.6" - - [dependencies.thiserror] - version = "1.0.2" -@@ -121,9 +121,12 @@ - [build-dependencies.clap_mangen] - version = "0.2" - -+[features] +@@ -124,17 +120,14 @@ + "clap_complete", + "clap_mangen", + ] +crypto-nettle = ["sequoia-openpgp/crypto-nettle"] +crypto-openssl = ["sequoia-openpgp/crypto-openssl"] -+ + default = [ + "cli", +- "dot-writer", + ] + [target."cfg(not(windows))".dev-dependencies.sequoia-openpgp] version = "1" --features = ["crypto-nettle"] +-features = [ +- "crypto-nettle", +- "__implicit-crypto-backend-for-tests", +-] default-features = false [badges.maintenance] diff --git a/sources b/sources index 08b5bdf..46b172f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequoia-wot-0.5.0.crate) = 1785ebcd4f8e9e0e345843eec34d286cc93af90cb485ae68d9be2839a0522feb4add38850fb8ace94ab3e8f952a08abd31d8e69007cc9fa9d2fc0356e920addb +SHA512 (sequoia-wot-0.9.0.crate) = e85e3dd8267f13d7357521963d9168948f2131d1072a544e99588abffa2942be5d45b11a5894e222adda54e34ef70f786e0bc096c8c0dcbaa58cbb9afbf29f2d