Accepting request 987836 from home:aplanas:branches:security

- Add missing dependencies for testing, and enable test bcond
  (bsc#1188085)
- Add patch to properly skip getekcertificate if curl is missing
  0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch

OBS-URL: https://build.opensuse.org/request/show/987836
OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-tools?expand=0&rev=88

0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch

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

tpm2.0-tools.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul  8 07:51:37 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Add missing dependencies for testing, and enable test bcond
+  (bsc#1188085)
+- 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>
 

tpm2.0-tools.spec

@@ -17,7 +17,7 @@
 
 
 %define _lto_cflags %{nil}
-%bcond_with test
+%bcond_without  test
 Name:           tpm2.0-tools
 Version:        5.2
 Release:        0
@@ -30,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
 Source2:        tpm2-tools.keyring
 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:  libcurl-devel
 BuildRequires:  libopenssl-devel
@@ -53,8 +55,10 @@ BuildRequires:  pandoc
 %endif
 %if %{with test}
 # requirements for unit test suite (configure --enable-unit)
+BuildRequires:  dbus-1-daemon
 BuildRequires:  expect
 BuildRequires:  ibmswtpm2
+BuildRequires:  iproute2
 BuildRequires:  libcmocka-devel
 BuildRequires:  python3-PyYAML
 BuildRequires:  tpm2.0-abrmd
@@ -95,8 +99,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/bash-completion/completions/*
 
 %if %{with test}
-# the test suite does not currently work, because it conflicts with our LTO
-# linking (see bsc#1188085).
 %check
 %make_build check
 %endif