From d47958b663b7953446b4990d143c433a9dbf9dc6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 16 Mar 2021 18:46:52 +0000 Subject: dev-libs/softhsm: drop 2.5.0 Signed-off-by: Sam James --- dev-libs/softhsm/Manifest | 1 - .../softhsm/files/softhsm-2.5.0-libressl.patch | 32 ------------- dev-libs/softhsm/softhsm-2.5.0.ebuild | 53 ---------------------- 3 files changed, 86 deletions(-) delete mode 100644 dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch delete mode 100644 dev-libs/softhsm/softhsm-2.5.0.ebuild (limited to 'dev-libs/softhsm') diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index c2da01da50a8..ecf0dc98c3eb 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1,2 +1 @@ -DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb diff --git a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch b/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch deleted file mode 100644 index 9aeaf2939ac4..000000000000 --- a/dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 308b0b2760d6cb218003768747346d31764f1cfe Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Fri, 19 Oct 2018 23:19:48 +0300 -Subject: [PATCH] crypto: use ENGINE_load_rdrand with recent openssl - -libressl and probably older openssl do not support this. - -Signed-off-by: Alon Bar-Lev ---- - src/lib/crypto/OSSLCryptoFactory.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -https://github.com/opendnssec/SoftHSMv2/pull/423 - -diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp b/src/lib/crypto/OSSLCryptoFactory.cpp -index dc5f737..04d383d 100644 ---- a/src/lib/crypto/OSSLCryptoFactory.cpp -+++ b/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 --- -2.18.1 - diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild deleted file mode 100644 index d9c6a91a08d5..000000000000 --- a/dev-libs/softhsm/softhsm-2.5.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A software PKCS#11 implementation" -HOMEPAGE="https://www.opendnssec.org/" -SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz" - -LICENSE="BSD" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="bindist gost libressl migration-tool test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - migration-tool? ( dev-db/sqlite:3= ) - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( dev-libs/libressl:= ) - !~dev-libs/softhsm-2.0.0:0 -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gcc:=[cxx] - virtual/pkgconfig - test? ( dev-util/cppunit ) -" - -DOCS=( NEWS README.md ) - -PATCHES=( - "${FILESDIR}/${P}-libressl.patch" -) - -src_configure() { - econf \ - --disable-static \ - --with-crypto-backend=openssl \ - --disable-p11-kit \ - --localstatedir="${EPREFIX}/var" \ - $(use_enable !bindist ecc) \ - $(use_enable gost) \ - $(use_with migration-tool migrate) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - keepdir /var/lib/softhsm/tokens -} -- cgit v1.2.3-65-gdbad