commit: 24dbb3eb248fb8f93f21a29ba6aee72c26106cfb Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Fri Jul 14 19:26:07 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Fri Jul 14 19:26:07 2023 +0000 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 <orbea <AT> 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..0000000 --- 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?= <[email protected]> -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 <[email protected]> -Reviewed-by: Edward Welbourne <[email protected]> -Reviewed-by: Volker Hilsheimer <[email protected]> -(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<QPair<QByteArray, QByteArray>> &headers) - { - for (const auto &h : 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..0000000 --- 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?= <[email protected]> -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 <[email protected]> -Reviewed-by: Volker Hilsheimer <[email protected]> -(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 &caCertificates = 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?= <[email protected]> -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 <[email protected]> -(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 ---- a/src/network/ssl/qsslsocket.cpp -+++ b/src/network/ssl/qsslsocket.cpp -@@ -2221,6 +2221,10 @@ QSslSocketPrivate::QSslSocketPrivate() - , flushTriggered(false) - { - QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration); -+ // If the global configuration doesn't allow root certificates to be loaded -+ // on demand then we have to disable it for this socket as well. -+ if (!configuration.allowRootCertOnDemandLoading) -+ allowRootCertOnDemandLoading = false; - } - - /*! -@@ -2470,6 +2474,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri - ptr->sessionProtocol = global->sessionProtocol; - ptr->ciphers = global->ciphers; - ptr->caCertificates = global->caCertificates; -+ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading; - ptr->protocol = global->protocol; - ptr->peerVerifyMode = global->peerVerifyMode; - ptr->peerVerifyDepth = global->peerVerifyDepth; --- -2.41.0 - 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 deleted file mode 100644 index 433dc67..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-QDnsLookup-dont-overflow-the-buffer.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 2103f2487f709dd9546c503820d9ad509e9a63b3 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <[email protected]> -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 <[email protected]> -Reviewed-by: Jani Heikkinen <[email protected]> -(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 &requestN - // 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 &requestN - 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 = 0xffff; // 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 &requestN - 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 &requestN - p += 4; - const quint16 size = (p[0] << 8) | p[1]; - p += 2; -+ if ((p - response) + size > responseLength) -+ return; // truncated - - if (type == QDnsLookup::A) { - if (size != 4) { --- -GitLab - 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 deleted file mode 100644 index d245531..0000000 --- a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From df809fd0b505b61d718fe1dc7fe19a79f9336cd9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -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 <[email protected]> ---- - 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 deleted file mode 100644 index 2e9886e..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; 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 - "${FILESDIR}/${P}-QDnsLookup-dont-overflow-the-buffer.patch" - "${FILESDIR}/${P}-CVE-2023-32762.patch" - "${FILESDIR}/${P}-libproxy-0.5-pkgconfig.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=( - $(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 -} diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild deleted file mode 100644 index a166a59..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9-r3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} != *9999* ]]; 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 - "${FILESDIR}/${P}-QDnsLookup-dont-overflow-the-buffer.patch" - "${FILESDIR}/${P}-CVE-2023-32762.patch" - "${FILESDIR}/${P}-libproxy-0.5-pkgconfig.patch" - "${FILESDIR}/${P}-CVE-2023-34410.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=( - $(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 -} diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild deleted file mode 100644 index c28e00c..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9.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} != *9999* ]]; 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 -}
