[packages/tpm2-tss] - added missing patch (missing file from git) and link patch (fix libtss2-tcti-libtpms linking); bui

qboosh qboosh at pld-linux.org
Mon Feb 21 21:31:51 CET 2022


commit 16e9c50ebb153dfef199dfd30ede96179b12b43d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 21 21:33:23 2022 +0100

    - added missing patch (missing file from git) and link patch (fix libtss2-tcti-libtpms linking); build with libtpms support

 tpm2-tss-link.patch    | 11 +++++++++++
 tpm2-tss-missing.patch | 10 ++++++++++
 tpm2-tss.spec          | 10 ++++++++++
 3 files changed, 31 insertions(+)
---
diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index e1ffd82..7ad9b3b 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -13,6 +13,8 @@ Group:		Libraries
 Source0:	https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	0d60d0df3fd0daae66881a3022281323
 Patch0:		%{name}-install.patch
+Patch1:		%{name}-missing.patch
+Patch2:		%{name}-link.patch
 URL:		https://github.com/tpm2-software/tpm2-tss
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -21,6 +23,7 @@ BuildRequires:	doxygen
 BuildRequires:	json-c-devel
 BuildRequires:	libltdl-devel >= 2:2
 BuildRequires:	libtool >= 2:2
+BuildRequires:	libtpms-devel
 %{?with_mbedtls:BuildRequires:	mbedtls-devel}
 %{!?with_mbedtls:BuildRequires:	openssl-devel >= 1.1.0}
 BuildRequires:	pkgconfig
@@ -91,6 +94,8 @@ Biblioteka statyczna tpm2-tss.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 # set VERSION properly when there is no .git directory
 %{__sed} -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/%{version}/' configure.ac
@@ -142,6 +147,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libtss2-tcti-cmd.so.0
 %attr(755,root,root) %{_libdir}/libtss2-tcti-device.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtss2-tcti-device.so.0
+%attr(755,root,root) %{_libdir}/libtss2-tcti-libtpms.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtss2-tcti-libtpms.so.0
 %attr(755,root,root) %{_libdir}/libtss2-tcti-mssim.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtss2-tcti-mssim.so.0
 %attr(755,root,root) %{_libdir}/libtss2-tcti-pcap.so.*.*.*
@@ -171,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libtss2-sys.so
 %attr(755,root,root) %{_libdir}/libtss2-tcti-cmd.so
 %attr(755,root,root) %{_libdir}/libtss2-tcti-device.so
+%attr(755,root,root) %{_libdir}/libtss2-tcti-libtpms.so
 %attr(755,root,root) %{_libdir}/libtss2-tcti-mssim.so
 %attr(755,root,root) %{_libdir}/libtss2-tcti-pcap.so
 %attr(755,root,root) %{_libdir}/libtss2-tcti-swtpm.so
@@ -183,6 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/tss2-sys.pc
 %{_pkgconfigdir}/tss2-tcti-cmd.pc
 %{_pkgconfigdir}/tss2-tcti-device.pc
+%{_pkgconfigdir}/tss2-tcti-libtpms.pc
 %{_pkgconfigdir}/tss2-tcti-mssim.pc
 %{_pkgconfigdir}/tss2-tcti-pcap.pc
 %{_pkgconfigdir}/tss2-tcti-swtpm.pc
@@ -207,6 +216,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libtss2-sys.a
 %{_libdir}/libtss2-tcti-cmd.a
 %{_libdir}/libtss2-tcti-device.a
+%{_libdir}/libtss2-tcti-libtpms.a
 %{_libdir}/libtss2-tcti-mssim.a
 %{_libdir}/libtss2-tcti-pcap.a
 %{_libdir}/libtss2-tcti-swtpm.a
diff --git a/tpm2-tss-link.patch b/tpm2-tss-link.patch
new file mode 100644
index 0000000..2b33301
--- /dev/null
+++ b/tpm2-tss-link.patch
@@ -0,0 +1,11 @@
+--- tpm2-tss-3.2.0/Makefile.am.orig	2022-02-21 21:15:40.607601135 +0100
++++ tpm2-tss-3.2.0/Makefile.am	2022-02-21 21:19:52.206238108 +0100
+@@ -369,7 +369,7 @@ EXTRA_DIST += lib/tss2-tcti-libtpms.map
+ if HAVE_LD_VERSION_SCRIPT
+ src_tss2_tcti_libtss2_tcti_libtpms_la_LDFLAGS  = -Wl,--version-script=$(srcdir)/lib/tss2-tcti-libtpms.map
+ endif # HAVE_LD_VERSION_SCRIPT
+-src_tss2_tcti_libtss2_tcti_libtpms_la_LIBADD   = $(libtss2_tctildr) $(libutil)
++src_tss2_tcti_libtss2_tcti_libtpms_la_LIBADD   = $(libtss2_mu) $(libutil)
+ src_tss2_tcti_libtss2_tcti_libtpms_la_SOURCES  = \
+     src/tss2-tcti/tcti-common.c \
+     src/tss2-tcti/tcti-libtpms.c \
diff --git a/tpm2-tss-missing.patch b/tpm2-tss-missing.patch
new file mode 100644
index 0000000..ecefd03
--- /dev/null
+++ b/tpm2-tss-missing.patch
@@ -0,0 +1,10 @@
+--- tpm2-tss-3.2.0/lib/tss2-tcti-libtpms.map.orig	1970-01-01 01:00:00.000000000 +0100
++++ tpm2-tss-3.2.0/lib/tss2-tcti-libtpms.map	2022-02-21 21:14:00.504810105 +0100
+@@ -0,0 +1,7 @@
++{
++    global:
++        Tss2_Tcti_Info;
++        Tss2_Tcti_Libtpms_Init;
++    local:
++        *;
++};
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tpm2-tss.git/commitdiff/16e9c50ebb153dfef199dfd30ede96179b12b43d



More information about the pld-cvs-commit mailing list