Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 480a63fdeb | |||
| 706a9ec879 |
@ -1 +0,0 @@
|
||||
1
|
||||
14
.gitignore
vendored
14
.gitignore
vendored
@ -1,12 +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.3.tar.gz
|
||||
rpm-sequoia-vendor-1.9.0.3.tar.gz
|
||||
|
||||
@ -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}
|
||||
23
plans/ci.fmf
23
plans/ci.fmf
@ -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
|
||||
@ -1,17 +0,0 @@
|
||||
--- rpm-sequoia-1.6.0/Cargo.toml 1970-01-01T00:00:01+00:00
|
||||
+++ rpm-sequoia-1.6.0/Cargo.toml 2024-01-25T14:12:35.470987+00:00
|
||||
@@ -73,13 +73,9 @@
|
||||
version = "0.1.4"
|
||||
|
||||
[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"]
|
||||
|
||||
[badges.maintenance]
|
||||
status = "actively-developed"
|
||||
@ -1,39 +1,47 @@
|
||||
# Generated by rust2rpm 25
|
||||
%bcond_without check
|
||||
## 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
|
||||
|
||||
# RHEL does not have packages for Rust dependencies
|
||||
%if 0%{?rhel}
|
||||
%global bundled_rust_deps 1
|
||||
%else
|
||||
%global bundled_rust_deps 0
|
||||
%endif
|
||||
# Generated by rust2rpm 27
|
||||
%bcond check 1
|
||||
|
||||
%global crate rpm-sequoia
|
||||
|
||||
Name: rust-rpm-sequoia
|
||||
Version: 1.6.0
|
||||
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
|
||||
Source: %{crates_source}
|
||||
# To create the vendor tarball:
|
||||
# tar xf %%{crate}-%%{version}.crate ; pushd %%{crate}-%%{version} ; \
|
||||
# patch -p1 < ../rpm-sequoia-fix-metadata.diff ; \
|
||||
# cargo vendor --versioned-dirs && tar Jcvf ../%%{crate}-%%{version}-vendor.tar.xz vendor/ ; popd
|
||||
Source1: %{crate}-%{version}-vendor.tar.xz
|
||||
# Manually created patch for downstream crate metadata changes
|
||||
# * default to the OpenSSL crypto backend of sequoia-openpgp
|
||||
Patch: rpm-sequoia-fix-metadata.diff
|
||||
# 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.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 \
|
||||
# --platform powerpc64le-unknown-linux-gnu \
|
||||
# --platform aarch64-unknown-linux-gnu \
|
||||
# --platform i686-unknown-linux-gnu \
|
||||
# --platform s390x-unknown-linux-gnu \
|
||||
# --all-features
|
||||
# tar -czf ../rpm-sequoia-vendor-1.9.0.3.tar.gz vendor
|
||||
Source1: %{crate}-vendor-%{version}.tar.gz
|
||||
Source2: vendor.toml
|
||||
|
||||
%if 0%{?bundled_rust_deps}
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: rust-toolset
|
||||
# vendored openssl-sys
|
||||
BuildRequires: openssl-devel
|
||||
%else
|
||||
BuildRequires: cargo-rpm-macros >= 24
|
||||
%endif
|
||||
# vendored openssl-sys
|
||||
BuildRequires: openssl-devel clang-devel
|
||||
|
||||
%global _description %{expand:
|
||||
An implementation of the RPM PGP interface using Sequoia.}
|
||||
@ -60,9 +68,7 @@ License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode
|
||||
%files -n %{crate}
|
||||
%license LICENSE.txt
|
||||
%license LICENSE.dependencies
|
||||
%if 0%{?bundled_rust_deps}
|
||||
%license cargo-vendor.txt
|
||||
%endif
|
||||
%doc README.md
|
||||
%{_libdir}/librpm_sequoia.so.1
|
||||
|
||||
@ -77,15 +83,10 @@ Requires: %{crate}%{?_isa} = %{version}-%{release}
|
||||
%{_libdir}/pkgconfig/rpm-sequoia.pc
|
||||
|
||||
%prep
|
||||
%autosetup -n %{crate}-%{version} -p1 %{?bundled_rust_deps:-a1}
|
||||
%if 0%{?bundled_rust_deps}
|
||||
%cargo_prep -v vendor
|
||||
%else
|
||||
%cargo_prep
|
||||
|
||||
%generate_buildrequires
|
||||
%cargo_generate_buildrequires
|
||||
%endif
|
||||
%autosetup -n %{crate}-%{version} -N -a1
|
||||
%cargo_prep -N
|
||||
# include full configuration for vendored dependencies
|
||||
cat %{SOURCE2} >> .cargo/config.toml
|
||||
|
||||
%build
|
||||
# build script uses environment variables to populate the pkgconfig file
|
||||
@ -94,9 +95,9 @@ export LIBDIR="%{_libdir}"
|
||||
%cargo_build
|
||||
%{cargo_license_summary}
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
%if 0%{?bundled_rust_deps}
|
||||
%cargo_vendor_manifest
|
||||
%endif
|
||||
%{cargo_vendor_manifest}
|
||||
# replace un-parseable git snapshot dependency information
|
||||
sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt
|
||||
|
||||
%install
|
||||
# install shared library
|
||||
@ -114,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
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (rpm-sequoia-1.6.0.crate) = d1e989d6ffc31acf4538c99365d4e3b52ff3d756ddcb9cbb5aa6a3ed9d5785930d928e3a081f6d5dfcc830b15ef21bb73a441b3fe232b1548522aa696f85ba51
|
||||
SHA512 (rpm-sequoia-1.6.0-vendor.tar.xz) = 63674d7b796c7b3d9a38dfb0f0485b98b9a71d12f9f9888b3b389f4d2452779ba511dae204c7021ad1d3d3beab4f809a45f4d25a0c492886558601ed84b9a4d2
|
||||
SHA512 (rpm-sequoia-1.9.0.3.tar.gz) = 11d887286f9a082e0fed33fe7d6928d27385049403c73dda5f6d11bb133b21d6fd953d811d113750bb878f10172c3b8b94bcc09716fee8492516718668fcb458
|
||||
SHA512 (rpm-sequoia-vendor-1.9.0.3.tar.gz) = bff2107ec3908b09a43b2edf6dde59497da913069165de83de3c1c48b0b91b316c3841f3f322f3e8f47486e733a79e64709c3a454157515e67b307fbcb3d2536
|
||||
|
||||
21
vendor.toml
Normal file
21
vendor.toml
Normal file
@ -0,0 +1,21 @@
|
||||
|
||||
[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=jjelen/pqc-ossl"]
|
||||
git = "https://gitlab.com/sequoia-pgp/sequoia"
|
||||
branch = "jjelen/pqc-ossl"
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source.vendored-sources]
|
||||
directory = "vendor"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user