diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-07 22:48:01 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-07 22:48:01 +0000 |
commit | c3bc61051d7f12b4c682efa7a5460bbc8815649e (patch) | |
tree | b6d19e96ba3c397fb8278eeb9b68170db92630ba /kde-apps/kdepim-runtime | |
parent | 3517852e3b8a68d1e997770fc0650c5053bafc6c (diff) |
gentoo resync : 07.01.2022
Diffstat (limited to 'kde-apps/kdepim-runtime')
-rw-r--r-- | kde-apps/kdepim-runtime/Manifest | 6 | ||||
-rw-r--r-- | kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch | 127 | ||||
-rw-r--r-- | kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild | 88 | ||||
-rw-r--r-- | kde-apps/kdepim-runtime/kdepim-runtime-21.12.1.ebuild (renamed from kde-apps/kdepim-runtime/kdepim-runtime-21.12.0.ebuild) | 2 |
4 files changed, 3 insertions, 220 deletions
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest index 85b75960cbc4..5bad229fb5e8 100644 --- a/kde-apps/kdepim-runtime/Manifest +++ b/kde-apps/kdepim-runtime/Manifest @@ -1,8 +1,6 @@ AUX kdepim-runtime-21.08.3-CVE-2020-15954.patch 3482 BLAKE2B 055f2b568348ba9443f84c6d24a0da8ead918e7b1f67f73d6645e887b003353cdc297d25d5a2e42d00dff7e80133451e81417337fca7c6023b1747a12eef0a5e SHA512 a86881edd2aaa9a1cb8a1ef23eb2c549b0b8b9e2d7dbdd2d992bab7b6f2b947244746c781108914c27ee5863912f8a1717a23bf153b2a4fdff3846f70f16fd70 -AUX kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch 5468 BLAKE2B 51c1c55ceeef2d7ef31d5bf8625ff139613c9f4abd3102d3cb70c695a871308acdce4237b2defc475fa21a79513ff85fb2d0968e664147c1c393f5d5939f770d SHA512 9a4343bfc12cd06f255a6e75b683ce2e15e3fa59de11f6a8f78a3d1953ff090a08dcd558f140c79057c8b8750ca6b93965d4bd53dc6e15cdd3f17866f6ff2ff2 DIST kdepim-runtime-21.08.3.tar.xz 1824164 BLAKE2B c1c367b45e306891e581b493b550061dd7f765299246baf170119f35e3aa5baf37bf595fb184e0ca74c72e6640829f6b6739c44bcd3ddbfe60d04a2d9194002b SHA512 d13bb98663372aafeaa34dab785ed1f09d9a3974cdb680c123978bbbc22ee721b5ff26332aedbddf638c0cb5847b94e9d60d24599210e1cadfde514b7a7c6454 -DIST kdepim-runtime-21.12.0.tar.xz 1807008 BLAKE2B 6c600df6b73fc6bb9e6fe3dc731adea7470672bd66f3276dad65ac386af6c423f4eff15a24890c1b0677360896c6a2141a712e93471c46a8bbecf98ccfa1ca70 SHA512 a0b8806697b83df547b9eff115710fcba147d8a8dd7772c98c23a4817239a59745d7c8ac38248d791a610a25cb6c3a82f92b410729b5c036083113e8a8a4866f +DIST kdepim-runtime-21.12.1.tar.xz 1807168 BLAKE2B 333a144fd71647c11321c6b4d17f949170244d41109a4c19b94a94fe08ee33dd001ad266639e6f47341351d349353c1343fb7745f704602d94fd0d5c542a767f SHA512 f120a6199f643fb0485464c71dbc6e063960338f906c67790c37fecff9c523057c4f24cbff9df423ca1b5501cd9c59ee71077185780fde815d6a4ae6352318a1 EBUILD kdepim-runtime-21.08.3-r1.ebuild 2559 BLAKE2B 5f33099e32f243f5b4eaf07eae5303ea891cc734ae3672b4fae014591848ddcad72939d1fe239c7af086d2155a07551f528febd522e9ddc817c59e9029fca519 SHA512 32ff7d171a0da855cf48938b5e05d92a920ff36212737c868921146e7bf506de2445bec4a8a9942a9ed6fbcf84506754aab05fe50698c1c19a5365e0b9cef278 -EBUILD kdepim-runtime-21.12.0-r1.ebuild 2531 BLAKE2B bf87953b4dcd2f603b0f5794ff8f9c24e2207750c885980cfc77414704dd7e93a6c2cec9e2cc165d2e3311d031659ad3145aaacb4a5de8e0503b42bdcec6c37a SHA512 b59d6b79690fa2821072593b45120c5f76c368ee356b2b04482772f3d92c1e32a1090ae2efa978ba71b699f7e673391ff0021d5aab8c91efa3582d970cd387f5 -EBUILD kdepim-runtime-21.12.0.ebuild 2468 BLAKE2B f189af1feb5d34d68897f58173778986b4312b124f0c901321bd09bc840027651e51a996c48782245b2694cea369dcc1d2bda13acf10e1a8139326cf9621c883 SHA512 d65a4fc43b6ddf4c510b3031b7510335a9ff7383818337f179ed05b3102069949912ccd364de8df9be595d724ee4b5f002b16153b66e3161351215976f3c3836 +EBUILD kdepim-runtime-21.12.1.ebuild 2468 BLAKE2B 756b3c870cf283589ef252fd1e77681c3e20a54b6c4007a0ec819066b2a728e2254ce4b8afebd900f79d9d3440b5bb9878c3388aa924db15b2e3e8a87b9c5455 SHA512 9fdd89b69886c24e289223839d8f62a6856f725c485e31e6a292d23c2946aa4becb53891b777dbc82a643f5edf84aed43f8c9c47552136a726e7fdb60469a105 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch deleted file mode 100644 index e911588dbdcb..000000000000 --- a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch +++ /dev/null @@ -1,127 +0,0 @@ -From f14fabcefb45790175e209ef8ae394def4a805e9 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Fri, 10 Dec 2021 21:55:13 +0100 -Subject: [PATCH] POP3: Fix SSL connections - -We need to go into ssl before trying to read from the socket, otherwise -nothing works - -BUGS: 446751 ---- - resources/pop3/pop3protocol.cpp | 72 ++++++++++++++++++++------------- - resources/pop3/pop3protocol.h | 2 + - 2 files changed, 45 insertions(+), 29 deletions(-) - -diff --git a/resources/pop3/pop3protocol.cpp b/resources/pop3/pop3protocol.cpp -index c2d01d33a..15971919e 100644 ---- a/resources/pop3/pop3protocol.cpp -+++ b/resources/pop3/pop3protocol.cpp -@@ -535,6 +535,39 @@ Result POP3Protocol::loginPASS() - return Result::pass(); - } - -+Result POP3Protocol::startSsl() -+{ -+ mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below -+ mSocket->startClientEncryption(); -+ const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout); -+ -+ const QSslCipher cipher = mSocket->sessionCipher(); -+ const QList<QSslError> errors = mSocket->sslHandshakeErrors(); -+ if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) { -+ QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) { -+ if (!cur.isEmpty()) -+ cur += QLatin1Char('\n'); -+ cur += error.errorString(); -+ return cur; -+ }); -+ -+ qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits() -+ << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString; -+ mContinueAfterSslError = false; -+ Q_EMIT sslError(KSslErrorUiData(mSocket)); -+ if (!mContinueAfterSslError) { -+ if (errorString.isEmpty()) -+ errorString = mSocket->errorString(); -+ qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString; -+ closeConnection(); -+ return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString)); -+ } -+ } else { -+ qCDebug(POP3_LOG) << "TLS has been enabled."; -+ } -+ return Result::pass(); -+} -+ - Result POP3Protocol::openConnection() - { - m_try_apop = mSettings.authenticationMethod() == MailTransport::Transport::EnumAuthenticationType::APOP; -@@ -560,6 +593,13 @@ Result POP3Protocol::openConnection() - return Result::fail(mSocket->error(), errorString); - } - -+ if (mSettings.useSSL()) { -+ const Result res = startSsl(); -+ if (!res.success) { -+ return res; -+ } -+ } -+ - mConnected = true; - - greeting_buf = new char[GREETING_BUF_LEN]; -@@ -608,35 +648,9 @@ Result POP3Protocol::openConnection() - "was unsuccessful.\nYou can " - "disable TLS in the POP account settings dialog.")); - } -- } -- if (mSettings.useSSL() || mSettings.useTLS()) { -- mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below -- mSocket->startClientEncryption(); -- const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout); -- -- const QSslCipher cipher = mSocket->sessionCipher(); -- const QList<QSslError> errors = mSocket->sslHandshakeErrors(); -- if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) { -- QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) { -- if (!cur.isEmpty()) -- cur += QLatin1Char('\n'); -- cur += error.errorString(); -- return cur; -- }); -- -- qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits() -- << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString; -- mContinueAfterSslError = false; -- Q_EMIT sslError(KSslErrorUiData(mSocket)); -- if (!mContinueAfterSslError) { -- if (errorString.isEmpty()) -- errorString = mSocket->errorString(); -- qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString; -- closeConnection(); -- return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString)); -- } -- } else { -- qCDebug(POP3_LOG) << "TLS has been enabled."; -+ const Result res = startSsl(); -+ if (!res.success) { -+ return res; - } - } - -diff --git a/resources/pop3/pop3protocol.h b/resources/pop3/pop3protocol.h -index 9b40b334f..d01f7ab7a 100644 ---- a/resources/pop3/pop3protocol.h -+++ b/resources/pop3/pop3protocol.h -@@ -127,6 +127,8 @@ private: - */ - Q_REQUIRED_RESULT Result loginPASS(); - -+ Q_REQUIRED_RESULT Result startSsl(); -+ - const Settings &mSettings; - QSslSocket *const mSocket; - unsigned short int m_iPort; --- -GitLab - diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild deleted file mode 100644 index a66086cea67a..000000000000 --- a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" -HOMEPAGE="https://apps.kde.org/kontact/" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="speech" - -RESTRICT="test" - -# TODO kolab -RDEPEND=" - >=app-crypt/qca-2.3.0:2 - dev-libs/cyrus-sasl:2 - dev-libs/libical:= - dev-libs/qtkeychain:= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtnetworkauth-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-apps/akonadi-${PVCUT}:5 - >=kde-apps/akonadi-calendar-${PVCUT}:5 - >=kde-apps/akonadi-contacts-${PVCUT}:5 - >=kde-apps/akonadi-mime-${PVCUT}:5 - >=kde-apps/akonadi-notes-${PVCUT}:5 - >=kde-apps/kalarmcal-${PVCUT}:5 - >=kde-apps/kcalutils-${PVCUT}:5 - >=kde-apps/kidentitymanagement-${PVCUT}:5 - >=kde-apps/kimap-${PVCUT}:5 - >=kde-apps/kldap-${PVCUT}:5 - >=kde-apps/kmailtransport-${PVCUT}:5 - >=kde-apps/kmbox-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-apps/libkgapi-${PVCUT}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdav-${KFMIN}:5 - >=kde-frameworks/kholidays-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - >=dev-qt/qtxmlpatterns-${QTMIN}:5 - test? ( >=kde-apps/kimap-${PVCUT}:5[test] ) -" - -PATCHES=( "${FILESDIR}"/${P}-fix-pop3-ssl-connections.patch ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON - $(cmake_use_find_package speech Qt5TextToSpeech) - ) - ecm_src_configure -} diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.1.ebuild index 30fa118d79a8..53293d3f6d15 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 |