diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-06-20 16:23:28 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-06-20 16:23:28 +0000 |
| commit | 7ae7b018ccf7760013f368fcb83aad9ecd8982a8 (patch) | |
| tree | e83ee6693050a76e305a95a376451aa583df151e /security/trousers/files/patch-src_include_tcsd.h | |
| parent | textproc/rubygem-gitlab-grit: make it work with rubygem-mime-types again (diff) | |
With the power of USES=dos2unix, get rid of most patches and files
with CRLF.
While there, run make makepatch, rename patches to use the new scheme,
and various fixes.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'security/trousers/files/patch-src_include_tcsd.h')
| -rw-r--r-- | security/trousers/files/patch-src_include_tcsd.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/security/trousers/files/patch-src_include_tcsd.h b/security/trousers/files/patch-src_include_tcsd.h new file mode 100644 index 000000000000..6d5943f0a5ce --- /dev/null +++ b/security/trousers/files/patch-src_include_tcsd.h @@ -0,0 +1,29 @@ +--- src/include/tcsd.h.orig 2016-06-20 15:21:26 UTC ++++ src/include/tcsd.h +@@ -53,14 +53,22 @@ struct tcsd_config + #define TCSD_DEFAULT_CONFIG_FILE ETC_PREFIX "/tcsd.conf" + extern char *tcsd_config_file; + ++#ifndef TSS_USER_NAME + #define TSS_USER_NAME "tss" ++#endif ++#ifndef TSS_GROUP_NAME + #define TSS_GROUP_NAME "tss" ++#endif ++ ++#ifndef TPM_PREFIX ++#define TPM_PREFIX "/lib/tpm" ++#endif + + #define TCSD_DEFAULT_MAX_THREADS 10 +-#define TCSD_DEFAULT_SYSTEM_PS_FILE VAR_PREFIX "/lib/tpm/system.data" +-#define TCSD_DEFAULT_SYSTEM_PS_DIR VAR_PREFIX "/lib/tpm" +-#define TCSD_DEFAULT_FIRMWARE_LOG_FILE "/sys/kernel/security/tpm0/binary_bios_measurements" +-#define TCSD_DEFAULT_KERNEL_LOG_FILE "/sys/kernel/security/ima/binary_runtime_measurements" ++#define TCSD_DEFAULT_SYSTEM_PS_FILE VAR_PREFIX TPM_PREFIX "/system.data" ++#define TCSD_DEFAULT_SYSTEM_PS_DIR VAR_PREFIX TPM_PREFIX ++#define TCSD_DEFAULT_FIRMWARE_LOG_FILE "/var/run/tpm/binary_bios_measurements" ++#define TCSD_DEFAULT_KERNEL_LOG_FILE "/var/run/ima/binary_runtime_measurements" + #define TCSD_DEFAULT_FIRMWARE_PCRS 0x00000000 + #define TCSD_DEFAULT_KERNEL_PCRS 0x00000000 + #define TCSD_DEFAULT_DISABLE_IPV4 0 |