diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-11-23 14:46:25 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-11-23 15:59:09 +0100 |
commit | 82dcbef59a844995352aa7b34a679fe4fed44213 (patch) | |
tree | b9d4ceaa4ffacfbe2ce051c4d7d893d0282f5b36 /kde-apps/kmailtransport | |
parent | sys-libs/kpmcore: Drop 21.08.3 (r0) (diff) | |
download | gentoo-82dcbef59a844995352aa7b34a679fe4fed44213.tar.gz gentoo-82dcbef59a844995352aa7b34a679fe4fed44213.tar.bz2 gentoo-82dcbef59a844995352aa7b34a679fe4fed44213.zip |
kde-apps/kmailtransport: Fix crash when response is empty
Upstream commit fb2ce5f1115ede2c782cc0e1095584eb07cf032b
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kmailtransport')
-rw-r--r-- | kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch | 25 | ||||
-rw-r--r-- | kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild | 46 |
2 files changed, 71 insertions, 0 deletions
diff --git a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch new file mode 100644 index 000000000000..84589d4908a3 --- /dev/null +++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch @@ -0,0 +1,25 @@ +From fb2ce5f1115ede2c782cc0e1095584eb07cf032b Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Mon, 1 Nov 2021 09:15:31 +0100 +Subject: [PATCH] Fix crash when response is empty + +--- + src/kmailtransport/servertest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kmailtransport/servertest.cpp b/src/kmailtransport/servertest.cpp +index 6e8d711..35079e1 100644 +--- a/src/kmailtransport/servertest.cpp ++++ b/src/kmailtransport/servertest.cpp +@@ -236,7 +236,7 @@ bool ServerTestPrivate::handlePopConversation(MailTransport::Socket *socket, int + // Initial Greeting + if (stage == 0) { + // Regexp taken from POP3 ioslave +- const QString responseWithoutCRLF = response.chopped(2); ++ const QString responseWithoutCRLF = response.isEmpty() ? response : response.chopped(2); + const QRegularExpression re(QStringLiteral("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$"), QRegularExpression::CaseInsensitiveOption); + if (responseWithoutCRLF.indexOf(re) != -1) { + authenticationResults[type] << Transport::EnumAuthenticationType::APOP; +-- +GitLab + diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild new file mode 100644 index 000000000000..c66e981901d5 --- /dev/null +++ b/kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=5.84.0 +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Mail transport service" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="" + +RESTRICT="test" + +RDEPEND=" + dev-libs/qtkeychain:= + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/akonadi-${PVCUT}:5 + >=kde-apps/akonadi-mime-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/ksmtp-${PVCUT}:5 + >=kde-apps/libkgapi-${PVCUT}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 +" +DEPEND="${RDEPEND} + test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-crash-when-response-empty.patch" ) |