SHA256
1
0
forked from pool/tpm2.0-tools
Dominique Leuenberger 2022-07-09 14:59:09 +00:00 committed by Git OBS Bridge
commit 29706ce84b
3 changed files with 46 additions and 5 deletions

View File

@ -0,0 +1,23 @@
From a10fd03a8d62226e798b8338c6caf73195e64557 Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@suse.com>
Date: Fri, 8 Jul 2022 10:09:24 +0200
Subject: [PATCH 1/1] tests/getekcertificate.sh: Skip the test if curl is not
present
Signed-off-by: Alberto Planas <aplanas@suse.com>
---
test/integration/tests/getekcertificate.sh | 1 +
1 file changed, 1 insertion(+)
Index: tpm2-tools-5.2/test/integration/tests/getekcertificate.sh
===================================================================
--- tpm2-tools-5.2.orig/test/integration/tests/getekcertificate.sh
+++ tpm2-tools-5.2/test/integration/tests/getekcertificate.sh
@@ -19,6 +19,7 @@ start_up
# Check connectivity
if [ -z "$(curl -V 2>/dev/null)" ]; then
echo "curl is not not installed. Skipping connection check."
+ exit 077
else
if [ "$(curl --silent --output /dev/null --write-out %{http_code} \
'https://ekop.intel.com/')" != '200' ]; then

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jul 8 07:51:37 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>
- Add missing dependencies for testing.
- Add patch to properly skip getekcertificate if curl is missing
0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch
-------------------------------------------------------------------
Thu Jul 7 15:14:37 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>
- Disable LTO for 5.2, to fix tpm2_makecredential with "-T none"
(bsc#1201291)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 8 16:37:28 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com> Wed Dec 8 16:37:28 UTC 2021 - Alberto Planas Dominguez <aplanas@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package tpm2.0-tools # spec file for package tpm2.0-tools
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,8 @@
# #
%bcond_with test %define _lto_cflags %{nil}
%bcond_with test
Name: tpm2.0-tools Name: tpm2.0-tools
Version: 5.2 Version: 5.2
Release: 0 Release: 0
@ -29,6 +30,8 @@ Source1: https://github.com/tpm2-software/tpm2-tools/releases/download/%{
# git show william-roberts-pub javier-martinez-pub joshua-lock-pub idesai-pub > tpm2-tools.keyring # git show william-roberts-pub javier-martinez-pub joshua-lock-pub idesai-pub > tpm2-tools.keyring
Source2: tpm2-tools.keyring Source2: tpm2-tools.keyring
Patch0: fix_bogus_warning.patch Patch0: fix_bogus_warning.patch
# PATCH-FIX-UPSTREAM 0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch -- based on PR#3041
Patch1: 0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
@ -52,8 +55,10 @@ BuildRequires: pandoc
%endif %endif
%if %{with test} %if %{with test}
# requirements for unit test suite (configure --enable-unit) # requirements for unit test suite (configure --enable-unit)
BuildRequires: dbus-1-daemon
BuildRequires: expect BuildRequires: expect
BuildRequires: ibmswtpm2 BuildRequires: ibmswtpm2
BuildRequires: iproute2
BuildRequires: libcmocka-devel BuildRequires: libcmocka-devel
BuildRequires: python3-PyYAML BuildRequires: python3-PyYAML
BuildRequires: tpm2.0-abrmd BuildRequires: tpm2.0-abrmd
@ -94,10 +99,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
%if %{with test} %if %{with test}
# the test suite does not currently work, because it conflicts with our LTO
# linking (see bsc#1188085).
%check %check
%make_build check # Do the tests sequentially to kill all tpm_server instances
# https://github.com/tpm2-software/tpm2-tools/issues/3042
%make_build -j1 check
%endif %endif
%changelog %changelog