Compare commits

..

No commits in common. "c10s" and "c10s-cve" have entirely different histories.

5 changed files with 18 additions and 34 deletions

2
.gitignore vendored
View File

@ -6,5 +6,3 @@
/sequoia-sqv-vendor-1.3.0.1.tar.gz
/sequoia-sqv-1.3.0.2.tar.gz
/sequoia-sqv-vendor-1.3.0.2.tar.gz
/sequoia-sqv-1.5.0.crate
/sequoia-sqv-vendor-1.5.0.tar.gz

View File

@ -6,34 +6,28 @@
%global __brp_mangle_shebangs_exclude_from ^/usr/src/debug/.*$
Name: rust-sequoia-sqv
Version: 1.5.0
Version: 1.3.0.2
Release: %autorelease
Summary: Simple OpenPGP signature verification program
License: LGPL-2.0-or-later
URL: https://crates.io/crates/sequoia-sqv
Source: %{crates_source}
# The version 1.3.0 upstream + patches from jjelen/pqc branch
# Generated using:
# git archive --format=tar.gz --prefix sequoia-sqv-1.3.0.2/ -o ../sequoia-sqv-1.3.0.2.tar.gz jjelen/pqc
Source0: %{crate}-%{version}.tar.gz
# Generated using cargo-vendor-filterer:
# cargo download %%{crate}==%%{version} > %%{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 ../%%{crate}-vendor-%%{version}.tar.gz vendor
# tar -czf ../sequoia-sqv-vendor-1.3.0.2.tar.gz vendor
Source1: %{crate}-vendor-%{version}.tar.gz
Source2: 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 features for unsupported crypto backends
Patch: sequoia-sqv-fix-metadata.diff
ExclusiveArch: %{rust_arches}
BuildRequires: clang
@ -96,7 +90,6 @@ License: %{shrink:
%prep
%autosetup -n %{crate}-%{version} -N -a1
%autopatch -M 99 -p1
%cargo_prep -N
# include full configuration for vendored dependencies
cat %{SOURCE2} >> .cargo/config.toml

View File

@ -1,17 +0,0 @@
--- sequoia-sqv-1.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
+++ sequoia-sqv-1.5.0/Cargo.toml 2025-03-08T11:15:16.145149+00:00
@@ -54,13 +54,9 @@
status = "actively-developed"
[features]
-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"]
+default = ["crypto-openssl"]
[[bin]]
name = "sqv"

View File

@ -1,2 +1,2 @@
SHA512 (sequoia-sqv-1.5.0.crate) = 90511824442bc8fe2a073a666aa4359c8529579d04098ab812bc048dec695ae493b834320d9c786219d1c20935d59620ab2a752e3cd7885aa850cf83722502a7
SHA512 (sequoia-sqv-vendor-1.5.0.tar.gz) = c6a75ead45db82d4a2d368f97e7bd82423b125219c21e465dd62b73a027aefd4c124081dd30a275ef7f49b88f1d2226aad51892ce89b5ac644ac1e2d67b2ecab
SHA512 (sequoia-sqv-1.3.0.2.tar.gz) = e3a3b9bfff021625099eb2272a4242a37f4c548849664dbc992f20c4f4da5b96f6ff5ed20587f64ebd428024ba4f058e216dcf2af7d192999aaeb31e008e901c
SHA512 (sequoia-sqv-vendor-1.3.0.2.tar.gz) = a004b5e17b2530a21047072301fd8ebb705a76e4784e17865878f82a4d7b4f6d2dfb666c4a62832d95caac1abd9a1217c71c14e230294c1c754709cf895d3774

View File

@ -1,5 +1,15 @@
[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"