summaryrefslogtreecommitdiff
path: root/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2016-05-18 13:53:45 +0000
committerHiroki Sato <hrs@FreeBSD.org>2016-05-18 13:53:45 +0000
commit5c2173b0dfcb57bb4a07acc58d3fd10066cad4fa (patch)
treeda9b2df572c6ff11d9931e782ac0888832e1445c /emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
parent- Simplify MASTER_SITES (diff)
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.
Diffstat (limited to 'emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt')
-rw-r--r--emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt b/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
index 8c1f00c2c879..fb503a5ef2a5 100644
--- a/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
+++ b/emulators/tpm-emulator/files/patch-tpmd-CMakeLists.txt
@@ -1,6 +1,6 @@
---- tpmd/CMakeLists.txt.orig 2010-07-06 06:21:20.000000000 +0900
-+++ tpmd/CMakeLists.txt 2010-10-25 02:56:43.624559116 +0900
-@@ -11,5 +11,5 @@
+--- tpmd/CMakeLists.txt.orig 2011-12-20 18:30:06 UTC
++++ tpmd/CMakeLists.txt
+@@ -11,5 +11,5 @@ elseif(WIN32)
add_subdirectory(windows)