From 73b5f87efa1cb540ff0ff870375e44577276f3785d7d2b3fdbb643af4699128f Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Wed, 11 Dec 2019 12:00:43 +0000 Subject: [PATCH 1/2] - update to version 2.3.0: - changes in version 2.3.0: - Add '--enable-debug' flag to configure script to simplify debug builds. This relies on the AX_CHECK_ENABLE_DEBUG autoconf archive macro. - Replaced custom dynamic TCTI loading code with libtss2-tctildr from upstream tpm2-tss repo. (requires tpm2-0-tss version 2.3.0) - Explicitly set '-O2' optimization when using FORTIFY_SOURCE as required. - changes in version 2.2.0: - New configuration option `--disable-defaultflags/ added. This is for use for packaging for targets that do not support the default compilation / linking flags. - Use private dependencies properly in pkg-config metadata for TCTI. - Refactor daemon main module to enable better handling of error conditions and enable more thorough unit testing. - Updated dependencies to ensure compatibility with pkg-config fixes in tpm2-tss. - Fixed bug causing TCTI to block when used by libtss2-sys built with partial reads enabled. - Removed unnecessary libs / flags for pthreads in the TCTI pkg-config. - Output from configure script now accurately describes the state of the flags that govern the integration tests. OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-abrmd?expand=0&rev=50 --- _service | 2 +- tpm2-abrmd-2.1.1.tar.gz | 3 --- tpm2-abrmd-2.3.0.tar.gz | 3 +++ tpm2.0-abrmd.changes | 25 +++++++++++++++++++++++++ tpm2.0-abrmd.spec | 2 +- 5 files changed, 30 insertions(+), 5 deletions(-) delete mode 100644 tpm2-abrmd-2.1.1.tar.gz create mode 100644 tpm2-abrmd-2.3.0.tar.gz diff --git a/_service b/_service index 3a5a670..03ca767 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/intel/tpm2-abrmd.git git - 2.1.1 + 2.3.0 @PARENT_TAG@ disable diff --git a/tpm2-abrmd-2.1.1.tar.gz b/tpm2-abrmd-2.1.1.tar.gz deleted file mode 100644 index 05334ef..0000000 --- a/tpm2-abrmd-2.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29a55a9e4bc57e4d93acda12cde77bbf332f1dbe99a393ddddd5ede4efc7079a -size 561352 diff --git a/tpm2-abrmd-2.3.0.tar.gz b/tpm2-abrmd-2.3.0.tar.gz new file mode 100644 index 0000000..a1db2e3 --- /dev/null +++ b/tpm2-abrmd-2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63cb59be1fd21e6ae233c37a0aa4a59883a4885a7bfd2c7e69979c5048518d50 +size 567803 diff --git a/tpm2.0-abrmd.changes b/tpm2.0-abrmd.changes index dc80bcb..a36894e 100644 --- a/tpm2.0-abrmd.changes +++ b/tpm2.0-abrmd.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Dec 11 11:55:13 UTC 2019 - matthias.gerstner@suse.com + +- update to version 2.3.0: + - changes in version 2.3.0: + - Add '--enable-debug' flag to configure script to simplify debug builds. + This relies on the AX_CHECK_ENABLE_DEBUG autoconf archive macro. + - Replaced custom dynamic TCTI loading code with libtss2-tctildr from + upstream tpm2-tss repo. (requires tpm2-0-tss version 2.3.0) + - Explicitly set '-O2' optimization when using FORTIFY_SOURCE as required. + - changes in version 2.2.0: + - New configuration option `--disable-defaultflags/ added. This is + for use for packaging for targets that do not support the default + compilation / linking flags. + - Use private dependencies properly in pkg-config metadata for TCTI. + - Refactor daemon main module to enable better handling of error + conditions and enable more thorough unit testing. + - Updated dependencies to ensure compatibility with pkg-config fixes + in tpm2-tss. + - Fixed bug causing TCTI to block when used by libtss2-sys built with + partial reads enabled. + - Removed unnecessary libs / flags for pthreads in the TCTI pkg-config. + - Output from configure script now accurately describes the state of the + flags that govern the integration tests. + ------------------------------------------------------------------- Mon Aug 26 06:49:37 UTC 2019 - mgerstner diff --git a/tpm2.0-abrmd.spec b/tpm2.0-abrmd.spec index 7e5398a..897c351 100644 --- a/tpm2.0-abrmd.spec +++ b/tpm2.0-abrmd.spec @@ -17,7 +17,7 @@ Name: tpm2.0-abrmd -Version: 2.1.1 +Version: 2.3.0 Release: 0 Summary: Intel's TCG Software Stack Access Broker & Resource Manager for TPM 2.0 chips License: BSD-2-Clause From d451320a04960999d2e6914f0d5bb0663c148c8119f26761dc0599dd7284af0c Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Wed, 11 Dec 2019 12:02:48 +0000 Subject: [PATCH 2/2] - drop fix_dlopen.patch: no longer necessary since abrmd not uses the tctildr shared library. This one hopefully now does the right thing. OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-abrmd?expand=0&rev=51 --- fix_dlopen.patch | 13 ------------- tpm2.0-abrmd.changes | 2 ++ tpm2.0-abrmd.spec | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 fix_dlopen.patch diff --git a/fix_dlopen.patch b/fix_dlopen.patch deleted file mode 100644 index e47e2f8..0000000 --- a/fix_dlopen.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tpm2-abrmd-2.0.0/src/tcti-util.c -=================================================================== ---- tpm2-abrmd-2.0.0.orig/src/tcti-util.c -+++ tpm2-abrmd-2.0.0/src/tcti-util.c -@@ -53,7 +53,7 @@ tcti_util_discover_info (const char *fil - if (*tcti_dl_handle == NULL) { - size = snprintf (filename_xfrm, - sizeof (filename_xfrm), -- "libtss2-tcti-%s.so.0", -+ "%s.0", - filename); - if (size >= sizeof (filename_xfrm)) { - g_critical ("TCTI name truncated in transform."); diff --git a/tpm2.0-abrmd.changes b/tpm2.0-abrmd.changes index a36894e..a81de5a 100644 --- a/tpm2.0-abrmd.changes +++ b/tpm2.0-abrmd.changes @@ -22,6 +22,8 @@ Wed Dec 11 11:55:13 UTC 2019 - matthias.gerstner@suse.com - Removed unnecessary libs / flags for pthreads in the TCTI pkg-config. - Output from configure script now accurately describes the state of the flags that govern the integration tests. +- drop fix_dlopen.patch: no longer necessary since abrmd not uses the tctildr + shared library. This one hopefully now does the right thing. ------------------------------------------------------------------- Mon Aug 26 06:49:37 UTC 2019 - mgerstner diff --git a/tpm2.0-abrmd.spec b/tpm2.0-abrmd.spec index 897c351..b4248d9 100644 --- a/tpm2.0-abrmd.spec +++ b/tpm2.0-abrmd.spec @@ -39,7 +39,6 @@ Recommends: libtss2-tcti-device0 Recommends: libtss2-tcti-tabrmd0 Requires: tpm2-0-tss BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: fix_dlopen.patch # the auto activation is not whitelisted for <= SLE12-SP3 %if 0%{?sle_version} > 120300 || 0%{?is_opensuse} %define install_dbus_files 1 @@ -74,7 +73,6 @@ use with the SAPI library (libtss2-sys) like any other TCTI. %prep %setup -q -n tpm2-abrmd-%{version} -%patch0 -p1 %build export CFLAGS="%optflags -fPIE"