svn commit: r446138 - in branches/2017Q3/security/softhsm2: . files

[Danilo G. Baio]

Author: dbaio
Date: Tue Jul 18 11:37:27 2017
New Revision: 446138
URL: https://svnweb.freebsd.org/changeset/ports/446138

Log:
  MFH: r446078 r446079
  
  security/softhsm2: Update to 2.3.0, Fix build with SQLITE3 storage backend
  
  Disable support for GOST if openssl-devel is used
  
  Add option SQLITE (optional) to fix build with SQLITE3 storage backend [1]
  
  While here:
    Add LICENSE_FILE
    Add USES= ssl (Q/A warning)
  
  PR:		220744
  PR:		218701 [1]
  Submitted by:	jaap at NLnetLabs.nl (maintainer)
  Submitted by:	sergey at akhmatov.ru [1]
  Approved by:	ports-secteam (junovitch), garga (mentor)
  Differential Revision:	https://reviews.freebsd.org/D11607

Added:
  branches/2017Q3/security/softhsm2/files/
     - copied from r446078, head/security/softhsm2/files/
Modified:
  branches/2017Q3/security/softhsm2/Makefile
  branches/2017Q3/security/softhsm2/distinfo
  branches/2017Q3/security/softhsm2/pkg-plist
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/security/softhsm2/Makefile
==============================================================================
--- branches/2017Q3/security/softhsm2/Makefile	Tue Jul 18 11:33:04 2017	(r446137)
+++ branches/2017Q3/security/softhsm2/Makefile	Tue Jul 18 11:37:27 2017	(r446138)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	softhsm
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.3.0
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
@@ -13,18 +12,21 @@ MAINTAINER=	jaap at NLnetLabs.nl
 COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
+CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var"
 INSTALL_TARGET=	install-strip
-USES=		libtool sqlite
+USES=		libtool ssl
 
 CONFLICTS=	softhsm-1.*
 
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=		SQLITE
+OPTIONS_SUB=		yes
+SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
+
 OPTIONS_SINGLE=		CRYP
 OPTIONS_SINGLE_CRYP=	CRYP_OPEN CRYP_BOTAN
 
@@ -33,14 +35,17 @@ CRYP_BOTAN_DESC=	Build with Botan crypto library
 
 OPTIONS_DEFAULT=	CRYP_OPEN
 
+SQLITE_CONFIGURE_WITH=	sqlite3=${LOCALBASE} objectstore-backend-db
+SQLITE_USES=		sqlite
+
 CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
 CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
-CRYP_OPEN_USES=		ssl
+
 CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
 
 .include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT:Mlibressl*}
+.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl-devel}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 

Modified: branches/2017Q3/security/softhsm2/distinfo
==============================================================================
--- branches/2017Q3/security/softhsm2/distinfo	Tue Jul 18 11:33:04 2017	(r446137)
+++ branches/2017Q3/security/softhsm2/distinfo	Tue Jul 18 11:37:27 2017	(r446138)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480976612
-SHA256 (softhsm-2.2.0.tar.gz) = eb6928ae08da44fca4135d84d6b79ad7345f408193208c54bf69f5b2e71f85f7
-SIZE (softhsm-2.2.0.tar.gz) = 966806
+TIMESTAMP = 1499110463
+SHA256 (softhsm-2.3.0.tar.gz) = 5ed604c89a3a6ef9d7d1ee92c28a2c4b3cd1f86f302c808e2d12c8f39aa2c127
+SIZE (softhsm-2.3.0.tar.gz) = 992417

Modified: branches/2017Q3/security/softhsm2/pkg-plist
==============================================================================
--- branches/2017Q3/security/softhsm2/pkg-plist	Tue Jul 18 11:33:04 2017	(r446137)
+++ branches/2017Q3/security/softhsm2/pkg-plist	Tue Jul 18 11:37:27 2017	(r446138)
@@ -1,10 +1,12 @@
 bin/softhsm2-dump-file
+%%SQLITE%%bin/softhsm2-dump-db
 bin/softhsm2-keyconv
 bin/softhsm2-util
 @sample %%ETCDIR%%2.conf.sample
 lib/softhsm/libsofthsm2.a
 lib/softhsm/libsofthsm2.so
 man/man1/softhsm2-dump-file.1.gz
+%%SQLITE%%man/man1/softhsm2-dump-db.1.gz
 man/man1/softhsm2-keyconv.1.gz
 man/man1/softhsm2-util.1.gz
 man/man5/softhsm2.conf.5.gz