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 E63C01396D0 for ; Sat, 26 Aug 2017 19:05:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54DDBE0C58; Sat, 26 Aug 2017 19:05:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F37EE0C58 for ; Sat, 26 Aug 2017 19:05:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BADB63417E5 for ; Sat, 26 Aug 2017 19:05:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 430FF8384 for ; Sat, 26 Aug 2017 19:05:50 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1503774325.c839cd4129639b115151ec473de2c6c6edb4e6a3.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/freerdp/files/2.0.0-rc0-libressl.patch net-misc/freerdp/freerdp-2.0.0_rc0.ebuild X-VCS-Directories: net-misc/freerdp/ net-misc/freerdp/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c839cd4129639b115151ec473de2c6c6edb4e6a3 X-VCS-Branch: master Date: Sat, 26 Aug 2017 19:05:50 +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: 8acfc1cd-5026-4c03-9fd4-f9d24fcab7e3 X-Archives-Hash: 86b7807e939c0bd37c44df3f62623364 commit: c839cd4129639b115151ec473de2c6c6edb4e6a3 Author: Mike Gilbert gentoo org> AuthorDate: Sat Aug 26 19:05:25 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Aug 26 19:05:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c839cd41 net-misc/freerdp: fix build with libressl Bug: https://bugs.gentoo.org/626506 Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17 net-misc/freerdp/files/2.0.0-rc0-libressl.patch | 89 +++++++++++++++++++++++++ net-misc/freerdp/freerdp-2.0.0_rc0.ebuild | 5 +- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/net-misc/freerdp/files/2.0.0-rc0-libressl.patch b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch new file mode 100644 index 00000000000..9e565e5b05d --- /dev/null +++ b/net-misc/freerdp/files/2.0.0-rc0-libressl.patch @@ -0,0 +1,89 @@ +From 9bf9ff9e8a548ecb5306d0142e75cdc274e93ba1 Mon Sep 17 00:00:00 2001 +From: Valery Kartel +Date: Wed, 26 Jul 2017 17:12:14 +0300 +Subject: [PATCH] Fix build with LibreSSL + +--- + libfreerdp/crypto/crypto.c | 2 +- + winpr/libwinpr/utils/ssl.c | 6 +++--- + winpr/tools/makecert/makecert.c | 6 +++--- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c +index 15e65d534..f3bb595b8 100644 +--- a/libfreerdp/crypto/crypto.c ++++ b/libfreerdp/crypto/crypto.c +@@ -388,7 +388,7 @@ BOOL x509_verify_certificate(CryptoCert cert, char* certificate_store_path) + if (cert_ctx == NULL) + goto end; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_algorithms(); + #else + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ +diff --git a/winpr/libwinpr/utils/ssl.c b/winpr/libwinpr/utils/ssl.c +index b674e21d5..78cbab1d8 100644 +--- a/winpr/libwinpr/utils/ssl.c ++++ b/winpr/libwinpr/utils/ssl.c +@@ -255,7 +255,7 @@ static BOOL CALLBACK _winpr_openssl_initialize(PINIT_ONCE once, PVOID param, PVO + } + #endif + /* SSL_load_error_strings() is void */ +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + SSL_load_error_strings(); + /* SSL_library_init() always returns "1" */ + SSL_library_init(); +@@ -296,7 +296,7 @@ BOOL winpr_CleanupSSL(DWORD flags) + #ifdef WINPR_OPENSSL_LOCKING_REQUIRED + _winpr_openssl_cleanup_locking(); + #endif +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_cleanup_all_ex_data(); + ERR_free_strings(); + EVP_cleanup(); +@@ -307,7 +307,7 @@ BOOL winpr_CleanupSSL(DWORD flags) + #ifdef WINPR_OPENSSL_LOCKING_REQUIRED + if (flags & WINPR_SSL_CLEANUP_THREAD) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10000000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10000000L) || defined(LIBRESSL_VERSION_NUMBER) + ERR_remove_state(0); + #else + ERR_remove_thread_state(NULL); +diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c +index a9efb352c..c9e38200a 100644 +--- a/winpr/tools/makecert/makecert.c ++++ b/winpr/tools/makecert/makecert.c +@@ -620,7 +620,7 @@ int makecert_context_output_certificate_file(MAKECERT_CONTEXT* context, char* pa + printf("Using default export password \"password\"\n"); + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + OpenSSL_add_all_algorithms(); + OpenSSL_add_all_ciphers(); + OpenSSL_add_all_digests(); +@@ -1008,7 +1008,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) + key_length = atoi(arg->Value); + } + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + context->rsa = RSA_generate_key(key_length, RSA_F4, NULL, NULL); + #else + { +@@ -1043,7 +1043,7 @@ int makecert_context_process(MAKECERT_CONTEXT* context, int argc, char** argv) + { + ASN1_TIME* before; + ASN1_TIME* after; +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + before = X509_get_notBefore(context->x509); + after = X509_get_notAfter(context->x509); + #else +-- +2.14.1 + diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild index 457a95da4a3..aeade402801 100644 --- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild @@ -89,7 +89,10 @@ DEPEND="${RDEPEND} " DOCS=( README ) -PATCHES=( "${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch ) +PATCHES=( + "${FILESDIR}"/2.0.0-rc0-libressl.patch + "${FILESDIR}"/freerdp-Fix-gstreamer-1.0-detection.patch +) src_configure() { local mycmakeargs=(