[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: d639c140a9ea34abda5bb244859a3dc7eff6c218 Author: orbea riseup net> AuthorDate: Mon Jul 22 04:42:42 2024 + Commit: orbea riseup net> CommitDate: Mon Jul 22 04:42:42 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d639c140 dev-qt/qtnetwork: stabilize 5.15.14-r1 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild index 57b4c7b..8436598 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: f883315b5fb072b727cadcb6ed0144903935849e Author: orbea riseup net> AuthorDate: Mon Jul 22 04:42:55 2024 + Commit: orbea riseup net> CommitDate: Mon Jul 22 04:42:55 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=f883315b dev-qt/qtnetwork: drop 5.15.14 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild | 67 --- 1 file changed, 67 deletions(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild deleted file mode 100644 index d4da090..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="gssapi libproxy sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND}" - -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 -) - -PATCHES=( - "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 -) - -src_configure() { - local myconf=( - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(qt_use sctp) - $(usev ssl -openssl-linked) - -no-dtls # Required for libressl - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 44a0bae1c517799f21a49912413dcf48044ad6dc Author: orbea riseup net> AuthorDate: Fri Jul 19 02:45:18 2024 + Commit: orbea riseup net> CommitDate: Fri Jul 19 02:45:18 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=44a0bae1 dev-qt/qtnetwork: add 5.15.14-r1 Signed-off-by: orbea riseup.net> .../files/qtnetwork-5.15.14-CVE-2024-39936.patch | 178 + dev-qt/qtnetwork/qtnetwork-5.15.14-r1.ebuild | 68 2 files changed, 246 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.14-CVE-2024-39936.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.14-CVE-2024-39936.patch new file mode 100644 index 000..c4445b2 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.14-CVE-2024-39936.patch @@ -0,0 +1,178 @@ +From 9f9a56d750caff8b4459e7e9bf82f1f4d725f72f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= +Date: Tue, 25 Jun 2024 17:09:35 +0200 +Subject: [PATCH] HTTP2: Delay any communication until encrypted() can be + responded to + +We have the encrypted() signal that lets users do extra checks on the +established connection. It is emitted as BlockingQueued, so the HTTP +thread stalls until it is done emitting. Users can potentially call +abort() on the QNetworkReply at that point, which is passed as a Queued +call back to the HTTP thread. That means that any currently queued +signal emission will be processed before the abort() call is processed. + +In the case of HTTP2 it is a little special since it is multiplexed and +the code is built to start requests as they are available. This means +that, while the code worked fine for HTTP1, since one connection only +has one request, it is not working for HTTP2, since we try to send more +requests in-between the encrypted() signal and the abort() call. + +This patch changes the code to delay any communication until the +encrypted() signal has been emitted and processed, for HTTP2 only. +It's done by adding a few booleans, both to know that we have to return +early and so we can keep track of what events arose and what we need to +resume once enough time has passed that any abort() call must have been +processed. + +Fixes: QTBUG-126610 +Pick-to: 6.8 6.7 6.5 6.2 5.15 5.12 +Change-Id: Ic25a600c278203256e35f541026f34a8783235ae +Reviewed-by: Marc Mutz +Reviewed-by: Volker Hilsheimer +(cherry picked from commit b1e75376cc3adfc7da5502a277dfe9711f3e0536) +(but really taken from upstream CVE-2024-39936-qtbase-5.15.patch) +--- + src/network/access/qhttp2protocolhandler.cpp | 6 +-- + .../access/qhttpnetworkconnectionchannel.cpp | 46 ++- + .../access/qhttpnetworkconnectionchannel_p.h | 6 +++ + 3 files changed, 53 insertions(+), 5 deletions(-) + +diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp +index ead88d781ae..926f3134a0e 100644 +--- a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp +@@ -375,12 +375,12 @@ bool QHttp2ProtocolHandler::sendRequest() + } + } + +-if (!prefaceSent && !sendClientPreface()) +-return false; +- + if (!requests.size()) + return true; + ++if (!prefaceSent && !sendClientPreface()) ++return false; ++ + m_channel->state = QHttpNetworkConnectionChannel::WritingState; + // Check what was promised/pushed, maybe we do not have to send a request + // and have a response already? +diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp +index 7620ca16470..13f9630c658 100644 +--- a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp +@@ -255,6 +255,10 @@ void QHttpNetworkConnectionChannel::abort() + bool QHttpNetworkConnectionChannel::sendRequest() + { + Q_ASSERT(!protocolHandler.isNull()); ++if (waitingForPotentialAbort) { ++needInvokeSendRequest = true; ++return false; // this return value is unused ++} + return protocolHandler->sendRequest(); + } + +@@ -267,21 +271,28 @@ bool QHttpNetworkConnectionChannel::sendRequest() + void QHttpNetworkConnectionChannel::sendRequestDelayed() + { + QMetaObject::invokeMethod(this, [this] { +-Q_ASSERT(!protocolHandler.isNull()); + if (reply) +-protocolHandler->sendRequest(); ++sendRequest(); + }, Qt::ConnectionType::QueuedConnection); + } + + void QHttpNetworkConnectionChannel::_q_receiveReply() + { + Q_ASSERT(!protocolHandler.isNull()); ++if (waitingForPotentialAbort) { ++needInvokeReceiveReply = true; ++return; ++} + protocolHandler->_q_receiveReply(); + } + + void QHttpNetworkConnectionChannel::_q_readyRead() + { + Q_ASSERT(!protocolHandler.isNull()); ++if (waitingForPotentialAbort) { ++needInvokeReadyRead = true; ++return; ++} +
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 3e2e339fa33da0e8ef0c0ca88c2014e305f50434 Author: orbea riseup net> AuthorDate: Fri Jun 28 18:59:41 2024 + Commit: orbea riseup net> CommitDate: Fri Jun 28 19:01:49 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3e2e339f dev-qt/qtnetwork: stabilize 5.15.14 for arm, ppc64 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild index 93d62b8..d4da090 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: bd0f603a55233290f3f91860a8df4c8fdf207cc7 Author: orbea riseup net> AuthorDate: Fri Jun 28 18:59:51 2024 + Commit: orbea riseup net> CommitDate: Fri Jun 28 19:01:52 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bd0f603a dev-qt/qtnetwork: drop 5.15.13 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 3 - ...etwork-5.15.10-ssl-upgr-default-DH-params.patch | 101 - dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild | 67 -- 3 files changed, 171 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 351fedb..93ac206 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,6 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b DIST qtbase-5.15-gentoo-patchset-6.tar.xz 8288 BLAKE2B ad9695a528345dd3b8e9ce72b7bdfe8f744f16685a567bbc7862ba6c28e5a426260cb0b73e2573cb3a6f16f1785786898ffb44c90f5d75354b97e5756c7573db SHA512 97bc4d5375e1750a5578439ff320ee2e5e929df1dafe56b4e86f2de8ad26c91dc4002e45ad75d9f936347d49b9f54c0c42f8fc2cb7dfd4f54bf08a210b3bc720 -DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d DIST qtbase-5.15.14-gentoo-kde-1.tar.xz 329640 BLAKE2B 5bd2d84f48874267a3328bf04e764f327bc8b3d574f8715fe02c4691e1ea8b2c0218ab66d55031e805d151be99956c5dfce304cac72b1edd371e2c447292e1e8 SHA512 37a7479c0fd0160fedd087f6da221484d47585f082f33f59118a75f9fa7a2e0969b9e9ed1b1234821dc6ffe55c07d22d20dc2ea4d2ee1dbd061f57bb4bf7f518 -DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef DIST qtbase-everywhere-opensource-src-5.15.14.tar.xz 50887988 BLAKE2B 292814ff8b9030766ce9941f4f13af56425f385543ff41cecd5d86b0a562fd220c8d9126fc36cfa0eab96440a64ec6a497306e00a59d388d13d34c8ea10a9633 SHA512 1280e7da926ff0c888dc3455ebeb73708bf8e44a3fe77ecf015e902608d75d7304639271dedba63635f959411452cd2b64a6f9166365a3aa3440656c00120272 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch deleted file mode 100644 index 94f1325..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 05406c3f5f516d3148254c8294e8883c28a2c95a Mon Sep 17 00:00:00 2001 -From: Giuseppe D'Angelo -Date: Wed, 21 Jun 2023 13:30:35 +0200 -Subject: [PATCH] SSL: upgrade the default DH parameters - -We have been using as default DH parameters the 1024-bit MODP group. -This is now considered insecure, and applications should use the -2048-bit at a minimum [1]. This commit therefore replaces the parameters -with the 2048-bit MODP group from [2]. - -To double check the data, use openssl asn1parse to verify that the prime -matches. For instance: - -1) put the encoded string in a `encoded.txt` file (c from the source, - removing the double quotes) -2) put the hexadecimal value of the 2048-bit group in a `reference.txt` - file (c from [2]) -3) compare the output of openssl asn1parse with the reference. For - instance like this: - -$ diff <(openssl asn1parse < encoded.txt | grep -m 1 INTEGER | perl -pe 's/.*://; s/\n//') <(perl -0777 -pe 's/\s//g' reference.txt) && echo OK -OK - -[1] https://datatracker.ietf.org/doc/html/rfc8247#section-2.4 -[2] https://datatracker.ietf.org/doc/html/rfc3526#section-3 - -[ChangeLog][QtNetwork][QSslDiffieHellmanParameters] The default -Diffie-Hellman parameters are now using the 2048-bit MODP group from -RFC 3526. - -Pick-to: 6.6 6.5 6.2 5.15 -Change-Id: I47133cd78ba0e954b8f93a3da09fa2c760c9f7a8 -Reviewed-by: Timur Pocheptsov -(cherry picked from commit 3ec24e329c9ef6802786a37f30ddd8982e903480) - src/network/ssl/qsslconfiguration.cpp | 12 ++-- - src/network/ssl/qssldiffiehellmanparameters.cpp | 13 +++-- - 2 files changed, 17 insertions(+), 8 deletions(-) - -diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp -index f5ce02807f..84a9187334 100644 a/src/network/ssl/qsslconfiguration.cpp -+++ b/src/network/ssl/qsslconfiguration.cpp -@@ -929,7 +929,11 @@ void
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 597d79acfddc4197aaed50e85f143843cab71b85 Author: Saki Xi riseup net> AuthorDate: Sun Jun 2 11:31:41 2024 + Commit: orbea riseup net> CommitDate: Sun Jun 2 13:11:20 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=597d79ac dev-qt/qtnetwork: 5.15.14 upstream sync Signed-off-by: Saki Xi riseup.net> Closes: https://github.com/gentoo/libressl/pull/562 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild index 7be2128..93d62b8 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: db46d4a642a7848fb02ff8a88855fb9d7f294836 Author: orbea riseup net> AuthorDate: Fri May 31 00:53:53 2024 + Commit: orbea riseup net> CommitDate: Fri May 31 00:53:53 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=db46d4a6 dev-qt/qtnetwork: add 5.15.14 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 3 ++ dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild | 67 +++ 2 files changed, 70 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 945cf51..351fedb 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,6 @@ DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b +DIST qtbase-5.15-gentoo-patchset-6.tar.xz 8288 BLAKE2B ad9695a528345dd3b8e9ce72b7bdfe8f744f16685a567bbc7862ba6c28e5a426260cb0b73e2573cb3a6f16f1785786898ffb44c90f5d75354b97e5756c7573db SHA512 97bc4d5375e1750a5578439ff320ee2e5e929df1dafe56b4e86f2de8ad26c91dc4002e45ad75d9f936347d49b9f54c0c42f8fc2cb7dfd4f54bf08a210b3bc720 DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d +DIST qtbase-5.15.14-gentoo-kde-1.tar.xz 329640 BLAKE2B 5bd2d84f48874267a3328bf04e764f327bc8b3d574f8715fe02c4691e1ea8b2c0218ab66d55031e805d151be99956c5dfce304cac72b1edd371e2c447292e1e8 SHA512 37a7479c0fd0160fedd087f6da221484d47585f082f33f59118a75f9fa7a2e0969b9e9ed1b1234821dc6ffe55c07d22d20dc2ea4d2ee1dbd061f57bb4bf7f518 DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef +DIST qtbase-everywhere-opensource-src-5.15.14.tar.xz 50887988 BLAKE2B 292814ff8b9030766ce9941f4f13af56425f385543ff41cecd5d86b0a562fd220c8d9126fc36cfa0eab96440a64ec6a497306e00a59d388d13d34c8ea10a9633 SHA512 1280e7da926ff0c888dc3455ebeb73708bf8e44a3fe77ecf015e902608d75d7304639271dedba63635f959411452cd2b64a6f9166365a3aa3440656c00120272 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild new file mode 100644 index 000..7be2128 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.14.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +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 +) + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: b642a81cc20acd81acb5cb9655cc6294dd6b2055 Author: orbea riseup net> AuthorDate: Fri Apr 5 16:50:28 2024 + Commit: orbea riseup net> CommitDate: Fri Apr 5 16:50:28 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b642a81c dev-qt/qtnetwork: drop 5.15.12-r1 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 2 - dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild | 67 2 files changed, 69 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index b0f1807..945cf51 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1,3 @@ DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 28 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d -DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild deleted file mode 100644 index 7a2dc60..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=3 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="gssapi libproxy sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND}" - -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 -) - -PATCHES=( - "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 -) - -src_configure() { - local myconf=( - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(qt_use sctp) - $(usev ssl -openssl-linked) - -no-dtls # Required for libressl - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 2865c96b68edd84efe85b11d74a0065cc408eae3 Author: Saki Xi riseup net> AuthorDate: Thu Apr 4 20:09:02 2024 + Commit: orbea riseup net> CommitDate: Thu Apr 4 20:14:19 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2865c96b dev-qt/qtnetwork: sync with ::gentoo Signed-off-by: Saki Xi riseup.net> Closes: https://github.com/gentoo/libressl/pull/556 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild index 9d40dde..d4da090 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: a1b69193e4858fb2c8c43788f6eb8bb31f020af0 Author: Saki Xi riseup net> AuthorDate: Thu Apr 4 03:41:47 2024 + Commit: orbea riseup net> CommitDate: Thu Apr 4 03:43:36 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a1b69193 dev-qt/qtnetwork: sync with ::gentoo Signed-off-by: Saki Xi riseup.net> Closes: https://github.com/gentoo/libressl/pull/555 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild index 7be2128..9d40dde 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 3e1500a8ba1262d6a93c45fd0c5dea257ca10a6d Author: orbea riseup net> AuthorDate: Sun Mar 24 14:04:53 2024 + Commit: orbea riseup net> CommitDate: Sun Mar 24 14:04:53 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3e1500a8 dev-qt/qtnetwork: add 5.15.13 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 2 + dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild | 67 +++ 2 files changed, 69 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 5e79c73..b0f1807 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,5 @@ DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 28 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a +DIST qtbase-5.15.13-gentoo-kde-1.tar.xz 331952 BLAKE2B 6fb7314f03e99d8d2f5e8486ea805164f7e42a14c29a46519bae200364ad3798d26fd09bbd9381030b816f0a68c45d98581a76b80ca3fff8ae4c0121c77fc6ae SHA512 2c049f451eaa4a5087bb39283a66e7bbef89b9e3235ae930c48a405aeaaa999e863857c5074de6ad282708c756b8acab40fbb68f2a4a8b45ef7ade72b12bb98d DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 +DIST qtbase-everywhere-opensource-src-5.15.13.tar.xz 50862768 BLAKE2B d96d4d6b11aae3c471d5f24ed1030004394dfb89d399d5cddc868f39d0a4851a75ed0d59fdc79ef354c21a354eae0f23df1cfb8c30290d5c080b5fad507ce29a SHA512 565632646b04eed525530a50f1228dd1aa3b8f1318485fa7cf6ad96eabdc2208ed1522b3fc174bd4797b7d51edff18ea1f91a82dd701379407b880f1dd0d16ef diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild new file mode 100644 index 000..7be2128 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +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 +) + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/
commit: 7d5ff36824d94a460398541d743901a337340e9d Author: orbea riseup net> AuthorDate: Tue Mar 12 17:40:29 2024 + Commit: orbea riseup net> CommitDate: Tue Mar 12 17:43:13 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7d5ff368 dev-qt/qtnetwork: update patch for libressl-3.9.0 Closes: https://github.com/gentoo/libressl/issues/552 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch index c9e7653..c2ab857 100644 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch @@ -15,7 +15,7 @@ index d1794d4d..1f1aa5ed 100644 int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); info.insert(name, QString::fromUtf8((char*)data, size)); -#if QT_CONFIG(opensslv11) -+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) ++#if QT_CONFIG(opensslv11) && (!defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x309fL)) q_CRYPTO_free(data, nullptr, 0); #else q_CRYPTO_free(data); @@ -137,7 +137,7 @@ index d9742fd6..fac28b5c 100644 DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x309fL) DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) +#else +DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) @@ -241,7 +241,7 @@ index 27aeffa1..32a21221 100644 void *q_CRYPTO_malloc(size_t num, const char *file, int line); #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0) -+#ifndef LIBRESSL_VERSION_NUMBER ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x309fL) void q_CRYPTO_free(void *str, const char *file, int line); #define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0) +#else // LIBRESSL_VERSION_NUMBER
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: d4a4ee01f030e265e5d65e5d32a45d0b8d22f1d2 Author: orbea riseup net> AuthorDate: Mon Feb 12 23:22:13 2024 + Commit: orbea riseup net> CommitDate: Mon Feb 12 23:22:13 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d4a4ee01 dev-qt/qtnetwork: drop 5.15.11, 5.15.12 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 4 -- dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild | 67 --- dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild | 67 --- 3 files changed, 138 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index c2fd8bc..5e79c73 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,7 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b -DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d -DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 28 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a -DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild deleted file mode 100644 index f6b8b0f..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="gssapi libproxy sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND}" - -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 -) - -PATCHES=( - "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 -) - -src_configure() { - local myconf=( - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(qt_use sctp) - $(usev ssl -openssl-linked) - -no-dtls # Required for libressl - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -} diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 8301f1f9c3bc1d31d7a698b768125a6360187980 Author: orbea riseup net> AuthorDate: Mon Feb 12 23:21:35 2024 + Commit: orbea riseup net> CommitDate: Mon Feb 12 23:21:35 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8301f1f9 dev-qt/qtnetwork: stabilize 5.15.12-r1 for arm, arm64 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 2 +- dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 47196da..c2fd8bc 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4 DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de -DIST qtbase-5.15.12-gentoo-kde-2.tar.xz 332644 BLAKE2B 19cc5d45ac1334cac525b26936926ba021f1763e8758d9dd2a7c1f1826d20e457f5bcb821ac3c3ba6e1d76d783b5328e9a22260a129c678bcd86f4a017d32349 SHA512 ee4b8bf6cc6fd458f94233f49af1bdabc0e0ec31c8691c2ab05213f2cbe20a4ff53430632c884da7d4a4cf927170acdec02628788e5beaff7271539a1b00a9bc +DIST qtbase-5.15.12-gentoo-kde-3.tar.xz 28 BLAKE2B f4b281098c142aeff32349a207c312de6b40057768c7732533923ddfc7db393352739a9c8b7af6a562268d2fed0397c5d5eb96a85ad376c97e7b8e51a2b962cb SHA512 6d5a826569793ae7e49f6f789d138290346be94976d3aa2c5526be9ada5dd85ffaa789422f4bedaaa6a76178e87978937be425d5f75fcce41d45726d02912c7a DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild index 5e3c0a4..7a2dc60 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild @@ -4,8 +4,8 @@ EAPI=8 if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=2 - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" + QT5_KDEPATCHSET_REV=3 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 9401ac6579b2e24cd2ad1ba0a9382fed3ad59daa Author: orbea riseup net> AuthorDate: Wed Jan 31 00:05:33 2024 + Commit: orbea riseup net> CommitDate: Wed Jan 31 00:05:33 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9401ac65 dev-qt/qtnetwork: stabilize 5.15.12-r1 for amd64, ppc, ppc64, x86 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild index fc4793d..5e3c0a4 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=2 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 2627dee8596aca5535d0bbe6ef60a8e6a58fc679 Author: Saki Xi riseup net> AuthorDate: Thu Jan 4 21:23:47 2024 + Commit: orbea riseup net> CommitDate: Fri Jan 5 14:29:46 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=2627dee8 dev-qt/qtnetwork: version bump Signed-off-by: Saki Xi riseup.net> Closes: https://github.com/gentoo/libressl/pull/547 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 3 ++ dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild | 67 2 files changed, 70 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 177ba1d..ec0d292 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d +DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d +DIST qtbase-5.15.12-gentoo-kde-2.tar.xz 332644 BLAKE2B 19cc5d45ac1334cac525b26936926ba021f1763e8758d9dd2a7c1f1826d20e457f5bcb821ac3c3ba6e1d76d783b5328e9a22260a129c678bcd86f4a017d32349 SHA512 ee4b8bf6cc6fd458f94233f49af1bdabc0e0ec31c8691c2ab05213f2cbe20a4ff53430632c884da7d4a4cf927170acdec02628788e5beaff7271539a1b00a9bc DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f +DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild new file mode 100644 index 000..fc4793d --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.12-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=2 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +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 +) + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 18f197a61f075932fcbc5672e9b9347aa38a1dd3 Author: orbea riseup net> AuthorDate: Fri Jan 5 14:32:23 2024 + Commit: orbea riseup net> CommitDate: Fri Jan 5 14:32:23 2024 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=18f197a6 dev-qt/qtnetwork: add 5.15.12 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 1 + dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild | 67 +++ 2 files changed, 68 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index ec0d292..47196da 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,6 +1,7 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15-gentoo-patchset-5.tar.xz 9116 BLAKE2B b6318fc7c3ccdbfe85d56797ffaa3b275ce3f324731caca5efb497494837ca00c020494e9f811c0d5e9a460a4d70f16291c637409e7ad72325a36bc55e113c8c SHA512 f0343bf475a86f3f73b98b166ee48b1c5c9200aac9212ad977befe05679d0c351167618b16ae958e6403f33eecdc465b26a0df5d0b83d5d57a8c85ddb8a41c9b DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d +DIST qtbase-5.15.12-gentoo-kde-1.tar.xz 330700 BLAKE2B d58eb3c12e4eaec9087bdf21ead08d4574fb7ce958b8453703f0b00efd27a4624329bbdf53e2c17d548e4791f7180bb3c0f68f0f3da4bc638c03622609d4df37 SHA512 f9519252a4b0451afae454155637f795688a8c9d8d40e03677430a7b887aa52d04996d93665e7068e41c8f7db428fdef933d4b8b342ea05847fffa5ddd82d1de DIST qtbase-5.15.12-gentoo-kde-2.tar.xz 332644 BLAKE2B 19cc5d45ac1334cac525b26936926ba021f1763e8758d9dd2a7c1f1826d20e457f5bcb821ac3c3ba6e1d76d783b5328e9a22260a129c678bcd86f4a017d32349 SHA512 ee4b8bf6cc6fd458f94233f49af1bdabc0e0ec31c8691c2ab05213f2cbe20a4ff53430632c884da7d4a4cf927170acdec02628788e5beaff7271539a1b00a9bc DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f DIST qtbase-everywhere-opensource-src-5.15.12.tar.xz 50840192 BLAKE2B da758bdc13a63e8856486476733d6e9ed0bd22aa29d0d575f25a7d2ac90d0bae0d789875c747f9b16ec72941101fdf54abb64036c0fc2f0f467811bd32c7f8d9 SHA512 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild new file mode 100644 index 000..7be2128 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.12.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +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 +) + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 8e4916c452278c97cce721f6c5420c28eacb08eb Author: orbea riseup net> AuthorDate: Tue Nov 7 14:30:17 2023 + Commit: orbea riseup net> CommitDate: Tue Nov 7 14:30:17 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8e4916c4 dev-qt/qtnetwork: stabilize 5.15.11 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild index 58010b2..f6b8b0f 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 41c6ef7a8ed167bacd10182709cd87b12753cc5b Author: orbea riseup net> AuthorDate: Tue Nov 7 14:30:27 2023 + Commit: orbea riseup net> CommitDate: Tue Nov 7 14:30:27 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=41c6ef7a dev-qt/qtnetwork: drop 5.15.10, 5.15.10-r3 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 3 -- dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild | 67 --- dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild| 79 3 files changed, 149 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 4cbc95c..177ba1d 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,6 +1,3 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d -DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b -DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74 DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d -DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild deleted file mode 100644 index d2d1b92..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=2 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="gssapi libproxy sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND}" - -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 -) - -PATCHES=( - "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 -) - -src_configure() { - local myconf=( - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(qt_use sctp) - $(usev ssl -openssl-linked) - -no-dtls # Required for libressl - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -} diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild deleted file mode 100644 index db460b7..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=1 -
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: a05fca32986023c05293a4adda25e7bb5d30e7e4 Author: Saki Xi riseup net> AuthorDate: Mon Oct 9 04:16:33 2023 + Commit: orbea riseup net> CommitDate: Mon Oct 9 13:43:13 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a05fca32 dev-qt/qtnetwork: version bump Signed-off-by: Saki Xi riseup.net> Closes: https://github.com/gentoo/libressl/pull/542 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 2 + dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild | 67 +++ 2 files changed, 69 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index a97f9f0..4cbc95c 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,4 +1,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74 +DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef +DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild new file mode 100644 index 000..58010b2 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.11.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +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 +) + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 525cc2a9fbc5468d967247e1da509320859c3410 Author: orbea riseup net> AuthorDate: Fri Aug 18 00:18:32 2023 + Commit: orbea riseup net> CommitDate: Fri Aug 18 00:18:32 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=525cc2a9 dev-qt/qtnetwork: stabilize 5.15.10-r3 for amd64, ppc, ppc64, x86 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild index 52d4d01..d2d1b92 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=2 - KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 3e636f7c8abc332f2563fd31a58eba401474ef4a Author: orbea riseup net> AuthorDate: Fri Aug 18 00:18:44 2023 + Commit: orbea riseup net> CommitDate: Fri Aug 18 00:18:44 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=3e636f7c dev-qt/qtnetwork: drop 5.15.10-r2 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild | 68 1 file changed, 68 deletions(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild deleted file mode 100644 index 0c7d55a..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="gssapi libproxy sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND}" - -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 -) - -PATCHES=( - "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 - "${FILESDIR}/${P}-ssl-upgr-default-DH-params.patch" -) - -src_configure() { - local myconf=( - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(qt_use sctp) - $(usev ssl -openssl-linked) - -no-dtls # Required for libressl - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: af2c9a2d41e6c161673396fc9a24ede5b2a65614 Author: orbea riseup net> AuthorDate: Fri Aug 11 05:27:00 2023 + Commit: orbea riseup net> CommitDate: Fri Aug 11 05:27:00 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=af2c9a2d dev-qt/qtnetwork: stabilize 5.15.10-r3 for arm, arm64 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild index 00977b5..52d4d01 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=2 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 07e6baf01392f8d380f038a1a2d88c0826da1c0a Author: orbea riseup net> AuthorDate: Sun Aug 6 21:13:49 2023 + Commit: orbea riseup net> CommitDate: Sun Aug 6 21:40:32 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=07e6baf0 dev-qt/qtnetwork: add 5.15.10-r3 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild | 67 2 files changed, 68 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 68ae69f..a97f9f0 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,4 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b +DIST qtbase-5.15.10-gentoo-kde-2.tar.xz 740184 BLAKE2B 0b76c6515425b45de65993a54e6b72afc620300c711e75720fd1283b964aee564a780845f52c033794f6fdca9a13ca863e52a91f7eda5d436f9a668356af82b2 SHA512 474fd27c13cd1b58c688c063ca119769cda9a5de8c97ae04fba81cba9e176126ac71107c6536cf825617c27aadcaf53732d4181c772fbae3c04988f85490fd74 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild new file mode 100644 index 000..00977b5 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=2 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +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 +) + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 24dbb3eb248fb8f93f21a29ba6aee72c26106cfb Author: orbea riseup net> AuthorDate: Fri Jul 14 19:26:07 2023 + Commit: orbea riseup net> CommitDate: Fri Jul 14 19:26:07 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=24dbb3eb dev-qt/qtnetwork: drop 5.15.9, 5.15.9-r2, 5.15.9-r3 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 2 - .../files/qtnetwork-5.15.9-CVE-2023-32762.patch| 39 --- .../files/qtnetwork-5.15.9-CVE-2023-34410.patch| 113 - 15.9-QDnsLookup-dont-overflow-the-buffer.patch | 103 --- .../qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch | 32 -- dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild| 82 --- dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild| 83 --- dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild | 79 -- 8 files changed, 533 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 667878e..68ae69f 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1,3 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b -DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791 DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef -DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-32762.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-32762.patch deleted file mode 100644 index 7509414..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-32762.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a196623892558623e467f20b67edb78794252a09 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= -Date: Fri, 5 May 2023 11:07:26 +0200 -Subject: [PATCH] Hsts: match header names case insensitively (CVE-2023-32762) - -Header field names are always considered to be case-insensitive. - -Pick-to: 6.5 6.5.1 6.2 5.15 -Fixes: QTBUG-113392 -Change-Id: Ifb4def4bb7f2ac070416cdc76581a769f1e52b43 -Reviewed-by: Qt CI Bot -Reviewed-by: Edward Welbourne -Reviewed-by: Volker Hilsheimer -(cherry picked from commit 1b736a815be0222f4b24289cf17575fc15707305) - -* asturmlechner 2023-05-23: Upstream backport to 5.15 taken from - https://www.qt.io/blog/security-advisory-qt-network - src/network/access/qhsts.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp -index 0cef0ad3dc..be7ef7ff58 100644 a/src/network/access/qhsts.cpp -+++ b/src/network/access/qhsts.cpp -@@ -364,8 +364,8 @@ quoted-pair= "\" CHAR - bool QHstsHeaderParser::parse(const QList> ) - { - for (const auto : headers) { --// We use '==' since header name was already 'trimmed' for us: --if (h.first == "Strict-Transport-Security") { -+// We compare directly because header name was already 'trimmed' for us: -+if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { - header = h.second; - // RFC6797, 8.1: - // --- -2.40.1 - diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch deleted file mode 100644 index 3c91452..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 51a3c8d7b8140f0bf6912d14a58bcd0092b868a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= -Date:
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 9bb6418e5709a44851658498a770a018d8817ce5 Author: orbea riseup net> AuthorDate: Fri Jul 14 19:24:56 2023 + Commit: orbea riseup net> CommitDate: Fri Jul 14 19:24:56 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9bb6418e dev-qt/qtnetwork: stabilize 5.15.10-r2 for ppc Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild index 42ddb35..0c7d55a 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase" @@ -25,11 +25,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 - "${FILESDIR}/${P}-ssl-upgr-default-DH-params.patch" -) - QT5_TARGET_SUBDIRS=( src/network src/plugins/bearer/generic @@ -46,6 +41,11 @@ QT5_GENTOO_PRIVATE_CONFIG=( :network ) +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 + "${FILESDIR}/${P}-ssl-upgr-default-DH-params.patch" +) + src_configure() { local myconf=( $(qt_use gssapi feature-gssapi)
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 8c3ceb68f54b39010d700743884cf1fe79af5986 Author: Saki Xi riseup net> AuthorDate: Wed Jul 12 14:20:22 2023 + Commit: orbea riseup net> CommitDate: Wed Jul 12 14:47:58 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8c3ceb68 dev-qt/qtnetwork: Sync ::gentoo Signed-off-by: Saki Xi riseup.net> Closes: https://github.com/gentoo/libressl/pull/533 Signed-off-by: orbea riseup.net> ...etwork-5.15.10-ssl-upgr-default-DH-params.patch | 101 + ...15.10-r1.ebuild => qtnetwork-5.15.10-r2.ebuild} | 3 +- 2 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch new file mode 100644 index 000..94f1325 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch @@ -0,0 +1,101 @@ +From 05406c3f5f516d3148254c8294e8883c28a2c95a Mon Sep 17 00:00:00 2001 +From: Giuseppe D'Angelo +Date: Wed, 21 Jun 2023 13:30:35 +0200 +Subject: [PATCH] SSL: upgrade the default DH parameters + +We have been using as default DH parameters the 1024-bit MODP group. +This is now considered insecure, and applications should use the +2048-bit at a minimum [1]. This commit therefore replaces the parameters +with the 2048-bit MODP group from [2]. + +To double check the data, use openssl asn1parse to verify that the prime +matches. For instance: + +1) put the encoded string in a `encoded.txt` file (c from the source, + removing the double quotes) +2) put the hexadecimal value of the 2048-bit group in a `reference.txt` + file (c from [2]) +3) compare the output of openssl asn1parse with the reference. For + instance like this: + +$ diff <(openssl asn1parse < encoded.txt | grep -m 1 INTEGER | perl -pe 's/.*://; s/\n//') <(perl -0777 -pe 's/\s//g' reference.txt) && echo OK +OK + +[1] https://datatracker.ietf.org/doc/html/rfc8247#section-2.4 +[2] https://datatracker.ietf.org/doc/html/rfc3526#section-3 + +[ChangeLog][QtNetwork][QSslDiffieHellmanParameters] The default +Diffie-Hellman parameters are now using the 2048-bit MODP group from +RFC 3526. + +Pick-to: 6.6 6.5 6.2 5.15 +Change-Id: I47133cd78ba0e954b8f93a3da09fa2c760c9f7a8 +Reviewed-by: Timur Pocheptsov +(cherry picked from commit 3ec24e329c9ef6802786a37f30ddd8982e903480) +--- + src/network/ssl/qsslconfiguration.cpp | 12 ++-- + src/network/ssl/qssldiffiehellmanparameters.cpp | 13 +++-- + 2 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp +index f5ce02807f..84a9187334 100644 +--- a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp +@@ -929,7 +929,11 @@ void QSslConfiguration::setPreSharedKeyIdentityHint(const QByteArray ) + Retrieves the current set of Diffie-Hellman parameters. + + If no Diffie-Hellman parameters have been set, the QSslConfiguration object +-defaults to using the 1024-bit MODP group from RFC 2409. ++defaults to using the 2048-bit MODP group from RFC 3526. ++ ++\note The default parameters may change in future Qt versions. ++Please check the documentation of the \e{exact Qt version} that you ++are using in order to know what defaults that version uses. + */ + QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const + { +@@ -943,7 +947,11 @@ QSslDiffieHellmanParameters QSslConfiguration::diffieHellmanParameters() const + a server to \a dhparams. + + If no Diffie-Hellman parameters have been set, the QSslConfiguration object +-defaults to using the 1024-bit MODP group from RFC 2409. ++defaults to using the 2048-bit MODP group from RFC 3526. ++ ++\note The default parameters may change in future Qt versions. ++Please check the documentation of the \e{exact Qt version} that you ++are using in order to know what defaults that version uses. + */ + void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParameters ) + { +diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp +index 7807afaa30..7c2505a0be 100644 +--- a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp +@@ -68,17 +68,18 @@ + + QT_BEGIN_NAMESPACE + +-// The 1024-bit MODP group from RFC 2459 (Second Oakley Group) ++// The 2048-bit MODP group from RFC 3526 + Q_AUTOTEST_EXPORT const char *qssl_dhparams_default_base64 = +-"MIGHAoGBAP//yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJR" +-"Sgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL" +-"/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//AgEC"; ++"MIIBCAKCAQEA///JD9qiIWjCNMTGYouA3BzRKQJOCIpnzHQCC76mOxObIlFKCHmO" ++
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 6ad73a62211e3263776a3ff900d7716b90b22b4a Author: orbea riseup net> AuthorDate: Sun Jun 25 01:23:16 2023 + Commit: orbea riseup net> CommitDate: Sun Jun 25 02:54:15 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6ad73a62 dev-qt/qtnetwork: add 5.10.10-r1 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/metadata.xml| 3 -- dev-qt/qtnetwork/qtnetwork-5.15.10-r1.ebuild | 67 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml index 8a8481b..dfe9a54 100644 --- a/dev-qt/qtnetwork/metadata.xml +++ b/dev-qt/qtnetwork/metadata.xml @@ -6,12 +6,9 @@ Gentoo Qt Project - Enable net-misc/connman-based bearer plugin Enable support for GSSAPI (virtual/krb5) Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration - Enable net-misc/networkmanager-based - bearer plugin https://bugreports.qt.io/ diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r1.ebuild new file mode 100644 index 000..d3e6e8a --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="gssapi libproxy sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +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 +) + +src_configure() { + local myconf=( + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 682c1f27c7f3db661584c54ac66cce54051e1eda Author: orbea riseup net> AuthorDate: Wed Jun 14 03:11:32 2023 + Commit: orbea riseup net> CommitDate: Wed Jun 14 03:11:32 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=682c1f27 dev-qt/qtnetwork: add 5.15.10 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 2 + dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild | 79 +++ 2 files changed, 81 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 3ad9f43..667878e 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,5 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d +DIST qtbase-5.15.10-gentoo-kde-1.tar.xz 725208 BLAKE2B 14e82b0f26d0e0de47e9e3c4c54dd6649f983b9468c9f5790fb206a823a77ef22fc02546e39ff0ba68aa589ba811629bb4c4615223af9e8bec7c7b96ae13bef6 SHA512 efc93c451577f6389ffd58690ce2e1a2d2f3b85072cb8d542c5db0ddee2b60e80f2f937fb815a63db9973cc88ef35f8adc47a5ec98c2ec0b01ac5320ac635a5b DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791 +DIST qtbase-everywhere-opensource-src-5.15.10.tar.xz 50422688 BLAKE2B 2a625296967bef17d491a3ec8fbb4a3beaf00180a2cda728e485f796c801241798bd85dd06d57ca9fef26c591fe9910a2fcb83a67bbc17640b7393d280b9ce53 SHA512 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild new file mode 100644 index 000..db460b7 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="connman gssapi libproxy networkmanager sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 +) + +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=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: bfa63407717e18916b47899d9380f569479b45e4 Author: orbea riseup net> AuthorDate: Tue Jun 13 03:42:01 2023 + Commit: orbea riseup net> CommitDate: Tue Jun 13 03:42:01 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bfa63407 dev-qt/qtnetwork: add 5.15.9-r3 Signed-off-by: orbea riseup.net> .../files/qtnetwork-5.15.9-CVE-2023-34410.patch| 113 + dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild| 83 +++ 2 files changed, 196 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch new file mode 100644 index 000..3c91452 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-34410.patch @@ -0,0 +1,113 @@ +From 51a3c8d7b8140f0bf6912d14a58bcd0092b868a1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= +Date: Wed, 10 May 2023 16:43:41 +0200 +Subject: [PATCH 1/2] Schannel: Reject certificate not signed by a configured + CA certificate + +Not entirely clear why, but when building the certificate chain for a +peer the system certificate store is searched for root certificates. +General expectation is that after calling +`sslConfiguration.setCaCertificates()` the system certificates will +not be taken into consideration. + +To work around this behavior, we do a manual check that the root of the +chain is part of the configured CA certificates. + +Pick-to: 6.5 6.2 5.15 +Change-Id: I03666a4d9b0eac39ae97e150b4743120611a11b3 +Reviewed-by: Edward Welbourne +Reviewed-by: Volker Hilsheimer +(cherry picked from commit ada2c573c1a25f8d96577734968fe317ddfa292a) +--- + src/network/ssl/qsslsocket_schannel.cpp | 22 ++ + 1 file changed, 22 insertions(+) + +diff --git a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp +index c956ce3c2b..d1b23af29b 100644 +--- a/src/network/ssl/qsslsocket_schannel.cpp b/src/network/ssl/qsslsocket_schannel.cpp +@@ -1880,6 +1880,28 @@ bool QSslSocketBackendPrivate::verifyCertContext(CERT_CONTEXT *certContext) + if (configuration.peerVerifyDepth > 0 && DWORD(configuration.peerVerifyDepth) < verifyDepth) + verifyDepth = DWORD(configuration.peerVerifyDepth); + ++const auto = q->sslConfiguration().caCertificates(); ++ ++if (!rootCertOnDemandLoadingAllowed() ++&& !(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN) ++&& (q->peerVerifyMode() == QSslSocket::VerifyPeer ++|| (isClient && q->peerVerifyMode() == QSslSocket::AutoVerifyPeer))) { ++// When verifying a peer Windows "helpfully" builds a chain that ++// may include roots from the system store. But we don't want that if ++// the user has set their own CA certificates. ++// Since Windows claims this is not a partial chain the root is included ++// and we have to check that it is one of our configured CAs. ++CERT_CHAIN_ELEMENT *element = chain->rgpElement[chain->cElement - 1]; ++QSslCertificate certificate = getCertificateFromChainElement(element); ++if (!caCertificates.contains(certificate)) { ++auto error = QSslError(QSslError::CertificateUntrusted, certificate); ++sslErrors += error; ++emit q->peerVerifyError(error); ++if (q->state() != QAbstractSocket::ConnectedState) ++return false; ++} ++} ++ + for (DWORD i = 0; i < verifyDepth; i++) { + CERT_CHAIN_ELEMENT *element = chain->rgpElement[i]; + QSslCertificate certificate = getCertificateFromChainElement(element); +-- +2.41.0 + + +From a933f89e1f69b97ccb9d1e5f82d9a619c02afcd2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= +Date: Thu, 25 May 2023 14:40:29 +0200 +Subject: [PATCH 2/2] Ssl: Copy the on-demand cert loading bool from default + config + +Otherwise individual sockets will still load system certificates when +a chain doesn't match against the configured CA certificates. +That's not intended behavior, since specifically setting the CA +certificates means you don't want the system certificates to be used. + +Follow-up to/amends ada2c573c1a25f8d96577734968fe317ddfa292a + +This is potentially a breaking change because now, if you ever add a +CA to the default config, it will disable loading system certificates +on demand for all sockets. And the only way to re-enable it is to +create a null-QSslConfiguration and set it as the new default. + +Pick-to: 6.5 6.2 5.15 +Change-Id: Ic3b2ab125c0cdd58ad654af1cb36173960ce2d1e +Reviewed-by: Timur Pocheptsov +(cherry picked from commit 57ba6260c0801055b7188fdaa1818b940590f5f1) +--- + src/network/ssl/qsslsocket.cpp | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp +index 5bb6e7ee4a..2a0b3a4f1d 100644 +---
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: ad5d5f2a2e54df66b56222a3ac635ca74de50b17 Author: orbea riseup net> AuthorDate: Wed May 31 15:09:36 2023 + Commit: orbea riseup net> CommitDate: Wed May 31 15:09:50 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ad5d5f2a dev-qt/qtnetwork: sync ::gentoo Signed-off-by: orbea riseup.net> .../qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch | 32 ++ dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild| 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch new file mode 100644 index 000..d245531 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch @@ -0,0 +1,32 @@ +From df809fd0b505b61d718fe1dc7fe19a79f9336cd9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 24 May 2023 20:21:33 +0200 +Subject: [PATCH] Use pkgconfig in order to find libproxy configuration + +>=libproxy-0.5 moved proxy.h into a non-default include search path. + +See also: +https://github.com/libproxy/libproxy/issues/226#issuecomment-1557064225 +https://bugs.gentoo.org/906879 + +Signed-off-by: Andreas Sturmlechner +--- + src/network/configure.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/configure.json b/src/network/configure.json +index 271ff164ac..ffba2d1eea 100644 +--- a/src/network/configure.json b/src/network/configure.json +@@ -53,7 +53,7 @@ + }, + "headers": "proxy.h", + "sources": [ +-"-lproxy" ++{ "type": "pkgConfig", "args": "libproxy-1.0" } + ] + }, + "openssl_headers": { +-- +2.40.1 + diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild index 45eeceb..2e9886e 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase" @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 "${FILESDIR}/${P}-QDnsLookup-dont-overflow-the-buffer.patch" "${FILESDIR}/${P}-CVE-2023-32762.patch" + "${FILESDIR}/${P}-libproxy-0.5-pkgconfig.patch" ) QT5_TARGET_SUBDIRS=(
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 6e0c7e3a9d7ecbb28cfd62c7fef56f9a4aea5fd1 Author: orbea riseup net> AuthorDate: Wed May 24 17:38:43 2023 + Commit: orbea riseup net> CommitDate: Wed May 24 17:38:43 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6e0c7e3a dev-qt/qtnetwork: add 5.15.9-r2 Signed-off-by: orbea riseup.net> .../files/qtnetwork-5.15.9-CVE-2023-32762.patch| 39 ++ ...5.15.9-r1.ebuild => qtnetwork-5.15.9-r2.ebuild} | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-32762.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-32762.patch new file mode 100644 index 000..7509414 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-CVE-2023-32762.patch @@ -0,0 +1,39 @@ +From a196623892558623e467f20b67edb78794252a09 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= +Date: Fri, 5 May 2023 11:07:26 +0200 +Subject: [PATCH] Hsts: match header names case insensitively (CVE-2023-32762) + +Header field names are always considered to be case-insensitive. + +Pick-to: 6.5 6.5.1 6.2 5.15 +Fixes: QTBUG-113392 +Change-Id: Ifb4def4bb7f2ac070416cdc76581a769f1e52b43 +Reviewed-by: Qt CI Bot +Reviewed-by: Edward Welbourne +Reviewed-by: Volker Hilsheimer +(cherry picked from commit 1b736a815be0222f4b24289cf17575fc15707305) + +* asturmlechner 2023-05-23: Upstream backport to 5.15 taken from + https://www.qt.io/blog/security-advisory-qt-network +--- + src/network/access/qhsts.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp +index 0cef0ad3dc..be7ef7ff58 100644 +--- a/src/network/access/qhsts.cpp b/src/network/access/qhsts.cpp +@@ -364,8 +364,8 @@ quoted-pair= "\" CHAR + bool QHstsHeaderParser::parse(const QList> ) + { + for (const auto : headers) { +-// We use '==' since header name was already 'trimmed' for us: +-if (h.first == "Strict-Transport-Security") { ++// We compare directly because header name was already 'trimmed' for us: ++if (h.first.compare("Strict-Transport-Security", Qt::CaseInsensitive) == 0) { + header = h.second; + // RFC6797, 8.1: + // +-- +2.40.1 + diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild similarity index 94% rename from dev-qt/qtnetwork/qtnetwork-5.15.9-r1.ebuild rename to dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild index 3e96f6c..45eeceb 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild @@ -31,8 +31,9 @@ RDEPEND="${DEPEND} " PATCHES=( - "${FILESDIR}"/${PN}-5.15.7-libressl.patch # Bug 562050, not upstreamable + "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 "${FILESDIR}/${P}-QDnsLookup-dont-overflow-the-buffer.patch" + "${FILESDIR}/${P}-CVE-2023-32762.patch" ) QT5_TARGET_SUBDIRS=(
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: fd08623964c090cad242486403def6de0554685c Author: orbea riseup net> AuthorDate: Tue May 23 13:15:05 2023 + Commit: orbea riseup net> CommitDate: Tue May 23 13:15:05 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=fd086239 dev-qt/qtnetwork: add 5.15.9-r1 Signed-off-by: orbea riseup.net> 15.9-QDnsLookup-dont-overflow-the-buffer.patch | 103 + dev-qt/qtnetwork/qtnetwork-5.15.9-r1.ebuild| 80 2 files changed, 183 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-QDnsLookup-dont-overflow-the-buffer.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-QDnsLookup-dont-overflow-the-buffer.patch new file mode 100644 index 000..433dc67 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-QDnsLookup-dont-overflow-the-buffer.patch @@ -0,0 +1,103 @@ +From 2103f2487f709dd9546c503820d9ad509e9a63b3 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Thu, 11 May 2023 21:40:15 -0700 +Subject: [PATCH] QDnsLookup/Unix: make sure we don't overflow the buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The DNS Records are variable length and encode their size in 16 bits +before the Record Data (RDATA). Ensure that both the RDATA and the +Record header fields before it fall inside the buffer we have. + +Additionally reject any replies containing more than one query records. + +[ChangeLog][QtNetwork][QDnsLookup] Fixed a bug that could cause a buffer +overflow in Unix systems while parsing corrupt, malicious, or truncated +replies. + +Pick-to: 5.15 6.2 6.5 6.5.1 +Change-Id: I3e3bfef633af4130a03afffd175e4b9547654b95 +Reviewed-by: MÃ¥rten Nordheim +Reviewed-by: Jani Heikkinen +(cherry picked from commit 7dba2c87619d558a61a30eb30cc1d9c3fe6df94c) + +* asturmlechner 2023-05-18: Resolve conflict with dev branch commit + 68b625901f9eb7c34e3d7aa302e1c0a454d3190b +--- + src/network/kernel/qdnslookup_unix.cpp | 31 +- + 1 file changed, 25 insertions(+), 6 deletions(-) + +diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp +index 12b40fc35dd..99e999d436c 100644 +--- a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp +@@ -227,7 +227,6 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray + // responseLength in case of error, we still can extract the + // exact error code from the response. + HEADER *header = (HEADER*)response; +-const int answerCount = ntohs(header->ancount); + switch (header->rcode) { + case NOERROR: + break; +@@ -260,18 +259,31 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray + return; + } + +-// Skip the query host, type (2 bytes) and class (2 bytes). + char host[PACKETSZ], answer[PACKETSZ]; + unsigned char *p = response + sizeof(HEADER); +-int status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); +-if (status < 0) { ++int status; ++ ++if (ntohs(header->qdcount) == 1) { ++// Skip the query host, type (2 bytes) and class (2 bytes). ++status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); ++if (status < 0) { ++reply->error = QDnsLookup::InvalidReplyError; ++reply->errorString = tr("Could not expand domain name"); ++return; ++} ++if ((p - response) + status + 4 >= responseLength) ++header->qdcount = 0x; // invalid reply below ++else ++p += status + 4; ++} ++if (ntohs(header->qdcount) > 1) { + reply->error = QDnsLookup::InvalidReplyError; +-reply->errorString = tr("Could not expand domain name"); ++reply->errorString = tr("Invalid reply received"); + return; + } +-p += status + 4; + + // Extract results. ++const int answerCount = ntohs(header->ancount); + int answerIndex = 0; + while ((p < response + responseLength) && (answerIndex < answerCount)) { + status = local_dn_expand(response, response + responseLength, p, host, sizeof(host)); +@@ -283,6 +295,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray + const QString name = QUrl::fromAce(host); + + p += status; ++ ++if ((p - response) + 10 > responseLength) { ++// probably just a truncated reply, return what we have ++return; ++} + const quint16 type = (p[0] << 8) | p[1]; + p += 2; // RR type + p += 2; // RR class +@@ -290,6 +307,8 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray + p += 4; + const quint16 size = (p[0] << 8) | p[1]; + p += 2; ++if ((p - response) + size > responseLength) ++return; // truncated + +
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 09c7aabc0cefb59fc4f91ce172307fd4a8f61205 Author: orbea riseup net> AuthorDate: Wed May 10 19:29:55 2023 + Commit: orbea riseup net> CommitDate: Wed May 10 19:29:55 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=09c7aabc dev-qt/qtnetwork: drop 5.15.8-r1 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest | 3 -- dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild | 79 - 2 files changed, 82 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 294b670..3ad9f43 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,6 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d -DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791 -DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild deleted file mode 100644 index b2e4249..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=6 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="connman gssapi libproxy networkmanager sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - connman? ( =dev-qt/qtdbus-${QT5_PV}* ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.7-libressl.patch # Bug 562050, not upstreamable -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usev connman -dbus-linked) - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(usev networkmanager -dbus-linked) - $(qt_use sctp) - $(usev ssl -openssl-linked) - -no-dtls # Required for libressl - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die -
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 0325fb1ff2d09c6ef84129fc5d2247c1700381ba Author: orbea riseup net> AuthorDate: Wed May 10 19:29:20 2023 + Commit: orbea riseup net> CommitDate: Wed May 10 19:29:20 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=0325fb1f dev-qt/qtnetwork: stabilize 5.15.9 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild index fb8518e..c28e00c 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 116a29fc0eabb60fc675a6d49569bd355dd62510 Author: orbea riseup net> AuthorDate: Sat Apr 15 17:01:51 2023 + Commit: orbea riseup net> CommitDate: Sat Apr 15 17:01:51 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=116a29fc dev-qt/qtnetwork: add 5.15.9 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 3 ++ dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild | 79 2 files changed, 82 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 2acd6e7..294b670 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,6 @@ DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e +DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4c4a146e0d47f10e6c1f540a23db64ba6b0d42f46d63f54f93587deae9ac528f6824fa0e88177fe109a53aaee7d8328d49e364cd SHA512 1ae6630cef6bead9187aaaf7c420566b2c1f946bfa22cb983c52267c098e9b1c7b82c99204cbd3eed5eb6ebde0359726e260fd449618802735af465ca39f0a1d DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b +DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a562b2850fe85e088acb2913a06a4a97f82fea015ae9cf20908e5044a0170a2f837cf94a67ac6e870da8ea6e7603057b5683c1a SHA512 60e6c338136affc936c776c129fd2d6620f5e36db8ded32970d59e953bf843786a6deea6cb529488dbd58dfc7c8ea9e71580026fdda8b364596f095e8e9b7791 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce +DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild new file mode 100644 index 000..fb8518e --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != ** ]]; then + QT5_KDEPATCHSET_REV=1 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +IUSE="connman gssapi libproxy networkmanager sctp +ssl" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +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 +) + +PATCHES=( + "${FILESDIR}"/${PN}-5.15.7-libressl.patch # Bug 562050, not upstreamable +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(usev ssl -openssl-linked) + -no-dtls # Required for libressl + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 951482234fac8c216ef402a25e11be930e709c30 Author: orbea riseup net> AuthorDate: Sun Apr 9 00:47:34 2023 + Commit: orbea riseup net> CommitDate: Wed Apr 12 02:00:24 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=95148223 dev-qt/qtnetwork: Merge ::gentoo changes Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild index 6fcaf01..b2e4249 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.8-r1.ebuild @@ -4,8 +4,8 @@ EAPI=8 if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=2 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + QT5_KDEPATCHSET_REV=6 + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: e407c717ae4cb243db24cd8d742dd1395bdbb25d Author: orbea riseup net> AuthorDate: Sun Apr 9 00:48:01 2023 + Commit: orbea riseup net> CommitDate: Wed Apr 12 02:00:27 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e407c717 dev-qt/qtnetwork: Remove 5.15.7 Closes: https://github.com/gentoo/libressl/pull/514 Signed-off-by: orbea riseup.net> dev-qt/qtnetwork/Manifest| 5 +- dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild | 79 2 files changed, 1 insertion(+), 83 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index ea0504c..2acd6e7 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,6 +1,3 @@ -DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e -DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 -DIST qtbase-5.15.8-gentoo-kde-2.tar.xz 784544 BLAKE2B d4f16e14d940660ec28b138e17ac9342657775e31797013e6ad59de51c9ebfec2effe03375581eea548a1de7b38219adc34062c7d3f339a3cce1347ad2d7 SHA512 3d8693ecaf98aff084dc9a2af6dce4566d272aa223b2bbd1c9f348a8a0d03055ac1129e9f39054f0d58b738dad482e1aacb1c3016bc86807f2238297e7d61cef -DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 +DIST qtbase-5.15.8-gentoo-kde-6.tar.xz 796880 BLAKE2B 014fd9c9693fe1a5adc54f1d147db4bbb4bf6f5fbde5950a9586a6868d16b63b83cf24821c33fd2a325d6b70a1fa655b0fc0da7ef74ae175e278ebda1f8c9aa4 SHA512 910a7e42e13f33b53984b4f61c58e53c1cf0accfa9eb1e143cc011882fff6cab14fa7c66562396b3a929f5ec6ecf56724d74df34ac15f32cc4d8ae6cb8da797b DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild deleted file mode 100644 index c1d5f2d..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != ** ]]; then - QT5_KDEPATCHSET_REV=1 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -fi - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -IUSE="connman gssapi libproxy networkmanager sctp +ssl" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - connman? ( =dev-qt/qtdbus-${QT5_PV}* ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.7-libressl.patch # Bug 562050, not upstreamable -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usev connman -dbus-linked) - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(usev networkmanager -dbus-linked) - $(qt_use sctp) - $(usev ssl
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 66402549f01efc4a44dcfdd010f5eb40ba9b8d93 Author: orbea riseup net> AuthorDate: Tue Jan 10 21:33:42 2023 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Jan 14 23:22:19 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=66402549 dev-qt/qtnetwork: Merge ::gentoo changes Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/487 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild index ce836b8..c1d5f2d 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != ** ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 59d5267c9f2cf5496182321738071309c5498c87 Author: orbea riseup net> AuthorDate: Tue Jan 10 21:32:03 2023 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Jan 14 23:22:15 2023 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=59d5267c dev-qt/qtnetwork: Add 5.15.8-r1 + Remove 5.15.5 Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 6 +- .../files/qtnetwork-5.15.5-libressl.patch | 355 - ...rk-5.15.5.ebuild => qtnetwork-5.15.8-r1.ebuild} | 14 +- 3 files changed, 10 insertions(+), 365 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index fa3592d..ea0504c 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,6 +1,6 @@ -DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 -DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7 +DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 -DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 +DIST qtbase-5.15.8-gentoo-kde-2.tar.xz 784544 BLAKE2B d4f16e14d940660ec28b138e17ac9342657775e31797013e6ad59de51c9ebfec2effe03375581eea548a1de7b38219adc34062c7d3f339a3cce1347ad2d7 SHA512 3d8693ecaf98aff084dc9a2af6dce4566d272aa223b2bbd1c9f348a8a0d03055ac1129e9f39054f0d58b738dad482e1aacb1c3016bc86807f2238297e7d61cef DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 +DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.5-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.5-libressl.patch deleted file mode 100644 index f41df00..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.5-libressl.patch +++ /dev/null @@ -1,355 +0,0 @@ -From bd917c12865c773b882f45a8ed66735e39b4f013 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Sat, 28 Nov 2020 06:12:22 +0200 -Subject: [PATCH] QSslSocket: add LibreSSL support - -Upstream-Status: Inappropriate -[Upstream is not willing to accept any patches for LibreSSL support] -Signed-off-by: Stefan Strogin -Signed-off-by: orbea - src/network/ssl/qsslcertificate_openssl.cpp | 2 +- - src/network/ssl/qsslcontext_openssl.cpp | 15 -- - src/network/ssl/qsslcontext_openssl_p.h | 7 +++ - src/network/ssl/qsslsocket_openssl.cpp| 2 +- - .../ssl/qsslsocket_openssl_symbols.cpp| 29 - .../ssl/qsslsocket_openssl_symbols_p.h| 42 ++- - 6 files changed, 89 insertions(+), 8 deletions(-) - -diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp -index 5022b899..73be1cf2 100644
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 905e47b8328eec88fd9b02fa71934ed0aeb729d2 Author: orbea riseup net> AuthorDate: Wed Nov 30 19:37:00 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Thu Dec 1 18:18:57 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=905e47b8 dev-qt/qtnetwork: Add 5.15.7 The patch was rebased and trimmed down from the 5.15.5 version. Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/478 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 5 +- .../files/qtnetwork-5.15.7-libressl.patch | 253 + dev-qt/qtnetwork/qtnetwork-5.15.7.ebuild | 79 +++ 3 files changed, 335 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 271f1b4..fa3592d 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f -DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e372168e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 +DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7 -DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 +DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 +DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch new file mode 100644 index 000..c9e7653 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.7-libressl.patch @@ -0,0 +1,253 @@ +From 282db75a652b230c83b3d99954b7a3fc2f6ae64c Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Wed, 30 Nov 2022 10:58:50 -0800 +Subject: [PATCH] QSslSocket: add LibreSSL support + +Upstream-Status: Inappropriate +[Upstream is not willing to accept any patches for LibreSSL support] + +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index d1794d4d..1f1aa5ed 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -727,7 +727,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = nullptr; + int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); + info.insert(name, QString::fromUtf8((char*)data, size)); +-#if QT_CONFIG(opensslv11) ++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) + q_CRYPTO_free(data, nullptr, 0); + #else + q_CRYPTO_free(data); +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index c992da9d..f659255a 100644 +---
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 392fa95eaa6a3a3cec33280476c701de1e2cfa44 Author: orbea riseup net> AuthorDate: Fri Oct 7 17:58:47 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Fri Oct 7 21:11:15 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=392fa95e dev-qt/qtnetwork: Merge ::gentoo changes Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild index 38a7c38..2d5e3c7 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="connman gssapi libproxy networkmanager sctp +ssl"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 23788a0df9e848714e75d7042f096fcfc4318b2e Author: orbea riseup net> AuthorDate: Fri Oct 7 17:59:26 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Fri Oct 7 21:11:15 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=23788a0d dev-qt/qtnetwork: Remove old version Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> .../files/qtnetwork-5.15.2-r14-libressl.patch | 369 - dev-qt/qtnetwork/metadata.xml | 1 - dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild | 80 - 3 files changed, 450 deletions(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch deleted file mode 100644 index 1a61fc9..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch +++ /dev/null @@ -1,369 +0,0 @@ -From bd917c12865c773b882f45a8ed66735e39b4f013 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Sat, 28 Nov 2020 06:12:22 +0200 -Subject: [PATCH] QSslSocket: add LibreSSL support - -Upstream-Status: Inappropriate -[Upstream is not willing to accept any patches for LibreSSL support] -Signed-off-by: Stefan Strogin -Signed-off-by: orbea - src/network/ssl/qsslcertificate_openssl.cpp | 2 +- - src/network/ssl/qsslcontext_openssl.cpp | 15 -- - src/network/ssl/qsslcontext_openssl_p.h | 7 +++ - src/network/ssl/qsslsocket_openssl.cpp| 2 +- - .../ssl/qsslsocket_openssl_symbols.cpp| 29 - .../ssl/qsslsocket_openssl_symbols_p.h| 47 ++- - 6 files changed, 94 insertions(+), 8 deletions(-) - -diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp -index 5022b899..73be1cf2 100644 a/src/network/ssl/qsslcertificate_openssl.cpp -+++ b/src/network/ssl/qsslcertificate_openssl.cpp -@@ -691,7 +691,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) - unsigned char *data = nullptr; - int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); - info.insert(name, QString::fromUtf8((char*)data, size)); --#if QT_CONFIG(opensslv11) -+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) - q_CRYPTO_free(data, nullptr, 0); - #else - q_CRYPTO_free(data); -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index d0a428c2..319cfc00 100644 a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, - } - #endif // dtls - --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) - extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); --#endif // TLS1_3_VERSION -+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER - - // Defined in qsslsocket.cpp - QList q_getDefaultDtlsCiphers(); -@@ -351,9 +351,11 @@ init_context: - return; - } - -+#ifndef LIBRESSL_VERSION_NUMBER - // A nasty hacked OpenSSL using a level that will make our auto-tests fail: - if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) - q_SSL_CTX_set_security_level(sslContext->ctx, 1); -+#endif // LIBRESSL_VERSION_NUMBER - - const long anyVersion = - #if QT_CONFIG(dtls) -@@ -627,14 +629,14 @@ init_context: - q_X509Callback); - } - --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) - // NewSessionTicket callback: - if (mode == QSslSocket::SslClientMode && !isDtls) { - q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); - q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); - } - --#endif // TLS1_3_VERSION -+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER - - #if QT_CONFIG(dtls) - // DTLS cookies: -@@ -722,6 +724,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) - } - #endif // ocsp - -+#ifndef LIBRESSL_VERSION_NUMBER - QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); - if (cctx) { - q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -768,7 +771,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) - sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); - sslContext->errorCode = QSslError::UnspecifiedError; - } --} else { -+} else -+#endif // LIBRESSL_VERSION_NUMBER -+{ - sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); - sslContext->errorCode = QSslError::UnspecifiedError; - } -diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h -index 70cb97aa..01a61cf5
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 7112c042906432aa758743db585589c0dfc8f2fe Author: orbea riseup net> AuthorDate: Tue Jun 21 16:13:17 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sun Jun 26 02:23:42 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7112c042 dev-qt/qtnetwork: Merge changes from ::gentoo Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/425 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild index a6062ff..7896f58 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: e847d659a4ae7ad35ef8cd1798d406ba4896fdcb Author: orbea riseup net> AuthorDate: Tue Jun 21 16:08:34 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sun Jun 26 02:23:38 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e847d659 dev-qt/qtnetwork: Added 5.15.5 The patch conflict can be solved by removing one chunk from the patch. Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 3 + .../files/qtnetwork-5.15.5-libressl.patch | 355 + dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild | 79 + 3 files changed, 437 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 876cb88..899868d 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,4 +1,7 @@ +DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e372168e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 +DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 +DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.5-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.5-libressl.patch new file mode 100644 index 000..f41df00 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.5-libressl.patch @@ -0,0 +1,355 @@ +From bd917c12865c773b882f45a8ed66735e39b4f013 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Sat, 28 Nov 2020 06:12:22 +0200 +Subject: [PATCH] QSslSocket: add LibreSSL support + +Upstream-Status: Inappropriate +[Upstream is not willing to accept any patches for LibreSSL support] +Signed-off-by: Stefan Strogin +Signed-off-by: orbea +--- + src/network/ssl/qsslcertificate_openssl.cpp | 2 +- + src/network/ssl/qsslcontext_openssl.cpp | 15 -- + src/network/ssl/qsslcontext_openssl_p.h | 7 +++ + src/network/ssl/qsslsocket_openssl.cpp| 2 +- + .../ssl/qsslsocket_openssl_symbols.cpp| 29 + .../ssl/qsslsocket_openssl_symbols_p.h| 42 ++- + 6 files changed, 89 insertions(+), 8 deletions(-) + +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index 5022b899..73be1cf2 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -691,7 +691,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = nullptr; + int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); + info.insert(name, QString::fromUtf8((char*)data, size)); +-#if QT_CONFIG(opensslv11) ++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) + q_CRYPTO_free(data, nullptr, 0); + #else + q_CRYPTO_free(data); +diff --git a/src/network/ssl/qsslcontext_openssl.cpp
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: a52ae040b1f9074f85cb82d7a1405eb4f3a93226 Author: orbea riseup net> AuthorDate: Tue Jun 21 16:10:55 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sun Jun 26 02:23:42 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a52ae040 dev-qt/qtnetwork: Remove old version Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest| 2 - dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild | 80 2 files changed, 82 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 899868d..271f1b4 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,7 +1,5 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f -DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e372168e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7 -DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild deleted file mode 100644 index d9d6821..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT5_KDEPATCHSET_REV=1 -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 ~riscv ~sparc x86" -fi - -IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" -REQUIRED_USE="!dtls" - -DEPEND=" - =dev-qt/qtcore-${QT5_PV}*:5= - sys-libs/zlib:= - connman? ( =dev-qt/qtdbus-${QT5_PV}* ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.2-r14-libressl.patch # Bug 562050, not upstreamable -) - -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - -src_configure() { - local myconf=( - $(usev connman -dbus-linked) - $(qt_use gssapi feature-gssapi) - $(qt_use libproxy) - $(usev networkmanager -dbus-linked) -
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: bd45a75176d93f888f7d86a2ec5de16f11a2660c Author: orbea riseup net> AuthorDate: Sat May 21 21:03:27 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat May 21 22:57:34 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bd45a751 dev-qt/qtnetwork: Updated for version 5.15.4 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/411 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest| 2 + dev-qt/qtnetwork/metadata.xml| 3 +- dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild | 80 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 9493fb3..876cb88 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,4 @@ DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c +DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e372168e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 +DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3 diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml index 6504a9e..7c239ff 100644 --- a/dev-qt/qtnetwork/metadata.xml +++ b/dev-qt/qtnetwork/metadata.xml @@ -1,12 +1,11 @@ -http://www.gentoo.org/dtd/metadata.dtd;> +https://www.gentoo.org/dtd/metadata.dtd;> q...@gentoo.org Gentoo Qt Project - Disable EC support via dev-libs/openssl Enable net-misc/connman-based bearer plugin Support for Datagram Transport Layer Security (can cause build issues with libressl) Enable support for GSSAPI (virtual/krb5) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild new file mode 100644 index 000..a6062ff --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=1 +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 ~riscv ~sparc ~x86" +fi + +IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" +REQUIRED_USE="!dtls" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +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 +) + +PATCHES=( + "${FILESDIR}"/${PN}-5.15.2-r14-libressl.patch # Bug 562050, not upstreamable +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(qt_use dtls) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + #
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 7e7de6f17d5017340ba157f143f2c77b4c4afc29 Author: orbea riseup net> AuthorDate: Sat Apr 30 15:43:32 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sun May 1 00:19:06 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7e7de6f1 dev-qt/qtnetwork: Update keywords Matches the gentoo keywords. Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest| 3 --- dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 277834e..9493fb3 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1,2 @@ -DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82 -DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc -DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild index a6062ff..d9d6821 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild @@ -10,7 +10,7 @@ inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: c0884c4ab3ffd73a7bfb0fa9a318982ed6f7e070 Author: orbea riseup net> AuthorDate: Sat Apr 30 15:44:22 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sun May 1 00:19:06 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c0884c4a dev-qt/qtnetwork: Remove old versions Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/401 Signed-off-by: Quentin Retornaz retornaz.com> .../files/qtnetwork-5.15.2-r11-libressl.patch | 407 - dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 80 dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild | 80 dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild | 80 4 files changed, 647 deletions(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch deleted file mode 100644 index 97e7f15..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch +++ /dev/null @@ -1,407 +0,0 @@ -From 89e6ffbf5e2febb9cedaf9e533fbcca9da398a2d Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Sat, 28 Nov 2020 06:12:22 +0200 -Subject: [PATCH] QSslSocket: add LibreSSL support - -Upstream-Status: Inappropriate -[Upstream is not willing to accept any patches for LibreSSL support] -Signed-off-by: Stefan Strogin -Signed-off-by: orbea - src/network/ssl/qsslcertificate_openssl.cpp | 2 +- - src/network/ssl/qsslcontext_openssl.cpp | 27 --- - src/network/ssl/qsslcontext_openssl_p.h | 7 +++ - src/network/ssl/qsslsocket_openssl.cpp| 2 +- - .../ssl/qsslsocket_openssl_symbols.cpp| 31 + - .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++ - 6 files changed, 107 insertions(+), 7 deletions(-) - -diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp -index ca9d61cc..19774432 100644 a/src/network/ssl/qsslcertificate_openssl.cpp -+++ b/src/network/ssl/qsslcertificate_openssl.cpp -@@ -661,7 +661,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) - unsigned char *data = nullptr; - int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); - info.insert(name, QString::fromUtf8((char*)data, size)); --#if QT_CONFIG(opensslv11) -+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) - q_CRYPTO_free(data, nullptr, 0); - #else - q_CRYPTO_free(data); -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index c9f202f5..4963474c 100644 a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, - } - #endif // dtls - --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) - extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); --#endif // TLS1_3_VERSION -+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER - - // Defined in qsslsocket.cpp - QList q_getDefaultDtlsCiphers(); -@@ -351,9 +351,11 @@ init_context: - return; - } - -+#ifndef LIBRESSL_VERSION_NUMBER - // A nasty hacked OpenSSL using a level that will make our auto-tests fail: - if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) - q_SSL_CTX_set_security_level(sslContext->ctx, 1); -+#endif // LIBRESSL_VERSION_NUMBER - - const long anyVersion = - #if QT_CONFIG(dtls) -@@ -408,16 +410,28 @@ init_context: - maxVersion = DTLS1_VERSION; - break; - case QSsl::DtlsV1_0OrLater: -+#ifdef DTLS_MAX_VERSION - minVersion = DTLS1_VERSION; - maxVersion = DTLS_MAX_VERSION; -+#else -+Q_UNREACHABLE(); -+#endif // DTLS_MAX_VERSION - break; - case QSsl::DtlsV1_2: -+#ifdef DTLS1_2_VERSION - minVersion = DTLS1_2_VERSION; - maxVersion = DTLS1_2_VERSION; -+#else -+Q_UNREACHABLE(); -+#endif // DTLS1_2_VERSION - break; - case QSsl::DtlsV1_2OrLater: -+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) - minVersion = DTLS1_2_VERSION; - maxVersion = DTLS_MAX_VERSION; -+#else -+Q_UNREACHABLE(); -+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION - break; - case QSsl::TlsV1_3OrLater: - #ifdef TLS1_3_VERSION -@@ -627,14 +641,14 @@ init_context: - q_X509Callback); - } - --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) - // NewSessionTicket callback: - if (mode == QSslSocket::SslClientMode && !isDtls) { - q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); - q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); - } - --#endif // TLS1_3_VERSION -+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER - - #if
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: cf76769e42626a6e4f6544e4deb3de11cb42c154 Author: orbea riseup net> AuthorDate: Fri Apr 1 18:12:24 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Apr 2 20:30:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=cf76769e dev-qt/qtnetwork: Version bump for 5.15.3 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/393 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest| 2 + dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild | 80 2 files changed, 82 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index bb0067a..277834e 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,5 @@ DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 +DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c +DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild new file mode 100644 index 000..a6062ff --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=1 +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 ~riscv ~sparc ~x86" +fi + +IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" +REQUIRED_USE="!dtls" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +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 +) + +PATCHES=( + "${FILESDIR}"/${PN}-5.15.2-r14-libressl.patch # Bug 562050, not upstreamable +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(qt_use dtls) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/
commit: caede61128f1b7c25c078ebbd738021b0098952b Author: Mike Skec protonmail ch> AuthorDate: Fri Mar 11 00:46:24 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Sun Mar 13 02:44:45 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=caede611 dev-qt/qtnetwork: fix build for LibreSSL 3.5.0 Signed-off-by: Mike Skec protonmail.ch> Closes: https://github.com/gentoo/libressl/pull/383 Signed-off-by: Quentin Retornaz retornaz.com> .../files/qtnetwork-5.15.2-r14-libressl.patch | 70 +++--- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch index b0a1aaa..1a61fc9 100644 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch @@ -36,31 +36,31 @@ index d0a428c2..319cfc00 100644 @@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, } #endif // dtls - + -#ifdef TLS1_3_VERSION +#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); -#endif // TLS1_3_VERSION +#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER - + // Defined in qsslsocket.cpp QList q_getDefaultDtlsCiphers(); @@ -351,9 +351,11 @@ init_context: return; } - + +#ifndef LIBRESSL_VERSION_NUMBER // A nasty hacked OpenSSL using a level that will make our auto-tests fail: if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) q_SSL_CTX_set_security_level(sslContext->ctx, 1); +#endif // LIBRESSL_VERSION_NUMBER - + const long anyVersion = #if QT_CONFIG(dtls) @@ -627,14 +629,14 @@ init_context: q_X509Callback); } - + -#ifdef TLS1_3_VERSION +#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) // NewSessionTicket callback: @@ -68,16 +68,16 @@ index d0a428c2..319cfc00 100644 q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); } - + -#endif // TLS1_3_VERSION +#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER - + #if QT_CONFIG(dtls) // DTLS cookies: @@ -722,6 +724,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) } #endif // ocsp - + +#ifndef LIBRESSL_VERSION_NUMBER QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); if (cctx) { @@ -98,9 +98,9 @@ index 70cb97aa..01a61cf5 100644 --- a/src/network/ssl/qsslcontext_openssl_p.h +++ b/src/network/ssl/qsslcontext_openssl_p.h @@ -61,6 +61,13 @@ - + QT_BEGIN_NAMESPACE - + +#ifndef DTLS_ANY_VERSION +#define DTLS_ANY_VERSION 0x1 +#endif @@ -109,7 +109,7 @@ index 70cb97aa..01a61cf5 100644 +#endif + #ifndef QT_NO_SSL - + class QSslContextPrivate; diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index af47dbf9..f4381efa 100644 @@ -118,7 +118,7 @@ index af47dbf9..f4381efa 100644 @@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() else if (mode == QSslSocket::SslServerMode) q_SSL_set_psk_server_callback(ssl, _ssl_psk_server_callback); - + -#if OPENSSL_VERSION_NUMBER >= 0x10101006L +#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) // Set the client callback for TLSv1.3 PSK @@ -128,7 +128,7 @@ diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qs index 0f48e498..0b47ccde 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -145,10 +145,13 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return +@@ -145,10 +145,15 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) @@ -138,8 +138,10 @@ index 0f48e498..0b47ccde 100644 DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) +#endif // OPENSSL_NO_DEPRECATED_3_0 DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) -+#ifndef LIBRESSL_VERSION_NUMBER ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER >= 0x305fL) DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) ++#endif ++#ifndef LIBRESSL_VERSION_NUMBER DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) @@ -156,10 +159,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: ecc8b9aacec323b065486d85c252a9231b210080 Author: orbea riseup net> AuthorDate: Wed Jan 19 23:26:54 2022 + Commit: Quentin Retornaz retornaz com> CommitDate: Thu Jan 20 01:29:12 2022 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ecc8b9aa dev-qt/qtnetwork: Updated for 5.15.2-r14 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/377 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 1 + .../files/qtnetwork-5.15.2-r14-libressl.patch | 367 + dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild | 80 + 3 files changed, 448 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 6b292bf..bb0067a 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ +DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82 DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch new file mode 100644 index 000..b0a1aaa --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r14-libressl.patch @@ -0,0 +1,367 @@ +From bd917c12865c773b882f45a8ed66735e39b4f013 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Sat, 28 Nov 2020 06:12:22 +0200 +Subject: [PATCH] QSslSocket: add LibreSSL support + +Upstream-Status: Inappropriate +[Upstream is not willing to accept any patches for LibreSSL support] +Signed-off-by: Stefan Strogin +Signed-off-by: orbea +--- + src/network/ssl/qsslcertificate_openssl.cpp | 2 +- + src/network/ssl/qsslcontext_openssl.cpp | 15 -- + src/network/ssl/qsslcontext_openssl_p.h | 7 +++ + src/network/ssl/qsslsocket_openssl.cpp| 2 +- + .../ssl/qsslsocket_openssl_symbols.cpp| 29 + .../ssl/qsslsocket_openssl_symbols_p.h| 47 ++- + 6 files changed, 94 insertions(+), 8 deletions(-) + +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index 5022b899..73be1cf2 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -691,7 +691,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = nullptr; + int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); + info.insert(name, QString::fromUtf8((char*)data, size)); +-#if QT_CONFIG(opensslv11) ++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) + q_CRYPTO_free(data, nullptr, 0); + #else + q_CRYPTO_free(data); +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index d0a428c2..319cfc00 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, + } + #endif // dtls + +-#ifdef TLS1_3_VERSION ++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) + extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); +-#endif // TLS1_3_VERSION ++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER + + // Defined in qsslsocket.cpp + QList q_getDefaultDtlsCiphers(); +@@ -351,9 +351,11 @@ init_context: + return; + } + ++#ifndef LIBRESSL_VERSION_NUMBER + // A nasty hacked OpenSSL using a level that will make our auto-tests fail: + if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) + q_SSL_CTX_set_security_level(sslContext->ctx, 1); ++#endif // LIBRESSL_VERSION_NUMBER + + const long anyVersion = + #if QT_CONFIG(dtls) +@@ -627,14 +629,14 @@ init_context: + q_X509Callback); + } + +-#ifdef TLS1_3_VERSION ++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) + // NewSessionTicket callback: + if (mode == QSslSocket::SslClientMode && !isDtls) { + q_SSL_CTX_sess_set_new_cb(sslContext->ctx,
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: bfc198850c0956f3257689768ec33e624bcce766 Author: orbea riseup net> AuthorDate: Sat Dec 25 00:41:50 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Dec 25 23:55:29 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bfc19885 dev-qt/qtnetwork: Updated for 5.15.2-r13 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/371 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild | 80 2 files changed, 81 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 4b89203..6b292bf 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild new file mode 100644 index 000..c9d0b35 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860 +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 ~riscv ~sparc x86" +fi + +IUSE="connman dtls gssapi libproxy networkmanager sctp +ssl" +REQUIRED_USE="!dtls" + +DEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + sys-libs/zlib:= + connman? ( =dev-qt/qtdbus-${QT5_PV}* ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0= ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +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 +) + +PATCHES=( + "${FILESDIR}"/${PN}-5.15.2-r11-libressl.patch # Bug 562050, not upstreamable +) + +pkg_setup() { + use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) + use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) +} + +src_configure() { + local myconf=( + $(usev connman -dbus-linked) + $(qt_use gssapi feature-gssapi) + $(qt_use libproxy) + $(usev networkmanager -dbus-linked) + $(qt_use sctp) + $(qt_use dtls) + $(usev ssl -openssl-linked) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 8b83aca60b827f17b3e56b24f1c6807443fb57a4 Author: orbea riseup net> AuthorDate: Wed Nov 3 17:09:10 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Nov 6 18:15:50 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=8b83aca6 dev-qt/qtnetwork: Update keywords + remove old version Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/363 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 2 - ...work-5.15.2-QNetworkAccessManager-memleak.patch | 41 --- .../files/qtnetwork-5.15.2-libressl.patch | 377 - dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 2 +- dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild| 80 - 5 files changed, 1 insertion(+), 501 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index c69b3ee..4b89203 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1 @@ DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 -DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 -DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch deleted file mode 100644 index be2c1f6..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001 -From: =?utf8?q?M=C3=A5rten=20Nordheim?= -Date: Fri, 6 Nov 2020 12:51:42 +0100 -Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details - -Details described in a comment. - -Task-number: QTBUG-88063 -Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52 -Reviewed-by: Timur Pocheptsov -(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c) -Reviewed-by: Qt Cherry-pick Bot - src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp -index 21916f53f15..727c1a0316d 100644 a/src/network/access/qnetworkreplyhttpimpl.cpp -+++ b/src/network/access/qnetworkreplyhttpimpl.cpp -@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest - - // For the synchronous HTTP, this is the normal way the delegate gets deleted - // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished --QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); -+QMetaObject::Connection threadFinishedConnection = -+QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); -+ -+// QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned -+// connections list. This orphaned list will be cleaned up next time 'thread' emits a signal, -+// unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect -+// it on deletion so that it cleans up the orphan immediately. -+QObject::connect(delegate, ::destroyed, delegate, [threadFinishedConnection]() { -+if (bool(threadFinishedConnection)) -+QObject::disconnect(threadFinishedConnection); -+}); - - // Set the properties it needs - delegate->httpRequest = httpRequest; --- -2.16.3 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch deleted file mode 100644 index f7fe32f..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch +++ /dev/null @@ -1,377 +0,0 @@ -From 07a00f9c6d87f1fa5360cfb8f086670f3fa5bd3f Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Sat, 28 Nov 2020 06:12:22 +0200 -Subject: [PATCH] QSslSocket: add LibreSSL support - -Upstream-Status: Inappropriate -[Upstream is not willing to accept any patches for LibreSSL support] -Signed-off-by: Stefan Strogin -
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 62a9ab00ac1109a43fcba3ad46acb3fdcbdde080 Author: orbea riseup net> AuthorDate: Sat Oct 2 01:34:03 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Oct 2 22:17:52 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=62a9ab00 dev-qt/qtnetwork: Updated for 5.15.2-r11 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/354 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 1 + .../files/qtnetwork-5.15.2-r11-libressl.patch | 407 + dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 80 3 files changed, 488 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index c298c0a..c69b3ee 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ +DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch new file mode 100644 index 000..97e7f15 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch @@ -0,0 +1,407 @@ +From 89e6ffbf5e2febb9cedaf9e533fbcca9da398a2d Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Sat, 28 Nov 2020 06:12:22 +0200 +Subject: [PATCH] QSslSocket: add LibreSSL support + +Upstream-Status: Inappropriate +[Upstream is not willing to accept any patches for LibreSSL support] +Signed-off-by: Stefan Strogin +Signed-off-by: orbea +--- + src/network/ssl/qsslcertificate_openssl.cpp | 2 +- + src/network/ssl/qsslcontext_openssl.cpp | 27 --- + src/network/ssl/qsslcontext_openssl_p.h | 7 +++ + src/network/ssl/qsslsocket_openssl.cpp| 2 +- + .../ssl/qsslsocket_openssl_symbols.cpp| 31 + + .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++ + 6 files changed, 107 insertions(+), 7 deletions(-) + +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index ca9d61cc..19774432 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -661,7 +661,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = nullptr; + int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); + info.insert(name, QString::fromUtf8((char*)data, size)); +-#if QT_CONFIG(opensslv11) ++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) + q_CRYPTO_free(data, nullptr, 0); + #else + q_CRYPTO_free(data); +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index c9f202f5..4963474c 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, + } + #endif // dtls + +-#ifdef TLS1_3_VERSION ++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) + extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); +-#endif // TLS1_3_VERSION ++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER + + // Defined in qsslsocket.cpp + QList q_getDefaultDtlsCiphers(); +@@ -351,9 +351,11 @@ init_context: + return; + } + ++#ifndef LIBRESSL_VERSION_NUMBER + // A nasty hacked OpenSSL using a level that will make our auto-tests fail: + if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) + q_SSL_CTX_set_security_level(sslContext->ctx, 1); ++#endif // LIBRESSL_VERSION_NUMBER + + const long anyVersion = + #if QT_CONFIG(dtls) +@@ -408,16 +410,28 @@ init_context: + maxVersion = DTLS1_VERSION; + break; + case QSsl::DtlsV1_0OrLater: ++#ifdef DTLS_MAX_VERSION + minVersion = DTLS1_VERSION; + maxVersion = DTLS_MAX_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS_MAX_VERSION + break; + case
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 1bf4c9c19e5ebe39c9c93248517450221a73c056 Author: orbea riseup net> AuthorDate: Sat Oct 2 01:34:03 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Oct 2 22:08:44 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1bf4c9c1 dev-qt/qtnetwork: Updated for 5.15.2-r11 Signed-off-by: orbea riseup.net> Signed-off-by: Quentin Retornaz retornaz.com> .../files/qtnetwork-5.15.2-r11-libressl.patch | 407 + dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild | 80 2 files changed, 487 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch new file mode 100644 index 000..97e7f15 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-r11-libressl.patch @@ -0,0 +1,407 @@ +From 89e6ffbf5e2febb9cedaf9e533fbcca9da398a2d Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Sat, 28 Nov 2020 06:12:22 +0200 +Subject: [PATCH] QSslSocket: add LibreSSL support + +Upstream-Status: Inappropriate +[Upstream is not willing to accept any patches for LibreSSL support] +Signed-off-by: Stefan Strogin +Signed-off-by: orbea +--- + src/network/ssl/qsslcertificate_openssl.cpp | 2 +- + src/network/ssl/qsslcontext_openssl.cpp | 27 --- + src/network/ssl/qsslcontext_openssl_p.h | 7 +++ + src/network/ssl/qsslsocket_openssl.cpp| 2 +- + .../ssl/qsslsocket_openssl_symbols.cpp| 31 + + .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++ + 6 files changed, 107 insertions(+), 7 deletions(-) + +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index ca9d61cc..19774432 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -661,7 +661,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = nullptr; + int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); + info.insert(name, QString::fromUtf8((char*)data, size)); +-#if QT_CONFIG(opensslv11) ++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) + q_CRYPTO_free(data, nullptr, 0); + #else + q_CRYPTO_free(data); +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index c9f202f5..4963474c 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +@@ -77,9 +77,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, const unsigned char *cookie, + } + #endif // dtls + +-#ifdef TLS1_3_VERSION ++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) + extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session); +-#endif // TLS1_3_VERSION ++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER + + // Defined in qsslsocket.cpp + QList q_getDefaultDtlsCiphers(); +@@ -351,9 +351,11 @@ init_context: + return; + } + ++#ifndef LIBRESSL_VERSION_NUMBER + // A nasty hacked OpenSSL using a level that will make our auto-tests fail: + if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) + q_SSL_CTX_set_security_level(sslContext->ctx, 1); ++#endif // LIBRESSL_VERSION_NUMBER + + const long anyVersion = + #if QT_CONFIG(dtls) +@@ -408,16 +410,28 @@ init_context: + maxVersion = DTLS1_VERSION; + break; + case QSsl::DtlsV1_0OrLater: ++#ifdef DTLS_MAX_VERSION + minVersion = DTLS1_VERSION; + maxVersion = DTLS_MAX_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS_MAX_VERSION + break; + case QSsl::DtlsV1_2: ++#ifdef DTLS1_2_VERSION + minVersion = DTLS1_2_VERSION; + maxVersion = DTLS1_2_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS1_2_VERSION + break; + case QSsl::DtlsV1_2OrLater: ++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) + minVersion = DTLS1_2_VERSION; + maxVersion = DTLS_MAX_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION + break; + case QSsl::TlsV1_3OrLater: + #ifdef TLS1_3_VERSION +@@ -627,14 +641,14 @@ init_context: + q_X509Callback); + } + +-#ifdef TLS1_3_VERSION ++#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER) + // NewSessionTicket callback: + if (mode == QSslSocket::SslClientMode && !isDtls) { + q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb); + q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT); + } + +-#endif // TLS1_3_VERSION ++#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER + + #if QT_CONFIG(dtls) + // DTLS cookies: +@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) + } + #endif // ocsp + ++#ifndef
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 703e442cbf9d7756e2b368c071652596a0cc3b86 Author: orbea riseup net> AuthorDate: Sat Oct 2 01:34:26 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Oct 2 22:08:45 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=703e442c dev-qt/qtnetwork: Update manifest Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/libressl/pull/354 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index c298c0a..c69b3ee 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ +DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: fd7a01618940f1f115dd334de74e287d22802143 Author: Quentin Retornaz retornaz com> AuthorDate: Sat Jun 19 11:49:31 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Jun 19 11:49:31 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=fd7a0161 dev-qt/qtnetwork: drop old Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild | 80 - 1 file changed, 80 deletions(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild deleted file mode 100644 index ce01f17..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz; - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="bindist connman dtls gssapi libproxy networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-libs/zlib:= - connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -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 -) - -PATCHES=( - "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063 - "${FILESDIR}"/${PN}-5.15.2-libressl.patch # Bug 562050, not upstreamable - "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 -) - -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 '') - $(usex gssapi -feature-gssapi -no-feature-gssapi) - $(qt_use libproxy) - $(usex networkmanager -dbus-linked '') - $(qt_use sctp) - $(qt_use dtls) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 05c8d97240cd8b4c8e02a067e70616d8005dccd9 Author: itZzenXX aleeas com> AuthorDate: Fri Jun 18 23:24:46 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat Jun 19 11:22:55 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=05c8d972 Bump qtnetwork Signed-off-by: itZzenXX aleeas.com> Closes: https://github.com/gentoo/libressl/pull/343 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild | 80 + 1 file changed, 80 insertions(+) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild new file mode 100644 index 000..ce01f17 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz; + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" +fi + +IUSE="bindist connman dtls gssapi libproxy networkmanager sctp +ssl" + +DEPEND=" + ~dev-qt/qtcore-${PV}:5= + sys-libs/zlib:= + connman? ( ~dev-qt/qtdbus-${PV} ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( ~dev-qt/qtdbus-${PV} ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +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 +) + +PATCHES=( + "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063 + "${FILESDIR}"/${PN}-5.15.2-libressl.patch # Bug 562050, not upstreamable + "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 +) + +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 '') + $(usex gssapi -feature-gssapi -no-feature-gssapi) + $(qt_use libproxy) + $(usex networkmanager -dbus-linked '') + $(qt_use sctp) + $(qt_use dtls) + $(usex ssl -openssl-linked '') + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + # workaround for bug 652650 + if use ssl; then + sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ + -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die + fi +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 1eee0f5a8db3433fd85ac061f71d117d842e8571 Author: Quentin Retornaz retornaz com> AuthorDate: Sat May 1 15:51:53 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Sat May 1 15:51:53 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1eee0f5a dev-qt/qtnetwork: add dtls USE flag Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/metadata.xml | 1 + dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml index 19a09a6..6504a9e 100644 --- a/dev-qt/qtnetwork/metadata.xml +++ b/dev-qt/qtnetwork/metadata.xml @@ -8,6 +8,7 @@ Disable EC support via dev-libs/openssl Enable net-misc/connman-based bearer plugin + Support for Datagram Transport Layer Security (can cause build issues with libressl) Enable support for GSSAPI (virtual/krb5) Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild index cc9144c..04eba6c 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi -IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl" +IUSE="bindist connman dtls gssapi libressl libproxy networkmanager sctp +ssl" DEPEND=" ~dev-qt/qtcore-${PV}:5= @@ -67,6 +67,7 @@ src_configure() { $(qt_use libproxy) $(usex networkmanager -dbus-linked '') $(qt_use sctp) + $(qt_use dtls) $(usex ssl -openssl-linked '') ) qt5-build_src_configure
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: fe23e01f83e5a2570760c2498617346b7e06c1d5 Author: Quentin Retornaz retornaz com> AuthorDate: Wed Jan 27 22:33:50 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Wed Jan 27 22:33:50 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=fe23e01f dev-qt/qtnetwork: drop old Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild | 77 1 file changed, 77 deletions(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild deleted file mode 100644 index 01f1825..000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -fi - -IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl" - -DEPEND=" - ~dev-qt/qtcore-${PV}:5= - sys-libs/zlib:= - connman? ( ~dev-qt/qtdbus-${PV} ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - networkmanager? ( ~dev-qt/qtdbus-${PV} ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - ssl? ( - !libressl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" - -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 -) - -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) # Bug 562050, not upstreamable - -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 '') - $(usex gssapi -feature-gssapi -no-feature-gssapi) - $(qt_use libproxy) - $(usex networkmanager -dbus-linked '') - $(qt_use sctp) - $(usex ssl -openssl-linked '') - ) - qt5-build_src_configure -} - -src_install() { - qt5-build_src_install - # workaround for bug 652650 - if use ssl; then - sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \ - -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die - fi -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 21ac3653f78ef5484fd9e029e93de3e90889780a Author: Quentin Retornaz retornaz com> AuthorDate: Wed Jan 27 22:30:44 2021 + Commit: Quentin Retornaz retornaz com> CommitDate: Wed Jan 27 22:30:44 2021 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=21ac3653 dev-qt/qtnetwork: revbump to 5.15.2-r1 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Quentin Retornaz retornaz.com> dev-qt/qtnetwork/Manifest | 1 + ...work-5.15.2-QNetworkAccessManager-memleak.patch | 41 +++ dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild| 82 ++ 3 files changed, 124 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 8d47df5..c298c0a 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch new file mode 100644 index 000..be2c1f6 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch @@ -0,0 +1,41 @@ +From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001 +From: =?utf8?q?M=C3=A5rten=20Nordheim?= +Date: Fri, 6 Nov 2020 12:51:42 +0100 +Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details + +Details described in a comment. + +Task-number: QTBUG-88063 +Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52 +Reviewed-by: Timur Pocheptsov +(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c) +Reviewed-by: Qt Cherry-pick Bot +--- + src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp +index 21916f53f15..727c1a0316d 100644 +--- a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp +@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest + + // For the synchronous HTTP, this is the normal way the delegate gets deleted + // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished +-QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); ++QMetaObject::Connection threadFinishedConnection = ++QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater())); ++ ++// QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned ++// connections list. This orphaned list will be cleaned up next time 'thread' emits a signal, ++// unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect ++// it on deletion so that it cleans up the orphan immediately. ++QObject::connect(delegate, ::destroyed, delegate, [threadFinishedConnection]() { ++if (bool(threadFinishedConnection)) ++QObject::disconnect(threadFinishedConnection); ++}); + + // Set the properties it needs + delegate->httpRequest = httpRequest; +-- +2.16.3 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild new file mode 100644 index 000..cc9144c --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz; + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" +fi + +IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl" + +DEPEND=" + ~dev-qt/qtcore-${PV}:5= + sys-libs/zlib:= + connman? ( ~dev-qt/qtdbus-${PV} ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( ~dev-qt/qtdbus-${PV} ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] ) +
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 92e51fd0194a46b1b4085df171916d79f19abc8c Author: Stefan Strogin gentoo org> AuthorDate: Sat Nov 28 19:22:28 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Sat Nov 28 19:22:28 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=92e51fd0 dev-qt/qtnetwork: upgrade to 5.15.2 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest | 2 +- ...ressl.patch => qtnetwork-5.15.2-libressl.patch} | 103 ++--- ...twork-5.15.0.ebuild => qtnetwork-5.15.2.ebuild} | 18 +++- 3 files changed, 85 insertions(+), 38 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 7dbec38..8d47df5 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1 @@ -DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a +DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch similarity index 79% rename from dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch rename to dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch index d0a4796..f7fe32f 100644 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-libressl.patch @@ -1,25 +1,25 @@ -From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001 +From 07a00f9c6d87f1fa5360cfb8f086670f3fa5bd3f Mon Sep 17 00:00:00 2001 From: Stefan Strogin -Date: Wed, 5 Feb 2020 03:49:35 +0200 -Subject: [PATCH] QSslSocket - add LibreSSL support +Date: Sat, 28 Nov 2020 06:12:22 +0200 +Subject: [PATCH] QSslSocket: add LibreSSL support Upstream-Status: Inappropriate [Upstream is not willing to accept any patches for LibreSSL support] Signed-off-by: Stefan Strogin --- src/network/ssl/qsslcertificate_openssl.cpp | 2 +- - src/network/ssl/qsslcontext_openssl.cpp | 17 +++- + src/network/ssl/qsslcontext_openssl.cpp | 19 +++- src/network/ssl/qsslcontext_openssl_p.h | 7 +++ src/network/ssl/qsslsocket_openssl.cpp| 2 +- - .../ssl/qsslsocket_openssl_symbols.cpp| 25 +++ - .../ssl/qsslsocket_openssl_symbols_p.h| 43 +++ - 6 files changed, 93 insertions(+), 3 deletions(-) + .../ssl/qsslsocket_openssl_symbols.cpp| 31 + + .../ssl/qsslsocket_openssl_symbols_p.h| 45 +++ + 6 files changed, 103 insertions(+), 3 deletions(-) diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp -index 6f1fb26a..eba5a729 100644 +index ca9d61cc..19774432 100644 --- a/src/network/ssl/qsslcertificate_openssl.cpp +++ b/src/network/ssl/qsslcertificate_openssl.cpp -@@ -658,7 +658,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) +@@ -661,7 +661,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) unsigned char *data = nullptr; int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); info.insert(name, QString::fromUtf8((char*)data, size)); @@ -29,10 +29,22 @@ index 6f1fb26a..eba5a729 100644 #else q_CRYPTO_free(data); diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index 0aa8a4f4..f161af8a 100644 +index c9f202f5..d3626cab 100644 --- a/src/network/ssl/qsslcontext_openssl.cpp +++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -397,16 +397,28 @@ init_context: +@@ -351,9 +351,11 @@ init_context: + return; + } + ++#ifndef LIBRESSL_VERSION_NUMBER + // A nasty hacked OpenSSL using a level that will make our auto-tests fail: + if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) + q_SSL_CTX_set_security_level(sslContext->ctx, 1); ++#endif // LIBRESSL_VERSION_NUMBER + + const long anyVersion = + #if QT_CONFIG(dtls) +@@ -408,16 +410,28 @@ init_context: maxVersion = DTLS1_VERSION; break; case QSsl::DtlsV1_0OrLater: @@ -61,7 +73,7 @@ index 0aa8a4f4..f161af8a 100644 break; case QSsl::TlsV1_3OrLater: #ifdef TLS1_3_VERSION -@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) +@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) } #endif // ocsp @@
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 423d689e2c7c85b606582909e5acf6d139341702 Author: Stefan Strogin gentoo org> AuthorDate: Sat Nov 28 19:17:13 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Sat Nov 28 19:18:11 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=423d689e dev-qt/qtnetwork: drop old 5.14.2 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest | 1 - .../files/qtnetwork-5.12.1-libressl.patch | 93 --- .../files/qtnetwork-5.12.4-libressl.patch | 14 -- .../files/qtnetwork-5.14.2-CVE-2020-13962.patch| 172 - dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild| 71 - 5 files changed, 351 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index f458c94..7dbec38 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1 @@ -DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch deleted file mode 100644 index bd86269..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/src/network/configure.json b/src/network/configure.json -index f3e18662aa..8990763756 100644 a/src/network/configure.json -+++ b/src/network/configure.json -@@ -165,7 +165,7 @@ - "test": { - "include": "openssl/opensslv.h", - "tail": [ --"#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L", -+"#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)", - "# error OpenSSL >= 1.1 is required", - "#endif" - ] -diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp -index 35cca9f01a..03afdc5945 100644 a/src/network/ssl/qsslcontext_openssl.cpp -+++ b/src/network/ssl/qsslcontext_openssl.cpp -@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); - if (cctx) { -diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp -index 299df6b685..670314d7e5 100644 a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -216,8 +216,13 @@ DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, - #endif - DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) - DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) -+#ifdef LIBRESSL_VERSION_NUMBER -+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) -+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) -+#else - DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) - DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) -+#endif - DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) - DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) -@@ -443,7 +448,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) - DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) - DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(SSL_CONF_CTX *,
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: 40e2ec24a753a94dbac9b2719ddee998c908563c Author: Stefan Strogin gentoo org> AuthorDate: Thu Jul 16 07:53:29 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Thu Jul 16 07:53:29 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=40e2ec24 dev-qt/qtnetwork: add patch to fix CVE-2020-13962 in 5.14.2 Closes: https://github.com/gentoo/libressl/issues/321 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Stefan Strogin gentoo.org> .../files/qtnetwork-5.14.2-CVE-2020-13962.patch| 172 + ...rk-5.14.2.ebuild => qtnetwork-5.14.2-r1.ebuild} | 1 + 2 files changed, 173 insertions(+) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch new file mode 100644 index 000..9bbdda6 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch @@ -0,0 +1,172 @@ +From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001 +From: Timur Pocheptsov +Date: Mon, 13 Apr 2020 20:31:34 +0200 +Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s) +returns 1). Also, do not call SSL_shutdown if a session encountered a fatal +error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown +was unsuccessful (returned code != 1), we have to clear the error(s) it queued. +Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to +resolve SSL_state to implement SSL_in_init. + +Fixes: QTBUG-83450 +Change-Id: I6326119f4e79605429263045ac20605c30dccca3 +Reviewed-by: MÃ¥rten Nordheim +(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655) +--- + src/network/ssl/qsslsocket.cpp | 2 +- + src/network/ssl/qsslsocket_openssl.cpp | 23 -- + src/network/ssl/qsslsocket_openssl11_symbols_p.h | 7 +++ + src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 + .../ssl/qsslsocket_opensslpre11_symbols_p.h| 2 ++ + src/network/ssl/qsslsocket_p.h | 1 + + 6 files changed, 36 insertions(+), 7 deletions(-) + +diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp +index 4e9e9472631..5c9e589ec39 100644 +--- a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp +@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init() + pendingClose = false; + flushTriggered = false; + ocspResponses.clear(); +- ++systemOrSslErrorDetected = false; + // we don't want to clear the ignoreErrorsList, so + // that it is possible setting it before connecting + //ignoreErrorsList.clear(); +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index 51510f1c60b..855865209bc 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext() + void QSslSocketBackendPrivate::destroySslContext() + { + if (ssl) { +-// We do not send a shutdown alert here. Just mark the session as +-// resumable for qhttpnetworkconnection's "optimization", otherwise +-// OpenSSL won't start a session resumption. +-q_SSL_shutdown(ssl); ++if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) { ++// We do not send a shutdown alert here. Just mark the session as ++// resumable for qhttpnetworkconnection's "optimization", otherwise ++// OpenSSL won't start a session resumption. ++if (q_SSL_shutdown(ssl) != 1) { ++// Some error may be queued, clear it. ++const auto errors = getErrorsFromOpenSsl(); ++Q_UNUSED(errors); ++} ++} + q_SSL_free(ssl); + ssl = nullptr; + } +@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit() + case SSL_ERROR_SSL: // error in the SSL library + // we do not know exactly what the error is, nor whether we can recover from it, + // so just return to prevent an endless loop in the outer "while" statement ++systemOrSslErrorDetected = true; + { + const ScopedBool bg(inSetAndEmitError, true); + setErrorAndEmit(QAbstractSocket::SslInternalError, +@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus() + void QSslSocketBackendPrivate::disconnectFromHost() + { + if (ssl) { +-if (!shutdown) { +-q_SSL_shutdown(ssl); ++if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) { ++if (q_SSL_shutdown(ssl) != 1) { ++// Some error may be queued, clear it. ++const auto
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: da1e90a474c81ada492744556ca4a826a57d3af5 Author: Stefan Strogin gentoo org> AuthorDate: Tue Jun 2 02:08:12 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Tue Jun 2 02:08:12 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=da1e90a4 dev-qt/qtnetwork: drop old 5.14.1 dev-qtnetwork-5.15.0 is fixed in gentoo.git, but not 5.14.2. So drop just the old version, not the entire package yet, as some users may want to use 5.14.2 on stable systems. Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 - dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild | 68 2 files changed, 69 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 4905e98..f458c94 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,2 @@ -DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild deleted file mode 100644 index 31d151f..000 --- a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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" -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 -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: fee91ddd7b946e76bc5b59cac50e830c2379bea9 Author: Stefan Strogin gentoo org> AuthorDate: Tue Jun 2 02:12:56 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Tue Jun 2 02:12:56 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=fee91ddd dev-qt/qtnetwork: sync keywords; 5.14.2 stable Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild index 6fafe4c..b470bcd 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild @@ -8,7 +8,7 @@ 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" + KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" fi IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl"
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 9e800fa134c8a71ffdbe546ec0dc9477a6f4c185 Author: Stefan Strogin gentoo org> AuthorDate: Wed May 27 08:14:40 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Wed May 27 08:14:40 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=9e800fa1 dev-qt/qtnetwork: version bump to 5.15.0 Bug: https://bugs.gentoo.org/562050 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest | 1 + .../files/qtnetwork-5.15.0-libressl.patch | 340 + dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild | 67 3 files changed, 408 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 62cc41e..4905e98 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 +DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch new file mode 100644 index 000..d0a4796 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch @@ -0,0 +1,340 @@ +From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Wed, 5 Feb 2020 03:49:35 +0200 +Subject: [PATCH] QSslSocket - add LibreSSL support + +Upstream-Status: Inappropriate +[Upstream is not willing to accept any patches for LibreSSL support] +Signed-off-by: Stefan Strogin +--- + src/network/ssl/qsslcertificate_openssl.cpp | 2 +- + src/network/ssl/qsslcontext_openssl.cpp | 17 +++- + src/network/ssl/qsslcontext_openssl_p.h | 7 +++ + src/network/ssl/qsslsocket_openssl.cpp| 2 +- + .../ssl/qsslsocket_openssl_symbols.cpp| 25 +++ + .../ssl/qsslsocket_openssl_symbols_p.h| 43 +++ + 6 files changed, 93 insertions(+), 3 deletions(-) + +diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +index 6f1fb26a..eba5a729 100644 +--- a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp +@@ -658,7 +658,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) + unsigned char *data = nullptr; + int size = q_ASN1_STRING_to_UTF8(, q_X509_NAME_ENTRY_get_data(e)); + info.insert(name, QString::fromUtf8((char*)data, size)); +-#if QT_CONFIG(opensslv11) ++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) + q_CRYPTO_free(data, nullptr, 0); + #else + q_CRYPTO_free(data); +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index 0aa8a4f4..f161af8a 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +@@ -397,16 +397,28 @@ init_context: + maxVersion = DTLS1_VERSION; + break; + case QSsl::DtlsV1_0OrLater: ++#ifdef DTLS_MAX_VERSION + minVersion = DTLS1_VERSION; + maxVersion = DTLS_MAX_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS_MAX_VERSION + break; + case QSsl::DtlsV1_2: ++#ifdef DTLS1_2_VERSION + minVersion = DTLS1_2_VERSION; + maxVersion = DTLS1_2_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS1_2_VERSION + break; + case QSsl::DtlsV1_2OrLater: ++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) + minVersion = DTLS1_2_VERSION; + maxVersion = DTLS_MAX_VERSION; ++#else ++Q_UNREACHABLE(); ++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION + break; + case QSsl::TlsV1_3OrLater: + #ifdef TLS1_3_VERSION +@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) + } + #endif // ocsp + ++#ifndef LIBRESSL_VERSION_NUMBER + QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); + if (cctx) { + q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); +@@ -742,7 +755,9 @@ void
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: de51630a598c8d88c8a68ad0ae04064559ca7ced Author: Stefan Strogin gentoo org> AuthorDate: Sat Apr 11 04:55:48 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Sat Apr 11 05:01:18 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=de51630a dev-qt/qtnetwork: drop old 5.13.2 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 - dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild | 68 2 files changed, 69 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 7660e68..4027b9b 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1 @@ -DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild deleted file mode 100644 index 0106a1e..000 --- a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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" -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 -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: ad08d4df67f1e2235ae1847448ed4e2c35d87ab5 Author: Stefan Strogin gentoo org> AuthorDate: Sat Apr 11 05:01:07 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Sat Apr 11 05:02:25 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ad08d4df dev-qt/qtnetwork: version bump to 5.14.2 Reported-by: Dennis Gaebler uni-ulm.de> Closes: https://github.com/gentoo/libressl/pull/318 Bug: https://bugs.gentoo.org/562050 Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/metadata.xml| 1 + dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild | 70 3 files changed, 72 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 4027b9b..62cc41e 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1,2 @@ DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b +DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml index cc8f058..19a09a6 100644 --- a/dev-qt/qtnetwork/metadata.xml +++ b/dev-qt/qtnetwork/metadata.xml @@ -8,6 +8,7 @@ Disable EC support via dev-libs/openssl Enable net-misc/connman-based bearer plugin + Enable support for GSSAPI (virtual/krb5) Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration Enable net-misc/networkmanager-based diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild new file mode 100644 index 000..6fafe4c --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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" +fi + +IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl" + +DEPEND=" + ~dev-qt/qtcore-${PV}:5= + sys-libs/zlib:= + connman? ( ~dev-qt/qtdbus-${PV} ) + gssapi? ( virtual/krb5 ) + 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 '') + $(usex gssapi -feature-gssapi -no-feature-gssapi) + $(qt_use libproxy) + $(usex networkmanager -dbus-linked '') + $(qt_use sctp) + $(usex ssl -openssl-linked '') + ) + qt5-build_src_configure +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 98d179762adfd5aa1aa9c1765ebdadac11e03696 Author: Stefan Strogin gentoo org> AuthorDate: Thu Mar 19 16:37:24 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Thu Mar 19 16:37:24 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=98d17976 dev-qt/qtnetwork: drop old 5.12.3, 5.12.5, 5.14.0 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 3 -- dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild | 67 --- dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild | 68 dev-qt/qtnetwork/qtnetwork-5.14.0.ebuild | 68 4 files changed, 206 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index bf3fa3b..7660e68 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1,2 @@ -DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 -DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 -DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild deleted file mode 100644 index 57dc13b..000 --- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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" -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 -) - -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 -} diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild deleted file mode 100644 index 0106a1e..000 --- a/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="Network abstraction library for the Qt5 framework" - -if [[
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 1f4a44b71fe981d50692298611739231937d4879 Author: Stefan Strogin gentoo org> AuthorDate: Tue Jan 28 23:34:14 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Tue Jan 28 23:34:14 2020 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1f4a44b7 dev-qt/qtnetwork: version bump to 5.14.1 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild | 68 2 files changed, 69 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 73589e2..bf3fa3b 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -2,3 +2,4 @@ DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a9 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6 +DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild new file mode 100644 index 000..31d151f --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.14.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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" +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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 1a2d6590d5ba053c02a120f0d0c9df462882304d Author: Stefan Strogin gentoo org> AuthorDate: Thu Dec 19 23:39:38 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Thu Dec 19 23:39:38 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1a2d6590 dev-qt/qtnetwork: version bump to 5.14.0 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.14.0.ebuild | 68 2 files changed, 69 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 33abd24..73589e2 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,4 @@ DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 +DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6 diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.0.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.0.ebuild new file mode 100644 index 000..0106a1e --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.14.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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" +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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 77d9434b872624c2457f5c11f267450d0b0d2108 Author: Dennis Gaebler uni-ulm de> AuthorDate: Fri Nov 1 15:08:08 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Sun Nov 3 03:38:53 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=77d9434b dev-qt/qtnetwork: bump to 5.13.2 Reported-by: Dennis Gaebler uni-ulm.de> Closes: https://github.com/gentoo/libressl/pull/311 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild | 68 2 files changed, 69 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index a1c8a32..d89400e 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,4 @@ DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 +DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild new file mode 100644 index 000..0106a1e --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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" +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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: e28b37d813439e53254feeab5433e0bf4f99f467 Author: Stefan Strogin gentoo org> AuthorDate: Sun Nov 3 03:37:19 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Sun Nov 3 03:38:59 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e28b37d8 dev-qt/qtnetwork: drop old 5.12.4 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 - dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild | 68 2 files changed, 69 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index d89400e..33abd24 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,4 +1,3 @@ DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 -DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild deleted file mode 100644 index 5deffc2..000 --- a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# 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" -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 -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: ea3b8838b3a089e473daf5372bb81836a81ab54d Author: Dennis Gaebler uni-ulm de> AuthorDate: Thu Sep 12 19:17:13 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Fri Sep 13 07:25:55 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ea3b8838 dev-qt/qtnetwork: bump to 5.12.5 Reported-by: Dennis Gaebler uni-ulm.de> Closes: https://github.com/gentoo/libressl/pull/306 Signed-off-by: Stefan Strogin gentoo.org> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild | 68 2 files changed, 69 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 83c7984..a1c8a32 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946 +DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild new file mode 100644 index 000..b741121 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: b61ba94129f03f1f4b982cdab1f71838fbbd51c9 Author: Aidan Harris aidanharr is> AuthorDate: Sun Jul 7 22:11:40 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Mon Jul 8 18:03:49 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b61ba941 dev-qt/qtnetwork: Drop old Qt versions no longer present in the main Gentoo tree Signed-off-by: Anthony G. Basile gentoo.org> dev-qt/qtnetwork/Manifest | 2 +- .../files/qtnetwork-5.11.3-libressl-2.6.patch | 48 -- .../files/qtnetwork-5.11.3-libressl-2.8.patch | 74 -- dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild | 70 4 files changed, 1 insertion(+), 193 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 2fb521e..83c7984 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,2 @@ -DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 +DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.11.3-libressl-2.6.patch b/dev-qt/qtnetwork/files/qtnetwork-5.11.3-libressl-2.6.patch deleted file mode 100644 index 5621934..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.11.3-libressl-2.6.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naurp old_qt/config.tests/unix/openssl11/openssl.cpp new_qt/config.tests/unix/openssl11/openssl.cpp old_qt/config.tests/unix/openssl11/openssl.cpp 2018-09-13 13:25:10.0 +0900 -+++ new_qt/config.tests/unix/openssl11/openssl.cpp 2018-10-20 08:31:20.497180387 +0900 -@@ -39,7 +39,7 @@ - - #include - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L || defined(LIBRESSL_VERSION_NUMBER) - # error "OpenSSL >= 1.1 is required" - #endif - -diff -Naurp old_qt/src/network/ssl/qsslcontext_openssl.cpp new_qt/src/network/ssl/qsslcontext_openssl.cpp old_qt/src/network/ssl/qsslcontext_openssl.cpp 2018-09-13 13:25:10.0 +0900 -+++ new_qt/src/network/ssl/qsslcontext_openssl.cpp 2018-10-20 08:34:24.613169930 +0900 -@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSs - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); - if (cctx) { -diff -Naurp old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp old_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-09-13 13:25:10.0 +0900 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-10-20 08:37:48.682266708 +0900 -@@ -406,7 +406,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) - DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) - DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return); - DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); - DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); -diff -Naurp old_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h new_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h old_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-09-13 13:25:10.0 +0900 -+++ new_qt/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-10-20 08:39:53.219936039 +0900 -@@ -356,7 +356,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, - int
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/, dev-qt/qtnetwork/files/
commit: b5e619354bc10456fbbda75bbbc02cf9a2a98834 Author: Aidan Harris aidanharris io> AuthorDate: Fri Jun 21 16:59:58 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Sat Jun 22 13:11:13 2019 + 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 000..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, _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 000..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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 481fd481c08bf0fd9ad37c956354345c0212b8e9 Author: Dennis Gaebler uni-ulm de> AuthorDate: Mon Apr 22 12:30:46 2019 + Commit: Stefan Strogin gmail com> CommitDate: Mon Apr 22 18:04:44 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=481fd481 dev-qt/qtnetwork: Add 5.12.3 Reported-by: Dennis Gaebler uni-ulm.de> Bug: https://bugs.gentoo.org/562050 Signed-off-by: Stefan Strogin gmail.com> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild | 67 2 files changed, 68 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 3118370..3ced962 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 DIST qtbase-everywhere-src-5.12.2.tar.xz 48364464 BLAKE2B 1743fc3e233ab5c204c4c88db61ede946fbb967ed69c47709ee071bf1b911ef79a6581ff9db6e6bdabb15202196614fbdce32521750e41898906100ae5259960 SHA512 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f22301454a0669be60a14d57d9a93aef553ce6f85f71613 +DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild new file mode 100644 index 000..e5d9d4f --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild @@ -0,0 +1,67 @@ +# 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 +) + +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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 7ddb832b11e71c8357577974b962d63a3e980ccc Author: Dennis Gaebler uni-ulm de> AuthorDate: Mon Apr 22 12:44:15 2019 + Commit: Stefan Strogin gmail com> CommitDate: Mon Apr 22 18:06:54 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7ddb832b dev-qt/qtnetwork: Drop old Reported-by: Dennis Gaebler uni-ulm.de> Closes: https://github.com/gentoo/libressl/pull/292 Signed-off-by: Stefan Strogin gmail.com> dev-qt/qtnetwork/Manifest| 1 - dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild | 67 2 files changed, 68 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 3ced962..2fb521e 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,2 @@ DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 -DIST qtbase-everywhere-src-5.12.2.tar.xz 48364464 BLAKE2B 1743fc3e233ab5c204c4c88db61ede946fbb967ed69c47709ee071bf1b911ef79a6581ff9db6e6bdabb15202196614fbdce32521750e41898906100ae5259960 SHA512 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f22301454a0669be60a14d57d9a93aef553ce6f85f71613 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild deleted file mode 100644 index e5d9d4f..000 --- a/dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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 -) - -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 -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: be75d4874cb2cd0ad1918a87f1d2900702ecca93 Author: Stefan Strogin gmail com> AuthorDate: Mon Mar 25 07:01:31 2019 + Commit: Stefan Strogin gmail com> CommitDate: Mon Mar 25 07:01:31 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=be75d487 dev-qt/qtnetwork: drop old Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Stefan Strogin gmail.com> dev-qt/qtnetwork/Manifest| 1 - dev-qt/qtnetwork/qtnetwork-5.12.1.ebuild | 67 2 files changed, 68 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 2f5ac74..3118370 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,3 +1,2 @@ DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 -DIST qtbase-everywhere-src-5.12.1.tar.xz 48239912 BLAKE2B 99a92c2134a20d5f52a1ae69e5d248f12e4668308f894ead17927a778558b4fcd598f5f5208527a77e20550d7eb77502253cae91ad19f61ff422a1ff52e84060 SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25 DIST qtbase-everywhere-src-5.12.2.tar.xz 48364464 BLAKE2B 1743fc3e233ab5c204c4c88db61ede946fbb967ed69c47709ee071bf1b911ef79a6581ff9db6e6bdabb15202196614fbdce32521750e41898906100ae5259960 SHA512 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f22301454a0669be60a14d57d9a93aef553ce6f85f71613 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.1.ebuild deleted file mode 100644 index 1362f6b..000 --- a/dev-qt/qtnetwork/qtnetwork-5.12.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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}"/${P}-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 -}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/
commit: 7d74943a95d64012d973fb65510c4d70a3f463f3 Author: Stefan Strogin gmail com> AuthorDate: Sun Mar 17 18:45:04 2019 + Commit: Stefan Strogin gmail com> CommitDate: Sun Mar 17 18:45:04 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=7d74943a dev-qt/qtnetwork: bump version to 5.12.2 Bug: https://bugs.gentoo.org/562050 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Stefan Strogin gmail.com> dev-qt/qtnetwork/Manifest| 1 + dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild | 67 2 files changed, 68 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 95f102a..2f5ac74 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,2 +1,3 @@ DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 DIST qtbase-everywhere-src-5.12.1.tar.xz 48239912 BLAKE2B 99a92c2134a20d5f52a1ae69e5d248f12e4668308f894ead17927a778558b4fcd598f5f5208527a77e20550d7eb77502253cae91ad19f61ff422a1ff52e84060 SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25 +DIST qtbase-everywhere-src-5.12.2.tar.xz 48364464 BLAKE2B 1743fc3e233ab5c204c4c88db61ede946fbb967ed69c47709ee071bf1b911ef79a6581ff9db6e6bdabb15202196614fbdce32521750e41898906100ae5259960 SHA512 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f22301454a0669be60a14d57d9a93aef553ce6f85f71613 diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild new file mode 100644 index 000..e5d9d4f --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.12.2.ebuild @@ -0,0 +1,67 @@ +# 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 +) + +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 +}
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: 5009a5a50855437ab0a31018d45528202e44fb18 Author: Stefan Strogin gmail com> AuthorDate: Sat Mar 2 00:48:09 2019 + Commit: Stefan Strogin gmail com> CommitDate: Sat Mar 2 00:48:09 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5009a5a5 dev-qt/qtnetwork: drop old Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Stefan Strogin gmail.com> dev-qt/qtnetwork/Manifest | 4 -- .../files/qtnetwork-5.11.1-libressl.patch | 73 -- dev-qt/qtnetwork/qtnetwork-5.11.1.ebuild | 64 --- 3 files changed, 141 deletions(-) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index ec63019..69f23c6 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,5 +1 @@ -AUX qtnetwork-5.11.1-libressl.patch 4529 BLAKE2B 854a753d276eee5d6731edd235ecafd3489a15daba838c35ca2e06b71f1c6f9dbc9c9eb160fd7720616423bd110187d91a47cf0ee06dc0cd7415d07b6526adb7 SHA512 818d144f8a5b091ea79df108d5f5ddbec517619dd2630d1e85a690d84a2b7f7183da5ff03abb53019c7484175c1e2614fd3a65f5ce6dd3071d122b05ed7a7825 -DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 -EBUILD qtnetwork-5.11.1.ebuild 1342 BLAKE2B 68cc09bc2d425c726ff826006e6488d2c8122ced9f947ca2f10b059bf072697868cf37f89db8305dacdcbb26699143f63780aa199d778ae4912f1dfded338b04 SHA512 676443edb5c6d94f8737d915ccc9474cac80c283525cedac80717f0b766152906600a41b3afa7c0a8ab61defc5bec7add8c364b430789ce3245362e9f19220e4 -MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.11.1-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.11.1-libressl.patch deleted file mode 100644 index 9ed8355..000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.11.1-libressl.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -ur a/config.tests/unix/openssl11/openssl.cpp b/config.tests/unix/openssl11/openssl.cpp a/config.tests/unix/openssl11/openssl.cpp 2018-06-15 09:29:31.0 +0200 -+++ b/config.tests/unix/openssl11/openssl.cpp 2018-11-07 19:00:26.251211691 +0100 -@@ -39,7 +39,7 @@ - - #include - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L || defined(LIBRESSL_VERSION_NUMBER) - # error "OpenSSL >= 1.1 is required" - #endif - -diff -ur a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp a/src/network/ssl/qsslcontext_openssl.cpp 2018-06-15 09:29:31.0 +0200 -+++ b/src/network/ssl/qsslcontext_openssl.cpp 2018-11-07 19:00:26.251211691 +0100 -@@ -248,7 +248,7 @@ - if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) - return; - --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); - if (cctx) { -diff -ur a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2018-06-15 09:29:31.0 +0200 -+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2018-11-07 19:00:57.976885459 +0100 -@@ -78,8 +78,8 @@ - unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); - BIO *q_BIO_new_file(const char *filename, const char *mode); - void q_ERR_clear_error(); --Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); --Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); -+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); -+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); - int q_CRYPTO_num_locks(); - void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); - void q_CRYPTO_set_id_callback(unsigned long (*a)()); -diff -ur a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp a/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-06-15 09:29:31.0 +0200 -+++
[gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
commit: e7ebc1bc36959b7a842b5800b4459dd444c3b5d6 Author: Stefan Strogin gmail com> AuthorDate: Sat Mar 2 00:50:42 2019 + Commit: Stefan Strogin gmail com> CommitDate: Sat Mar 2 00:50:42 2019 + URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e7ebc1bc dev-qt/qtnetwork: bump version to 5.12.1; add patch Bug: https://bugs.gentoo.org/562050 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Stefan Strogin gmail.com> dev-qt/qtnetwork/Manifest | 1 + .../files/qtnetwork-5.12.1-libressl.patch | 93 ++ dev-qt/qtnetwork/qtnetwork-5.12.1.ebuild | 67 3 files changed, 161 insertions(+) diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 69f23c6..95f102a 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1,2 @@ DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65 +DIST qtbase-everywhere-src-5.12.1.tar.xz 48239912 BLAKE2B 99a92c2134a20d5f52a1ae69e5d248f12e4668308f894ead17927a778558b4fcd598f5f5208527a77e20550d7eb77502253cae91ad19f61ff422a1ff52e84060 SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25 diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch new file mode 100644 index 000..bd86269 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.12.1-libressl.patch @@ -0,0 +1,93 @@ +diff --git a/src/network/configure.json b/src/network/configure.json +index f3e18662aa..8990763756 100644 +--- a/src/network/configure.json b/src/network/configure.json +@@ -165,7 +165,7 @@ + "test": { + "include": "openssl/opensslv.h", + "tail": [ +-"#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L", ++"#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)", + "# error OpenSSL >= 1.1 is required", + "#endif" + ] +diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +index 35cca9f01a..03afdc5945 100644 +--- a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp +@@ -249,7 +249,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) + if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) + return; + +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) + if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { + QSharedPointer cctx(q_SSL_CONF_CTX_new(), _SSL_CONF_CTX_free); + if (cctx) { +diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp +index 299df6b685..670314d7e5 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -216,8 +216,13 @@ DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, + #endif + DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) + DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) ++#ifdef LIBRESSL_VERSION_NUMBER ++DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) ++DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) ++#else + DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) + DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) ++#endif + DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) + DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) + DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) +@@ -443,7 +448,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - + DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) + DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) + DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) + DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); +