diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2010-12-14 22:49:47 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2010-12-14 22:49:47 +0000 |
| commit | 3fc9cc9ed381703d46ae7fc462dc2c97c8a33913 (patch) | |
| tree | c328a01ce6fd4aee3037e7fea680ac0bbd4f79b8 | |
| parent | b144080799dc149115acb1b487af07aabdb06ff6 (diff) | |
| download | freebsd-ports-3fc9cc9ed381703d46ae7fc462dc2c97c8a33913.zip | |
All cleanup done (PREFIX clean, permission clean), and bump PORTREVISION.
| -rw-r--r-- | emulators/tpm-emulator/Makefile | 10 | ||||
| -rw-r--r-- | emulators/tpm-emulator/files/patch-CMakeLists.txt | 9 | ||||
| -rw-r--r-- | emulators/tpm-emulator/pkg-plist | 1 | ||||
| -rw-r--r-- | security/trousers/Makefile | 17 |
4 files changed, 27 insertions, 10 deletions
diff --git a/emulators/tpm-emulator/Makefile b/emulators/tpm-emulator/Makefile index 8786332e580d..a065d26c9b51 100644 --- a/emulators/tpm-emulator/Makefile +++ b/emulators/tpm-emulator/Makefile @@ -7,6 +7,7 @@ PORTNAME= tpm-emulator PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= emulators security MASTER_SITES= BERLIOS/${PORTNAME} DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION} @@ -47,4 +48,13 @@ WRKSRC= ${WRKDIR}/${DISTNAME} post-extract: @${MKDIR} ${WRKSRC}/build +post-install: + @${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 ${PREFIX}/var/lib/tpm + @${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/tpm + +add-plist-post: + @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} var/run/tpm 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/tpm" >> ${TMPPLIST} + .include <bsd.port.mk> diff --git a/emulators/tpm-emulator/files/patch-CMakeLists.txt b/emulators/tpm-emulator/files/patch-CMakeLists.txt index 33f4b1b0ae15..076defe218fe 100644 --- a/emulators/tpm-emulator/files/patch-CMakeLists.txt +++ b/emulators/tpm-emulator/files/patch-CMakeLists.txt @@ -1,6 +1,11 @@ --- CMakeLists.txt.orig 2010-07-06 06:21:20.000000000 +0900 -+++ CMakeLists.txt 2010-12-15 07:24:08.279834034 +0900 -@@ -36,7 +36,7 @@ ++++ CMakeLists.txt 2010-12-15 07:33:54.234887143 +0900 +@@ -32,11 +32,11 @@ + else() + set(TPM_LOG_FILE "/var/log/tpmd.log") + set(TPM_SOCKET_NAME "/var/run/tpm/tpmd_socket:0") +-set(TPM_STORAGE_NAME "/var/lib/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}") ++set(TPM_STORAGE_NAME "$ENV{PREFIX}/var/lib/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}") set(TPM_DEVICE_NAME "/dev/tpm") endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/emulators/tpm-emulator/pkg-plist b/emulators/tpm-emulator/pkg-plist index 15185f639fe0..1e106fbe20dc 100644 --- a/emulators/tpm-emulator/pkg-plist +++ b/emulators/tpm-emulator/pkg-plist @@ -4,3 +4,4 @@ lib/libtddl.a lib/libtddl.so lib/libtddl.so.1 lib/libtddl.so.1.2.0.7 +@dirrmtry var/lib/tpm diff --git a/security/trousers/Makefile b/security/trousers/Makefile index 800f7051dcd3..edfb90a6692c 100644 --- a/security/trousers/Makefile +++ b/security/trousers/Makefile @@ -7,7 +7,7 @@ PORTNAME= trousers PORTVERSION= 0.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} @@ -86,15 +86,16 @@ post-install: ${WRKSRC}/dist/tcsd.conf ${EXAMPLESDIR}/tcsd.conf @[ -f ${PREFIX}/etc/tcsd.conf ] || \ ${CP} -p ${EXAMPLESDIR}/tcsd.conf ${PREFIX}/etc/tcsd.conf - @${INSTALL} -d -o root -g ${GROUPS} -m 0700 /var/run/tpm - @${INSTALL} -d -o root -g ${GROUPS} -m 0700 /var/run/ima - @${INSTALL} -d -o root -g ${GROUPS} -m 0700 ${PREFIX}/var/lib/tpm + @${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/tpm + @${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/ima + @${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 ${PREFIX}/var/lib/tpm @${CAT} ${PKGMESSAGE} add-plist-post: - @${ECHO_CMD} "@unexec ${RMDIR} /var/run/tpm 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${INSTALL} -d -o root -g ${GROUPS} -m 0700 /var/run/tpm" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} /var/run/ima 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${INSTALL} -d -o root -g ${GROUPS} -m 0700 /var/run/ima" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} var/run/tpm 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/tpm" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} var/run/ima 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/ima" >> ${TMPPLIST} .include <bsd.port.post.mk> |