svn commit: r416685 - in head/security/opencryptoki: . files
Hiroki Sato
hrs at FreeBSD.org
Fri Jun 10 18:24:10 UTC 2016
Author: hrs
Date: Fri Jun 10 18:24:09 2016
New Revision: 416685
URL: https://svnweb.freebsd.org/changeset/ports/416685
Log:
Fix dependency and build of ICSF token support. The configure script
enabled the build when libldap was found.
Spotted by: luca.pizzamiglio at gmail.com
PR: 209992
Modified:
head/security/opencryptoki/Makefile
head/security/opencryptoki/files/pkcsslotd.in
head/security/opencryptoki/pkg-plist
Modified: head/security/opencryptoki/Makefile
==============================================================================
--- head/security/opencryptoki/Makefile Fri Jun 10 17:05:07 2016 (r416684)
+++ head/security/opencryptoki/Makefile Fri Jun 10 18:24:09 2016 (r416685)
@@ -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="${GR
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>
Modified: head/security/opencryptoki/files/pkcsslotd.in
==============================================================================
--- head/security/opencryptoki/files/pkcsslotd.in Fri Jun 10 17:05:07 2016 (r416684)
+++ head/security/opencryptoki/files/pkcsslotd.in Fri Jun 10 18:24:09 2016 (r416685)
@@ -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
Modified: head/security/opencryptoki/pkg-plist
==============================================================================
--- head/security/opencryptoki/pkg-plist Fri Jun 10 17:05:07 2016 (r416684)
+++ head/security/opencryptoki/pkg-plist Fri Jun 10 18:24:09 2016 (r416685)
@@ -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
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
More information about the svn-ports-head
mailing list