diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2016-05-18 13:53:45 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2016-05-18 13:53:45 +0000 |
| commit | 5c2173b0dfcb57bb4a07acc58d3fd10066cad4fa (patch) | |
| tree | da9b2df572c6ff11d9931e782ac0888832e1445c /security/trousers/files/patch-src-tcsd-Makefile.am | |
| 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.
Notes
Notes:
svn path=/head/; revision=415449
Diffstat (limited to 'security/trousers/files/patch-src-tcsd-Makefile.am')
| -rw-r--r-- | security/trousers/files/patch-src-tcsd-Makefile.am | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/security/trousers/files/patch-src-tcsd-Makefile.am b/security/trousers/files/patch-src-tcsd-Makefile.am new file mode 100644 index 000000000000..8c6cd754468b --- /dev/null +++ b/security/trousers/files/patch-src-tcsd-Makefile.am @@ -0,0 +1,21 @@ +--- src/tcsd/Makefile.am.orig 2014-04-24 18:05:44 UTC ++++ src/tcsd/Makefile.am +@@ -1,4 +1,4 @@ +-sbin_PROGRAMS=tcsd ++sbin_PROGRAMS=tcsd tcsd_emu + + tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE + tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@ +@@ -6,6 +6,12 @@ tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,no + + tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c + ++tcsd_emu_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE ++tcsd_emu_LDADD=${top_builddir}/src/tcs/libtcs_emu.a -ltddl -L${LOCALBASE}/lib/tddl_emu -lpthread @CRYPTOLIB@ ++tcsd_emu_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now -Wl,-rpath=${LOCALBASE}/lib/tddl_emu:${LOCALBASE}/lib ++ ++tcsd_emu_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c ++ + if TSS_BUILD_PS + tcsd_CFLAGS+=-DTSS_BUILD_PS + endif |