From 90402a607676cc56d718f1c84294f05ee571f416 Mon Sep 17 00:00:00 2001
From: Ricardo Salveti <ricardo@foundries.io>
Date: Thu, 17 Jan 2019 12:02:25 -0200
Subject: softhsm: bump to 2.5.0

Changes in 2.5.0:
 - Support for cross-compilation
 - Use RDRAND in OpenSSL if that engine is available
 - Support for EDDSA with vendor defined mechanisms
 - Replace PKCS11 headers with a version from p11-kit

Recipe updated to build support for EdDSA since that is already
available in latest OpenSSL (1.1.1a).

HOMEPAGE and LICENSE also changed to match upstream.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
---
 recipes-support/softhsm/softhsm_git.bb | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'recipes-support/softhsm/softhsm_git.bb')

diff --git a/recipes-support/softhsm/softhsm_git.bb b/recipes-support/softhsm/softhsm_git.bb
index c26903d..4dcfe7d 100644
--- a/recipes-support/softhsm/softhsm_git.bb
+++ b/recipes-support/softhsm/softhsm_git.bb
@@ -1,27 +1,26 @@
 SUMMARY = "HSM emulator"
-LICENSE = "BSD"
+HOMEPAGE = "https://www.opendnssec.org/softhsm/"
+LICENSE = "BSD-2-Clause & ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210"
 
-inherit autotools-brokensep
+DEPENDS = "openssl"
 
+SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master"
+SRCREV = "369df0383d101bc8952692c2a368ac8bc887d1b4"
 
-SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master \
-	   file://0001-Cross-compilation-tweaks.patch"
-SRCREV="1f7498c0c65b1b1ad5e1bdbd87e9d4b100705745"
+PV = "2.5.0"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += " openssl"
+inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-gost --with-openssl=${STAGING_LIBDIR}/.."
+# EdDSA requires OpenSSL >= 1.1.1
+EXTRA_OECONF = "--enable-eddsa --disable-gost"
 
-do_configure() {
- unset docdir
- sh ./autogen.sh
- oe_runconf
+do_configure_prepend() {
+    (
+        cd ${S}
+        unset docdir
+        sh ./autogen.sh
+    )
 }
-
-FILES_${PN} = "${bindir} \
-	       ${libdir}/softhsm \
-	       ${sysconfdir} \
-	       ${localstatedir}/lib/softhsm "
-- 
cgit v1.2.3-54-g00ecf