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-tcs-ps-tcsps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'security/trousers/files/patch-src-tcs-ps-tcsps.c') diff --git a/security/trousers/files/patch-src-tcs-ps-tcsps.c b/security/trousers/files/patch-src-tcs-ps-tcsps.c index df56d1883a7f..3f79d1b0e626 100644 --- a/security/trousers/files/patch-src-tcs-ps-tcsps.c +++ b/security/trousers/files/patch-src-tcs-ps-tcsps.c @@ -1,5 +1,5 @@ ---- src/tcs/ps/tcsps.c.orig 2010-05-02 11:39:11.000000000 +0900 -+++ src/tcs/ps/tcsps.c 2010-10-24 21:04:04.833559489 +0900 +--- src/tcs/ps/tcsps.c.orig 2014-04-24 18:05:44 UTC ++++ src/tcs/ps/tcsps.c @@ -24,6 +24,11 @@ #define LE_16 htole16 #define LE_32 htole32 -- cgit v1.2.3