Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tpm2.0-tools for openSUSE:Factory
checked in at 2022-07-09 16:59:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tpm2.0-tools (Old)
and /work/SRC/openSUSE:Factory/.tpm2.0-tools.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tpm2.0-tools"
Sat Jul 9 16:59:09 2022 rev:34 rq:987921 version:5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/tpm2.0-tools/tpm2.0-tools.changes
2021-12-08 22:09:22.062874176 +0100
+++ /work/SRC/openSUSE:Factory/.tpm2.0-tools.new.1523/tpm2.0-tools.changes
2022-07-09 16:59:14.828455013 +0200
@@ -1,0 +2,13 @@
+Fri Jul 8 07:51:37 UTC 2022 - Alberto Planas Dominguez <apla...@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 <apla...@suse.com>
+
+- Disable LTO for 5.2, to fix tpm2_makecredential with "-T none"
+ (bsc#1201291)
+
+-------------------------------------------------------------------
New:
----
0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tpm2.0-tools.spec ++++++
--- /var/tmp/diff_new_pack.EXk5Cf/_old 2022-07-09 16:59:15.292455710 +0200
+++ /var/tmp/diff_new_pack.EXk5Cf/_new 2022-07-09 16:59:15.296455716 +0200
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
#
+%define _lto_cflags %{nil}
%bcond_with test
Name: tpm2.0-tools
Version: 5.2
@@ -29,6 +30,8 @@
# 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
@@ -52,8 +55,10 @@
%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
@@ -94,10 +99,10 @@
%{_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
+# Do the tests sequentially to kill all tpm_server instances
+# https://github.com/tpm2-software/tpm2-tools/issues/3042
+%make_build -j1 check
%endif
%changelog
++++++ 0001-tests-getekcertificate.sh-Skip-the-test-if-curl-is-n.patch ++++++
>From a10fd03a8d62226e798b8338c6caf73195e64557 Mon Sep 17 00:00:00 2001
From: Alberto Planas <apla...@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 <apla...@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
