* [gentoo-commits] repo/gentoo:master commit in: dev-libs/softhsm/, dev-libs/softhsm/files/
@ 2017-10-07 8:22 Alon Bar-Lev
0 siblings, 0 replies; 2+ messages in thread
From: Alon Bar-Lev @ 2017-10-07 8:22 UTC (permalink / raw
To: gentoo-commits
commit: 58657a205b43d9e5b6b50146bd881e6682563ca1
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 7 07:42:02 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 08:21:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58657a20
dev-libs/softhsm: cleanup
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/softhsm/Manifest | 1 -
dev-libs/softhsm/files/softhsm-2.2.0-build.patch | 251 ---------------------
.../softhsm/files/softhsm-2.2.0-libressl.patch | 203 -----------------
dev-libs/softhsm/softhsm-2.2.0-r3.ebuild | 54 -----
4 files changed, 509 deletions(-)
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 2748890b6ba..45dc5ca6ea3 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,2 +1 @@
-DIST softhsm-2.2.0.tar.gz 966806 SHA256 eb6928ae08da44fca4135d84d6b79ad7345f408193208c54bf69f5b2e71f85f7 SHA512 6ef17deef491f7298244a3d2ddefe25843fc17534c4e5f2e08927f05cafdaf05601beb953539fce5d34fa02fe355cbd4ab3aaabb6e5a106936b04c06aae9793c WHIRLPOOL 9e2ead19b2091fc46c6cdf63d2aaa26ad21dfe7d69d047ea85b38d725576885c8a1c6656cbec9d79e480158a9b8f9a90d36cf3fad0a80af317b883ee59ffba06
DIST softhsm-2.3.0.tar.gz 992417 SHA256 5ed604c89a3a6ef9d7d1ee92c28a2c4b3cd1f86f302c808e2d12c8f39aa2c127 SHA512 ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f WHIRLPOOL adf718c757f2f1ab3bdc8dade04790e89fd5ef1e51d957b3506b8a89a61ef19cb5225805ed7a8e5c8073298f19e60a59b140339cc3693121cb21fbd15a670794
diff --git a/dev-libs/softhsm/files/softhsm-2.2.0-build.patch b/dev-libs/softhsm/files/softhsm-2.2.0-build.patch
deleted file mode 100644
index 83b6548371e..00000000000
--- a/dev-libs/softhsm/files/softhsm-2.2.0-build.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From ae2fea013237e227ab62b52f9855a8f9dd8dcdbb Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 27 Jan 2017 14:18:19 +0200
-Subject: [PATCH 1/2] build: add missing log dependency to test
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/lib/test/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/test/Makefile.am b/src/lib/test/Makefile.am
-index 339593e..4555ff2 100644
---- a/src/lib/test/Makefile.am
-+++ b/src/lib/test/Makefile.am
-@@ -25,6 +25,7 @@ p11test_SOURCES = p11test.cpp \
- AsymWrapUnwrapTests.cpp \
- TestsBase.cpp \
- TestsNoPINInitBase.cpp \
-+ ../common/log.cpp \
- ../common/osmutex.cpp
-
- p11test_LDADD = ../libsofthsm2.la
---
-2.10.2
-
-From c90ba51dd944c9e842e4743cf8dd9d5f4ea7bc5d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 27 Jan 2017 14:41:11 +0200
-Subject: [PATCH 2/2] build: tests: use pkg-config for cppunit
-
-do not execute cppunit-config over and over.
-move detection to autoconf.
-use standard pkg-config module of pkg-config instead
-of cppunit-config.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 3 +++
- m4/acx_cppunit.m4 | 4 ++++
- src/lib/crypto/test/Makefile.am | 7 ++++---
- src/lib/data_mgr/test/Makefile.am | 7 ++++---
- src/lib/handle_mgr/test/Makefile.am | 7 ++++---
- src/lib/object_store/test/Makefile.am | 7 ++++---
- src/lib/session_mgr/test/Makefile.am | 7 ++++---
- src/lib/slot_mgr/test/Makefile.am | 7 ++++---
- src/lib/test/Makefile.am | 7 ++++---
- 9 files changed, 35 insertions(+), 21 deletions(-)
- create mode 100644 m4/acx_cppunit.m4
-
-diff --git a/configure.ac b/configure.ac
-index 4ecabd6..7df0f73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,6 +117,9 @@ ACX_VISIBILITY
- # If we should install the p11-kit module
- ACX_P11KIT
-
-+# cppunit setetings
-+ACX_CPPUNIT
-+
- # Set full directory paths
- full_sysconfdir=`eval eval eval eval eval echo "${sysconfdir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
- full_localstatedir=`eval eval eval eval eval echo "${localstatedir}" | sed "s#NONE#${prefix}#" | sed "s#NONE#${ac_default_prefix}#"`
-diff --git a/m4/acx_cppunit.m4 b/m4/acx_cppunit.m4
-new file mode 100644
-index 0000000..ff5b90e
---- /dev/null
-+++ b/m4/acx_cppunit.m4
-@@ -0,0 +1,4 @@
-+AC_DEFUN([ACX_CPPUNIT],[
-+ PKG_PROG_PKG_CONFIG
-+ PKG_CHECK_MODULES([CPPUNIT], [cppunit], [have_cppunit=yes], [have_cppunit=no])
-+])
-diff --git a/src/lib/crypto/test/Makefile.am b/src/lib/crypto/test/Makefile.am
-index ca7e421..81c2ce6 100644
---- a/src/lib/crypto/test/Makefile.am
-+++ b/src/lib/crypto/test/Makefile.am
-@@ -8,8 +8,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../../object_store \
- -I$(srcdir)/../../session_mgr \
- -I$(srcdir)/../../slot_mgr \
-- @CRYPTO_INCLUDES@ \
-- `cppunit-config --cflags`
-+ @CRYPTO_INCLUDES@
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = cryptotest
-
-@@ -32,7 +33,7 @@ cryptotest_SOURCES = cryptotest.cpp \
-
- cryptotest_LDADD = ../../libsofthsm_convarch.la
-
--cryptotest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
-+cryptotest_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install
-
- TESTS = cryptotest
-
-diff --git a/src/lib/data_mgr/test/Makefile.am b/src/lib/data_mgr/test/Makefile.am
-index 27b4fbd..944224c 100644
---- a/src/lib/data_mgr/test/Makefile.am
-+++ b/src/lib/data_mgr/test/Makefile.am
-@@ -8,8 +8,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../../object_store \
- -I$(srcdir)/../../session_mgr \
- -I$(srcdir)/../../slot_mgr \
-- @CRYPTO_INCLUDES@ \
-- `cppunit-config --cflags`
-+ @CRYPTO_INCLUDES@
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = datamgrtest
-
-@@ -20,7 +21,7 @@ datamgrtest_SOURCES = datamgrtest.cpp \
-
- datamgrtest_LDADD = ../../libsofthsm_convarch.la
-
--datamgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
-+datamgrtest_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install
-
- TESTS = datamgrtest
-
-diff --git a/src/lib/handle_mgr/test/Makefile.am b/src/lib/handle_mgr/test/Makefile.am
-index 4cf92e4..f439a56 100644
---- a/src/lib/handle_mgr/test/Makefile.am
-+++ b/src/lib/handle_mgr/test/Makefile.am
-@@ -8,8 +8,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../../object_store \
- -I$(srcdir)/../../session_mgr \
- -I$(srcdir)/../../slot_mgr \
-- -I$(srcdir)/../../data_mgr \
-- `cppunit-config --cflags`
-+ -I$(srcdir)/../../data_mgr
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = handlemgrtest
-
-@@ -18,7 +19,7 @@ handlemgrtest_SOURCES = handlemgrtest.cpp \
-
- handlemgrtest_LDADD = ../../libsofthsm_convarch.la
-
--handlemgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs`
-+handlemgrtest_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install
-
- TESTS = handlemgrtest
-
-diff --git a/src/lib/object_store/test/Makefile.am b/src/lib/object_store/test/Makefile.am
-index ab2aa82..eec4a92 100644
---- a/src/lib/object_store/test/Makefile.am
-+++ b/src/lib/object_store/test/Makefile.am
-@@ -8,8 +8,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../../data_mgr \
- -I$(srcdir)/../../session_mgr \
- -I$(srcdir)/../../slot_mgr \
-- @CRYPTO_INCLUDES@ \
-- `cppunit-config --cflags`
-+ @CRYPTO_INCLUDES@
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = objstoretest
-
-@@ -32,7 +33,7 @@ endif
-
- objstoretest_LDADD = ../../libsofthsm_convarch.la
-
--objstoretest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
-+objstoretest_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install -pthread
-
- TESTS = objstoretest
-
-diff --git a/src/lib/session_mgr/test/Makefile.am b/src/lib/session_mgr/test/Makefile.am
-index 5e9a71c..385deec 100644
---- a/src/lib/session_mgr/test/Makefile.am
-+++ b/src/lib/session_mgr/test/Makefile.am
-@@ -8,8 +8,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../../data_mgr \
- -I$(srcdir)/../../session_mgr \
- -I$(srcdir)/../../slot_mgr \
-- -I$(srcdir)/../../object_store \
-- `cppunit-config --cflags`
-+ -I$(srcdir)/../../object_store
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = sessionmgrtest
-
-@@ -18,7 +19,7 @@ sessionmgrtest_SOURCES = sessionmgrtest.cpp \
-
- sessionmgrtest_LDADD = ../../libsofthsm_convarch.la
-
--sessionmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
-+sessionmgrtest_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install -pthread
-
- TESTS = sessionmgrtest
-
-diff --git a/src/lib/slot_mgr/test/Makefile.am b/src/lib/slot_mgr/test/Makefile.am
-index e9b9ce2..ecf36f5 100644
---- a/src/lib/slot_mgr/test/Makefile.am
-+++ b/src/lib/slot_mgr/test/Makefile.am
-@@ -8,8 +8,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../../object_store \
- -I$(srcdir)/../../session_mgr \
- -I$(srcdir)/../../data_mgr \
-- @CRYPTO_INCLUDES@ \
-- `cppunit-config --cflags`
-+ @CRYPTO_INCLUDES@
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = slotmgrtest
-
-@@ -18,7 +19,7 @@ slotmgrtest_SOURCES = slotmgrtest.cpp \
-
- slotmgrtest_LDADD = ../../libsofthsm_convarch.la
-
--slotmgrtest_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread
-+slotmgrtest_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install -pthread
-
- TESTS = slotmgrtest
-
-diff --git a/src/lib/test/Makefile.am b/src/lib/test/Makefile.am
-index 4555ff2..9d157a5 100644
---- a/src/lib/test/Makefile.am
-+++ b/src/lib/test/Makefile.am
-@@ -2,8 +2,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-
- AM_CPPFLAGS = -I$(srcdir)/.. \
- -I$(srcdir)/../cryptoki_compat \
-- -I$(srcdir)/../common \
-- `cppunit-config --cflags`
-+ -I$(srcdir)/../common
-+
-+AM_CFLAGS = @CPPUNIT_CFLAGS@
-
- check_PROGRAMS = p11test
-
-@@ -30,7 +31,7 @@ p11test_SOURCES = p11test.cpp \
-
- p11test_LDADD = ../libsofthsm2.la
-
--p11test_LDFLAGS = @CRYPTO_LIBS@ -no-install `cppunit-config --libs` -pthread -static
-+p11test_LDFLAGS = @CRYPTO_LIBS@ @CPPUNIT_LIBS@ -no-install -pthread -static
-
- TESTS = p11test
-
---
-2.10.2
-
diff --git a/dev-libs/softhsm/files/softhsm-2.2.0-libressl.patch b/dev-libs/softhsm/files/softhsm-2.2.0-libressl.patch
deleted file mode 100644
index c8b6237b18b..00000000000
--- a/dev-libs/softhsm/files/softhsm-2.2.0-libressl.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 13ed52e65f6f07f2c0c2aa70604298c9f983693d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 28 Jan 2017 21:09:05 +0200
-Subject: [PATCH] crypto: openssl: libressl support
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- m4/acx_openssl_gost.m4 | 2 +-
- src/lib/crypto/OSSLComp.cpp | 2 +-
- src/lib/crypto/OSSLComp.h | 2 +-
- src/lib/crypto/OSSLCryptoFactory.cpp | 2 +-
- src/lib/crypto/OSSLDHPrivateKey.cpp | 2 +-
- src/lib/crypto/OSSLDHPublicKey.cpp | 2 +-
- src/lib/crypto/OSSLDSAPrivateKey.cpp | 2 +-
- src/lib/crypto/OSSLDSAPublicKey.cpp | 2 +-
- src/lib/crypto/OSSLECDH.cpp | 2 +-
- src/lib/crypto/OSSLECDSA.cpp | 4 ++--
- src/lib/crypto/OSSLRSAPrivateKey.cpp | 2 +-
- src/lib/crypto/OSSLRSAPublicKey.cpp | 2 +-
- win32/Configure.py | 2 +-
- 13 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/m4/acx_openssl_gost.m4 b/m4/acx_openssl_gost.m4
-index 2a949f2..dca489b 100644
---- a/m4/acx_openssl_gost.m4
-+++ b/m4/acx_openssl_gost.m4
-@@ -22,7 +22,7 @@ AC_DEFUN([ACX_OPENSSL_GOST],[
- OpenSSL_add_all_algorithms();
-
- /* Load engines */
-- #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ENGINE_load_builtin_engines();
- #else
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN | OPENSSL_INIT_LOAD_CONFIG, NULL);
-diff --git a/src/lib/crypto/OSSLComp.cpp b/src/lib/crypto/OSSLComp.cpp
-index 31333f6..ede710b 100644
---- a/src/lib/crypto/OSSLComp.cpp
-+++ b/src/lib/crypto/OSSLComp.cpp
-@@ -34,7 +34,7 @@
- #include "OSSLComp.h"
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
-diff --git a/src/lib/crypto/OSSLComp.h b/src/lib/crypto/OSSLComp.h
-index 71d6c21..4bced32 100644
---- a/src/lib/crypto/OSSLComp.h
-+++ b/src/lib/crypto/OSSLComp.h
-@@ -36,7 +36,7 @@
- #include "config.h"
- #include <openssl/opensslv.h>
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
-diff --git a/src/lib/crypto/OSSLCryptoFactory.cpp b/src/lib/crypto/OSSLCryptoFactory.cpp
-index cd7f9d3..41134df 100644
---- a/src/lib/crypto/OSSLCryptoFactory.cpp
-+++ b/src/lib/crypto/OSSLCryptoFactory.cpp
-@@ -134,7 +134,7 @@ OSSLCryptoFactory::OSSLCryptoFactory()
-
- #ifdef WITH_GOST
- // Load engines
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- ENGINE_load_builtin_engines();
- #else
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN |
-diff --git a/src/lib/crypto/OSSLDHPrivateKey.cpp b/src/lib/crypto/OSSLDHPrivateKey.cpp
-index 4c1b9c3..5571a88 100644
---- a/src/lib/crypto/OSSLDHPrivateKey.cpp
-+++ b/src/lib/crypto/OSSLDHPrivateKey.cpp
-@@ -210,7 +210,7 @@ void OSSLDHPrivateKey::createOSSLKey()
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLDHPublicKey.cpp b/src/lib/crypto/OSSLDHPublicKey.cpp
-index 78820e1..e261726 100644
---- a/src/lib/crypto/OSSLDHPublicKey.cpp
-+++ b/src/lib/crypto/OSSLDHPublicKey.cpp
-@@ -151,7 +151,7 @@ void OSSLDHPublicKey::createOSSLKey()
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLDSAPrivateKey.cpp b/src/lib/crypto/OSSLDSAPrivateKey.cpp
-index 2192fad..527e041 100644
---- a/src/lib/crypto/OSSLDSAPrivateKey.cpp
-+++ b/src/lib/crypto/OSSLDSAPrivateKey.cpp
-@@ -227,7 +227,7 @@ void OSSLDSAPrivateKey::createOSSLKey()
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLDSAPublicKey.cpp b/src/lib/crypto/OSSLDSAPublicKey.cpp
-index 71ec3bf..38ecc79 100644
---- a/src/lib/crypto/OSSLDSAPublicKey.cpp
-+++ b/src/lib/crypto/OSSLDSAPublicKey.cpp
-@@ -168,7 +168,7 @@ void OSSLDSAPublicKey::createOSSLKey()
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLECDH.cpp b/src/lib/crypto/OSSLECDH.cpp
-index 9afbf38..e2abaeb 100644
---- a/src/lib/crypto/OSSLECDH.cpp
-+++ b/src/lib/crypto/OSSLECDH.cpp
-@@ -187,7 +187,7 @@ bool OSSLECDH::deriveKey(SymmetricKey **ppSymmetricKey, PublicKey* publicKey, Pr
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLECDSA.cpp b/src/lib/crypto/OSSLECDSA.cpp
-index 80d2386..7387367 100644
---- a/src/lib/crypto/OSSLECDSA.cpp
-+++ b/src/lib/crypto/OSSLECDSA.cpp
-@@ -78,7 +78,7 @@ bool OSSLECDSA::sign(PrivateKey* privateKey, const ByteString& dataToSign,
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-@@ -170,7 +170,7 @@ bool OSSLECDSA::verify(PublicKey* publicKey, const ByteString& originalData,
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLRSAPrivateKey.cpp b/src/lib/crypto/OSSLRSAPrivateKey.cpp
-index 94ec432..26065cf 100644
---- a/src/lib/crypto/OSSLRSAPrivateKey.cpp
-+++ b/src/lib/crypto/OSSLRSAPrivateKey.cpp
-@@ -289,7 +289,7 @@ void OSSLRSAPrivateKey::createOSSLKey()
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/src/lib/crypto/OSSLRSAPublicKey.cpp b/src/lib/crypto/OSSLRSAPublicKey.cpp
-index 71b1b92..2a6893b 100644
---- a/src/lib/crypto/OSSLRSAPublicKey.cpp
-+++ b/src/lib/crypto/OSSLRSAPublicKey.cpp
-@@ -133,7 +133,7 @@ void OSSLRSAPublicKey::createOSSLKey()
- }
-
- // Use the OpenSSL implementation and not any engine
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef WITH_FIPS
- if (FIPS_mode())
-diff --git a/win32/Configure.py b/win32/Configure.py
-index 0a01e0c..2ad652d 100644
---- a/win32/Configure.py
-+++ b/win32/Configure.py
-@@ -789,7 +789,7 @@ int main() {\n\
- ENGINE *eg;\n\
- const EVP_MD* EVP_GOST_34_11;\n\
- OpenSSL_add_all_algorithms();\n\
--#if OPENSSL_VERSION_NUMBER < 0x10100000L\n\
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)\n\
- ENGINE_load_builtin_engines();\n\
- #else\n\
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN | OPENSSL_INIT_LOAD_CONFIG, NULL);\n\
---
-2.10.2
-
diff --git a/dev-libs/softhsm/softhsm-2.2.0-r3.ebuild b/dev-libs/softhsm/softhsm-2.2.0-r3.ebuild
deleted file mode 100644
index 653177b975f..00000000000
--- a/dev-libs/softhsm/softhsm-2.2.0-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="A software PKCS#11 implementation"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.opendnssec.org/files/source/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist libressl migration-tool test"
-SLOT="2"
-LICENSE="BSD"
-
-RDEPEND="
- sys-devel/gcc:=[cxx]
- migration-tool? ( dev-db/sqlite:3 )
- !libressl? ( dev-libs/openssl:=[bindist=] )
- libressl? ( dev-libs/libressl )
- !=dev-libs/softhsm-2.0.0:0
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-libressl.patch"
-)
-DOCS=( NEWS README.md )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- --localstatedir="${EROOT}var" \
- --with-crypto-backend=openssl \
- --disable-p11-kit \
- $(use_enable !bindist ecc) \
- $(use_enable !libressl gost) \
- $(use_with migration-tool migrate)
-}
-
-src_install() {
- default
- prune_libtool_files --modules
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/softhsm/, dev-libs/softhsm/files/
@ 2021-03-16 19:23 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-16 19:23 UTC (permalink / raw
To: gentoo-commits
commit: d47958b663b7953446b4990d143c433a9dbf9dc6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 18:46:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 19:22:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d47958b6
dev-libs/softhsm: drop 2.5.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
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(-)
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index c2da01da50a..ecf0dc98c3e 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 9aeaf2939ac..00000000000
--- 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 <alon.barlev@gmail.com>
-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 <alon.barlev@gmail.com>
----
- 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 d9c6a91a08d..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-16 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-07 8:22 [gentoo-commits] repo/gentoo:master commit in: dev-libs/softhsm/, dev-libs/softhsm/files/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2021-03-16 19:23 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox