Index: Makefile =================================================================== --- Makefile (revision 528790) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= softhsm -PORTVERSION= 2.5.0 -PORTREVISION= 2 +PORTVERSION= 2.6.1 CATEGORIES= security MASTER_SITES= http://dist.opendnssec.org/source/ \ http://dist.opendnssec.org/source/testing/ @@ -26,6 +25,9 @@ USE_LDCONFIG= yes LIB_DEPENDS+= libcppunit.so:devel/cppunit +MY_DEPENDS+= p11-kit:security/p11-kit +BUILD_DEPENDS+= ${MY_DEPENDS} +RUN_DEPENDS+= ${MY_DEPENDS} OPTIONS_DEFINE= SQLITE MIGRATE MIGRATE_IMPLIES= SQLITE @@ -46,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_BOTAN_LIB_DEPENDS= libbotan-2.so:security/botan2 CRYP_OPEN_CONFIGURE_ON= --with-crypto-backend=openssl --with-openssl=${OPENSSLBASE} Index: distinfo =================================================================== --- distinfo (revision 528790) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540213808 -SHA256 (softhsm-2.5.0.tar.gz) = 92aa56cf45e25892326e98b851c44de9cac8559e208720e579bf8e2cd1c132b2 -SIZE (softhsm-2.5.0.tar.gz) = 1078439 +TIMESTAMP = 1588231625 +SHA256 (softhsm-2.6.1.tar.gz) = 61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2 +SIZE (softhsm-2.6.1.tar.gz) = 1066766 Index: files/patch-src_lib_crypto_OSSLCryptoFactory.cpp =================================================================== --- files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (revision 533331) +++ files/patch-src_lib_crypto_OSSLCryptoFactory.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- 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 Property changes on: files/patch-src_lib_crypto_OSSLCryptoFactory.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-src_lib_object__store_DB.h =================================================================== --- files/patch-src_lib_object__store_DB.h (revision 533331) +++ files/patch-src_lib_object__store_DB.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/lib/object_store/DB.h.orig 2017-07-13 14:38:02 UTC -+++ src/lib/object_store/DB.h -@@ -37,6 +37,7 @@ - - #include - #include -+#include - - namespace DB { - Property changes on: files/patch-src_lib_object__store_DB.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property