Update softhsm2 to version 2.6.1.

Pkgsrc changes:
 * Change dependency from botan to botan-devel to get version 2.x.

Upstream changes:

SoftHSM 2.6.1 - 2020-04-29

* Issue #542: Support Ed448/X448 for OpenSSL
* Issue #538: Improved warning and compilation issues for GCC10
* Issue #527: Fixed compilation issues for MacOS 10.15.4/Xcode 11.4

SoftHSM 2.6.0 - 2020-03-17

* Issue #493: Upgrade to Botan 2.
* Issue #530: Update appveyor build.
* Issue #438: Detect crypto algorithms by default.
  (Patch from Alon Bar-Lev)
* Issue #455: Provide a new configuration option to allow enabling and
  disabling various mechanisms (slots.mechanisms in the softhsm2.conf).
  (Thanks to Jakub Jelen)
* Issue #479: Increase SQLite busy timeout from 15 seconds to 3 minutes.
  (Patch from Jan Luebbe)
* Issue #513: Add configuration option to reset state on fork closing all
  sessions rather than keeping all sessions open in duplicate process.
  (Thanks to Anderson Toshiyuki Sasaki)
* Issue #500: C_WaitForSlotEvent implementation.
  (Patch from massey101)
* Issue #445: Add wrap support with CKM_AES_CBC.

Bugfixes:
* Issue #418: Set fields to NULL to avoid double free.
  (Patch from Brian J Murray)
* Issue #423: ENGINE_load_rdrand is not supported with older openssl.
  (Patch from Alon Bar-Lev)
* Issue #429: Updated prerequisite to build from repository.
  (Patch from Dharmesh Khandelwal)
* Issue #434: Fix build issues with CMake.
  (Patch from Peter Wu)
* Issue #435: Fix botan build without EDDSA.
  (Patch from Peter Wu)
* Issue #442: Release resources from OSSLEVPSymmetricAlgorithm.
  (Patch from Petr Menšík)
* Issue #449/#502: Do not copy zero sized buffer avoid null pointer reference.
  (Patch from space88man)
* Issue #464: Race condition with multiple threads closing last session and
  opening a newer sessions.
  (Patch from Takarth)
* Issue #452: Fixes to automake build fir undefined macros.
* Issue #462: User PIN count wrongly calculated.
  (Patch from Ondrej Hlavaty)
* Issue #516: Fix memory leak in OSSLCryptoFactory.
  (Patch from Anderson Sasaki)
* Issue #494: Allow null pointers as arguments when count is zero.
  (Patch from Yunjong Jeong)
* Issue #518: Sporadic problem in closing sessions because of lookup of
  object without prior locking.
* Issue #506: Check key type for C_EncryptInit and C_DecryptInit.
  (Patch from Yunjong Jeong)
* Issue #526: Adjust EDDSA code to return valid EC_PARAMS.
  (Patch from Jakub Jelen)
* Issue #452: Autogen failure on undefined macro AC_MSG_ERROR.
* Issue #527: Fixed some build errors for GCC 10.
* Issue #470: Null pointer arguments validation for C_EncryptFinal, etc.

3 files changed, 12 insertions, 13 deletions

diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index 115171d0dce..f0c1b226cd8 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2020/11/05 09:07:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2021/03/07 19:49:12 he Exp $
 #
 
-VERSION=	2.5.0
-PKGREVISION=	4
+VERSION=	2.6.1
 DISTNAME=	softhsm-${VERSION}
 PKGNAME=	softhsm2-${VERSION}
 CATEGORIES=	security
@@ -28,7 +27,7 @@ CONFIGURE_ARGS+=	--disable-gost
 EGDIR=			${PREFIX}/share/examples/softhsm
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKSRC}/src/lib/common/Makefile.in
+SUBST_FILES.paths=	src/lib/common/Makefile.in
 SUBST_STAGE.paths=	pre-configure
 SUBST_VARS.paths=	EGDIR
 
@@ -47,5 +46,5 @@ pre-install:
 
 USE_BUILTIN.sqlite3=NO
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/botan/buildlink3.mk"
+.include "../../security/botan-devel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/softhsm2/buildlink3.mk b/security/softhsm2/buildlink3.mk
index 99696821f68..7aa751647a2 100644
--- a/security/softhsm2/buildlink3.mk
+++ b/security/softhsm2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/11/05 09:07:07 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2021/03/07 19:49:12 he Exp $
 
 BUILDLINK_TREE+=	softhsm2
 
@@ -7,10 +7,10 @@ SOFTHSM2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.softhsm2+=	softhsm2>=2.0.0
 BUILDLINK_ABI_DEPENDS.softhsm2+=	softhsm2>=2.5.0nb4
-BUILDLINK_PKGSRCDIR.softhsm2?=	../../security/softhsm2
+BUILDLINK_PKGSRCDIR.softhsm2?=		../../security/softhsm2
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/botan/buildlink3.mk"
+.include "../../security/botan-devel/buildlink3.mk"
 .endif	# SOFTHSM2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-softhsm2
diff --git a/security/softhsm2/distinfo b/security/softhsm2/distinfo
index bc894743b6e..fc13c994c5a 100644
--- a/security/softhsm2/distinfo
+++ b/security/softhsm2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2019/11/06 10:11:41 he Exp $
+$NetBSD: distinfo,v 1.2 2021/03/07 19:49:12 he Exp $
 
-SHA1 (softhsm-2.5.0.tar.gz) = 9b1072d9e12e1834e4f9518ec60a3e38aa92bc09
-RMD160 (softhsm-2.5.0.tar.gz) = 652beae56eb85bb864df45e89fcb1ddf84276d6d
-SHA512 (softhsm-2.5.0.tar.gz) = a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
-Size (softhsm-2.5.0.tar.gz) = 1078439 bytes
+SHA1 (softhsm-2.6.1.tar.gz) = c6fd316df6366960b8c8cda92408d7e02c3fb434
+RMD160 (softhsm-2.6.1.tar.gz) = 73b116b9513d1afcd241431e967a582de1cb737f
+SHA512 (softhsm-2.6.1.tar.gz) = e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
+Size (softhsm-2.6.1.tar.gz) = 1066766 bytes
 SHA1 (patch-configure) = 220881a76fa84e8ba6a81c902bdfd07bc6af88bd
 SHA1 (patch-configure.ac) = 5d1d5134e580f1310446da4323c0e1c65b6115de
 SHA1 (patch-src_lib_common_Makefile.in) = ca783cdfdb4d16eece5fd21d02033e71968d00c6