| 1 |
commit: d3e9868a04678b1a7f7cfc30156642e5dde81130 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Apr 8 17:02:50 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 9 00:08:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e9868a |
| 7 |
|
| 8 |
net-p2p/bitcoin-qt: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/7878 |
| 11 |
|
| 12 |
net-p2p/bitcoin-qt/files/0.13.2-libressl.patch | 48 -------------------------- |
| 13 |
1 file changed, 48 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch b/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 415adcc59ea..00000000000 |
| 18 |
--- a/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,48 +0,0 @@ |
| 21 |
-commit 0388afe69dd85ca9549727ee105ba7017169b464 (HEAD -> EVP_MD_CTX_new, personal-github/EVP_MD_CTX_new) |
| 22 |
-Author: Luke Dashjr <luke-jr+git@×××××××.org> |
| 23 |
-Date: Wed Jan 4 17:07:42 2017 +0000 |
| 24 |
- |
| 25 |
- Let autoconf detect presence of EVP_MD_CTX_new |
| 26 |
- |
| 27 |
- Fixes LibreSSL compatibility |
| 28 |
- |
| 29 |
-diff --git a/configure.ac b/configure.ac |
| 30 |
-index ced258e..02af0d6 100644 |
| 31 |
---- a/configure.ac |
| 32 |
-+++ b/configure.ac |
| 33 |
-@@ -832,6 +832,13 @@ else |
| 34 |
- fi |
| 35 |
- fi |
| 36 |
- |
| 37 |
-+save_CXXFLAGS="${CXXFLAGS}" |
| 38 |
-+CXXFLAGS="${CXXFLAGS} ${CRYPTO_CFLAGS} ${SSL_CFLAGS}" |
| 39 |
-+AC_CHECK_DECLS([EVP_MD_CTX_new],,,[AC_INCLUDES_DEFAULT |
| 40 |
-+#include <openssl/x509_vfy.h> |
| 41 |
-+]) |
| 42 |
-+CXXFLAGS="${save_CXXFLAGS}" |
| 43 |
-+ |
| 44 |
- dnl univalue check |
| 45 |
- |
| 46 |
- need_bundled_univalue=yes |
| 47 |
-diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp |
| 48 |
-index 82be4d8..0d4907b 100644 |
| 49 |
---- a/src/qt/paymentrequestplus.cpp |
| 50 |
-+++ b/src/qt/paymentrequestplus.cpp |
| 51 |
-@@ -159,7 +159,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c |
| 52 |
- std::string data_to_verify; // Everything but the signature |
| 53 |
- rcopy.SerializeToString(&data_to_verify); |
| 54 |
- |
| 55 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 56 |
-+#if HAVE_DECL_EVP_MD_CTX_NEW |
| 57 |
- EVP_MD_CTX *ctx = EVP_MD_CTX_new(); |
| 58 |
- if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context."); |
| 59 |
- #else |
| 60 |
-@@ -174,7 +174,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c |
| 61 |
- !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) { |
| 62 |
- throw SSLVerifyError("Bad signature, invalid payment request."); |
| 63 |
- } |
| 64 |
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 65 |
-+#if HAVE_DECL_EVP_MD_CTX_NEW |
| 66 |
- EVP_MD_CTX_free(ctx); |
| 67 |
- #endif |
| 68 |
- |
Archives