diff options
| author | hrs <hrs@FreeBSD.org> | 2016-06-10 18:24:09 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2016-06-10 18:24:09 +0000 |
| commit | 45861dd5be667ee636e42b6f7490670442010174 (patch) | |
| tree | 407a537c37f6192a45564ef96f3db066c576c7d9 | |
| parent | a456c7bca7b5913c85ba7ec56272a348ddd15275 (diff) | |
| download | FreeBSD-ports-45861dd5be667ee636e42b6f7490670442010174.zip FreeBSD-ports-45861dd5be667ee636e42b6f7490670442010174.tar.gz | |
Fix dependency and build of ICSF token support. The configure script
enabled the build when libldap was found.
Spotted by: luca.pizzamiglio@gmail.com
PR: 209992
| -rw-r--r-- | security/opencryptoki/Makefile | 9 | ||||
| -rw-r--r-- | security/opencryptoki/files/pkcsslotd.in | 3 | ||||
| -rw-r--r-- | security/opencryptoki/pkg-plist | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile index 8a139cb..aafeeec 100644 --- a/security/opencryptoki/Makefile +++ b/security/opencryptoki/Makefile @@ -3,6 +3,7 @@ PORTNAME= opencryptoki PORTVERSION= 3.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF @@ -40,11 +41,15 @@ PLIST_SUB= USERS="${USERS}" GROUPS="${GROUPS}" USERS= _pkcs11 GROUPS= _pkcs11 +OPTIONS_DEFINE= LDAP +OPTIONS_SUB= yes +LDAP_CONFIGURE_ENABLE= icsf +LDAP_USE= OPENLDAP=yes + post-install: ${MV} ${STAGEDIR}${ETCDIR}/opencryptoki.conf \ ${STAGEDIR}${ETCDIR}/opencryptoki.conf.sample - ${RMDIR} ${STAGEDIR}/var/run/opencryptoki/swtok \ - ${STAGEDIR}/var/run/opencryptoki/tpm \ + ${RMDIR} ${STAGEDIR}/var/run/opencryptoki/* \ ${STAGEDIR}/var/run/opencryptoki .include <bsd.port.mk> diff --git a/security/opencryptoki/files/pkcsslotd.in b/security/opencryptoki/files/pkcsslotd.in index 159fa36..8518e57 100644 --- a/security/opencryptoki/files/pkcsslotd.in +++ b/security/opencryptoki/files/pkcsslotd.in @@ -23,7 +23,8 @@ start_precmd=${name}_prestart pkcsslotd_prestart () { install -d -o %%USERS%% -g %%GROUPS%% -m 0755 \ /var/run/opencryptoki/swtok \ - /var/run/opencryptoki/tpm + /var/run/opencryptoki/tpm \ + /var/run/opencryptoki/icsf } load_rc_config $name diff --git a/security/opencryptoki/pkg-plist b/security/opencryptoki/pkg-plist index 9244ac7..ea011ea 100644 --- a/security/opencryptoki/pkg-plist +++ b/security/opencryptoki/pkg-plist @@ -7,6 +7,7 @@ lib/opencryptoki/libopencryptoki.so lib/opencryptoki/libopencryptoki.so.0 lib/opencryptoki/libopencryptoki.so.0.0.0 lib/opencryptoki/methods +%%LDAP%%lib/opencryptoki/stdll/PKCS11_ICSF.so lib/opencryptoki/stdll/PKCS11_SW.so lib/opencryptoki/stdll/PKCS11_TPM.so lib/opencryptoki/stdll/libpkcs11_sw.so @@ -15,6 +16,9 @@ lib/opencryptoki/stdll/libpkcs11_sw.so.0.0.0 lib/opencryptoki/stdll/libpkcs11_tpm.so lib/opencryptoki/stdll/libpkcs11_tpm.so.0 lib/opencryptoki/stdll/libpkcs11_tpm.so.0.0.0 +%%LDAP%%lib/opencryptoki/stdll/libpkcs11_icsf.so.0.0.0 +%%LDAP%%lib/opencryptoki/stdll/libpkcs11_icsf.so.0 +%%LDAP%%lib/opencryptoki/stdll/libpkcs11_icsf.so lib/pkcs11/PKCS11_API.so lib/pkcs11/libopencryptoki.so lib/pkcs11/methods @@ -27,7 +31,9 @@ man/man5/opencryptoki.conf.5.gz man/man7/opencryptoki.7.gz man/man8/pkcsslotd.8.gz sbin/pkcsconf +%%LDAP%%sbin/pkcsicsf sbin/pkcsslotd +%%LDAP%%@dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/icsf @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/swtok/TOK_OBJ @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/swtok @dir(%%USERS%%,%%GROUPS%%,700) /var/lib/opencryptoki/tpm |
