From e971cdddcf1eb61776f209d91bae1b43fadb1fc96d9559a29b0caa20d8530573 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 20 Aug 2020 10:50:14 +0000 Subject: [PATCH] Accepting request 827398 from home:michals - Update to upstream version 1.5.0 (jsc#SLE-13828). - Fix build warning due to -O0 + ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch - Fix uninitialized variable warning + ibmtss-certifyx509-Fix-uninitialized-variable.patch OBS-URL: https://build.opensuse.org/request/show/827398 OBS-URL: https://build.opensuse.org/package/show/security/ibmtss?expand=0&rev=35 --- ...rtifyx509-Fix-uninitialized-variable.patch | 11 ++++++++ ...not-disable-optimization-for-debug-b.patch | 28 +++++++++++++++++++ ibmtss.changes | 9 ++++++ ibmtss.spec | 7 +++-- ibmtss1.3.0.tar.gz | 3 -- ibmtss1.5.0.tar.gz | 3 ++ 6 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 ibmtss-certifyx509-Fix-uninitialized-variable.patch create mode 100644 ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch delete mode 100644 ibmtss1.3.0.tar.gz create mode 100644 ibmtss1.5.0.tar.gz diff --git a/ibmtss-certifyx509-Fix-uninitialized-variable.patch b/ibmtss-certifyx509-Fix-uninitialized-variable.patch new file mode 100644 index 0000000..a9ce78a --- /dev/null +++ b/ibmtss-certifyx509-Fix-uninitialized-variable.patch @@ -0,0 +1,11 @@ +--- a/utils/certifyx509.c 2020-05-14 20:44:20.000000000 +0200 ++++ b/utils/certifyx509.c 2020-08-17 18:36:52.842956894 +0200 +@@ -137,7 +137,7 @@ + TPMI_DH_OBJECT objectHandle = 0; + TPMI_DH_OBJECT signHandle = 0; + unsigned int algCount = 0; +- TPMI_ALG_SIG_SCHEME scheme; ++ TPMI_ALG_SIG_SCHEME scheme = TPM_ALG_ERROR; + TPMI_RSA_KEY_BITS keyBits = 0; + TPMI_ECC_CURVE curveID = 0; + TPMI_ALG_HASH halg = TPM_ALG_SHA256; diff --git a/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch b/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch new file mode 100644 index 0000000..1f26055 --- /dev/null +++ b/ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch @@ -0,0 +1,28 @@ +From 005064b673d937a305427eb9fa4d549f93f6090a Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Mon, 17 Aug 2020 18:21:51 +0200 +Subject: [PATCH] configure.ac: Do not disable optimization for debug build. + +This conflicts with FORTIFY_SOURCE and generates completely different +assembly for debug and procuction. + +Signed-off-by: Michal Suchanek +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -62,7 +62,7 @@ AC_CHECK_FUNCS([gethostbyname memmove memset socket strerror strtoul]) + # Replace autotools default optimization + AC_ARG_ENABLE(debug, + AS_HELP_STRING([--enable-debug], [Build a TSS library used for debugging])) +- AS_IF([test "$enable_debug" = "yes"], [CFLAGS="$USER_CFLAGS -g -ggdb -O0"]) ++ AS_IF([test "$enable_debug" = "yes"], [CFLAGS="$USER_CFLAGS -g -ggdb -Wextra -Werror"]) + + # Linux requires -DTPM_POSIX + case $host_os in +-- +2.26.2 + diff --git a/ibmtss.changes b/ibmtss.changes index cbdd98f..1727039 100644 --- a/ibmtss.changes +++ b/ibmtss.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 17 14:38:12 UTC 2020 - Michal Suchanek + +- Update to upstream version 1.5.0 (jsc#SLE-13828). +- Fix build warning due to -O0 + + ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch +- Fix uninitialized variable warning + + ibmtss-certifyx509-Fix-uninitialized-variable.patch + ------------------------------------------------------------------- Fri Mar 27 13:19:08 UTC 2020 - Dominique Leuenberger diff --git a/ibmtss.spec b/ibmtss.spec index fe4531f..36b2519 100644 --- a/ibmtss.spec +++ b/ibmtss.spec @@ -18,12 +18,12 @@ # %define libversion 1 -%define libversion_full 1.3.0 +%define libversion_full 1.5.0 %define libname libibmtss %define libpkgname %{libname}%{libversion} Name: ibmtss -Version: 1.3.0 +Version: 1.5.0 Release: 0 Summary: IBM's TPM 2.0 TSS License: BSD-3-Clause @@ -31,6 +31,8 @@ Group: Productivity/Security URL: https://sourceforge.net/projects/ibmtpm20tss Source: https://sourceforge.net/projects/ibmtpm20tss/files/ibmtss%{version}.tar.gz Source1: 90-tpm-ibmtss.rules +Patch1: ibmtss-configure.ac-Do-not-disable-optimization-for-debug-b.patch +Patch2: ibmtss-certifyx509-Fix-uninitialized-variable.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: ibmswtpm2 @@ -73,6 +75,7 @@ Includes IBM's TPM 2.0 TSS C header files %prep %setup -q -c +%autopatch -p1 %build autoreconf -i diff --git a/ibmtss1.3.0.tar.gz b/ibmtss1.3.0.tar.gz deleted file mode 100644 index 7e35628..0000000 --- a/ibmtss1.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5242ce5ca8f9aff8d7a5c71dc41dbdac472b0827dafc3a1cdb6e32c16cbb95e3 -size 1020543 diff --git a/ibmtss1.5.0.tar.gz b/ibmtss1.5.0.tar.gz new file mode 100644 index 0000000..fec66e4 --- /dev/null +++ b/ibmtss1.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22d14871b9cfb1c7ddbcc0e5b379ddc065660d9a7c7b3a4a21a3ba13f1a8ddb1 +size 1037930