From 5c2173b0dfcb57bb4a07acc58d3fd10066cad4fa Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Wed, 18 May 2016 13:53:45 +0000 Subject: security/trousers: - Update to 0.3.13. - Remove CONFLICTS with emulators/tpm-emulator. Two separate binaries, sbin/tcsd (for actual TPM device) and sbin/tcsd_emu (for TPM emulator) are now installed. rc.d/tcsd chooses one of them depending on $tcsd_mode. When tcsd_mode="native" (default) it runs sbin/tcsd, and when tcsd_mode="emulator" it runs sbin/tcsd_emu. Note that sbin/tcsd_emu depends on tpmd in emulators/tpm-emulator. - Simplify @sample. emulators/tpm-emulator: - Remove CONFLICTS with security/trousers. - Simplify rc.d/tpmd. --- security/trousers/files/patch-src-trspi-Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'security/trousers/files/patch-src-trspi-Makefile.am') diff --git a/security/trousers/files/patch-src-trspi-Makefile.am b/security/trousers/files/patch-src-trspi-Makefile.am index e9fd99e550c7..8b7f1bb90a64 100644 --- a/security/trousers/files/patch-src-trspi-Makefile.am +++ b/security/trousers/files/patch-src-trspi-Makefile.am @@ -1,5 +1,5 @@ ---- src/trspi/Makefile.am.orig 2012-09-20 02:24:48.000000000 +0900 -+++ src/trspi/Makefile.am 2013-12-05 15:12:35.000000000 +0900 +--- src/trspi/Makefile.am.orig 2014-04-24 18:05:44 UTC ++++ src/trspi/Makefile.am @@ -1,7 +1,8 @@ noinst_LTLIBRARIES=libtrousers.la -- cgit v1.2.3