enable tmt tests

Signed-off-by: Cole Robinson <crobinso@redhat.com>

.packit.yaml

@@ -1,16 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-rawhide
-  - job: koji_build
-    trigger: commit
-    dist_git_branches:
-      - fedora-all
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched

downgrade-dialoguer.patch

@@ -0,0 +1,13 @@
+diff --git a/efi-tools/Cargo.toml b/efi-tools/Cargo.toml
+index 383ea77..68b8356 100644
+--- a/efi-tools/Cargo.toml
++++ b/efi-tools/Cargo.toml
+@@ -33,7 +33,7 @@ log.workspace = true
+ stderrlog.workspace = true
+ uguid.workspace = true
+ 
+-dialoguer = "0.12"
++dialoguer = "0.11"
+ glob = "0.3"
+ 
+ virtfw-libefi = { workspace = true, features = [ "std", "sbdata", "x509" ] }

downgrade-x509.patch

@@ -1,60 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 2a38a77d0a32..ed0d5a2f7314 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -24,7 +24,7 @@ byteorder = { version = "1", default-features = false }
- clap = { version = "4.5.4", features = [ "derive", "wrap_help" ] }
- clap_mangen = { version = ">= 0.2.30, < 0.4" }
- env_logger = { version = "0.11" }
--der = { version = "0.8" }
-+der = { version = "0.7.10" }
- fdt = { version = "0.1" }
- igvm = { version = "0.4" }
- igvm_defs = { version = "0.4" }
-@@ -38,7 +38,7 @@ spin = { version = ">= 0.10, < 0.13" }
- uefi = { version = "0.39" }
- uefi-raw = { version = "0.15.1" }
- uguid = { version = "2" }
--x509-cert = { version = "0.3", default-features = false }
-+x509-cert = { version = "0.2.5", default-features = false }
- zerocopy = { version = "0.8", features = [ "derive" ] }
- 
- virtfw-libhw = { path = "libhw", version = "0.5.2" }
-diff --git a/libefi/src/sb/certs/info.rs b/libefi/src/sb/certs/info.rs
-index 5926898c0e9d..0cd31bc376cc 100644
---- a/libefi/src/sb/certs/info.rs
-+++ b/libefi/src/sb/certs/info.rs
-@@ -20,8 +20,8 @@ pub struct CertInfo {
- 
- impl CertInfo {
-     fn attr(name: &Name, oid: &ObjectIdentifier) -> Option<String> {
--        for attr in name.iter_rdn() {
--            if attr.iter().any(|x| x.oid == *oid) {
-+        for attr in name.0.iter() {
-+            if attr.0.iter().any(|x| x.oid == *oid) {
-                 return Some(attr.to_string());
-             }
-         }
-@@ -30,16 +30,15 @@ impl CertInfo {
- 
-     pub fn new_from_der(der: &[u8]) -> Option<Self> {
-         let cert = Certificate::from_der(der).ok()?;
--        let tbs = cert.tbs_certificate();
--        let subject = tbs.subject();
--        let issuer = tbs.issuer();
--        let not_before = tbs.validity().not_before.to_date_time();
--        let not_after = tbs.validity().not_after.to_date_time();
-+        let subject = cert.tbs_certificate.subject;
-+        let issuer = cert.tbs_certificate.issuer;
-+        let not_before = cert.tbs_certificate.validity.not_before.to_date_time();
-+        let not_after = cert.tbs_certificate.validity.not_after.to_date_time();
-         let info = Self {
-             subject: subject.to_string(),
--            subject_cn: Self::attr(subject, &OID_CN),
-+            subject_cn: Self::attr(&subject, &OID_CN),
-             issuer: issuer.to_string(),
--            issuer_cn: Self::attr(issuer, &OID_CN),
-+            issuer_cn: Self::attr(&issuer, &OID_CN),
-             not_before: EfiTime::from(&not_before),
-             not_after: EfiTime::from(&not_after),
-         };

plans.fmf

@@ -1,46 +1,6 @@
 summary: run tests from distgit tarball
+discover:
+  how: fmf
+  dist-git-source: true
 execute:
   how: tmt
-
-/tmt:
-  summary: run upstream tmt tests
-  provision:
-    how: virtual
-    hardware:
-      memory: '>= 4 GB'
-      cpu:
-        processors: ">= 2"
-      virtualization:
-        is-supported: true
-  prepare:
-    - name: install dependencies
-      how: install
-      package:
-        - virt-firmware-rs
-        - qemu-system-x86-core
-  discover:
-    how: fmf
-    dist-git-source: true
-
-/cargo:
-  summary: run upstream cargo tests
-  prepare:
-    - name: install dependencies
-      how: install
-      package:
-        - git
-        - make
-        - cargo
-        - rustc
-        - openssl-devel
-        - systemd-devel
-  discover:
-    how: shell
-    dist-git-source: true
-    tests:
-      - name: /run/make/test
-        test: |
-          set -ex
-          version=$(rpmspec -q --qf '%{version}\n' $TMT_SOURCE_DIR/*.spec | head -1)
-          prepdir="$TMT_SOURCE_DIR/virt-firmware-rs-v${version}"
-          make -C $prepdir test

sources

@@ -1 +1 @@
-SHA512 (virt-firmware-rs-v26.8.tar.gz) = 4573b05f567f2b4e17b2f7a0f54dd154b16e55f5b773a52358d42ffc841086be0c7a9231fa66150d55b5da267187a62b19d382ed10bd0c4558a264cb7baad68d
+SHA512 (virt-firmware-rs-v26.1.tar.gz) = ed096f21dee8f642ab85b9eb4d9c5b5e81af7a48ce0abca77dd4db4ffe142e4cd01eae3d3a5dde48ab226cb0e0e73af269570da078983682c6eac687ef46cf2c

virt-firmware-rs.spec

@@ -18,29 +18,27 @@ BuildRequires:  rust-std-static-x86_64-unknown-uefi
 %endif
 
 Name:           virt-firmware-rs
-Version:        26.8
+Version:        26.1
 Release:        %autorelease
 Summary:        Tools for EFI and virtual machine firmware
 
 SourceLicense:  MIT
 License:        %{shrink:
-((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND
-(0BSD OR MIT OR Apache-2.0) AND
-(Apache-2.0) AND
-(Apache-2.0 OR MIT) AND
-(Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
-(BSD-2-Clause OR Apache-2.0 OR MIT) AND
-(BSD-3-Clause) AND
-(MIT) AND
-(MIT OR Apache-2.0) AND
-(MIT OR Zlib OR Apache-2.0) AND
-(MPL-2.0) AND
-(Unlicense OR MIT)
+        Apache-2.0
+        Apache-2.0 OR BSL-1.0
+        Apache-2.0 OR MIT
+        Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+        BSD-2-Clause OR Apache-2.0 OR MIT
+        MIT
+        MIT OR Apache-2.0
+        MPL-2.0
+        Unlicense OR MIT
 }
 
 URL:            https://gitlab.com/kraxel/virt-firmware-rs
 Source:         https://gitlab.com/kraxel/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
-Patch1:         downgrade-x509.patch
+
+Patch1:		downgrade-dialoguer.patch
 
 ExclusiveArch:  x86_64 aarch64 riscv64
 BuildRequires:  cargo-rpm-macros >= 24
@@ -65,20 +63,19 @@ firmware.  This package has EFI applications for %{efiarch}.
 %prep
 %autosetup -n %{name}-v%{version} -p1
 # drop unused packages from workspace to reduce dependencies.
-sed -i Cargo.toml -e '/experimental/d'
 sed -i Cargo.toml -e '/mefisto/d'
 %if %{without efi_apps}
 sed -i Cargo.toml -e '/efi-apps/d'
 %endif
 
 %generate_buildrequires
-%cargo_generate_buildrequires -f std,json,pem,udev,authenticode
+%cargo_generate_buildrequires -f std,json,pem,udev
 
 %build
 %cargo_prep
 %cargo_build -- --package virtfw-efi-tools --features udev
 %cargo_build -- --package virtfw-efi-tools
-%cargo_build -- --package virtfw-igvm-tools --features authenticode
+%cargo_build -- --package virtfw-igvm-tools
 %cargo_build -- --package virtfw-varstore --features std,json,pem
 %if %{with efi_apps}
 %cargo_build -- --package virtfw-efi-apps --target $(uname -m)-unknown-uefi