diff --git a/.gitignore b/.gitignore index 540596e..6c4a0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tpm2-abrmd-2.0.0.tar.gz +SOURCES/tpm2-abrmd-2.1.1.tar.gz diff --git a/.tpm2-abrmd.metadata b/.tpm2-abrmd.metadata index cb67256..1bde8fd 100644 --- a/.tpm2-abrmd.metadata +++ b/.tpm2-abrmd.metadata @@ -1 +1 @@ -3df5896c55f6ffd520c4ff3c1f4b1d65f8738417 SOURCES/tpm2-abrmd-2.0.0.tar.gz +54e92602ea4234d6b57a2528b77d64df272f5ada SOURCES/tpm2-abrmd-2.1.1.tar.gz diff --git a/SOURCES/tcti-dynamic-Make-the-tss2-device-TCTI-library-SONAM.patch b/SOURCES/tcti-dynamic-Make-the-tss2-device-TCTI-library-SONAM.patch deleted file mode 100644 index 13b2f6c..0000000 --- a/SOURCES/tcti-dynamic-Make-the-tss2-device-TCTI-library-SONAM.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 9c4a30c22725948537911dafa664d3741fd0249b Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 4 Jul 2018 16:04:15 +0200 -Subject: [PATCH 1/1] tcti-dynamic: Make the tss2 device TCTI library SONAME - the default - -The raw libtss2-tcti-device.so is only included in the development package -but the tpm2-abrmd tries to dynamically load this instead of the library's -SONAME which is included in the tpm2-tss package. - -This was reported in [0] and partially fixed by the commit d2f0b2d1f0f -("tcti-util: Use proper SONAME for TCTI dlopen"). But I still needed these -changes so the tpm2-abrmd daemon could lookup the correct library name. - -[0]: https://lists.01.org/pipermail/tpm2/2018-May/000700.html - -Signed-off-by: Javier Martinez Canillas ---- - man/tpm2-abrmd.8.in | 12 ++++++------ - src/tabrmd.h | 2 +- - src/tcti-dynamic.c | 2 +- - src/tcti-dynamic.h | 2 +- - 4 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/man/tpm2-abrmd.8.in b/man/tpm2-abrmd.8.in -index c745a7e5eac..e02cbf44a16 100644 ---- a/man/tpm2-abrmd.8.in -+++ b/man/tpm2-abrmd.8.in -@@ -25,7 +25,7 @@ is formatted as "tcti-name:tcti-conf" where: - .IP 'tcti-name' - The name of the TCTI library shared object file. Libraries are found using - the same algorithm as dlopen (3). If the TCTI library file name follows the --naming convention: \fBlibtss2-tcti-.so\fR where is the name for -+naming convention: \fBlibtss2-tcti-.so.0\fR where is the name for - the TCTI, the value of \fB\fR may be supplied in place of the full - library file name. See 'EXAMPLES' below. - .IP 'tcti-conf' -@@ -89,21 +89,21 @@ Execute daemon with default TCTI and provided config string: - This is equivalent to: - .B tpm2-abrmd --tcti="device:/dev/tpm0" - .br --.B tpm2-abrmd --tcti="libtss2-tcti-device.so:/dev/tpm0" -+.B tpm2-abrmd --tcti="libtss2-tcti-device.so.0:/dev/tpm0" - .TP - Have daemon use Microsoft/IBM TPM2 Simulator tcti library --'libtss2-tcti-mssim.so'. -+'libtss2-tcti-mssim.so.0'. - This connects to a TPM2 simulator via a TCP mssim. - .br - .B tpm2-abrmd --tcti="mssim" - .br --.B tpm2-abrmd --tcti="libtss2-tcti-mssim.so" -+.B tpm2-abrmd --tcti="libtss2-tcti-mssim.so.0" - .TP --Have daemon use tcti library 'libtss2-tcti-mssim.so' and config string -+Have daemon use tcti library 'libtss2-tcti-mssim.so.0' and config string - 'tcp://127.0.0.1:5555': - .B tpm2-abrmd --tcti=mssim:tcp://127.0.0.1:5555" - .br --.B tpm2-abrmd --tcti="libtss2-tcti-mssim.so:tcp://127.0.0.1:5555" -+.B tpm2-abrmd --tcti="libtss2-tcti-mssim.so.0:tcp://127.0.0.1:5555" - .SH AUTHOR - Philip Tricca - .SH "SEE ALSO" -diff --git a/src/tabrmd.h b/src/tabrmd.h -index 7e0eb02b4ef..ed9d7dd063b 100644 ---- a/src/tabrmd.h -+++ b/src/tabrmd.h -@@ -43,7 +43,7 @@ - #define TABRMD_ENTROPY_SRC_DEFAULT "/dev/urandom" - #define TABRMD_SESSIONS_MAX_DEFAULT 4 - #define TABRMD_SESSIONS_MAX 64 --#define TABRMD_TCTI_FILENAME_DEFAULT "libtss2-tcti-device.so" -+#define TABRMD_TCTI_FILENAME_DEFAULT "libtss2-tcti-device.so.0" - #define TABRMD_TCTI_CONF_DEFAULT NULL - #define TABRMD_TRANSIENT_MAX_DEFAULT 27 - #define TABRMD_TRANSIENT_MAX 100 -diff --git a/src/tcti-dynamic.c b/src/tcti-dynamic.c -index f3e0b6db694..852eb70b2ea 100644 ---- a/src/tcti-dynamic.c -+++ b/src/tcti-dynamic.c -@@ -139,7 +139,7 @@ tcti_dynamic_class_init (TctiDynamicClass *klass) - g_param_spec_string ("file-name", - "TCTI library file", - "Library file containing TCTI implementation.", -- "libtss2-tcti-device.so", -+ "libtss2-tcti-device.so.0", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); - obj_properties[PROP_CONF_STR] = - g_param_spec_string ("conf-str", -diff --git a/src/tcti-dynamic.h b/src/tcti-dynamic.h -index 08691a66d58..2ed0eaea640 100644 ---- a/src/tcti-dynamic.h -+++ b/src/tcti-dynamic.h -@@ -34,7 +34,7 @@ - - G_BEGIN_DECLS - --#define TCTI_DYNAMIC_DEFAULT_FILE_NAME "libtss2-tcti-device.so" -+#define TCTI_DYNAMIC_DEFAULT_FILE_NAME "libtss2-tcti-device.so.0" - #define TCTI_DYNAMIC_DEFAULT_CONF_STR "/dev/tpm0" - - typedef struct _TctiDynamicClass { --- -2.17.1 - diff --git a/SPECS/tpm2-abrmd.spec b/SPECS/tpm2-abrmd.spec index 260d2a2..cba5130 100644 --- a/SPECS/tpm2-abrmd.spec +++ b/SPECS/tpm2-abrmd.spec @@ -1,7 +1,7 @@ %global selinuxtype targeted Name: tpm2-abrmd -Version: 2.0.0 +Version: 2.1.1 Release: 3%{?dist} Summary: A system daemon implementing TPM2 Access Broker and Resource Manager @@ -9,8 +9,6 @@ License: BSD URL: https://github.com/tpm2-software/tpm2-abrmd Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: tcti-dynamic-Make-the-tss2-device-TCTI-library-SONAM.patch - %{?systemd_requires} BuildRequires: systemd BuildRequires: libtool @@ -24,7 +22,7 @@ BuildRequires: pkgconfig(tss2-sys) BuildRequires: tpm2-tss-devel >= 2.0.0-2%{?dist} # tpm2-abrmd depends on the package that contains its SELinux policy module -Requires: (%{name}-selinux >= %{version}-1%{?dist} if selinux-policy-%{selinuxtype}) +Requires: (%{name}-selinux >= 2.0.0-1%{?dist} if selinux-policy-%{selinuxtype}) %description tpm2-abrmd is a system daemon implementing the TPM2 access broker (TAB) and @@ -92,6 +90,18 @@ required to build applications that use tpm2-abrmd. %systemd_postun tpm2-abrmd.service %changelog +* Tue May 28 2019 Jerry Snitselaar - 2.1.1-3 +- Update CI gating to use test. +resolves: rhbz#1682416 + +* Tue May 14 2019 Jerry Snitselaar - 2.1.1-2 +- Add initial CI gating. +resolves: rhbz#1682416 + +* Tue Apr 30 2019 Jerry Snitselaar - 2.1.1-1 +- Rebase to release 2.1.1 +resolves: rhbz#1664499 + * Wed Feb 06 2019 Jerry Snitselaar - 2.0.0-3 - Fix tpm2-abrmd-selinux Requires resolves: rhbz#1642000