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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A753E139087 for ; Thu, 5 Jan 2017 14:12:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0BB6E0C1F; Thu, 5 Jan 2017 14:12:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CEABE0C19 for ; Thu, 5 Jan 2017 14:12:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C6C13413C3 for ; Thu, 5 Jan 2017 14:12:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A346C2622 for ; Thu, 5 Jan 2017 14:12:23 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1483625274.31ab6249b3a35002038c6c7f0a4e33cf482aff88.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild net-p2p/bitcoin-qt/files/0.13.2-libressl.patch X-VCS-Directories: net-p2p/bitcoin-qt/ net-p2p/bitcoin-qt/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 31ab6249b3a35002038c6c7f0a4e33cf482aff88 X-VCS-Branch: master Date: Thu, 5 Jan 2017 14:12:23 +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-Archives-Salt: 8fcb38bc-6cfd-4228-afe3-3cd5480dd029 X-Archives-Hash: cfd948f98349ac35972d9f93e94936ab commit: 31ab6249b3a35002038c6c7f0a4e33cf482aff88 Author: Luke Dashjr utopios org> AuthorDate: Wed Jan 4 18:37:51 2017 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Jan 5 14:07:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ab6249 net-p2p/bitcoin-qt: Backport LibreSSL fix for 0.13.2 net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild | 2 ++ net-p2p/bitcoin-qt/files/0.13.2-libressl.patch | 48 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild index 30cc24a..45b5c94 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild @@ -79,6 +79,8 @@ src_prepare() { sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" + epatch "${FILESDIR}/0.13.2-libressl.patch" + bitcoincore_autoreconf } diff --git a/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch b/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch new file mode 100644 index 00000000..415adcc --- /dev/null +++ b/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch @@ -0,0 +1,48 @@ +commit 0388afe69dd85ca9549727ee105ba7017169b464 (HEAD -> EVP_MD_CTX_new, personal-github/EVP_MD_CTX_new) +Author: Luke Dashjr +Date: Wed Jan 4 17:07:42 2017 +0000 + + Let autoconf detect presence of EVP_MD_CTX_new + + Fixes LibreSSL compatibility + +diff --git a/configure.ac b/configure.ac +index ced258e..02af0d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -832,6 +832,13 @@ else + fi + fi + ++save_CXXFLAGS="${CXXFLAGS}" ++CXXFLAGS="${CXXFLAGS} ${CRYPTO_CFLAGS} ${SSL_CFLAGS}" ++AC_CHECK_DECLS([EVP_MD_CTX_new],,,[AC_INCLUDES_DEFAULT ++#include ++]) ++CXXFLAGS="${save_CXXFLAGS}" ++ + dnl univalue check + + need_bundled_univalue=yes +diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp +index 82be4d8..0d4907b 100644 +--- a/src/qt/paymentrequestplus.cpp ++++ b/src/qt/paymentrequestplus.cpp +@@ -159,7 +159,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c + std::string data_to_verify; // Everything but the signature + rcopy.SerializeToString(&data_to_verify); + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if HAVE_DECL_EVP_MD_CTX_NEW + EVP_MD_CTX *ctx = EVP_MD_CTX_new(); + if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context."); + #else +@@ -174,7 +174,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c + !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) { + throw SSLVerifyError("Bad signature, invalid payment request."); + } +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if HAVE_DECL_EVP_MD_CTX_NEW + EVP_MD_CTX_free(ctx); + #endif +