import CS rust-rpm-sequoia-1.9.0.1-1.el9

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,18 +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
+SOURCES/rpm-sequoia-1.9.0.1.tar.gz
+SOURCES/rpm-sequoia-vendor-1.9.0.1.tar.gz

.rust-rpm-sequoia.metadata

@@ -0,0 +1,2 @@
+432d3139fb34497ab6bf73e81a1bc435b4ab6928 SOURCES/rpm-sequoia-1.9.0.1.tar.gz
+77ed5771d0f3daa336f64f22797c71c9ef967ff5 SOURCES/rpm-sequoia-vendor-1.9.0.1.tar.gz

SOURCES/rpm-sequoia-fix-metadata.diff

@@ -0,0 +1,18 @@
+diff -up a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml	2025-06-20 23:38:40.780060126 +0200
++++ b/Cargo.toml	2025-06-20 23:39:27.431884313 +0200
+@@ -42,13 +42,9 @@ crate-type = ["cdylib"]
+ 
+ # We explicitly do not want to enable Sequoia's decompression support.
+ # Hence we only select a crypto backend.
+-default = ["crypto-nettle"]
++default = ["crypto-openssl"]
+ crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
+-crypto-rust = ["sequoia-openpgp/crypto-rust"]
+-crypto-cng = ["sequoia-openpgp/crypto-cng"]
+ crypto-openssl = ["sequoia-openpgp/crypto-openssl"]
+-crypto-botan = ["sequoia-openpgp/crypto-botan"]
+-crypto-botan2 = ["sequoia-openpgp/crypto-botan2"]
+ 
+ [patch.crates-io]
+ buffered-reader = { git = "https://gitlab.com/sequoia-pgp/sequoia", branch = "justus/pqc" }

SOURCES/vendor.toml

@@ -0,0 +1,21 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."git+https://github.com/teythoon/rust-openssl?branch=justus/pqc"]
+git = "https://github.com/teythoon/rust-openssl"
+branch = "justus/pqc"
+replace-with = "vendored-sources"
+
+[source."git+https://gitlab.com/sequoia-pgp/sequoia-policy-config?branch=justus/pqc"]
+git = "https://gitlab.com/sequoia-pgp/sequoia-policy-config"
+branch = "justus/pqc"
+replace-with = "vendored-sources"
+
+[source."git+https://gitlab.com/sequoia-pgp/sequoia?branch=justus/pqc"]
+git = "https://gitlab.com/sequoia-pgp/sequoia"
+branch = "justus/pqc"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+

SPECS/rust-rpm-sequoia.spec

@@ -1,18 +1,25 @@
+## 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.9.0.3
+Version:        1.9.0.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.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 \
@@ -21,9 +28,12 @@ Source:         %{crate}-%{version}.tar.gz
 #                         --platform i686-unknown-linux-gnu \
 #                         --platform s390x-unknown-linux-gnu \
 #                         --all-features
-#   tar -czf ../rpm-sequoia-vendor-1.9.0.3.tar.gz vendor
+#   tar -czf ../%%{crate}-vendor-%%{version}.tar.gz vendor
 Source1:        %{crate}-vendor-%{version}.tar.gz
 Source2:        vendor.toml
+# Manually created patch for downstream crate metadata changes
+# * default to the OpenSSL crypto backend of sequoia-openpgp
+Patch:          rpm-sequoia-fix-metadata.diff
 
 %if 0%{?rhel}
 BuildRequires:  rust-toolset
@@ -31,7 +41,7 @@ BuildRequires:  rust-toolset
 BuildRequires:  cargo-rpm-macros >= 24
 %endif
 # vendored openssl-sys
-BuildRequires:  openssl-devel clang-devel
+BuildRequires:  openssl-devel
 
 %global _description %{expand:
 An implementation of the RPM PGP interface using Sequoia.}
@@ -74,6 +84,7 @@ Requires:       %{crate}%{?_isa} = %{version}-%{release}
 
 %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
@@ -105,4 +116,13 @@ cp -pav target/release/rpm-sequoia.pc %{buildroot}/%{_libdir}/pkgconfig/
 %endif
 
 %changelog
-%autochangelog
+## START: Generated by rpmautospec
+* Fri Jul 04 2025 Jakub Jelen <jjelen@redhat.com> - 1.9.0.1-1
+- Pull PQC crypto to rpm-sequoia
+
+* Thu May 22 2025 Stanislav Zidek <szidek@redhat.com> - 1.6.0-2
+- RHEL-9 CI and gating setup
+
+* Wed May 21 2025 Jakub Jelen <jjelen@redhat.com> - 1.6.0-1
+- Initial commit on c9s
+## END: Generated by rpmautospec

ci.fmf

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

gating.yaml

@@ -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}

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

sources

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

vendor.toml

@@ -1,21 +0,0 @@
-
-[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"
-