View | Details | Raw Unified | Return to bug 245008 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	softhsm
4
PORTNAME=	softhsm
5
PORTVERSION=	2.5.0
5
PORTVERSION=	2.6.0
6
PORTREVISION=	2
7
CATEGORIES=	security
6
CATEGORIES=	security
8
MASTER_SITES=	http://dist.opendnssec.org/source/ \
7
MASTER_SITES=	http://dist.opendnssec.org/source/ \
9
		http://dist.opendnssec.org/source/testing/
8
		http://dist.opendnssec.org/source/testing/
Lines 26-31 Link Here
26
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
27
26
28
LIB_DEPENDS+=		libcppunit.so:devel/cppunit
27
LIB_DEPENDS+=		libcppunit.so:devel/cppunit
28
MY_DEPENDS+=		p11-kit:security/p11-kit
29
BUILD_DEPENDS+=		${MY_DEPENDS}
30
RUN_DEPENDS+=		${MY_DEPENDS}
29
31
30
OPTIONS_DEFINE=		SQLITE MIGRATE
32
OPTIONS_DEFINE=		SQLITE MIGRATE
31
MIGRATE_IMPLIES=	SQLITE
33
MIGRATE_IMPLIES=	SQLITE
Lines 46-52 Link Here
46
MIGRATE_CONFIGURE_WITH=	migrate
48
MIGRATE_CONFIGURE_WITH=	migrate
47
49
48
CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
50
CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
49
CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
51
CRYP_BOTAN_LIB_DEPENDS=	libbotan-2.so:security/botan2
50
52
51
CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl --with-openssl=${OPENSSLBASE}
53
CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl --with-openssl=${OPENSSLBASE}
52
54
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1540213808
1
TIMESTAMP = 1584470879
2
SHA256 (softhsm-2.5.0.tar.gz) = 92aa56cf45e25892326e98b851c44de9cac8559e208720e579bf8e2cd1c132b2
2
SHA256 (softhsm-2.6.0.tar.gz) = 19c2500f22c547b69d314fda55a91c40b0d2a9c269496a5da5d32ae1b835d6d1
3
SIZE (softhsm-2.5.0.tar.gz) = 1078439
3
SIZE (softhsm-2.6.0.tar.gz) = 1061748
(-)files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (-13 lines)
Lines 1-13 Link Here
1
--- src/lib/crypto/OSSLCryptoFactory.cpp.orig	2019-07-02 17:52:44 UTC
2
+++ src/lib/crypto/OSSLCryptoFactory.cpp
3
@@ -141,8 +141,10 @@ OSSLCryptoFactory::OSSLCryptoFactory()
4
 	// Initialise OpenSSL
5
 	OpenSSL_add_all_algorithms();
6
 
7
+#if !( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
8
 	// Make sure RDRAND is loaded first
9
 	ENGINE_load_rdrand();
10
+#endif
11
 	// Locate the engine
12
 	rdrand_engine = ENGINE_by_id("rdrand");
13
 	// Use RDRAND if available
(-)files/patch-src_lib_object__store_DB.h (-10 lines)
Lines 1-10 Link Here
1
--- src/lib/object_store/DB.h.orig	2017-07-13 14:38:02 UTC
2
+++ src/lib/object_store/DB.h
3
@@ -37,6 +37,7 @@
4
 
5
 #include <string>
6
 #include <sqlite3.h>
7
+#include <time.h>
8
 
9
 namespace DB {
10
 

Return to bug 245008