From 3d1774fa349b79f9b13e7ed61b424e5b72aa6a4f Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 8 Jul 2026 11:46:55 +0200 Subject: [PATCH] Update to final version 1.4.0 The version is 1.4.0.2 due to previous versioning issue, but the crate archive content matches the upstream 1.4.0. Resolves: RHEL-171291 --- .gitignore | 4 ++ rust-sequoia-sq-mldsa-alias.patch | 2 +- rust-sequoia-sq.spec | 27 +++++++---- sequoia-sq-fix-metadata.diff | 81 +++++++++++++++++++++++++++++++ sources | 4 +- vendor.toml | 10 ---- 6 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 sequoia-sq-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 3a6db22..4c89bb8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,7 @@ /sequoia-sq-1.3.1.1.tar.gz /sequoia-sq-vendor-1.4.0.1.tar.gz /sequoia-sq-1.4.0.1.tar.gz +/sequoia-sq-vendor-1.4.0.tar.gz +/sequoia-sq-1.4.0.crate +/sequoia-sq-1.4.0.2.crate +/sequoia-sq-vendor-1.4.0.2.tar.gz diff --git a/rust-sequoia-sq-mldsa-alias.patch b/rust-sequoia-sq-mldsa-alias.patch index 763e60c..bf621f7 100644 --- a/rust-sequoia-sq-mldsa-alias.patch +++ b/rust-sequoia-sq-mldsa-alias.patch @@ -3,9 +3,9 @@ index f238bf4..b8896a2 100644 --- a/src/cli/key.rs +++ b/src/cli/key.rs @@ -105,7 +105,9 @@ pub enum CipherSuite { - Rsa4k, #[default] Cv25519, + Cv448, + #[value(alias("mldsa65"))] MLDSA65_Ed25519, + #[value(alias("mldsa87"))] diff --git a/rust-sequoia-sq.spec b/rust-sequoia-sq.spec index b1ea285..4d88d47 100644 --- a/rust-sequoia-sq.spec +++ b/rust-sequoia-sq.spec @@ -9,29 +9,39 @@ Name: rust-sequoia-sq -Version: 1.4.0.1 +Version: 1.4.0.2 Release: %autorelease Summary: Command-line frontends for Sequoia License: LGPL-2.0-or-later URL: https://crates.io/crates/sequoia-sq -# The version 1.4.0 upstream + patches from pqc branches -# Generated using: -# git archive --format=tar.gz --prefix sequoia-sq-1.4.0.1/ -o ../sequoia-sq-1.4.0.1.tar.gz pqc -Source0: %{crate}-%{version}.tar.gz - +# Upstream version 1.4.0 adjusted to 1.4.0.2 to fix sorting due to +# previously using manually created tarball with verison 1.4.0.1 +# based on the pre-release upstream version 1.4.0 +Source0: %{crates_source} # Generated using cargo-vendor-filterer: +# cargo download %%{crate}==1.4.0 > %%{crate}-%%{version}.crate +# tar xf %%{crate}-%%{version}.crate +# pushd %%{crate}-%%{version} # cargo vendor-filterer --platform x86_64-unknown-linux-gnu \ # --platform powerpc64le-unknown-linux-gnu \ # --platform aarch64-unknown-linux-gnu \ # --platform i686-unknown-linux-gnu \ # --platform s390x-unknown-linux-gnu \ # --all-features -# tar -czf ../sequoia-sq-vendor-1.4.0.1.tar.gz vendor +# tar -czf ../%%{crate}-vendor-%%{version}.tar.gz vendor Source1: %{crate}-vendor-%{version}.tar.gz Source3: vendor.toml +# Manually created patch for downstream crate metadata changes +# * switch crypto backend from Nettle to OpenSSL +# * exclude files that are only useful for upstream development +# * drop automated generation of upstream integration tests +# * drop features for unsupported crypto backends +Patch: sequoia-sq-fix-metadata.diff +# Backward comatibility for algorithm names from pre-release snapshot Patch1: rust-sequoia-sq-mldsa-alias.patch + %if 0%{?rhel} BuildRequires: rust-toolset %else @@ -47,7 +57,6 @@ BuildRequires: capnproto BuildRequires: capnproto-devel BuildRequires: clang -BuildRequires: cmake >= 3.1 %global _description %{expand: Command-line frontends for Sequoia.} @@ -110,7 +119,7 @@ License: %{shrink: %endif %prep -%autosetup -n %{crate}-%{version} -a1 -p1 +%autosetup -n %{crate}-1.4.0 -a1 -p1 %cargo_prep -N # include full configuration for vendored dependencies cat %{SOURCE3} >> .cargo/config.toml diff --git a/sequoia-sq-fix-metadata.diff b/sequoia-sq-fix-metadata.diff new file mode 100644 index 0000000..387cfc8 --- /dev/null +++ b/sequoia-sq-fix-metadata.diff @@ -0,0 +1,81 @@ +--- sequoia-sq-1.4.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-sq-1.4.0/Cargo.toml 2026-05-27T13:39:39.992697+00:00 +@@ -49,6 +49,12 @@ + ] + license = "LGPL-2.0-or-later" + repository = "https://gitlab.com/sequoia-pgp/sequoia-sq" ++exclude = [ ++ "/deny.toml", ++ "/Dockerfile", ++ "/sq.subplot", ++ "/sq-subplot.md", ++] + + [badges.gitlab] + repository = "sequoia-pgp/sequoia-sq" +@@ -57,18 +63,10 @@ + [features] + allow-experimental-crypto = ["sequoia-openpgp/allow-experimental-crypto"] + allow-variable-time-crypto = ["sequoia-openpgp/allow-variable-time-crypto"] +-crypto-botan = ["sequoia-openpgp/crypto-botan"] +-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"] +-crypto-cng = ["sequoia-openpgp/crypto-cng"] + crypto-nettle = ["sequoia-openpgp/crypto-nettle"] + crypto-openssl = ["sequoia-openpgp/crypto-openssl"] + crypto-rust = ["sequoia-openpgp/crypto-rust"] +-default = ["crypto-nettle"] +-subplot = [ +- "culpa", +- "subplot-build", +- "subplotlib", +-] ++default = ["crypto-openssl"] + + [[bin]] + name = "sq" +@@ -79,11 +77,6 @@ + name = "integration" + path = "tests/integration.rs" + +-[[test]] +-name = "sq-subplot" +-path = "tests/sq-subplot.rs" +-required-features = ["subplot"] +- + [dependencies.aho-corasick] + version = "1" + +@@ -111,10 +104,6 @@ + version = ">=0.7, <2" + default-features = false + +-[dependencies.culpa] +-version = "1" +-optional = true +- + [dependencies.dirs] + version = ">=5, <7" + +@@ -186,10 +175,6 @@ + [dependencies.serde] + version = "1.0.137" + features = ["derive"] +- +-[dependencies.subplotlib] +-version = ">=0.11, <0.14" +-optional = true + + [dependencies.tempfile] + version = "3.1" +@@ -298,10 +283,6 @@ + version = "1.0.137" + features = ["derive"] + +-[build-dependencies.subplot-build] +-version = ">=0.11, <0.14" +-optional = true +- + [build-dependencies.terminal_size] + version = ">=0.2.6, <0.5" + + diff --git a/sources b/sources index 6744a54..837de0c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (sequoia-sq-vendor-1.4.0.1.tar.gz) = 57cbdb583364dfa2c6b3c445677cc46f59e5cf723573e5813b686ef3cc8e5cd23f2b8f9bdff176eeb3187b9efe86f57b64afadcefa8508fef98f23f191d2cf6b -SHA512 (sequoia-sq-1.4.0.1.tar.gz) = 10d21460425e90e60f2842189387c8cb42a42d08ae04c29a6e0bedc6fefed73f24c3b6eff885becea593a2ee847c78ae3f8c8c52100bf3890160e62f51b2debc +SHA512 (sequoia-sq-1.4.0.2.crate) = 53a776ddd367e3d327770aff964f64010618a9ebc8380f57316fd65b3b76288bf8232ae4090d29b3bb57cc48092dfd932471dcef81b0672ba6e5ddbb060985f1 +SHA512 (sequoia-sq-vendor-1.4.0.2.tar.gz) = 11fdda1f6fdad08c254e8a5810e6b559ad037e3e95a94f2afc96904c66d10e653852d56d5a32ffe126ed8da9ef4093e38c50b32b1635a1ae6d848fcd7e3ea690 diff --git a/vendor.toml b/vendor.toml index 1519f24..11bdee2 100644 --- a/vendor.toml +++ b/vendor.toml @@ -1,16 +1,6 @@ [source.crates-io] replace-with = "vendored-sources" -[source."git+https://gitlab.com/jjelen/sequoia-policy-config?branch=jjelen/pqc-ossl"] -git = "https://gitlab.com/jjelen/sequoia-policy-config" -branch = "jjelen/pqc-ossl" -replace-with = "vendored-sources" - -[source."git+https://gitlab.com/jjelen/sequoia?branch=jjelen/pqc-ossl"] -git = "https://gitlab.com/jjelen/sequoia" -branch = "jjelen/pqc-ossl" -replace-with = "vendored-sources" - [source.vendored-sources] directory = "vendor"