diff --git a/1.0.tar.gz b/1.0.tar.gz new file mode 100644 index 0000000..76d40ce --- /dev/null +++ b/1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5697cfe7f4fd44d6ae1ec03cddb6b44d5cf5cd13e134c7238049551d1615488 +size 3790493 diff --git a/baselibs.conf b/baselibs.conf index 530badb..f0e1bda 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libtss2-0 +libsapi0 diff --git a/resourcemgr.service b/resourcemgr.service deleted file mode 100644 index 9dcf41a..0000000 --- a/resourcemgr.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=TPM 2.0 Core Services Daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/resourcemgr - -[Install] -WantedBy=multi-user.target diff --git a/tpm2-0-tss-0.98.tar.gz b/tpm2-0-tss-0.98.tar.gz deleted file mode 100644 index 9452184..0000000 --- a/tpm2-0-tss-0.98.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7be3f9f2473506ab06a3f06ebd8ea0920c317e7e14c5ca7ce54e58e8b48b9232 -size 3742841 diff --git a/tpm2-0-tss-configure.patch b/tpm2-0-tss-configure.patch new file mode 100644 index 0000000..04b8fb5 --- /dev/null +++ b/tpm2-0-tss-configure.patch @@ -0,0 +1,13 @@ +Index: TPM2.0-TSS-1.0/configure.ac +=================================================================== +--- TPM2.0-TSS-1.0.orig/configure.ac ++++ TPM2.0-TSS-1.0/configure.ac +@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_PROG_CC + AC_PROG_CXX + LT_INIT() +-AX_PTHREAD([], [AC_MSG_ERROR([requires pthread])]) ++AX_PTHREAD([], []) + AM_INIT_AUTOMAKE([foreign + subdir-objects]) + AC_CONFIG_FILES([Makefile]) diff --git a/tpm2-0-tss.changes b/tpm2-0-tss.changes index b409797..61b6241 100644 --- a/tpm2-0-tss.changes +++ b/tpm2-0-tss.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Thu Feb 16 13:35:44 UTC 2017 - jengelh@inai.de + +- Remove --with-pic which is only for static libs. +- Fix an improper Requires line. +- Split libtcti* from libsapi0; these are independentlty + developable units. + +------------------------------------------------------------------- +Wed Feb 8 13:43:55 UTC 2017 - meissner@suse.com + +- Updated to 1.0 (FATE#321508) + - Added + - Travis-CI integration with GitHub + - Unit tests for primitive (un)?marshal functions. + - Example systemd unit for resourcemgr. + - Allow for unit tests to be enabled selectively. + - added pkg-config files for libraries + - Changed + - move simulator initialization code to socket TCTI init function. + - socket TCTI finalize no longer frees context + - rename libtss2 to libsapi + - rename libtcti_device to libtcti-device + - rename libtcti_socket to libtcti-socket + - move $(includedir)/tss to $(includedir)/sapi + - Move default compiler flags to config.site file. + - Fixed + - Fix run away resourcemgr threads by closing client sockets when resourcemgr recv() call returns 0. + - Set MSG_NOSIGNAL for client connections to avoid SIGPIPE killing resourcemgr. + - Fixes to handling of persistent objects by resourcemgr. + - Removed + - Semicolon from TPMA_* macros definitions. + - Windows build files. + - SAPI_CLIENT macro tests. + - Security + - Fix buffer overflow in resourcemgr. +- use sample resourcemanager.service +- tpm2-0-tss-configure.patch: fix weird error. + ------------------------------------------------------------------- Sat Aug 6 19:28:27 UTC 2016 - meissner@suse.com diff --git a/tpm2-0-tss.spec b/tpm2-0-tss.spec index 3c1dca0..0cd39d9 100644 --- a/tpm2-0-tss.spec +++ b/tpm2-0-tss.spec @@ -1,7 +1,7 @@ # # spec file for package tpm2-0-tss # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ Name: tpm2-0-tss -Version: 0.98 +Version: 1.0 Release: 0 -Summary: TSS (TCG Software Stack) access library for TPM 2.0 chips +Summary: Intel's TCG Software Stack access library for TPM 2.0 chips License: BSD-2-Clause Group: Productivity/Security Url: https://github.com/01org/TPM2.0-TSS -Source0: %{name}-%{version}.tar.gz -Source1: resourcemgr.service +Source0: https://github.com/01org/TPM2.0-TSS/archive/%{version}.tar.gz Source2: baselibs.conf +Patch0: tpm2-0-tss-configure.patch +BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool @@ -38,43 +39,67 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build The tpm2-0-tss package provides a TPM 2.0 TSS implementation. %package devel -Summary: Development headers for the TSS (TCG Software Stack) access library for TPM 2.0 chips +Summary: Development headers for the Intel TSS library for TPM 2.0 chips Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: libtss2-0 = %{version} +Requires: libsapi0 = %{version} +Requires: libtcti-device0 = %{version} +Requires: libtcti-socket0 = %{version} %description devel -This package provides the development files for the libtss2 library +This package provides the development files for the libsapi library for accessing TPM 2.0 chips. -%package -n libtss2-0 -Summary: TSS (TCG Software Stack) access library for TPM 2.0 chip +%package -n libsapi0 +Summary: TPM2 System API library Group: System/Libraries Requires: trousers # Non-SLPP package name from earlier Obsoletes: libtss2 < %version-%release Provides: libtss2 = %version-%release -%description -n libtss2-0 +%description -n libsapi0 This package provides the library to access the TSS (TCG Software Stack) for accessing TPM 2.0 chips. +%package -n libtcti-device0 +Summary: TCTI library for communicating with a TPM device node +Group: System/Libraries + +%description -n libtcti-device0 +TPM Command Transmission Interface library for communicating with a +TPM device node. + +%package -n libtcti-socket0 +Summary: TCTI library for communicating with a TPM over a socket +Group: System/Libraries + +%description -n libtcti-socket0 +TPM Command Transmission Interface library for communicating with a +TPM over a socket. + %prep -%setup -q +%setup -q -n TPM2.0-TSS-%{version} +%patch0 -p1 %build bash bootstrap -%configure --disable-static --with-pic +%configure --disable-static make %{?_smp_mflags} PTHREAD_LDFLAGS=-pthread %install %make_install find %{buildroot} -type f -name "*.la" -delete -print -install -D -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/resourcemgr.service +install -D -m 0644 contrib/resourcemgr.service %{buildroot}/%{_unitdir}/resourcemgr.service +sed -e 's#usr/local/sbin/#usr/sbin#;' -i %{buildroot}/%{_unitdir}/resourcemgr.service ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rcresourcemgr -%post -n libtss2-0 -p /sbin/ldconfig -%postun -n libtss2-0 -p /sbin/ldconfig +%post -n libsapi0 -p /sbin/ldconfig +%postun -n libsapi0 -p /sbin/ldconfig +%post -n libtcti-device0 -p /sbin/ldconfig +%postun -n libtcti-device0 -p /sbin/ldconfig +%post -n libtcti-socket0 -p /sbin/ldconfig +%postun -n libtcti-socket0 -p /sbin/ldconfig %pre %service_add_pre resourcemgr.service @@ -90,7 +115,7 @@ ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rcresourcemgr %files %defattr(-,root,root) -%doc *.md ChangeLog LICENSE *.png +%doc *.md LICENSE %{_sbindir}/resourcemgr /%{_unitdir}/resourcemgr.service %{_sbindir}/rcresourcemgr @@ -98,15 +123,22 @@ ln -sv %{_sbindir}/service %{buildroot}%{_sbindir}/rcresourcemgr %files devel %defattr(-,root,root) %{_includedir}/tcti -%{_includedir}/tss2 +%{_includedir}/sapi %{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc ##only available in static form #%{_libdir}/libtddl.a -%files -n libtss2-0 +%files -n libsapi0 %defattr(-,root,root) -/%{_libdir}/libtss2.so.* -/%{_libdir}/libtctidevice.so.* -/%{_libdir}/libtctisocket.so.* +%{_libdir}/libsapi.so.* + +%files -n libtcti-device0 +%defattr(-,root,root) +%{_libdir}/libtcti-device.so.* + +%files -n libtcti-socket0 +%defattr(-,root,root) +%{_libdir}/libtcti-socket.so.* %changelog