diff options
Diffstat (limited to 'dev-qt/qtnetwork')
-rw-r--r-- | dev-qt/qtnetwork/Manifest | 4 | ||||
-rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch | 101 | ||||
-rw-r--r-- | dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild | 64 | ||||
-rw-r--r-- | dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild | 2 |
4 files changed, 2 insertions, 169 deletions
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 2d92c1553e43..df428f03ee03 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1,9 +1,7 @@ -AUX qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch 4618 BLAKE2B 51ca56a407d055533e80c7639d385e959517a1983fddb0635e2441769c29d9b02ea9eb60ad18030185fde7e2babdfd18afb5a17d1a0365c0ff6c564519f44c0f SHA512 1e94f218a3d0e7580900712635a19d3162cadbbc77b62b91d1c195f0cd11ac90be0b90821fb9e48887e2ad3c1f4e49fee1ac33c291a587f595baaa8d72ea6b9d 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 -EBUILD qtnetwork-5.15.10-r2.ebuild 1249 BLAKE2B 4f6f60347ffb721f0f1c5220d7533481d46f18a8d7259b24f95a33a159716e90debef1f55fc70f09ec6c72bd8d259982f14487c5a9c74cfbc294263348dba6c2 SHA512 7471abd2f2ad3e43ecc8c8ae3b19cbe73c1915fbe30629279e955b0047e3715c260bff7b052afee126d0084c7c20d1d0c04c00ede1406c5eaa54bd23bb939ba8 -EBUILD qtnetwork-5.15.10-r3.ebuild 1188 BLAKE2B 1f2041c719dfc4cea369a0d563d2eb835c6767c25c7d2c8d2fe670502cde747d8a61cf31a60b494bed840c625f06d62544773e889ba29d712d83d47aebbbb1b8 SHA512 12e9646d81dcd816d6a62f1e6ff0ca9abe9cdc3d18542be1f7e1afb489cecdf8659a651ba053a52fed949a8656ecfd788e5bb0ec57f301b1169262b06bda9310 +EBUILD qtnetwork-5.15.10-r3.ebuild 1184 BLAKE2B d48b6815cb9bd130bd5aee83bbad57475b855feb99bc8a9381873815c24d1bdbf68dfb4ad92a1caa33c2f2b960906fd6f5e720507a8591ad00edf7bc745ce988 SHA512 57df9d3ad6dc76250d0732d7f63d12ac6e962aea47452a5a07d7a54877e3ba3bbe0ebf60dfb1c58bc6f3f0cf756289287b91cbae769d2cba941e79ae958d9e98 EBUILD qtnetwork-5.15.10.ebuild 1607 BLAKE2B 8c336a9117dd3289b8cc2c91fc6cce82cb9072612b65c5f5df79e402f1b765f20d9ada4e208f0143fe7e40c1f8c830837586104429244706135f02fa11facd63 SHA512 2f0f7f0bb1570e6e4501a29dd0fd6a96d1d44c2e01a354a78364f93a3cdcb7e47262f5f065fc629d3037306dfd8170fe552d677d894f1a507ff71aca47c41d4a MISC metadata.xml 690 BLAKE2B 3e1cccd88cb778d868aa5aa650d9114a79eaf7b5961dc6222b2da3e5c7536a43c7481b6d56bb9176b36ed2560ccb0712635146872f370fdc1e319286133a1651 SHA512 e402ad3b586e305a6f7ee99f24edd505b1e76f7a957108fc252a4a1af8978ac113b9b1c56e4fb0bfb696bcf29a1295f52af6614924f0e3ae2d7f71810a3be707 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 94f1325070d5..000000000000 --- 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 <giuseppe.dangelo@kdab.com> -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&p from the source, - removing the double quotes) -2) put the hexadecimal value of the 2048-bit group in a `reference.txt` - file (c&p 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 <timur.pocheptsov@qt.io> -(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 &hint) - 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 &dhparams) - { -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" -+ "NATd75UZs806QxswKwpt8l8UN0/hNW1tUcJF5IW1dmJefsb0TELppjftawv/XLb0Brft7jhr" -+ "+1qJn6WunyQRfEsf5kkoZlHs5Fs9wgB8uKFjvwWY2kg2HFXTmmkWP6j9JM9fg2VdI9yjrZYc" -+ "YvNWIIVSu57VKQdwlpZtZww1Tkq8mATxdGwIyhghfDKQXkYuNs474553LBgOhgObJ4Oi7Aei" -+ "j7XFXfBvTFLJ3ivL9pVYFxg5lUl86pVq5RXSJhiY+gUQFXKOWoqsqmj//////////wIBAg=="; - - /*! - Returns the default QSslDiffieHellmanParameters used by QSslSocket. - -- This is currently the 1024-bit MODP group from RFC 2459, also -- known as the Second Oakley Group. -+ This is currently the 2048-bit MODP group from RFC 3526. - */ - QSslDiffieHellmanParameters QSslDiffieHellmanParameters::defaultParameters() - { --- -2.41.0 - 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 af527a8bcd60..000000000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10-r2.ebuild +++ /dev/null @@ -1,64 +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="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}/${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) - ) - 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-r3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10-r3.ebuild index 761559b940c5..6754d7382fb3 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} != *9999* ]]; 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" |