Compare commits

..

2 Commits

8 changed files with 88 additions and 65 deletions

View File

@ -1 +0,0 @@
1

22
.gitignore vendored
View File

@ -1,20 +1,2 @@
/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.9.0.3.tar.gz
rpm-sequoia-vendor-1.9.0.3.tar.gz

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

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

View File

@ -1,23 +0,0 @@
/fips-disabled-buildroot-disabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/rust-rpm-sequoia
name: /plans/ci/fips-disabled-buildroot-disabled
/fips-disabled-buildroot-enabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/rust-rpm-sequoia
name: /plans/ci/fips-disabled-buildroot-enabled
/fips-enabled-buildroot-disabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/rust-rpm-sequoia
name: /plans/ci/fips-enabled-buildroot-disabled
/fips-enabled-buildroot-enabled:
plan:
import:
url: https://pkgs.devel.redhat.com/git/tests/rust-rpm-sequoia
name: /plans/ci/fips-enabled-buildroot-enabled

View File

@ -1,18 +1,28 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
# Generated by rust2rpm 27
%bcond check 1
%global crate rpm-sequoia
Name: rust-rpm-sequoia
Version: 1.10.1.1
Version: 1.9.0.3
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.1 upstream + patches to use pqc branches in openpgp and pqc-ossl in policy-config
# The version 1.9.0 upstream + patches to use ossl bindings + pqc in sequoia-openpgp from pqc-ossl branches
# Generated using:
# git archive --format=tar.gz --prefix rpm-sequoia-1.10.1.1/ -o ../rpm-sequoia-1.10.1.1.tar.gz pqc
# git archive --format=tar.gz --prefix ../rpm-sequoia-1.9.0.3/ -o rpm-sequoia-1.9.0.3.tar.gz pqc
Source: %{crate}-%{version}.tar.gz
# Generated using cargo-vendor-filterer:
# cargo vendor-filterer --platform x86_64-unknown-linux-gnu \
@ -21,7 +31,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.1.1.tar.gz vendor
# tar -czf ../rpm-sequoia-vendor-1.9.0.3.tar.gz vendor
Source1: %{crate}-vendor-%{version}.tar.gz
Source2: vendor.toml
@ -53,8 +63,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}
@ -107,4 +115,67 @@ cp -pav target/release/rpm-sequoia.pc %{buildroot}/%{_libdir}/pkgconfig/
%endif
%changelog
%autochangelog
## START: Generated by rpmautospec
* Thu Sep 18 2025 Jakub Jelen <jjelen@redhat.com> - 1.9.0.3-1
- Include MD5 in ossl bindings and sequoia-openpgp for RPM
* Mon Sep 15 2025 Jakub Jelen <jjelen@redhat.com> - 1.9.0.2-1
- Build 1.9.0 version with ossl bindings to unbreak FIPS
* Fri Jul 04 2025 Jakub Jelen <jjelen@redhat.com> - 1.9.0.1-1
- Pull PQC crypto to rpm-sequoia
* Mon Nov 11 2024 Stanislav Zidek <szidek@redhat.com> - 1.6.0-6
- gating: added CI plans
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.6.0-5
- Bump release for October 2024 mass rebuild:
* Wed Jul 17 2024 Stanislav Zidek <szidek@redhat.com> - 1.6.0-4
- RHEL-10 CI and gating setup
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.6.0-3
- Bump release for June 2024 mass rebuild
* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.6.0-2
- Update Rust macro usage
* Fri Jan 26 2024 Fabio Valentini <decathorpe@gmail.com> - 1.6.0-1
- Update to version 1.6.0; Fixes RHBZ#2260336
* Sat Sep 09 2023 Fabio Valentini <decathorpe@gmail.com> - 1.5.0-1
- Update to version 1.5.0; Fixes RHBZ#2235784
* Tue Jun 27 2023 Fabio Valentini <decathorpe@gmail.com> - 1.4.1-1
- Update to version 1.4.1; Fixes RHBZ#2217961
* Tue May 16 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.0-3
- Use vendored dependencies in RHEL builds
* Wed May 03 2023 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-2
- Rebuild for openssl crate >= v0.10.48 (RUSTSEC-2023-{0022,0023,0024})
* Fri Apr 14 2023 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-1
- Update to version 1.4.0; Fixes RHBZ#2186636
* Mon Mar 06 2023 Fabio Valentini <decathorpe@gmail.com> - 1.3.0-1
- Update to version 1.3.0; Fixes RHBZ#2175877
* Sun Feb 05 2023 Fabio Valentini <decathorpe@gmail.com> - 1.2.0-3
- Rebuild for fixed frame pointer compiler flags in Rust RPM macros
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 23 2022 Fabio Valentini <decathorpe@gmail.com> - 1.2.0-1
- Update to version 1.2.0; Fixes RHBZ#2145244
* Wed Nov 23 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.2-2
- Rebuild for sequoia-openpgp 1.11.0
* Mon Nov 14 2022 Fabio Valentini <decathorpe@gmail.com> - 1.1.2-1
- Update to version 1.1.2; Fixes RHBZ#2138400
* Thu Oct 13 2022 Fabio Valentini <decathorpe@gmail.com> - 1.0.1-1
- Initial import (#2087499)
## END: Generated by rpmautospec

View File

@ -1,2 +1,2 @@
SHA512 (rpm-sequoia-1.10.1.1.tar.gz) = 6038343036b7b0317c202f046d146245363988ae2d52021246bdb4e560422b557b38e0b17f88de630e58afce43f29b32e2de15a011af769de2f2b27ba8fb434a
SHA512 (rpm-sequoia-vendor-1.10.1.1.tar.gz) = fca5b244a1442056acd550dc9c1c19426c157a25f7a06849700319be775b6d57c379685edd1e2f596c10e987057a057d688a43e41e27a0f22b5f70987eaf2c02
SHA512 (rpm-sequoia-1.9.0.3.tar.gz) = 11d887286f9a082e0fed33fe7d6928d27385049403c73dda5f6d11bb133b21d6fd953d811d113750bb878f10172c3b8b94bcc09716fee8492516718668fcb458
SHA512 (rpm-sequoia-vendor-1.9.0.3.tar.gz) = bff2107ec3908b09a43b2edf6dde59497da913069165de83de3c1c48b0b91b316c3841f3f322f3e8f47486e733a79e64709c3a454157515e67b307fbcb3d2536

View File

@ -2,14 +2,18 @@
[source.crates-io]
replace-with = "vendored-sources"
[source."git+https://github.com/latchset/kryoptic"]
git = "https://github.com/latchset/kryoptic"
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/sequoia-pgp/sequoia?branch=pqc"]
[source."git+https://gitlab.com/sequoia-pgp/sequoia?branch=jjelen/pqc-ossl"]
git = "https://gitlab.com/sequoia-pgp/sequoia"
branch = "pqc"
branch = "jjelen/pqc-ossl"
replace-with = "vendored-sources"
[source.vendored-sources]