From owner-svn-ports-all@freebsd.org Mon Mar 18 12:42:38 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73977153E40F; Mon, 18 Mar 2019 12:42:38 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 15F6987E9D; Mon, 18 Mar 2019 12:42:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD29621851; Mon, 18 Mar 2019 12:42:37 +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 x2ICgbta008591; Mon, 18 Mar 2019 12:42:37 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2ICgbAc008590; Mon, 18 Mar 2019 12:42:37 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201903181242.x2ICgbAc008590@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 18 Mar 2019 12:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496141 - in head/security/openssl_tpm_engine: . files X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: in head/security/openssl_tpm_engine: . files X-SVN-Commit-Revision: 496141 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 15F6987E9D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 18 Mar 2019 12:42:38 -0000 Author: hrs Date: Mon Mar 18 12:42:37 2019 New Revision: 496141 URL: https://svnweb.freebsd.org/changeset/ports/496141 Log: Add a workaround for shlib name depending on OpenSSL's version. Modified: head/security/openssl_tpm_engine/Makefile head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample Modified: head/security/openssl_tpm_engine/Makefile ============================================================================== --- head/security/openssl_tpm_engine/Makefile Mon Mar 18 12:32:49 2019 (r496140) +++ head/security/openssl_tpm_engine/Makefile Mon Mar 18 12:42:37 2019 (r496141) @@ -4,7 +4,7 @@ PORTNAME= openssl_tpm_engine PORTVERSION= 0.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= hrs@FreeBSD.org @@ -24,8 +24,7 @@ GH_ACCOUNT= mgerstner GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl="${OPENSSLBASE}" SUB_FILES= pkg-message -PLIST_FILES= bin/create_tpm_key \ - lib/openssl/engines/tpm.so +PLIST_FILES= bin/create_tpm_key INSTALL_TARGET= install-strip PORTEXAMPLES= openssl.cnf.sample @@ -38,8 +37,24 @@ IGNORE= Detected LibreSSL (RAND_METHOD structure unsup .endif post-patch: - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \ + (${CAT} ${OPENSSLINC}/openssl/opensslv.h; \ + ${ECHO_CMD} "#if OPENSSL_VERSION_NUMBER < 0x10100000L"; \ + ${ECHO_CMD} "lib/openssl/engines/libtpm.so"; \ + ${ECHO_CMD} "#else"; \ + ${ECHO_CMD} "lib/openssl/engines/tpm.so"; \ + ${ECHO_CMD} "#endif"; \ + ) | ${CPP} | ${GREP} -v \# > ${WRKDIR}/.tpmso; \ + ${REINPLACE_CMD} "s|%%TPMSO%%|${PREFIX}/$$(cat ${WRKDIR}/.tpmso)|g" \ ${WRKSRC}/dist/openssl.cnf.sample + +.if defined(INSTALL_AS_USER) +_T=|| ${TRUE} +.endif +post-install: + (${CAT} ${WRKDIR}/.tpmso; \ + ${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null ${_T}" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null ${_T}" >> ${TMPPLIST}; \ + ) >> ${TMPPLIST} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample ============================================================================== --- head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample Mon Mar 18 12:32:49 2019 (r496140) +++ head/security/openssl_tpm_engine/files/patch-dist-openssl.cnf.sample Mon Mar 18 12:42:37 2019 (r496141) @@ -5,7 +5,7 @@ [tpm_section] -dynamic_path = /usr/local/ssl/lib/engines/libtpm.so -+dynamic_path = %%PREFIX%%/lib/openssl/engines/tpm.so ++dynamic_path = %%TPMSO%% engine_id = tpm default_algorithms = ALL #default_algorithms = RAND,RSA