1 |
commit: b5e619354bc10456fbbda75bbbc02cf9a2a98834 |
2 |
Author: Aidan Harris <mail <AT> aidanharris <DOT> io> |
3 |
AuthorDate: Fri Jun 21 16:59:58 2019 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 22 13:11:13 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b5e61935 |
7 |
|
8 |
dev-qt/qtnetwork-5.12.4: Add 5.12.4 |
9 |
|
10 |
Signed-off-by: Aidan Harris <mail <AT> aidanharris.io> |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
.../files/qtnetwork-5.12.4-libressl.patch | 14 +++++ |
14 |
dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild | 68 ++++++++++++++++++++++ |
15 |
2 files changed, 82 insertions(+) |
16 |
|
17 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch |
18 |
new file mode 100644 |
19 |
index 0000000..b200efa |
20 |
--- /dev/null |
21 |
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch |
22 |
@@ -0,0 +1,14 @@ |
23 |
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
24 |
+index c8bc6e06..76324ea5 100644 |
25 |
+--- a/src/network/ssl/qsslsocket_openssl.cpp |
26 |
++++ b/src/network/ssl/qsslsocket_openssl.cpp |
27 |
+@@ -460,7 +460,7 @@ bool QSslSocketBackendPrivate::initSslContext() |
28 |
+ q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); |
29 |
+ } |
30 |
+ #endif |
31 |
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L |
32 |
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) |
33 |
+ // Set the client callback for TLSv1.3 PSK |
34 |
+ if (mode == QSslSocket::SslClientMode |
35 |
+ && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |
36 |
+ |
37 |
|
38 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild |
39 |
new file mode 100644 |
40 |
index 0000000..7778da7 |
41 |
--- /dev/null |
42 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild |
43 |
@@ -0,0 +1,68 @@ |
44 |
+# Copyright 1999-2019 Gentoo Authors |
45 |
+# Distributed under the terms of the GNU General Public License v2 |
46 |
+ |
47 |
+EAPI=6 |
48 |
+QT5_MODULE="qtbase" |
49 |
+inherit qt5-build |
50 |
+ |
51 |
+DESCRIPTION="Network abstraction library for the Qt5 framework" |
52 |
+ |
53 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
54 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
55 |
+fi |
56 |
+ |
57 |
+IUSE="bindist connman libproxy libressl networkmanager sctp +ssl" |
58 |
+ |
59 |
+DEPEND=" |
60 |
+ ~dev-qt/qtcore-${PV} |
61 |
+ sys-libs/zlib:= |
62 |
+ connman? ( ~dev-qt/qtdbus-${PV} ) |
63 |
+ libproxy? ( net-libs/libproxy ) |
64 |
+ networkmanager? ( ~dev-qt/qtdbus-${PV} ) |
65 |
+ sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
66 |
+ ssl? ( |
67 |
+ !libressl? ( dev-libs/openssl:0=[bindist=] ) |
68 |
+ libressl? ( dev-libs/libressl:0= ) |
69 |
+ ) |
70 |
+" |
71 |
+RDEPEND="${DEPEND} |
72 |
+ connman? ( net-misc/connman ) |
73 |
+ networkmanager? ( net-misc/networkmanager ) |
74 |
+" |
75 |
+ |
76 |
+PATCHES=( |
77 |
+ "${FILESDIR}"/${PN}-5.12.1-libressl.patch |
78 |
+ "${FILESDIR}"/${PN}-5.12.4-libressl.patch |
79 |
+) |
80 |
+ |
81 |
+QT5_TARGET_SUBDIRS=( |
82 |
+ src/network |
83 |
+ src/plugins/bearer/generic |
84 |
+) |
85 |
+ |
86 |
+QT5_GENTOO_CONFIG=( |
87 |
+ libproxy:libproxy: |
88 |
+ ssl::SSL |
89 |
+ ssl::OPENSSL |
90 |
+ ssl:openssl-linked:LINKED_OPENSSL |
91 |
+) |
92 |
+ |
93 |
+QT5_GENTOO_PRIVATE_CONFIG=( |
94 |
+ :network |
95 |
+) |
96 |
+ |
97 |
+pkg_setup() { |
98 |
+ use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
99 |
+ use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |
100 |
+} |
101 |
+ |
102 |
+src_configure() { |
103 |
+ local myconf=( |
104 |
+ $(usex connman -dbus-linked '') |
105 |
+ $(qt_use libproxy) |
106 |
+ $(usex networkmanager -dbus-linked '') |
107 |
+ $(qt_use sctp) |
108 |
+ $(usex ssl -openssl-linked '') |
109 |
+ ) |
110 |
+ qt5-build_src_configure |
111 |
+} |