[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/files/, kde-apps/kmailtransport/

[Andreas Sturmlechner]

commit: 653d0304fe180fb030803e36552cff2f15656a65
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 28 21:40:16 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 28 22:32:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653d0304

kde-apps/kmailtransport: SmtpJob: Fix use of KCompositeJob

Upstream commit 7b2a5ccea0c54b81245acdbbea77a13e570bba2b
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=406839
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=409122
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=421664
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=456923

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch | 49 ++
 .../kmailtransport-22.08.3-r1.ebuild   | 47 +
 2 files changed, 96 insertions(+)

diff --git 
a/kde-apps/kmailtransport/files/kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch
 
b/kde-apps/kmailtransport/files/kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch
new file mode 100644
index ..4140cb77d21b
--- /dev/null
+++ 
b/kde-apps/kmailtransport/files/kmailtransport-22.08.3-SmtpJob-fix-use-of-KCompositeJob.patch
@@ -0,0 +1,49 @@
+From 7b2a5ccea0c54b81245acdbbea77a13e570bba2b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Mon, 21 Nov 2022 11:57:51 +0100
+Subject: [PATCH] SmtpJob: Fix use of KCompositeJob
+
+SmtpJob overrides slotResult, but this had two issues. First, it connected
+to LoginJob::result itself, though addJob already does that. Second, in two
+cases it did not remove finished jobs from the list of subjobs, leading to
+dangling pointers and messing up state. This was most likely only reached
+in the case of an expired XOAUTH2 access_token and caused the job to fail
+after a successful refresh.
+
+BUG: 406839
+BUG: 409122
+BUG: 421664
+BUG: 456923
+---
+ src/kmailtransport/plugins/smtp/smtpjob.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp 
b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+index 9d565af..5be220a 100644
+--- a/src/kmailtransport/plugins/smtp/smtpjob.cpp
 b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+@@ -308,7 +308,6 @@ void SmtpJobPrivate::doLogin()
+ break;
+ }
+ 
+-q->connect(login, ::result, q, ::slotResult);
+ q->addSubjob(login);
+ login->start();
+ qCDebug(MAILTRANSPORT_SMTP_LOG) << "Login started";
+@@ -352,11 +351,12 @@ bool SmtpJob::doKill()
+ void SmtpJob::slotResult(KJob *job)
+ {
+ if (s_sessionPool.isDestroyed()) {
++removeSubjob(job);
+ return;
+ }
+-
+ if (qobject_cast(job)) {
+ if (job->error() == KSmtp::LoginJob::TokenExpired) {
++removeSubjob(job);
+ startPasswordRetrieval(/*force refresh */ true);
+ return;
+ }
+-- 
+GitLab
+

diff --git a/kde-apps/kmailtransport/kmailtransport-22.08.3-r1.ebuild 
b/kde-apps/kmailtransport/kmailtransport-22.08.3-r1.ebuild
new file mode 100644
index ..1a304ab97eb3
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-22.08.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+inherit ecm gear.kde.org
+
+DESCRIPTION="Mail transport service"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+   dev-libs/qtkeychain:=[qt5(+)]
+   >=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}-SmtpJob-fix-use-of-KCompositeJob.patch" )

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/files/

[Conrad Kostecki]

commit: 81bb63c3ee3da471884b73827bd7ae3a1ba5be27
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Apr 23 16:05:45 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Apr 25 21:46:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81bb63c3

kde-apps/kmailtransport: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../kmailtransport-21.08.3-CVE-2021-38373.patch| 63 --
 ...ort-21.08.3-fix-crash-when-response-empty.patch | 25 -
 2 files changed, 88 deletions(-)

diff --git 
a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch 
b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
deleted file mode 100644
index e83449e4e32a..
--- a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From cc4907eba8e16c319fb837b5ec85393b118c4ab6 Mon Sep 17 00:00:00 2001
-From: Volker Krause 
-Date: Thu, 16 Sep 2021 17:07:08 +0200
-Subject: [PATCH] Adapt to KSmtp moving encryption settings from LoginJob to
- Session
-
-See https://invent.kde.org/pim/ksmtp/-/merge_requests/5.
-
-(cherry picked from commit b49ee72009620f152aaab1f592704e56e3be01f5)

- src/kmailtransport/plugins/smtp/smtpjob.cpp | 29 ++---
- 1 file changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp 
b/src/kmailtransport/plugins/smtp/smtpjob.cpp
-index 7ad0124..5a08dfd 100644
 a/src/kmailtransport/plugins/smtp/smtpjob.cpp
-+++ b/src/kmailtransport/plugins/smtp/smtpjob.cpp
-@@ -134,6 +134,20 @@ void SmtpJob::startSmtpJob()
- d->session = new KSmtp::Session(transport()->host(), 
transport()->port());
- d->session->setUseNetworkProxy(transport()->useProxy());
- d->session->setUiProxy(d->uiProxy);
-+switch (transport()->encryption()) {
-+case Transport::EnumEncryption::None:
-+d->session->setEncryptionMode(KSmtp::Session::Unencrypted);
-+break;
-+case Transport::EnumEncryption::TLS:
-+d->session->setEncryptionMode(KSmtp::Session::STARTTLS);
-+break;
-+case Transport::EnumEncryption::SSL:
-+d->session->setEncryptionMode(KSmtp::Session::TLS);
-+break;
-+default:
-+qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << 
transport()->encryption();
-+break;
-+}
- if (transport()->specifyHostname()) {
- d->session->setCustomHostname(transport()->localHostname());
- }
-@@ -298,21 +312,6 @@ void SmtpJobPrivate::doLogin()
- break;
- }
- 
--switch (q->transport()->encryption()) {
--case Transport::EnumEncryption::None:
--login->setEncryptionMode(KSmtp::LoginJob::Unencrypted);
--break;
--case Transport::EnumEncryption::TLS:
--login->setEncryptionMode(KSmtp::LoginJob::STARTTLS);
--break;
--case Transport::EnumEncryption::SSL:
--login->setEncryptionMode(KSmtp::LoginJob::SSLorTLS);
--break;
--default:
--qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << 
q->transport()->encryption();
--break;
--}
--
- q->connect(login, ::result, q, ::slotResult);
- q->addSubjob(login);
- login->start();
--- 
-2.34.0
-

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
deleted file mode 100644
index 84589d4908a3..
--- 
a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fb2ce5f1115ede2c782cc0e1095584eb07cf032b Mon Sep 17 00:00:00 2001
-From: Laurent Montel 
-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] << 

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/

[Yixun Lan]

commit: bb7cfdaa40bb095f671871e9debe6de5a4739ca1
Author: Alex Fan  gmail  com>
AuthorDate: Wed Dec  1 02:23:11 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Dec  1 06:34:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7cfdaa

kde-apps/kmailtransport: keyword 21.08.3-r2 for ~riscv

Signed-off-by: Alex Fan  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild 
b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
index bd7f8d4f16cb..8b14d213dc76 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/

[Andreas Sturmlechner]

commit: f7b6ae7e0a239d102011aff426833758d8d801b4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 23 15:22:41 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 23 20:04:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b6ae7e

kde-apps/kmailtransport: Drop 21.08.3-r1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kmailtransport-21.08.3-r1.ebuild   | 46 --
 1 file changed, 46 deletions(-)

diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild 
b/kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild
deleted file mode 100644
index c66e981901d5..
--- a/kde-apps/kmailtransport/kmailtransport-21.08.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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" )

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/files/, kde-apps/kmailtransport/

[Andreas Sturmlechner]

commit: 4754456d4c60b3dc562a7d32de2ff6bf66ab6679
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 23 15:21:55 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 23 20:04:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4754456d

kde-apps/kmailtransport: Adapt to kde-apps/ksmtp CVE-2021-38373 fix

Upstream commit cc4907eba8e16c319fb837b5ec85393b118c4ab6

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=423423
Bug: https://bugs.gentoo.org/807355
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kmailtransport-21.08.3-CVE-2021-38373.patch| 63 ++
 .../kmailtransport-21.08.3-r2.ebuild   | 49 +
 2 files changed, 112 insertions(+)

diff --git 
a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch 
b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
new file mode 100644
index ..e83449e4e32a
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
@@ -0,0 +1,63 @@
+From cc4907eba8e16c319fb837b5ec85393b118c4ab6 Mon Sep 17 00:00:00 2001
+From: Volker Krause 
+Date: Thu, 16 Sep 2021 17:07:08 +0200
+Subject: [PATCH] Adapt to KSmtp moving encryption settings from LoginJob to
+ Session
+
+See https://invent.kde.org/pim/ksmtp/-/merge_requests/5.
+
+(cherry picked from commit b49ee72009620f152aaab1f592704e56e3be01f5)
+---
+ src/kmailtransport/plugins/smtp/smtpjob.cpp | 29 ++---
+ 1 file changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp 
b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+index 7ad0124..5a08dfd 100644
+--- a/src/kmailtransport/plugins/smtp/smtpjob.cpp
 b/src/kmailtransport/plugins/smtp/smtpjob.cpp
+@@ -134,6 +134,20 @@ void SmtpJob::startSmtpJob()
+ d->session = new KSmtp::Session(transport()->host(), 
transport()->port());
+ d->session->setUseNetworkProxy(transport()->useProxy());
+ d->session->setUiProxy(d->uiProxy);
++switch (transport()->encryption()) {
++case Transport::EnumEncryption::None:
++d->session->setEncryptionMode(KSmtp::Session::Unencrypted);
++break;
++case Transport::EnumEncryption::TLS:
++d->session->setEncryptionMode(KSmtp::Session::STARTTLS);
++break;
++case Transport::EnumEncryption::SSL:
++d->session->setEncryptionMode(KSmtp::Session::TLS);
++break;
++default:
++qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << 
transport()->encryption();
++break;
++}
+ if (transport()->specifyHostname()) {
+ d->session->setCustomHostname(transport()->localHostname());
+ }
+@@ -298,21 +312,6 @@ void SmtpJobPrivate::doLogin()
+ break;
+ }
+ 
+-switch (q->transport()->encryption()) {
+-case Transport::EnumEncryption::None:
+-login->setEncryptionMode(KSmtp::LoginJob::Unencrypted);
+-break;
+-case Transport::EnumEncryption::TLS:
+-login->setEncryptionMode(KSmtp::LoginJob::STARTTLS);
+-break;
+-case Transport::EnumEncryption::SSL:
+-login->setEncryptionMode(KSmtp::LoginJob::SSLorTLS);
+-break;
+-default:
+-qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << 
q->transport()->encryption();
+-break;
+-}
+-
+ q->connect(login, ::result, q, ::slotResult);
+ q->addSubjob(login);
+ login->start();
+-- 
+2.34.0
+

diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild 
b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
new file mode 100644
index ..c9317630cf43
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
@@ -0,0 +1,49 @@
+# 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-21.08.3-r1: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
+   

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/

[Mikle Kolyada]

commit: f9df091d7c2ae60a722967c95928c0657203cd26
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Feb 24 19:34:37 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Feb 24 19:34:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9df091d

kde-apps/kmailtransport: Stabilize 20.12.2 arm64, #770775

Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild 
b/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
index 255cda022ed..8a980c8c20e 100644
--- a/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/

[Mikle Kolyada]

commit: 56048aab58f0831d81d72abdbae0bd079ec72309
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr  6 15:36:25 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr  6 15:36:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56048aab

kde-apps/kmailtransport: x86 stable wrt bug #682452

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild 
b/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
index 5509a10284d..21e857ba257 100644
--- a/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-18.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Mail transport service"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/

[Andreas Sturmlechner]

commit: 015a0569be8b26a4b34dea89cce1027c7ae860f3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 13:37:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 13:44:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015a0569

kde-apps/kmailtransport: Drop 17.12.1 (r0)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../kmailtransport/kmailtransport-17.12.1.ebuild   | 43 --
 1 file changed, 43 deletions(-)

diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild 
b/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
deleted file mode 100644
index 1cd4221e5d1..000
--- a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_kdeapps_dep akonadi)
-   $(add_kdeapps_dep akonadi-mime)
-   $(add_kdeapps_dep kmime)
-   $(add_kdeapps_dep ksmtp)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-   !kde-apps/kdepim-l10n
-   !kde-apps/kdepimlibs:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
-
-RESTRICT+=" test"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/, kde-apps/kmailtransport/files/

[Andreas Sturmlechner]

commit: edbd4611c2ce0adbb46d27c5eb4646f66cdc5d32
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 11:27:36 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 11:27:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbd4611

kde-apps/kmailtransport: Fix draft message mailtransport

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../kmailtransport-17.12.1-draft-message-fix.patch | 27 +
 .../kmailtransport-17.12.1-r1.ebuild   | 46 ++
 2 files changed, 73 insertions(+)

diff --git 
a/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch 
b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
new file mode 100644
index 000..78a52547561
--- /dev/null
+++ 
b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
@@ -0,0 +1,27 @@
+From 424f0273dbebd115da6812e0b680fb911f282cd4 Mon Sep 17 00:00:00 2001
+From: Laurent Montel 
+Date: Mon, 15 Jan 2018 07:04:47 +0100
+Subject: Fix Bug 388573 - Draft message is confused about mail transport
+
+FIXED-IN: 5.7.2
+BUG: 388573
+---
+ src/kmailtransport/widgets/transportcombobox.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kmailtransport/widgets/transportcombobox.cpp 
b/src/kmailtransport/widgets/transportcombobox.cpp
+index b538f98..f198c4e 100644
+--- a/src/kmailtransport/widgets/transportcombobox.cpp
 b/src/kmailtransport/widgets/transportcombobox.cpp
+@@ -37,7 +37,7 @@ TransportComboBox::TransportComboBox(QWidget *parent)
+ : QComboBox(parent)
+ , d(new TransportComboBoxPrivate)
+ {
+-QMetaObject::invokeMethod(this, "updateComboboxList");
++updateComboboxList();
+ connect(TransportManager::self(), ::transportsChanged, 
this, ::updateComboboxList);
+ connect(TransportManager::self(), ::transportRemoved, 
this, ::transportRemoved);
+ }
+-- 
+cgit v0.11.2
+

diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild 
b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
new file mode 100644
index 000..a954a87a9c2
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_kdeapps_dep akonadi)
+   $(add_kdeapps_dep akonadi-mime)
+   $(add_kdeapps_dep kmime)
+   $(add_kdeapps_dep ksmtp)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+   !kde-apps/kdepim-l10n
+   !kde-apps/kdepimlibs:4
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-17.11.80-deps.patch"
+   "${FILESDIR}/${P}-draft-message-fix.patch"
+)
+
+RESTRICT+=" test"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/files/

[Andreas Sturmlechner]

commit: df62db764f12ea05bb1b150bf09e1a546e6bba68
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 15 06:22:02 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 15 06:22:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df62db76

kde-apps/kmailtransport: Add missing patch

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 .../files/kmailtransport-17.11.80-deps.patch   | 37 ++
 1 file changed, 37 insertions(+)

diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch 
b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
new file mode 100644
index 000..f245f77a965
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-17.11.80-deps.patch
@@ -0,0 +1,37 @@
+From 1e6ac475c2f591b93d3b1a10c75514d172bbbdf7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 16 Nov 2017 16:11:11 +0100
+Subject: [PATCH] Drop obsolete dependencies
+
+---
+ CMakeLists.txt | 7 ---
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 53761c3..1df4b65 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -38,7 +38,6 @@ set(CMAKECONFIG_INSTALL_DIR 
"${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport")
+ find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5DocTools ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+@@ -50,12 +49,6 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII 
-DQT_NO_CAST_TO_ASCII")
+ add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x06)
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+-find_package(Sasl2)
+-set_package_properties(Sasl2 PROPERTIES
+- DESCRIPTION "The Cyrus-sasl library"
+- URL "http://www.cyrussasl.org;
+- TYPE OPTIONAL
+-)
+ 
+ if(BUILD_TESTING)
+add_definitions(-DBUILD_TESTING)
+-- 
+2.13.6
+