Compare commits

..

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

5 changed files with 17 additions and 27 deletions

18
.gitignore vendored
View File

@ -1,26 +1,8 @@
/rpm-sequoia-1.0.1.crate
/rpm-sequoia-1.1.2.crate
/rpm-sequoia-1.2.0.crate
/rpm-sequoia-1.3.0.crate
/rpm-sequoia-1.4.0.crate
/rpm-sequoia-1.4.0-vendor.tar.xz
/rpm-sequoia-1.4.1.crate
/rpm-sequoia-1.4.1-vendor.tar.xz
/rpm-sequoia-1.5.0.crate
/rpm-sequoia-1.5.0-vendor.tar.xz
/rpm-sequoia-1.6.0.crate
/rpm-sequoia-1.6.0-vendor.tar.xz
/rpm-sequoia-1.9.0.1.tar.gz
/rpm-sequoia-vendor-1.9.0.1.tar.gz
/rpm-sequoia-1.9.0.2.tar.gz
/rpm-sequoia-vendor-1.9.0.2.tar.gz
/rpm-sequoia-1.9.0.3.tar.gz
/rpm-sequoia-vendor-1.9.0.3.tar.gz
/rpm-sequoia-1.10.1.1.tar.gz
/rpm-sequoia-vendor-1.10.1.1.tar.gz
/rpm-sequoia-1.10.2.1.tar.gz
/rpm-sequoia-vendor-1.10.2.1.tar.gz
/rpm-sequoia-1.10.2.2.tar.gz
/rpm-sequoia-vendor-1.10.2.2.tar.gz
/rpm-sequoia-1.10.2.3.tar.gz
/rpm-sequoia-vendor-1.10.2.3.tar.gz

View File

@ -1,6 +1,6 @@
--- !Policy
product_versions:
- rhel-10
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}

View File

@ -4,15 +4,15 @@
%global crate rpm-sequoia
Name: rust-rpm-sequoia
Version: 1.10.2.3
Version: 1.10.2.1
Release: %autorelease
Summary: Implementation of the RPM PGP interface using Sequoia
License: LGPL-2.0-or-later
URL: https://crates.io/crates/rpm-sequoia
# The version 1.10.2 upstream + updated dependencies to support PQC and fix RUSTSEC issues
# The version 1.10.2 upstream + patches to use pqc branches in openpgp and pqc-ossl in policy-config
# Generated using:
# git archive --format=tar.gz --prefix rpm-sequoia-1.10.2.3/ -o ../rpm-sequoia-1.10.2.3.tar.gz pqc
# git archive --format=tar.gz --prefix rpm-sequoia-1.10.2.1/ -o ../rpm-sequoia-1.10.2.1.tar.gz pqc
Source: %{crate}-%{version}.tar.gz
# Generated using cargo-vendor-filterer:
# cargo vendor-filterer --platform x86_64-unknown-linux-gnu \
@ -21,7 +21,7 @@ Source: %{crate}-%{version}.tar.gz
# --platform i686-unknown-linux-gnu \
# --platform s390x-unknown-linux-gnu \
# --all-features
# tar -czf ../rpm-sequoia-vendor-1.10.2.3.tar.gz vendor
# tar -czf ../rpm-sequoia-vendor-1.10.2.1.tar.gz vendor
Source1: %{crate}-vendor-%{version}.tar.gz
Source2: vendor.toml
@ -53,8 +53,6 @@ Summary: %{summary}
License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
Requires: openssl-libs >= 1:3.5.1-4.el10_1
%description -n %{crate} %{_description}
%files -n %{crate}

View File

@ -1,2 +1,2 @@
SHA512 (rpm-sequoia-1.10.2.3.tar.gz) = d0e43aaa18ec0c2d50daa4c2dd04dabf3d62d38f37f94b76ed43b520aba225118aae52adb0e5d89c8e80bed076233400734e29a97b523045be9192a9c56c3980
SHA512 (rpm-sequoia-vendor-1.10.2.3.tar.gz) = 31e301acc16372849753fc7be702a6cb78a61a3405c2d5666b3d0ead3b4ae11d6afde3c78cc5199fdb5509b814c7ec3361bbe59a0d10101aed23dbf8cbdbbbfe
SHA512 (rpm-sequoia-1.10.2.1.tar.gz) = 1130aefcf21aab2ff86c4e9f2f2a8012312ae56a32205235a6720c747da4b192cb631dfc028416167379ff4b291eedcea7e11801496150ef371cd768c69f34ed
SHA512 (rpm-sequoia-vendor-1.10.2.1.tar.gz) = bd13bacb80dc483e778137826716872b735529275dc1eda03fa36a8ac9b8cfc0dfa1810556d26c4cd72f846fab67c06236e3b5fc6095ab07ee33bf82b9f8c1ad

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"