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 D371B138334 for ; Wed, 10 Oct 2018 11:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 844F2E088C; Wed, 10 Oct 2018 11:12:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 3CC95E088C for ; Wed, 10 Oct 2018 11:12:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C12D733D3C2 for ; Wed, 10 Oct 2018 11:12:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1A683D3 for ; Wed, 10 Oct 2018 11:12:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1539169949.6e6625164350305d29cb53417ed1a6c444b9cb71.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libircclient/files/, net-libs/libircclient/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libircclient/files/libircclient-1.10-openssl.patch net-libs/libircclient/libircclient-1.10.ebuild X-VCS-Directories: net-libs/libircclient/ net-libs/libircclient/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6e6625164350305d29cb53417ed1a6c444b9cb71 X-VCS-Branch: master Date: Wed, 10 Oct 2018 11:12:34 +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: 220dd358-ed9f-4cfc-bd6b-623af4aef9cf X-Archives-Hash: 10060c0d6ab4b5ed82cfdfd46e272a83 commit: 6e6625164350305d29cb53417ed1a6c444b9cb71 Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 10 11:12:13 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 10 11:12:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e662516 net-libs/libircclient: Added two openssl fixes from upstream. Signed-off-by: Lars Wendler gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../files/libircclient-1.10-openssl.patch | 38 ++++++++++++++++++++++ net-libs/libircclient/libircclient-1.10.ebuild | 3 ++ 2 files changed, 41 insertions(+) diff --git a/net-libs/libircclient/files/libircclient-1.10-openssl.patch b/net-libs/libircclient/files/libircclient-1.10-openssl.patch new file mode 100644 index 00000000000..b488f7f626c --- /dev/null +++ b/net-libs/libircclient/files/libircclient-1.10-openssl.patch @@ -0,0 +1,38 @@ +https://sourceforge.net/p/libircclient/code/141/ +https://sourceforge.net/p/libircclient/code/142/ + +--- libircclient-1.10/src/ssl.c ++++ libircclient-1.10/src/ssl.c +@@ -114,26 +114,23 @@ + #if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_library_init(); + #else +- OPENSSL_init_ssl(0, NULL); ++ if ( OPENSSL_init_ssl(0, NULL) == 0 ) ++ return LIBIRC_ERR_SSL_INIT_FAILED; + #endif + + if ( RAND_status() == 0 ) + return LIBIRC_ERR_SSL_INIT_FAILED; + + // Create an SSL context; currently a single context is used for all connections ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ssl_context = SSL_CTX_new( SSLv23_method() ); ++#else ++ ssl_context = SSL_CTX_new( TLS_client_method() ); ++#endif + + if ( !ssl_context ) + return LIBIRC_ERR_SSL_INIT_FAILED; + +- // Disable SSLv2 as it is unsecure +- if ( (SSL_CTX_set_options( ssl_context, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) == 0 ) +- return LIBIRC_ERR_SSL_INIT_FAILED; +- +- // Enable only strong ciphers +- if ( SSL_CTX_set_cipher_list( ssl_context, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH" ) != 1 ) +- return LIBIRC_ERR_SSL_INIT_FAILED; +- + // Set the verification + if ( session->options & LIBIRC_OPTION_SSL_NO_VERIFY ) + SSL_CTX_set_verify( ssl_context, SSL_VERIFY_NONE, 0 ); diff --git a/net-libs/libircclient/libircclient-1.10.ebuild b/net-libs/libircclient/libircclient-1.10.ebuild index d25e3c79b6e..940b5f0a396 100644 --- a/net-libs/libircclient/libircclient-1.10.ebuild +++ b/net-libs/libircclient/libircclient-1.10.ebuild @@ -21,6 +21,9 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10-shared.patch "${FILESDIR}"/${PN}-1.8-static.patch "${FILESDIR}"/${PN}-1.8-include.patch + + # upstream patches (can usually be removed with next version bump) + "${FILESDIR}"/${PN}-1.10-openssl.patch ) src_prepare() {