From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 32AE8158094 for ; Sun, 10 Jul 2022 22:52:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4568FE0D54; Sun, 10 Jul 2022 22:52:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23945E0D54 for ; Sun, 10 Jul 2022 22:52:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95766341097 for ; Sun, 10 Jul 2022 22:52:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3286B52D for ; Sun, 10 Jul 2022 22:52:06 +0000 (UTC) From: "Quentin Retornaz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Quentin Retornaz" Message-ID: <1657493372.3a076f1a5894ca8aedba576fd88e4f23e82876be.quentin@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-libs/softhsm/, dev-libs/softhsm/files/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-libs/softhsm/Manifest dev-libs/softhsm/files/softhsm-2.5.0-libressl.patch dev-libs/softhsm/softhsm-2.5.0.ebuild X-VCS-Directories: dev-libs/softhsm/files/ dev-libs/softhsm/ X-VCS-Committer: quentin X-VCS-Committer-Name: Quentin Retornaz X-VCS-Revision: 3a076f1a5894ca8aedba576fd88e4f23e82876be X-VCS-Branch: master Date: Sun, 10 Jul 2022 22:52:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32584b00-3db4-4f8e-bbd3-190d2696c3fb X-Archives-Hash: 9595dd5b8bc70311ded33ddfe86e818d commit: 3a076f1a5894ca8aedba576fd88e4f23e82876be Author: orbea riseup net> AuthorDate: Wed Jul 6 23:44:47 2022 +0000 Commit: Quentin Retornaz retornaz com> CommitDate: Sun Jul 10 22:49:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3a076f1a dev-libs/softhsm: Remove old version Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/438 Signed-off-by: Quentin Retornaz retornaz.com> dev-libs/softhsm/Manifest | 1 - .../softhsm/files/softhsm-2.5.0-libressl.patch | 32 -------------- dev-libs/softhsm/softhsm-2.5.0.ebuild | 49 ---------------------- 3 files changed, 82 deletions(-) diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index c2da01d..ecf0dc9 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 9aeaf29..0000000 --- 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 d2b2683..0000000 --- a/dev-libs/softhsm/softhsm-2.5.0.ebuild +++ /dev/null @@ -1,49 +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" - -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="bindist gost migration-tool test" -RESTRICT="!test? ( test )" -SLOT="2" -LICENSE="BSD" - -RDEPEND="migration-tool? ( dev-db/sqlite:3= ) - dev-libs/openssl:0=[bindist=] - !~dev-libs/softhsm-2.0.0:0" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - sys-devel/gcc:=[cxx] - 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="${EROOT}/var" \ - $(use_enable !bindist ecc) \ - $(use_enable gost) \ - $(use_with migration-tool migrate) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - - keepdir "${EROOT}/var/lib/softhsm/tokens" -}