From owner-svn-ports-head@freebsd.org Tue Jul 2 20:45:37 2019 Return-Path: Delivered-To: svn-ports-head@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 78FEE15DCFE8; Tue, 2 Jul 2019 20:45:37 +0000 (UTC) (envelope-from zeising@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 187426F48B; Tue, 2 Jul 2019 20:45:37 +0000 (UTC) (envelope-from zeising@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 E6BC818AE; Tue, 2 Jul 2019 20:45:36 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x62KjaxK045860; Tue, 2 Jul 2019 20:45:36 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x62KjakF045858; Tue, 2 Jul 2019 20:45:36 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201907022045.x62KjakF045858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Tue, 2 Jul 2019 20:45:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505706 - in head/security/softhsm2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/security/softhsm2: . files X-SVN-Commit-Revision: 505706 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 187426F48B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jul 2019 20:45:37 -0000 Author: zeising Date: Tue Jul 2 20:45:36 2019 New Revision: 505706 URL: https://svnweb.freebsd.org/changeset/ports/505706 Log: security/softhsm2: Fix build with non-base openSSL PR: 233777 Submitted by: Sergey Akhmatov Approved by: Jaap Akkerhuis (maintainer) Added: head/security/softhsm2/files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (contents, props changed) Modified: head/security/softhsm2/Makefile Modified: head/security/softhsm2/Makefile ============================================================================== --- head/security/softhsm2/Makefile Tue Jul 2 20:31:57 2019 (r505705) +++ head/security/softhsm2/Makefile Tue Jul 2 20:45:36 2019 (r505706) @@ -3,7 +3,7 @@ PORTNAME= softhsm PORTVERSION= 2.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://dist.opendnssec.org/source/ \ http://dist.opendnssec.org/source/testing/ @@ -48,7 +48,7 @@ MIGRATE_CONFIGURE_WITH= migrate CRYP_BOTAN_CONFIGURE_ON= --with-crypto-backend=botan CRYP_BOTAN_LIB_DEPENDS= libbotan-1.10.so:security/botan110 -CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl +CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl --with-openssl=${OPENSSLBASE} .include Added: head/security/softhsm2/files/patch-src_lib_crypto_OSSLCryptoFactory.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/softhsm2/files/patch-src_lib_crypto_OSSLCryptoFactory.cpp Tue Jul 2 20:45:36 2019 (r505706) @@ -0,0 +1,13 @@ +--- src/lib/crypto/OSSLCryptoFactory.cpp.orig 2019-07-02 17:52:44 UTC ++++ src/lib/crypto/OSSLCryptoFactory.cpp +@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory() + // Initialise OpenSSL + OpenSSL_add_all_algorithms(); + ++#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ) + // Make sure RDRAND is loaded first + ENGINE_load_rdrand(); ++#endif + // Locate the engine + rdrand_engine = ENGINE_by_id("rdrand"); + // Use RDRAND if available