From owner-svn-ports-all@freebsd.org Fri Jun 10 18:24:10 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA7C9ADA6CB; Fri, 10 Jun 2016 18:24:10 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 926112003; Fri, 10 Jun 2016 18:24:10 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5AIO9s0029959; Fri, 10 Jun 2016 18:24:09 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5AIO9XN029956; Fri, 10 Jun 2016 18:24:09 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201606101824.u5AIO9XN029956@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Fri, 10 Jun 2016 18:24:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416685 - in head/security/opencryptoki: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2016 18:24:10 -0000 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@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 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