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 966C9138334 for ; Sat, 20 Jul 2019 00:20:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B2F1E078A; Sat, 20 Jul 2019 00:20:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 57E4BE078A for ; Sat, 20 Jul 2019 00:20:01 +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 1E45D3480CD for ; Sat, 20 Jul 2019 00:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C30BA6EA for ; Sat, 20 Jul 2019 00:19:58 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1561209073.b5e619354bc10456fbbda75bbbc02cf9a2a98834.steils@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild X-VCS-Directories: dev-qt/qtnetwork/files/ dev-qt/qtnetwork/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: b5e619354bc10456fbbda75bbbc02cf9a2a98834 X-VCS-Branch: master Date: Sat, 20 Jul 2019 00:19:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32c71c7d-d93b-49a5-87f2-1164dfebd549 X-Archives-Hash: 28c9958c8f233477caf11adf3a4a32fb commit: b5e619354bc10456fbbda75bbbc02cf9a2a98834 Author: Aidan Harris aidanharris io> AuthorDate: Fri Jun 21 16:59:58 2019 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Sat Jun 22 13:11:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b5e61935 dev-qt/qtnetwork-5.12.4: Add 5.12.4 Signed-off-by: Aidan Harris aidanharris.io> Signed-off-by: Anthony G. Basile gentoo.org> .../files/qtnetwork-5.12.4-libressl.patch | 14 +++++ dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild | 68 ++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch new file mode 100644 index 0000000..b200efa --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch @@ -0,0 +1,14 @@ +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index c8bc6e06..76324ea5 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -460,7 +460,7 @@ bool QSslSocketBackendPrivate::initSslContext() + q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); + } + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x10101006L ++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) + // Set the client callback for TLSv1.3 PSK + if (mode == QSslSocket::SslClientMode + && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { + diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild new file mode 100644 index 0000000..7778da7 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +fi + +IUSE="bindist connman libproxy libressl networkmanager sctp +ssl" + +DEPEND=" + ~dev-qt/qtcore-${PV} + sys-libs/zlib:= + connman? ( ~dev-qt/qtdbus-${PV} ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( ~dev-qt/qtdbus-${PV} ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[bindist=] ) + libressl? ( dev-libs/libressl:0= ) + ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.12.1-libressl.patch + "${FILESDIR}"/${PN}-5.12.4-libressl.patch +) + +QT5_TARGET_SUBDIRS=( + src/network + src/plugins/bearer/generic +) + +QT5_GENTOO_CONFIG=( + libproxy:libproxy: + ssl::SSL + ssl::OPENSSL + ssl:openssl-linked:LINKED_OPENSSL +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :network +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usex connman -dbus-linked '') + $(qt_use libproxy) + $(usex networkmanager -dbus-linked '') + $(qt_use sctp) + $(usex ssl -openssl-linked '') + ) + qt5-build_src_configure +}