import CS snpguest-0.8.3-1.el9

.gitignore

@@ -1,4 +1,2 @@
-/snpguest-0.8.3.tar.gz
-/snpguest-0.8.3-vendor.tar.gz
-/snpguest-0.8.0.tar.gz
-/snpguest-0.8.0-vendor-FEDORA.tar.gz
+SOURCES/snpguest-0.8.3-vendor.tar.gz
+SOURCES/snpguest-0.8.3.tar.gz

.snpguest.metadata

@@ -0,0 +1,2 @@
+1dd2c15e84c807bb1d7f41a6c9dac7d8d65575b1 SOURCES/snpguest-0.8.3-vendor.tar.gz
+6ce670c86e90932ffd5707563be2a5c0f385294e SOURCES/snpguest-0.8.3.tar.gz

SPECS/snpguest.spec

@@ -1,7 +1,7 @@
 # Generated by rust2rpm 27
 %bcond check 1
 
-%global version 0.8.0
+%global version 0.8.3
 %global crate snpguest
 
 Name:           snpguest
@@ -10,18 +10,9 @@ Release:        1%{?dist}
 Summary:        A CLI tool for interacting with SEV-SNP guest environment
 
 URL:            https://github.com/virtee/%{crate}
-Source:         https://github.com/virtee/%{crate}/archive/refs/tags/snpguest-%{version}.tar.gz
-
-# Creating vendor tar (on latest Fedora under a snpguest dir):
-# dnf install <all dependencies>
-# Edit create_vendor_source.sh to reflect proper version number being updated.
-# bash create_vendor_source.sh
-# mv snpguest-{VERSION}-vendor.tar.xz ../vendor/
-Source1:         vendor/snpguest-%{version}-vendor-FEDORA.tar.gz
-
-# To build vendored dependencies on Fedora, update the env_logger dependency to match Fedora's present version.
-Patch1:          remove-openssl-vendored-dependency.diff
-Patch2:          use-vendored-fedora-deps.diff
+Source:         https://github.com/virtee/%{crate}/archive/refs/tags/%{crate}-%{version}.tar.gz
+Source1:        https://github.com/virtee/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
+Patch:          snpguest-remove-openssl-vendored-dependency.diff
 
 # snpguest is a tool using features specific to AMD EPYC processors (x86_64).
 ExclusiveArch:  x86_64
@@ -53,7 +44,7 @@ Administrative utility for AMD SEV-SNP.}
 
 %prep
 %autosetup -n %{crate}-%{version} -p1 -a1
-rm -f Cargo.lock
+rm -rf Cargo.lock
 %cargo_prep -v vendor
 
 %build
@@ -70,12 +61,6 @@ rm -f Cargo.lock
 %endif
 
 %changelog
-* Wed Feb 19 2025 Tyler Fanelli <tfanelli@redhat.com> - 0.8.0-1
-- Deprecate version to 0.8.0 for Fedora dependency building
-- Update dependencies for vendoring with Fedora
-- Use cargo vendor-filterer to create vendor Source1
-- Resolves: RHEL-68138
-
 * Wed Feb 12 2025 Tyler Fanelli <tfanelli@redhat.com> - 0.8.3-1
 - Initial commit on c10s
-  Resolves: RHELPLAN-171501
+  Resolves: RHELPLAN-171498

create_vendor_source.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# fail upon error
-set -e
-
-# Run on Fedora
-# make sure all dependencies are yum installed
-
-# cd <guest-components-dir-ready-to-be-built>
-
-# create a .cargo/config.toml
-if [ ! -f .cargo/config.toml ]; then
-    rpm -E '%{cargo_prep}' > cargo_prep.sh
-    bash cargo_prep.sh
-fi
-
-# run cargo vendor-filtered --offline
-cargo vendor-filterer  --respect-source-config --offline --platform x86_64-unknown-linux-gnu --keep-dep-kinds all --all-features --exclude-crate-path "idna#tests" --exclude-crate-path "idna-0.4.0#tests"
-
-# run tar
-tar -czf snpguest-0.8.0-vendor-FEDORA.tar.gz vendor/
-
-echo snpguest-0.8.0-vendor-FEDORA.tar.gz created

gating.yaml

@@ -1,5 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules: []

remove-openssl-vendored-dependency.diff

@@ -1,13 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 3b554d2..cb20eb5 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -26,7 +26,7 @@ sev = { version = "4.0", default-features = false, features = ['openssl','snp']}
- nix = "^0.23"
- serde = { version = "1.0", features = ["derive"] }
- bincode = "^1.2.1"
--openssl = { version = "^0.10", features = ["vendored"]}
-+openssl = { version = "^0.10" }
- reqwest = { version="0.11.10", features = ["blocking"] }
- hex = "0.4"
- x509-parser = { version="^0.14", features=["verify"] }

sources

@@ -1,2 +0,0 @@
-SHA512 (snpguest-0.8.0.tar.gz) = eeb09e67d200c96f7a8f68301016f999876080f99bd56d8d1d9454e7a5cdc048c9b81440eb057cc30c2278af98a847ddab4d0450b23ee7a1a6812ff6b59c7af9
-SHA512 (snpguest-0.8.0-vendor-FEDORA.tar.gz) = 86b1228e23ac0e0078b251d5b6cc789a573f6a0392371c86e5c59b20b016f2db63394777b9b85bc65676d9a662de4dd79b140d27a58e2bd6dae21a296547360e

use-vendored-fedora-deps.diff

@@ -1,33 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index cb20eb5..9c5fae2 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,21 +20,21 @@ hyperv = ["tss-esapi"]
- 
- [dependencies]
- clap = { version = "4.5", features = [ "derive" ] }
--env_logger = "0.10.0"
-+env_logger = "0.11.6"
- anyhow = "1.0.69"
- sev = { version = "4.0", default-features = false, features = ['openssl','snp']}
--nix = "^0.23"
-+nix = "0.29"
- serde = { version = "1.0", features = ["derive"] }
- bincode = "^1.2.1"
- openssl = { version = "^0.10" }
--reqwest = { version="0.11.10", features = ["blocking"] }
-+reqwest = { version="0.12.12", features = ["blocking"] }
- hex = "0.4"
--x509-parser = { version="^0.14", features=["verify"] }
--asn1-rs = "0.5.2"
--rand = "0.8.5"
-+x509-parser = { version="0.16", features=["verify"] }
-+asn1-rs = "0.6.2"
-+rand = "0.9.0"
- tss-esapi = { version = "7.2", optional=true }
- msru = "0.2.0"
- colorful = "0.2.2"
--bitfield = "0.13.2"
-+bitfield = "0.15.0"
- clap-num = "1.1.1"
- base64 = "0.22.1"