diff --git a/tpm-tools-1.3.5-fix-for-new-DSO-linking.patch b/tpm-tools-1.3.5-fix-for-new-DSO-linking.patch new file mode 100644 index 0000000..4393e93 --- /dev/null +++ b/tpm-tools-1.3.5-fix-for-new-DSO-linking.patch @@ -0,0 +1,58 @@ +Fix build with new DSO linking rules + +tpm_sealdata.o calls functions from libcrypto, but the dependency was not +directly expressed. libtpm_pkcs11 calls functions from libdl. +See http://fedoraproject.org/wiki/UnderstandingDSOLinkChange for details. + +Index: tpm-tools-1.3.5/src/cmds/Makefile.am +=================================================================== +--- tpm-tools-1.3.5.orig/src/cmds/Makefile.am ++++ tpm-tools-1.3.5/src/cmds/Makefile.am +@@ -30,7 +30,7 @@ else + AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX + endif + +-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal ++LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto + + tpm_sealdata_SOURCES = tpm_sealdata.c + tpm_unsealdata_SOURCES = tpm_unsealdata.c +Index: tpm-tools-1.3.5/lib/Makefile.am +=================================================================== +--- tpm-tools-1.3.5.orig/lib/Makefile.am ++++ tpm-tools-1.3.5/lib/Makefile.am +@@ -52,7 +52,7 @@ if P11_SUPPORT + noinst_LTLIBRARIES += libtpm_pkcs11.la + + libtpm_pkcs11_la_SOURCES= tpm_pkcs11.c +-libtpm_pkcs11_la_LIBADD = libtpm_utils.la ++libtpm_pkcs11_la_LIBADD = libtpm_utils.la -ldl + endif + + # +Index: tpm-tools-1.3.5/lib/Makefile.in +=================================================================== +--- tpm-tools-1.3.5.orig/lib/Makefile.in ++++ tpm-tools-1.3.5/lib/Makefile.in +@@ -297,7 +297,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ + libtpm_tspi_la_SOURCES = tpm_tspi.c + libtpm_tspi_la_LIBADD = libtpm_utils.la + @P11_SUPPORT_TRUE@libtpm_pkcs11_la_SOURCES = tpm_pkcs11.c +-@P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la ++@P11_SUPPORT_TRUE@libtpm_pkcs11_la_LIBADD = libtpm_utils.la -ldl + + # + # Installed Libraries +Index: tpm-tools-1.3.5/src/cmds/Makefile.in +=================================================================== +--- tpm-tools-1.3.5.orig/src/cmds/Makefile.in ++++ tpm-tools-1.3.5/src/cmds/Makefile.in +@@ -242,7 +242,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + @TSS_LIB_IS_12_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX + @TSS_LIB_IS_12_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX -DTSS_LIB_IS_12 +-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal ++LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto + tpm_sealdata_SOURCES = tpm_sealdata.c + tpm_unsealdata_SOURCES = tpm_unsealdata.c + all: all-am diff --git a/tpm-tools.spec b/tpm-tools.spec index 66b03fa..2fbd7a0 100644 --- a/tpm-tools.spec +++ b/tpm-tools.spec @@ -1,7 +1,7 @@ %global name tpm-tools %global version 1.3.5 %global tarballrev -1 -%global release 1 +%global release 2 Name: %{name} Summary: Management tools for the TPM hardware @@ -10,6 +10,7 @@ Release: %{release}%{?dist} License: CPL Group: Applications/System Source0: http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz +Patch0: tpm-tools-1.3.5-fix-for-new-DSO-linking.patch URL: http://trousers.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: trousers-devel openssl-devel opencryptoki-devel @@ -45,6 +46,7 @@ for developing tpm-tools applications. %prep %setup -q +%patch0 -p1 %build %configure @@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/tpmUnseal* %changelog +* Sun Feb 14 2010 Michal Schmidt - 1.3.5-2 +- Fix for DSO linking change. + * Mon Feb 01 2010 Steve Grubb 1.3.5-1 - New upstream bug fix release