From d451320a04960999d2e6914f0d5bb0663c148c8119f26761dc0599dd7284af0c Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Wed, 11 Dec 2019 12:02:48 +0000 Subject: [PATCH] - 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"