diff --git a/664.patch b/664.patch new file mode 100644 index 0000000..8d2834e --- /dev/null +++ b/664.patch @@ -0,0 +1,45 @@ +From 63a11e5f1f4d700230293cc736c6532ff032a49d Mon Sep 17 00:00:00 2001 +From: Gowtham Suresh Kumar +Date: Thu, 2 Mar 2023 09:24:14 +0000 +Subject: [PATCH] Update tss-esapi version + +The tmp2-tss version on meta-security has been updated to 4.0.1 +from 3.2.0. This is not compatible with the current tss-esapi crate. +The newer version 7.2.0 of the crate is now available which +resolves the issue. + +Signed-off-by: Gowtham Suresh Kumar + +GuillaumeG: Drop Cargo.lock part since osc service already update it +--- + Cargo.lock | 8 ++++---- + Cargo.toml | 2 +- + e2e_tests/Cargo.toml | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index b6327dc8..87cc1a10 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -29,7 +29,7 @@ log = { version = "0.4.14", features = ["serde"] } + cryptoki = { version = "0.3.0", optional = true, features = ["psa-crypto-conversions"] } + picky-asn1-der = { version = "0.2.4", optional = true } + picky-asn1 = { version = "0.3.0", optional = true } +-tss-esapi = { version = "7.1.0", optional = true } ++tss-esapi = { version = "7.2.0", optional = true } + bincode = "1.3.1" + structopt = "0.3.21" + derivative = "2.2.0" +diff --git a/e2e_tests/Cargo.toml b/e2e_tests/Cargo.toml +index 3302ce38..b895e84b 100644 +--- a/e2e_tests/Cargo.toml ++++ b/e2e_tests/Cargo.toml +@@ -17,7 +17,7 @@ log = "0.4.14" + rand = "0.7.3" + env_logger = "0.8.3" + stdext = "0.3.1" +-tss-esapi = { version = "7.1.0", optional = true } ++tss-esapi = { version = "7.2.0", optional = true } + + [dev-dependencies] + ring = "0.16.20" diff --git a/_service b/_service index 9906f0a..48e502d 100644 --- a/_service +++ b/_service @@ -2,5 +2,9 @@ xz parsec-1.1.0 + true + + + parsec-1.1.0 diff --git a/parsec.changes b/parsec.changes index 59c0349..c4f4981 100644 --- a/parsec.changes +++ b/parsec.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 15 07:27:47 UTC 2023 - Guillaume GARDET + +- Add patch to fix build on Tumbleweed (update tss-esapi to 7.2.0): + * 664.patch +- Add true to _service to apply + security updates +- Use cargo-packaging for all flavors +- Enable cargo_audit + ------------------------------------------------------------------- Thu Jan 19 11:03:49 UTC 2023 - Guillaume GARDET diff --git a/parsec.spec b/parsec.spec index 97cddbc..a3613d6 100644 --- a/parsec.spec +++ b/parsec.spec @@ -1,7 +1,7 @@ # # spec file for package parsec # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Source4: config.toml Source5: parsec.conf Source6: system-user-parsec.conf Source10: https://git.trustedfirmware.org/TS/trusted-services.git/snapshot/trusted-services-389b506.tar.gz +# PATCH-FIX-UPSTREAM - https://github.com/parallaxsecond/parsec/pull/664 +Patch1: 664.patch BuildRequires: cargo BuildRequires: clang-devel BuildRequires: cmake @@ -42,15 +44,11 @@ BuildRequires: llvm-devel # Fix build with GCC11 on Backports SLE15-SP4/5 - Avoid to get -lstdc++ not found BuildRequires: libstdc++6-devel-gcc11 %endif +BuildRequires: cargo-packaging BuildRequires: pkgconfig BuildRequires: protobuf-devel BuildRequires: python3 # jwt-svid-authenticator (SPIFFE-based authenticator) needs rust >= 1.53 -%if %suse_version > 1550 -BuildRequires: cargo-packaging -%else -BuildRequires: rust-packaging -%endif BuildRequires: rust >= 1.53 BuildRequires: sysuser-tools BuildRequires: pkgconfig(tss2-esys) >= 2.3.3 @@ -73,6 +71,7 @@ enabling cloud-native delivery flows within the data center and at the edge. %prep %setup -q -a1 -a10 -n parsec-%{archive_version} +%patch1 -p1 rmdir trusted-services-vendor mv trusted-services-389b506 trusted-services-vendor rm -rf .cargo && mkdir .cargo diff --git a/vendor.tar.xz b/vendor.tar.xz index 73d9372..fb522ff 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:721dfab1cbe0cd2201af183058d688d9e5a33fcb8f745fb5af08841eccdf8e14 -size 38998636 +oid sha256:65a690914e0071eb0244df867f94d049b839c80817d6aa2dd32b06dc2c84fa02 +size 46665220