From bd0f603a55233290f3f91860a8df4c8fdf207cc7 Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 28 Jun 2024 11:59:51 -0700 Subject: dev-qt/qtnetwork: drop 5.15.13 Signed-off-by: orbea --- 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(-) delete mode 100644 dev-qt/qtnetwork/files/qtnetwork-5.15.10-ssl-upgr-default-DH-params.patch delete mode 100644 dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild 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..0000000 --- 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&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 -(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.13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.13.ebuild deleted file mode 100644 index d4da090..0000000 --- a/dev-qt/qtnetwork/qtnetwork-5.15.13.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} != *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}/${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 -} -- cgit v1.2.3-65-gdbad