diff --git a/rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch b/rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch index 8532c67..29d9e58 100644 --- a/rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch +++ b/rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch @@ -1,7 +1,7 @@ -From 39a360d49653006e951b96315aa0e4587f9a6fcd Mon Sep 17 00:00:00 2001 +From 5e765286bdcf989f5ba68a3230bd88652e8fce43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= Date: Mon, 23 Feb 2015 13:08:24 +0200 -Subject: [PATCH 01/17] Stop _incomingDataTimer when imapprotocol object is +Subject: [PATCH 01/24] Stop _incomingDataTimer when imapprotocol object is destroyed. A crash occurs in case the timer is active and the object is destroyed. @@ -10,7 +10,7 @@ A crash occurs in case the timer is active and the object is destroyed. 1 file changed, 3 insertions(+) diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp -index 4df62a5..984e263 100644 +index 4df62a57..984e2638 100644 --- a/src/plugins/messageservices/imap/imapprotocol.cpp +++ b/src/plugins/messageservices/imap/imapprotocol.cpp @@ -3019,6 +3019,9 @@ ImapProtocol::ImapProtocol() @@ -24,5 +24,5 @@ index 4df62a5..984e263 100644 delete _fsm; } -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0002-Introduce-acceptUntrustedCertificates-configuration.patch b/rpm/0002-Introduce-acceptUntrustedCertificates-configuration.patch index 56fe5a5..9be8d36 100644 --- a/rpm/0002-Introduce-acceptUntrustedCertificates-configuration.patch +++ b/rpm/0002-Introduce-acceptUntrustedCertificates-configuration.patch @@ -1,27 +1,27 @@ -From bd8c9b6476c2ce24179c39b1c7624a0de260627a Mon Sep 17 00:00:00 2001 +From ebfe9142f6b968a53e7796bdce081e36a852db67 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Mon, 13 Aug 2018 15:45:24 +0300 -Subject: [PATCH 02/17] Introduce acceptUntrustedCertificates() configuration. +Subject: [PATCH 02/24] Introduce acceptUntrustedCertificates() configuration. --- - src/libraries/qmfclient/qmailserviceaction.h | 2 ++ - src/libraries/qmfmessageserver/qmailtransport.cpp | 29 +++++++++++++++++----- - src/libraries/qmfmessageserver/qmailtransport.h | 9 ++++++- - .../messageservices/imap/imapconfiguration.cpp | 14 +++++++++++ - .../messageservices/imap/imapconfiguration.h | 5 ++++ - src/plugins/messageservices/imap/imapprotocol.cpp | 10 +++++++- - src/plugins/messageservices/imap/imaptransport.cpp | 15 ----------- - src/plugins/messageservices/imap/imaptransport.h | 5 ---- - src/plugins/messageservices/pop/popclient.cpp | 16 ++++++++++++ - .../messageservices/pop/popconfiguration.cpp | 13 ++++++++++ - src/plugins/messageservices/pop/popconfiguration.h | 5 ++++ - src/plugins/messageservices/smtp/smtpclient.cpp | 10 ++++++++ - .../messageservices/smtp/smtpconfiguration.cpp | 10 ++++++++ - .../messageservices/smtp/smtpconfiguration.h | 2 ++ + src/libraries/qmfclient/qmailserviceaction.h | 2 ++ + .../qmfmessageserver/qmailtransport.cpp | 29 +++++++++++++++---- + .../qmfmessageserver/qmailtransport.h | 9 +++++- + .../imap/imapconfiguration.cpp | 14 +++++++++ + .../messageservices/imap/imapconfiguration.h | 5 ++++ + .../messageservices/imap/imapprotocol.cpp | 10 ++++++- + .../messageservices/imap/imaptransport.cpp | 15 ---------- + .../messageservices/imap/imaptransport.h | 5 ---- + src/plugins/messageservices/pop/popclient.cpp | 16 ++++++++++ + .../messageservices/pop/popconfiguration.cpp | 13 +++++++++ + .../messageservices/pop/popconfiguration.h | 5 ++++ + .../messageservices/smtp/smtpclient.cpp | 10 +++++++ + .../smtp/smtpconfiguration.cpp | 10 +++++++ + .../messageservices/smtp/smtpconfiguration.h | 2 ++ 14 files changed, 117 insertions(+), 28 deletions(-) diff --git a/src/libraries/qmfclient/qmailserviceaction.h b/src/libraries/qmfclient/qmailserviceaction.h -index 3f6a142..6ba4020 100644 +index 3f6a1421..6ba4020e 100644 --- a/src/libraries/qmfclient/qmailserviceaction.h +++ b/src/libraries/qmfclient/qmailserviceaction.h @@ -99,6 +99,8 @@ public: @@ -34,7 +34,7 @@ index 3f6a142..6ba4020 100644 }; diff --git a/src/libraries/qmfmessageserver/qmailtransport.cpp b/src/libraries/qmfmessageserver/qmailtransport.cpp -index e2699b2..b9d8e52 100644 +index e2699b24..b9d8e52a 100644 --- a/src/libraries/qmfmessageserver/qmailtransport.cpp +++ b/src/libraries/qmfmessageserver/qmailtransport.cpp @@ -47,6 +47,7 @@ @@ -102,7 +102,7 @@ index e2699b2..b9d8e52 100644 /*! \internal */ diff --git a/src/libraries/qmfmessageserver/qmailtransport.h b/src/libraries/qmfmessageserver/qmailtransport.h -index 9b56ed6..f811366 100644 +index 9b56ed64..f8113661 100644 --- a/src/libraries/qmfmessageserver/qmailtransport.h +++ b/src/libraries/qmfmessageserver/qmailtransport.h @@ -35,6 +35,9 @@ @@ -143,7 +143,7 @@ index 9b56ed6..f811366 100644 #endif diff --git a/src/plugins/messageservices/imap/imapconfiguration.cpp b/src/plugins/messageservices/imap/imapconfiguration.cpp -index b4004bd..07289a1 100644 +index b4004bd6..07289a1c 100644 --- a/src/plugins/messageservices/imap/imapconfiguration.cpp +++ b/src/plugins/messageservices/imap/imapconfiguration.cpp @@ -198,6 +198,15 @@ void ImapConfiguration::setSearchLimit(int limit) @@ -175,7 +175,7 @@ index b4004bd..07289a1 100644 void ImapConfigurationEditor::setDeleteMail(bool b) diff --git a/src/plugins/messageservices/imap/imapconfiguration.h b/src/plugins/messageservices/imap/imapconfiguration.h -index f0c0569..69dc8ad 100644 +index f0c0569a..69dc8ad1 100644 --- a/src/plugins/messageservices/imap/imapconfiguration.h +++ b/src/plugins/messageservices/imap/imapconfiguration.h @@ -85,6 +85,10 @@ public: @@ -198,7 +198,7 @@ index f0c0569..69dc8ad 100644 void setDeleteMail(bool b); diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp -index 984e263..f82df5a 100644 +index 984e2638..f82df5a3 100644 --- a/src/plugins/messageservices/imap/imapprotocol.cpp +++ b/src/plugins/messageservices/imap/imapprotocol.cpp @@ -3060,10 +3060,18 @@ bool ImapProtocol::open( const ImapConfiguration& config, qint64 bufferSize) @@ -222,7 +222,7 @@ index 984e263..f82df5a 100644 qMailLog(IMAP) << objectName() << "Setting read buffer size to" << bufferSize; _transport->socket().setReadBufferSize(bufferSize); diff --git a/src/plugins/messageservices/imap/imaptransport.cpp b/src/plugins/messageservices/imap/imaptransport.cpp -index aaa2a97..7bfbea0 100644 +index aaa2a97f..7bfbea06 100644 --- a/src/plugins/messageservices/imap/imaptransport.cpp +++ b/src/plugins/messageservices/imap/imaptransport.cpp @@ -317,21 +317,6 @@ void ImapTransport::imapClose() @@ -248,7 +248,7 @@ index aaa2a97..7bfbea0 100644 { #if 0 diff --git a/src/plugins/messageservices/imap/imaptransport.h b/src/plugins/messageservices/imap/imaptransport.h -index a1c5042..50c12e5 100644 +index a1c50426..50c12e51 100644 --- a/src/plugins/messageservices/imap/imaptransport.h +++ b/src/plugins/messageservices/imap/imaptransport.h @@ -68,11 +68,6 @@ public: @@ -264,7 +264,7 @@ index a1c5042..50c12e5 100644 void test(); diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp -index 85ac855..b8aa5c7 100644 +index 85ac8553..b8aa5c7d 100644 --- a/src/plugins/messageservices/pop/popclient.cpp +++ b/src/plugins/messageservices/pop/popclient.cpp @@ -112,6 +112,10 @@ void PopClient::createTransport() @@ -314,7 +314,7 @@ index 85ac855..b8aa5c7 100644 } diff --git a/src/plugins/messageservices/pop/popconfiguration.cpp b/src/plugins/messageservices/pop/popconfiguration.cpp -index b56dba0..5c6754f 100644 +index b56dba07..5c6754f9 100644 --- a/src/plugins/messageservices/pop/popconfiguration.cpp +++ b/src/plugins/messageservices/pop/popconfiguration.cpp @@ -99,6 +99,14 @@ bool PopConfiguration::intervalCheckRoamingEnabled() const @@ -345,7 +345,7 @@ index b56dba0..5c6754f 100644 void PopConfigurationEditor::setDeleteMail(bool b) diff --git a/src/plugins/messageservices/pop/popconfiguration.h b/src/plugins/messageservices/pop/popconfiguration.h -index 1644faa..fe0119c 100644 +index 1644faad..fe0119c3 100644 --- a/src/plugins/messageservices/pop/popconfiguration.h +++ b/src/plugins/messageservices/pop/popconfiguration.h @@ -67,6 +67,10 @@ public: @@ -368,7 +368,7 @@ index 1644faa..fe0119c 100644 void setDeleteMail(bool b); diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp -index 2789397..9e1e219 100644 +index 27893973..9e1e2198 100644 --- a/src/plugins/messageservices/smtp/smtpclient.cpp +++ b/src/plugins/messageservices/smtp/smtpclient.cpp @@ -201,10 +201,20 @@ void SmtpClient::newConnection() @@ -393,7 +393,7 @@ index 2789397..9e1e219 100644 QMailServiceAction::Status::ErrorCode SmtpClient::addMail(const QMailMessage& mail) diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.cpp b/src/plugins/messageservices/smtp/smtpconfiguration.cpp -index e8807cc..23d4394 100644 +index e8807cc7..23d43949 100644 --- a/src/plugins/messageservices/smtp/smtpconfiguration.cpp +++ b/src/plugins/messageservices/smtp/smtpconfiguration.cpp @@ -66,6 +66,11 @@ int SmtpConfiguration::smtpPort() const @@ -421,7 +421,7 @@ index e8807cc..23d4394 100644 { setValue("smtpusername", str); diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.h b/src/plugins/messageservices/smtp/smtpconfiguration.h -index e8b28a6..ed115d5 100644 +index e8b28a6b..ed115d53 100644 --- a/src/plugins/messageservices/smtp/smtpconfiguration.h +++ b/src/plugins/messageservices/smtp/smtpconfiguration.h @@ -69,6 +69,7 @@ public: @@ -441,5 +441,5 @@ index e8b28a6..ed115d5 100644 void setSmtpPassword(const QString& password); void setSmtpAuthentication(int t); -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0003-fix-tests-installation-path.patch b/rpm/0003-fix-tests-installation-path.patch index e8a02f7..02970ec 100644 --- a/rpm/0003-fix-tests-installation-path.patch +++ b/rpm/0003-fix-tests-installation-path.patch @@ -1,19 +1,19 @@ -From 7f641c940ef2ca28f1c21a245870f4c56721c280 Mon Sep 17 00:00:00 2001 +From 86e3b14ee20e9599da9a09ba5c131e8ccbf647cd Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Tue, 30 Apr 2013 14:38:17 +0300 -Subject: [PATCH 03/17] fix tests installation path. +Subject: [PATCH 03/24] fix tests installation path. --- - benchmarks/tst_messageserver/tst_messageserver.pro | 2 +- - tests/qt5/tests.xml | 532 ++++++++++----------- - tests/tests.pri | 2 +- - tests/tests.pro | 2 +- - tests/tests.xml | 532 ++++++++++----------- - tests/tst_python_email/tst_python_email.pro | 2 +- + .../tst_messageserver/tst_messageserver.pro | 2 +- + tests/qt5/tests.xml | 532 +++++++++--------- + tests/tests.pri | 2 +- + tests/tests.pro | 2 +- + tests/tests.xml | 532 +++++++++--------- + tests/tst_python_email/tst_python_email.pro | 2 +- 6 files changed, 536 insertions(+), 536 deletions(-) diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro -index 2d50131..1dc2ddd 100644 +index 2d50131a..1dc2ddd5 100644 --- a/benchmarks/tst_messageserver/tst_messageserver.pro +++ b/benchmarks/tst_messageserver/tst_messageserver.pro @@ -2,7 +2,7 @@ TEMPLATE = app @@ -26,7 +26,7 @@ index 2d50131..1dc2ddd 100644 BASE=../../ include($$BASE/common.pri) diff --git a/tests/qt5/tests.xml b/tests/qt5/tests.xml -index ffbb593..ac9464a 100644 +index ffbb593f..ac9464a6 100644 --- a/tests/qt5/tests.xml +++ b/tests/qt5/tests.xml @@ -5,123 +5,123 @@ @@ -1462,7 +1462,7 @@ index ffbb593..ac9464a 100644 true diff --git a/tests/tests.pri b/tests/tests.pri -index 623b19c..1d3ba39 100644 +index 623b19ca..1d3ba39e 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -3,7 +3,7 @@ QT += testlib @@ -1475,7 +1475,7 @@ index 623b19c..1d3ba39 100644 include(../common.pri) diff --git a/tests/tests.pro b/tests/tests.pro -index cac4494..cae0815 100644 +index cac44948..cae08159 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -41,5 +41,5 @@ CONFIG += unittest @@ -1486,7 +1486,7 @@ index cac4494..cae0815 100644 +test_description.path = /opt/tests/qmf-qt5/test-definition INSTALLS += test_description diff --git a/tests/tests.xml b/tests/tests.xml -index 3a708ed..b8fff81 100644 +index 3a708ed0..b8fff814 100644 --- a/tests/tests.xml +++ b/tests/tests.xml @@ -5,123 +5,123 @@ @@ -2922,7 +2922,7 @@ index 3a708ed..b8fff81 100644 true diff --git a/tests/tst_python_email/tst_python_email.pro b/tests/tst_python_email/tst_python_email.pro -index 4cde1fe..204ecd5 100644 +index 4cde1fe3..204ecd5a 100644 --- a/tests/tst_python_email/tst_python_email.pro +++ b/tests/tst_python_email/tst_python_email.pro @@ -4,7 +4,7 @@ TARGET = tst_python_email @@ -2935,5 +2935,5 @@ index 4cde1fe..204ecd5 100644 INSTALLS += testdata -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0004-Accounts-qt-integration.patch b/rpm/0004-Accounts-qt-integration.patch index 4b3686a..2dd3fc3 100644 --- a/rpm/0004-Accounts-qt-integration.patch +++ b/rpm/0004-Accounts-qt-integration.patch @@ -1,7 +1,7 @@ -From 8efc819f896bd8456418d41d567197dd2abaaa20 Mon Sep 17 00:00:00 2001 +From 0a0fa3662eb6c99bf70994e858eb5380d37a0619 Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Wed, 29 May 2013 09:44:20 +0300 -Subject: [PATCH] Accounts-qt integration. +Subject: [PATCH 04/24] Accounts-qt integration. Squashed commits, either one line description or block comment: @@ -3658,7 +3658,7 @@ index 771a7a45..b4dc7b32 100644 #endif diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp -index 4df62a57..6c548ee6 100644 +index f82df5a3..e4e0f0e1 100644 --- a/src/plugins/messageservices/imap/imapprotocol.cpp +++ b/src/plugins/messageservices/imap/imapprotocol.cpp @@ -559,8 +559,11 @@ class LoginState : public ImapState @@ -3736,7 +3736,7 @@ index 4df62a57..6c548ee6 100644 } return false; -@@ -3183,11 +3212,19 @@ void ImapProtocol::sendStartTLS() +@@ -3194,11 +3223,19 @@ void ImapProtocol::sendStartTLS() _fsm->setState(&_fsm->startTlsState); } @@ -3756,7 +3756,7 @@ index 4df62a57..6c548ee6 100644 void ImapProtocol::sendLogout() { -@@ -3806,7 +3843,7 @@ QString ImapProtocol::quoteString(const QString& input) +@@ -3817,7 +3854,7 @@ QString ImapProtocol::quoteString(const QString& input) QByteArray ImapProtocol::quoteString(const QByteArray& input) { @@ -4093,7 +4093,7 @@ index a704ab57..2d1a1040 100644 #endif diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp -index 85ac8553..3d567135 100644 +index b8aa5c7d..c34e9e89 100644 --- a/src/plugins/messageservices/pop/popclient.cpp +++ b/src/plugins/messageservices/pop/popclient.cpp @@ -76,10 +76,18 @@ PopClient::PopClient(QObject* parent) @@ -4126,7 +4126,7 @@ index 85ac8553..3d567135 100644 } void PopClient::messageBufferFlushed() -@@ -156,6 +168,7 @@ void PopClient::newConnection() +@@ -168,6 +180,7 @@ void PopClient::newConnection() testing = false; pendingDeletes = false; lastStatusTimer.start(); @@ -4134,7 +4134,7 @@ index 85ac8553..3d567135 100644 if (transport && transport->connected()) { if (selected) { // Re-use the existing connection -@@ -241,6 +254,24 @@ void PopClient::setAccount(const QMailAccountId &id) +@@ -257,6 +270,24 @@ void PopClient::setAccount(const QMailAccountId &id) qMailLog(POP) << "Flags for POP folder" << folder.id() << folder.path() << "updated"; } } @@ -4159,7 +4159,7 @@ index 85ac8553..3d567135 100644 } QMailAccountId PopClient::accountId() const -@@ -513,12 +544,30 @@ void PopClient::processResponse(const QString &response) +@@ -529,12 +560,30 @@ void PopClient::processResponse(const QString &response) { if (response[0] != '+') { // Authentication failed @@ -4190,7 +4190,7 @@ index 85ac8553..3d567135 100644 if (!response.isEmpty()) { // Send the response as Base64 encoded -@@ -727,7 +776,11 @@ void PopClient::nextAction() +@@ -743,7 +792,11 @@ void PopClient::nextAction() emit updateStatus(tr("Logging in")); // Get the login command sequence to use @@ -4202,7 +4202,7 @@ index 85ac8553..3d567135 100644 nextStatus = Auth; nextCommand = authCommands.takeFirst(); -@@ -1224,6 +1277,11 @@ void PopClient::checkForNewMessages() +@@ -1240,6 +1293,11 @@ void PopClient::checkForNewMessages() void PopClient::cancelTransfer(QMailServiceAction::Status::ErrorCode code, const QString &text) { operationFailed(code, text); @@ -4214,7 +4214,7 @@ index 85ac8553..3d567135 100644 } void PopClient::retrieveOperationCompleted() -@@ -1321,3 +1379,72 @@ void PopClient::removeAllFromBuffer(QMailMessage *message) +@@ -1337,3 +1395,72 @@ void PopClient::removeAllFromBuffer(QMailMessage *message) _bufferedMessages.remove(i); } } @@ -4556,7 +4556,7 @@ index 97300b99..06183262 100644 #endif diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp -index 27893973..7b768e5e 100644 +index 9e1e2198..9d77e6c5 100644 --- a/src/plugins/messageservices/smtp/smtpclient.cpp +++ b/src/plugins/messageservices/smtp/smtpclient.cpp @@ -113,6 +113,11 @@ SmtpClient::SmtpClient(QObject* parent) @@ -4629,7 +4629,7 @@ index 27893973..7b768e5e 100644 SmtpConfiguration smtpCfg(config); if ( smtpCfg.smtpServer().isEmpty() ) { status = Done; -@@ -541,6 +576,31 @@ void SmtpClient::nextAction(const QString &response) +@@ -551,6 +586,31 @@ void SmtpClient::nextAction(const QString &response) addressComponent = localAddress.toIPv4Address(); // Find the authentication mode to use @@ -4661,7 +4661,7 @@ index 27893973..7b768e5e 100644 QByteArray authCmd(SmtpAuthenticator::getAuthentication(config.serviceConfiguration("smtp"), capabilities)); if (!authCmd.isEmpty()) { sendCommand(authCmd); -@@ -555,14 +615,50 @@ void SmtpClient::nextAction(const QString &response) +@@ -565,14 +625,50 @@ void SmtpClient::nextAction(const QString &response) status = Authenticated; nextAction(QString()); } @@ -4712,7 +4712,7 @@ index 27893973..7b768e5e 100644 if (!response.isEmpty()) { // Send the response as Base64 encoded, mask the debug output -@@ -570,8 +666,9 @@ void SmtpClient::nextAction(const QString &response) +@@ -580,8 +676,9 @@ void SmtpClient::nextAction(const QString &response) bufferedResponse.clear(); return; } else { @@ -4724,7 +4724,7 @@ index 27893973..7b768e5e 100644 } } else if (responseCode == 235) { // We are now authenticated -@@ -580,14 +677,29 @@ void SmtpClient::nextAction(const QString &response) +@@ -590,14 +687,29 @@ void SmtpClient::nextAction(const QString &response) } else if (responseCode == 530) { operationFailed(QMailServiceAction::Status::ErrConfiguration, response); } else { @@ -4755,7 +4755,7 @@ index 27893973..7b768e5e 100644 if (mailItr == mailList.end()) { // Nothing to send status = Quit; -@@ -841,6 +953,10 @@ void SmtpClient::nextAction(const QString &response) +@@ -851,6 +963,10 @@ void SmtpClient::nextAction(const QString &response) void SmtpClient::cancelTransfer(QMailServiceAction::Status::ErrorCode code, const QString &text) { operationFailed(code, text); @@ -4766,7 +4766,7 @@ index 27893973..7b768e5e 100644 } void SmtpClient::messageProcessed(const QMailMessageId &id) -@@ -995,3 +1111,53 @@ void SmtpClient::stopTransferring() +@@ -1005,3 +1121,53 @@ void SmtpClient::stopTransferring() status = Sent; } } @@ -5449,5 +5449,5 @@ index 26719daa..84ca9409 100644 QMailAccount account3(account1.id()); QCOMPARE(QMailStore::instance()->lastError(), QMailStore::InvalidId); -- -2.26.2 +2.17.1 diff --git a/rpm/0005-Start-messageserver-on-system-startup-in-case-there-.patch b/rpm/0005-Start-messageserver-on-system-startup-in-case-there-.patch index a821be3..6203b29 100644 --- a/rpm/0005-Start-messageserver-on-system-startup-in-case-there-.patch +++ b/rpm/0005-Start-messageserver-on-system-startup-in-case-there-.patch @@ -1,7 +1,7 @@ -From 428c566dc26d64b06dc0d560bc804c3f8754e222 Mon Sep 17 00:00:00 2001 +From 4372ae2417889a38fd2352d1608cee8435150638 Mon Sep 17 00:00:00 2001 From: Evgeny Karpov Date: Thu, 24 Oct 2013 09:37:30 +0000 -Subject: [PATCH 05/17] Start messageserver on system startup in case there are +Subject: [PATCH 05/24] Start messageserver on system startup in case there are email accounts present Squashed: @@ -16,11 +16,11 @@ Signed-off-by: Philippe De Swert Squashed: Start messageserver only after all accounts related services. Contributes JB#28613 --- - src/tools/accountscheck/accountscheck.cpp | 63 ++++++++++++++++++++++ - src/tools/accountscheck/accountscheck.pro | 19 +++++++ - .../systemd/messageserver5-accounts-check.service | 12 +++++ - src/tools/systemd/messageserver5.service | 15 ++++++ - src/tools/tools.pro | 4 ++ + src/tools/accountscheck/accountscheck.cpp | 63 +++++++++++++++++++ + src/tools/accountscheck/accountscheck.pro | 19 ++++++ + .../messageserver5-accounts-check.service | 12 ++++ + src/tools/systemd/messageserver5.service | 15 +++++ + src/tools/tools.pro | 4 ++ 5 files changed, 113 insertions(+) create mode 100644 src/tools/accountscheck/accountscheck.cpp create mode 100644 src/tools/accountscheck/accountscheck.pro @@ -29,7 +29,7 @@ Start messageserver only after all accounts related services. Contributes JB#286 diff --git a/src/tools/accountscheck/accountscheck.cpp b/src/tools/accountscheck/accountscheck.cpp new file mode 100644 -index 0000000..364fb77 +index 00000000..364fb77e --- /dev/null +++ b/src/tools/accountscheck/accountscheck.cpp @@ -0,0 +1,63 @@ @@ -98,7 +98,7 @@ index 0000000..364fb77 +} diff --git a/src/tools/accountscheck/accountscheck.pro b/src/tools/accountscheck/accountscheck.pro new file mode 100644 -index 0000000..0c707b9 +index 00000000..0c707b92 --- /dev/null +++ b/src/tools/accountscheck/accountscheck.pro @@ -0,0 +1,19 @@ @@ -123,7 +123,7 @@ index 0000000..0c707b9 +INSTALLS+= target systemd diff --git a/src/tools/systemd/messageserver5-accounts-check.service b/src/tools/systemd/messageserver5-accounts-check.service new file mode 100644 -index 0000000..c2ec29e +index 00000000..c2ec29ea --- /dev/null +++ b/src/tools/systemd/messageserver5-accounts-check.service @@ -0,0 +1,12 @@ @@ -141,7 +141,7 @@ index 0000000..c2ec29e +WantedBy=user-session.target diff --git a/src/tools/systemd/messageserver5.service b/src/tools/systemd/messageserver5.service new file mode 100644 -index 0000000..0d583d1 +index 00000000..0d583d15 --- /dev/null +++ b/src/tools/systemd/messageserver5.service @@ -0,0 +1,15 @@ @@ -161,7 +161,7 @@ index 0000000..0d583d1 +[Install] +WantedBy=user-session.target diff --git a/src/tools/tools.pro b/src/tools/tools.pro -index d05c337..689ad32 100644 +index d05c3377..689ad320 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -1,2 +1,6 @@ @@ -172,5 +172,5 @@ index d05c337..689ad32 100644 + SUBDIRS += accountscheck +} -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch b/rpm/0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch index d918844..ac20165 100644 --- a/rpm/0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch +++ b/rpm/0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch @@ -1,18 +1,18 @@ -From 11f08173dc746f86d94e8352a8f32dc3d1e44053 Mon Sep 17 00:00:00 2001 +From f96179ba4c01e11f58a2197eb5e2fe6e8266c1c1 Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Wed, 10 Sep 2014 14:36:13 +0300 -Subject: [PATCH 06/17] Add keepalive timer to IMAP IDLE service +Subject: [PATCH 06/24] Add keepalive timer to IMAP IDLE service This commit introduce a dependency on nemo-keepalive via DEFINES+=USE_KEEPALIVE --- - src/plugins/messageservices/imap/imap.pro | 4 ++++ - src/plugins/messageservices/imap/imapservice.cpp | 23 +++++++++++++++++++++++ - src/plugins/messageservices/imap/imapservice.h | 11 +++++++++++ + src/plugins/messageservices/imap/imap.pro | 4 ++++ + .../messageservices/imap/imapservice.cpp | 23 +++++++++++++++++++ + .../messageservices/imap/imapservice.h | 11 +++++++++ 3 files changed, 38 insertions(+) diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro -index 1c0ae6b..1b5742b 100644 +index 1c0ae6bb..1b5742b4 100644 --- a/src/plugins/messageservices/imap/imap.pro +++ b/src/plugins/messageservices/imap/imap.pro @@ -5,6 +5,10 @@ load(qt_plugin) @@ -27,7 +27,7 @@ index 1c0ae6b..1b5742b 100644 QT += alignedtimer } diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp -index f132dd0..7cc0085 100644 +index f132dd0d..7cc00856 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp @@ -1518,6 +1518,12 @@ ImapService::ImapService(const QMailAccountId &accountId) @@ -69,7 +69,7 @@ index f132dd0..7cc0085 100644 class ImapConfigurator : public QMailMessageServiceConfigurator { diff --git a/src/plugins/messageservices/imap/imapservice.h b/src/plugins/messageservices/imap/imapservice.h -index 00682a8..b3e8dd9 100644 +index 00682a87..b3e8dd97 100644 --- a/src/plugins/messageservices/imap/imapservice.h +++ b/src/plugins/messageservices/imap/imapservice.h @@ -38,6 +38,10 @@ @@ -105,5 +105,5 @@ index 00682a8..b3e8dd9 100644 class ImapServicePlugin : public QMailMessageServicePlugin -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0007-Use-Qt5-booster-to-save-memory.patch b/rpm/0007-Use-Qt5-booster-to-save-memory.patch index 02dde9e..28838b0 100644 --- a/rpm/0007-Use-Qt5-booster-to-save-memory.patch +++ b/rpm/0007-Use-Qt5-booster-to-save-memory.patch @@ -1,7 +1,7 @@ -From 3daf24239f43d5c5ab28a29f70287851e54d8f5c Mon Sep 17 00:00:00 2001 +From 769280d652f4828cbff7c2d0ece3d6fbbb3cf902 Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Mon, 27 Oct 2014 09:49:12 +0200 -Subject: [PATCH 07/17] Use Qt5 booster to save memory. +Subject: [PATCH 07/24] Use Qt5 booster to save memory. --- src/tools/messageserver/main.cpp | 2 +- @@ -10,7 +10,7 @@ Subject: [PATCH 07/17] Use Qt5 booster to save memory. 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/tools/messageserver/main.cpp b/src/tools/messageserver/main.cpp -index 9c10762..d9a35c5 100644 +index 9c107629..d9a35c53 100644 --- a/src/tools/messageserver/main.cpp +++ b/src/tools/messageserver/main.cpp @@ -41,7 +41,7 @@ @@ -23,7 +23,7 @@ index 9c10762..d9a35c5 100644 #ifdef USE_HTML_PARSER // Need for html parsing by in qmailmessage.cpp, but don't need real UI diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro -index f7d9293..a092b8c 100644 +index f7d92931..a092b8ce 100644 --- a/src/tools/messageserver/messageserver.pro +++ b/src/tools/messageserver/messageserver.pro @@ -17,6 +17,12 @@ contains(DEFINES, USE_HTML_PARSER) { @@ -40,7 +40,7 @@ index f7d9293..a092b8c 100644 target.path += $$QMF_INSTALL_ROOT/bin diff --git a/src/tools/systemd/messageserver5.service b/src/tools/systemd/messageserver5.service -index 0d583d1..a5aa05a 100644 +index 0d583d15..a5aa05a9 100644 --- a/src/tools/systemd/messageserver5.service +++ b/src/tools/systemd/messageserver5.service @@ -1,13 +1,13 @@ @@ -61,5 +61,5 @@ index 0d583d1..a5aa05a 100644 RestartSec=1 -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch b/rpm/0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch index b5f613c..5709bfd 100644 --- a/rpm/0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch +++ b/rpm/0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch @@ -1,7 +1,7 @@ -From 3b543f7c23c2906669d1041419a2e8094c8c8ea3 Mon Sep 17 00:00:00 2001 +From 1c8ac90c0760b5ea00d5f5625dab35e7f4957b80 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Mon, 13 Aug 2018 17:24:36 +0300 -Subject: [PATCH 08/17] Introduce QMailAccount::HasPersistentConnection status +Subject: [PATCH 08/24] Introduce QMailAccount::HasPersistentConnection status flag Use QMailAccount::HasPersistentConnection status flag for IMAP idle instead of @@ -13,7 +13,7 @@ keepalive(less state transitions). 1 file changed, 10 insertions(+) diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp -index f352b1d..599b573 100644 +index 221fa7c5..ab509afd 100644 --- a/src/libraries/qmfclient/qmailstore_p.cpp +++ b/src/libraries/qmfclient/qmailstore_p.cpp @@ -2671,6 +2671,10 @@ bool SSOAccountSatisfyTheProperty(Accounts::Account* ssoAccount, const QMailAcco @@ -27,7 +27,7 @@ index f352b1d..599b573 100644 return SSOAccountCompareProperty(ssoAccount, status, argument.op, argument.valueList); -@@ -3712,11 +3716,13 @@ QMailAccount QMailStorePrivate::extractAccount(const QSharedPointervalueAsBool("email/default"); const bool& canTransmit = ssoAccount->valueAsBool("canTransmit", true); const bool& appendSignature = ssoAccount->valueAsBool("signatureEnabled", true); @@ -41,7 +41,7 @@ index f352b1d..599b573 100644 result.setSignature(ssoAccount->valueAsString("signature")); result.setFromAddress(ssoAccount->contains("fullName")? -@@ -6221,6 +6227,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptAddAccount(QMailAccou +@@ -6222,6 +6228,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptAddAccount(QMailAccou ssoAccount->setValue("status", account->status()); const bool appendSignature = (account->status() & QMailAccount::AppendSignature); ssoAccount->setValue("signatureEnabled", appendSignature); @@ -50,7 +50,7 @@ index f352b1d..599b573 100644 ssoAccount->setValue("signature", account->signature()); ssoAccount->setValue("emailaddress", account->fromAddress().address()); ssoAccount->setValue("fullName", account->fromAddress().name()); -@@ -7023,6 +7031,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateAccount(QMailAc +@@ -7024,6 +7032,8 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateAccount(QMailAc ssoAccount->setValue("status", account->status()); bool signatureEnabled = account->status() & QMailAccount::AppendSignature; ssoAccount->setValue("signatureEnabled", signatureEnabled); @@ -60,5 +60,5 @@ index f352b1d..599b573 100644 ssoAccount->setValue("emailaddress", account->fromAddress().address()); ssoAccount->setValue("fullName", account->fromAddress().name()); -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0009-Introduce-discovery-of-authentication-from-the-anoun.patch b/rpm/0009-Introduce-discovery-of-authentication-from-the-anoun.patch index bbaa527..2afe4d0 100644 --- a/rpm/0009-Introduce-discovery-of-authentication-from-the-anoun.patch +++ b/rpm/0009-Introduce-discovery-of-authentication-from-the-anoun.patch @@ -1,40 +1,40 @@ -From bba720da13248c3f0d5eb1d460f04a1c22af9764 Mon Sep 17 00:00:00 2001 +From 9906e81a475c705655248b955bb05d2d316e3d03 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Wed, 15 Aug 2018 11:26:49 +0300 -Subject: [PATCH 09/17] Introduce discovery of authentication from the anounced +Subject: [PATCH 09/24] Introduce discovery of authentication from the anounced capabilities(IMAP/SMTP) Squashed oneliner: Default to IMAP LOGIN if server does not advertise any auth caps and LOGINDISABLED. --- - src/libraries/qmfclient/ssoauthplugin.h | 4 +- - src/libraries/qmfclient/ssosessionmanager.cpp | 12 +- - src/libraries/qmfclient/ssosessionmanager.h | 7 +- - .../qmfmessageserver/qmailauthenticator.cpp | 9 +- - .../qmfmessageserver/qmailauthenticator.h | 3 +- - .../messageservices/imap/imapauthenticator.cpp | 135 ++++++++++++++---- - .../messageservices/imap/imapauthenticator.h | 5 +- - src/plugins/messageservices/imap/imapclient.cpp | 41 +++--- - src/plugins/messageservices/imap/imapclient.h | 5 +- - src/plugins/messageservices/imap/imapprotocol.cpp | 20 +-- - src/plugins/messageservices/imap/imapprotocol.h | 3 +- - src/plugins/messageservices/imap/imapservice.cpp | 35 +++-- - .../messageservices/pop/popauthenticator.cpp | 48 +++---- - src/plugins/messageservices/pop/popauthenticator.h | 5 +- - src/plugins/messageservices/pop/popclient.cpp | 13 +- - src/plugins/messageservices/pop/popclient.h | 4 +- - .../messageservices/smtp/smtpauthenticator.cpp | 152 ++++++++++++++------- - .../messageservices/smtp/smtpauthenticator.h | 6 +- - src/plugins/messageservices/smtp/smtpclient.cpp | 28 ++-- - src/plugins/messageservices/smtp/smtpclient.h | 4 +- - .../messageservices/smtp/smtpconfiguration.cpp | 9 ++ - .../messageservices/smtp/smtpconfiguration.h | 2 + - src/plugins/ssoauth/password/passwordplugin.cpp | 109 +++++++++------ - src/plugins/ssoauth/password/passwordplugin.h | 10 +- + src/libraries/qmfclient/ssoauthplugin.h | 4 +- + src/libraries/qmfclient/ssosessionmanager.cpp | 12 +- + src/libraries/qmfclient/ssosessionmanager.h | 7 +- + .../qmfmessageserver/qmailauthenticator.cpp | 9 +- + .../qmfmessageserver/qmailauthenticator.h | 3 +- + .../imap/imapauthenticator.cpp | 135 ++++++++++++---- + .../messageservices/imap/imapauthenticator.h | 5 +- + .../messageservices/imap/imapclient.cpp | 41 ++--- + src/plugins/messageservices/imap/imapclient.h | 5 +- + .../messageservices/imap/imapprotocol.cpp | 20 +-- + .../messageservices/imap/imapprotocol.h | 3 +- + .../messageservices/imap/imapservice.cpp | 35 ++-- + .../messageservices/pop/popauthenticator.cpp | 48 +++--- + .../messageservices/pop/popauthenticator.h | 5 +- + src/plugins/messageservices/pop/popclient.cpp | 13 +- + src/plugins/messageservices/pop/popclient.h | 4 +- + .../smtp/smtpauthenticator.cpp | 152 ++++++++++++------ + .../messageservices/smtp/smtpauthenticator.h | 6 +- + .../messageservices/smtp/smtpclient.cpp | 28 ++-- + src/plugins/messageservices/smtp/smtpclient.h | 4 +- + .../smtp/smtpconfiguration.cpp | 9 ++ + .../messageservices/smtp/smtpconfiguration.h | 2 + + .../ssoauth/password/passwordplugin.cpp | 109 ++++++++----- + src/plugins/ssoauth/password/passwordplugin.h | 10 +- 24 files changed, 420 insertions(+), 249 deletions(-) diff --git a/src/libraries/qmfclient/ssoauthplugin.h b/src/libraries/qmfclient/ssoauthplugin.h -index faf3713..bbc59a7 100644 +index faf3713c..bbc59a76 100644 --- a/src/libraries/qmfclient/ssoauthplugin.h +++ b/src/libraries/qmfclient/ssoauthplugin.h @@ -57,8 +57,8 @@ public: @@ -49,7 +49,7 @@ index faf3713..bbc59a7 100644 virtual SignOn::SessionData sessionData(const QString &accountProvider, QVariantMap authParameters) const = 0; virtual SSOAuthService *createService() = 0; diff --git a/src/libraries/qmfclient/ssosessionmanager.cpp b/src/libraries/qmfclient/ssosessionmanager.cpp -index e988ed6..edb467d 100644 +index e988ed61..edb467d1 100644 --- a/src/libraries/qmfclient/ssosessionmanager.cpp +++ b/src/libraries/qmfclient/ssosessionmanager.cpp @@ -67,7 +67,7 @@ @@ -102,7 +102,7 @@ index e988ed6..edb467d 100644 } diff --git a/src/libraries/qmfclient/ssosessionmanager.h b/src/libraries/qmfclient/ssosessionmanager.h -index eaecf91..61806ba 100644 +index eaecf916..61806ba4 100644 --- a/src/libraries/qmfclient/ssosessionmanager.h +++ b/src/libraries/qmfclient/ssosessionmanager.h @@ -63,8 +63,7 @@ public: @@ -139,7 +139,7 @@ index eaecf91..61806ba 100644 QString _authMechanism; QString _authUsername; diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.cpp b/src/libraries/qmfmessageserver/qmailauthenticator.cpp -index 92a12e7..373bcf2 100644 +index 92a12e70..373bcf21 100644 --- a/src/libraries/qmfmessageserver/qmailauthenticator.cpp +++ b/src/libraries/qmfmessageserver/qmailauthenticator.cpp @@ -32,7 +32,6 @@ @@ -170,7 +170,7 @@ index 92a12e7..373bcf2 100644 return cramMd5Response(challenge, configuration.value("username").toUtf8(), password.toUtf8()); } diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.h b/src/libraries/qmfmessageserver/qmailauthenticator.h -index a9f2d21..3891139 100644 +index a9f2d214..3891139d 100644 --- a/src/libraries/qmfmessageserver/qmailauthenticator.h +++ b/src/libraries/qmfmessageserver/qmailauthenticator.h @@ -35,6 +35,7 @@ @@ -191,7 +191,7 @@ index a9f2d21..3891139 100644 static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge); #endif diff --git a/src/plugins/messageservices/imap/imapauthenticator.cpp b/src/plugins/messageservices/imap/imapauthenticator.cpp -index 941801d..38dd4d9 100644 +index 941801dd..38dd4d9f 100644 --- a/src/plugins/messageservices/imap/imapauthenticator.cpp +++ b/src/plugins/messageservices/imap/imapauthenticator.cpp @@ -40,11 +40,16 @@ @@ -368,7 +368,7 @@ index 941801d..38dd4d9 100644 +} diff --git a/src/plugins/messageservices/imap/imapauthenticator.h b/src/plugins/messageservices/imap/imapauthenticator.h -index 879629f..02b3d67 100644 +index 879629ff..02b3d67c 100644 --- a/src/plugins/messageservices/imap/imapauthenticator.h +++ b/src/plugins/messageservices/imap/imapauthenticator.h @@ -44,12 +44,11 @@ class ImapAuthenticator @@ -387,7 +387,7 @@ index 879629f..02b3d67 100644 }; diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp -index f5028aa..949c254 100644 +index f5028aa3..949c254c 100644 --- a/src/plugins/messageservices/imap/imapclient.cpp +++ b/src/plugins/messageservices/imap/imapclient.cpp @@ -183,7 +183,7 @@ class IdleProtocol : public ImapProtocol { @@ -510,7 +510,7 @@ index f5028aa..949c254 100644 // copying here as the data is shared QMailAccountConfiguration config = QMailAccountConfiguration(_config.id()); diff --git a/src/plugins/messageservices/imap/imapclient.h b/src/plugins/messageservices/imap/imapclient.h -index b4dc7b3..bd4b320 100644 +index b4dc7b32..bd4b320f 100644 --- a/src/plugins/messageservices/imap/imapclient.h +++ b/src/plugins/messageservices/imap/imapclient.h @@ -92,6 +92,7 @@ public: @@ -540,7 +540,7 @@ index b4dc7b3..bd4b320 100644 }; diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp -index e4e0f0e..1b05dc1 100644 +index e4e0f0e1..1b05dc19 100644 --- a/src/plugins/messageservices/imap/imapprotocol.cpp +++ b/src/plugins/messageservices/imap/imapprotocol.cpp @@ -560,7 +560,7 @@ public: @@ -611,7 +611,7 @@ index e4e0f0e..1b05dc1 100644 _fsm->loginState.setConfiguration(config, _capabilities, ssoLogin); _fsm->setState(&_fsm->loginState); diff --git a/src/plugins/messageservices/imap/imapprotocol.h b/src/plugins/messageservices/imap/imapprotocol.h -index d3147ea..166919b 100644 +index d3147ea4..166919b8 100644 --- a/src/plugins/messageservices/imap/imapprotocol.h +++ b/src/plugins/messageservices/imap/imapprotocol.h @@ -144,6 +144,7 @@ public: @@ -632,7 +632,7 @@ index d3147ea..166919b 100644 void sendLogin(const QMailAccountConfiguration &config); #endif diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp -index 7cc0085..c5c6118 100644 +index 7cc00856..c5c61189 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp @@ -1616,6 +1616,10 @@ void ImapService::accountsUpdated(const QMailAccountIdList &ids) @@ -686,7 +686,7 @@ index 7cc0085..c5c6118 100644 // account was enabled and still is, update checkinterval diff --git a/src/plugins/messageservices/pop/popauthenticator.cpp b/src/plugins/messageservices/pop/popauthenticator.cpp -index 87fa079..843b167 100644 +index 87fa0791..843b1675 100644 --- a/src/plugins/messageservices/pop/popauthenticator.cpp +++ b/src/plugins/messageservices/pop/popauthenticator.cpp @@ -40,6 +40,15 @@ @@ -767,7 +767,7 @@ index 87fa079..843b167 100644 +} diff --git a/src/plugins/messageservices/pop/popauthenticator.h b/src/plugins/messageservices/pop/popauthenticator.h -index 2d1a104..419b950 100644 +index 2d1a1040..419b9508 100644 --- a/src/plugins/messageservices/pop/popauthenticator.h +++ b/src/plugins/messageservices/pop/popauthenticator.h @@ -44,12 +44,11 @@ class PopAuthenticator @@ -786,7 +786,7 @@ index 2d1a104..419b950 100644 #endif diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp -index c34e9e8..f44528f 100644 +index c34e9e89..f44528fd 100644 --- a/src/plugins/messageservices/pop/popclient.cpp +++ b/src/plugins/messageservices/pop/popclient.cpp @@ -273,11 +273,10 @@ void PopClient::setAccount(const QMailAccountId &id) @@ -826,7 +826,7 @@ index c34e9e8..f44528f 100644 qMailLog(POP) << "Got SSO response"; if(!ssoCredentials.isEmpty()) { diff --git a/src/plugins/messageservices/pop/popclient.h b/src/plugins/messageservices/pop/popclient.h -index f7df5d5..44b778b 100644 +index f7df5d5d..44b778bb 100644 --- a/src/plugins/messageservices/pop/popclient.h +++ b/src/plugins/messageservices/pop/popclient.h @@ -111,7 +111,7 @@ protected slots: @@ -848,7 +848,7 @@ index f7df5d5..44b778b 100644 }; diff --git a/src/plugins/messageservices/smtp/smtpauthenticator.cpp b/src/plugins/messageservices/smtp/smtpauthenticator.cpp -index 0dae24c..8e57a76 100644 +index 0dae24c5..8e57a76f 100644 --- a/src/plugins/messageservices/smtp/smtpauthenticator.cpp +++ b/src/plugins/messageservices/smtp/smtpauthenticator.cpp @@ -33,78 +33,124 @@ @@ -1050,7 +1050,7 @@ index 0dae24c..8e57a76 100644 } -#endif diff --git a/src/plugins/messageservices/smtp/smtpauthenticator.h b/src/plugins/messageservices/smtp/smtpauthenticator.h -index 0618326..23f31cb 100644 +index 06183262..23f31cb2 100644 --- a/src/plugins/messageservices/smtp/smtpauthenticator.h +++ b/src/plugins/messageservices/smtp/smtpauthenticator.h @@ -34,6 +34,7 @@ @@ -1077,7 +1077,7 @@ index 0618326..23f31cb 100644 #endif diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp -index 9d77e6c..ba0d5cf 100644 +index 9d77e6c5..ba0d5cf0 100644 --- a/src/plugins/messageservices/smtp/smtpclient.cpp +++ b/src/plugins/messageservices/smtp/smtpclient.cpp @@ -157,11 +157,10 @@ void SmtpClient::setAccount(const QMailAccountId &id) @@ -1153,7 +1153,7 @@ index 9d77e6c..ba0d5cf 100644 qMailLog(SMTP) << "Got SSO response"; if(!ssoCredentials.isEmpty()) { diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h -index 2c7b233..1ca218a 100644 +index 2c7b2333..1ca218a8 100644 --- a/src/plugins/messageservices/smtp/smtpclient.h +++ b/src/plugins/messageservices/smtp/smtpclient.h @@ -104,7 +104,7 @@ private slots: @@ -1175,7 +1175,7 @@ index 2c7b233..1ca218a 100644 }; diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.cpp b/src/plugins/messageservices/smtp/smtpconfiguration.cpp -index 23d4394..74056f6 100644 +index 23d43949..74056f6c 100644 --- a/src/plugins/messageservices/smtp/smtpconfiguration.cpp +++ b/src/plugins/messageservices/smtp/smtpconfiguration.cpp @@ -93,6 +93,10 @@ int SmtpConfiguration::smtpEncryption() const @@ -1201,7 +1201,7 @@ index 23d4394..74056f6 100644 #endif diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.h b/src/plugins/messageservices/smtp/smtpconfiguration.h -index ed115d5..7e03e95 100644 +index ed115d53..7e03e956 100644 --- a/src/plugins/messageservices/smtp/smtpconfiguration.h +++ b/src/plugins/messageservices/smtp/smtpconfiguration.h @@ -75,6 +75,7 @@ public: @@ -1221,7 +1221,7 @@ index ed115d5..7e03e95 100644 }; diff --git a/src/plugins/ssoauth/password/passwordplugin.cpp b/src/plugins/ssoauth/password/passwordplugin.cpp -index 1d2304c..20d2cf5 100644 +index 1d2304c1..20d2cf57 100644 --- a/src/plugins/ssoauth/password/passwordplugin.cpp +++ b/src/plugins/ssoauth/password/passwordplugin.cpp @@ -88,52 +88,80 @@ SSOPasswordPlugin::~SSOPasswordPlugin() @@ -1370,7 +1370,7 @@ index 1d2304c..20d2cf5 100644 } diff --git a/src/plugins/ssoauth/password/passwordplugin.h b/src/plugins/ssoauth/password/passwordplugin.h -index 1ae046d..a7a2567 100644 +index 1ae046d8..a7a25676 100644 --- a/src/plugins/ssoauth/password/passwordplugin.h +++ b/src/plugins/ssoauth/password/passwordplugin.h @@ -57,16 +57,16 @@ public: @@ -1396,5 +1396,5 @@ index 1ae046d..a7a2567 100644 #endif // PASSWORDPLUGIN_H -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0010-Handle-SMTP-response-504.patch b/rpm/0010-Handle-SMTP-response-504.patch index 30510d4..0ce6e78 100644 --- a/rpm/0010-Handle-SMTP-response-504.patch +++ b/rpm/0010-Handle-SMTP-response-504.patch @@ -1,22 +1,22 @@ -From c63f681dd192b2bbf8d3cd28b77170a837f3e7bc Mon Sep 17 00:00:00 2001 +From 44a6bb349ec2682372242a25bce9ac5f5ada4a49 Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Wed, 17 Dec 2014 17:16:45 +0000 -Subject: [PATCH 10/17] Handle SMTP response 504. +Subject: [PATCH 10/24] Handle SMTP response 504. Handle SMTP response 504 and reset auth method if auth from caps is enabled. --- - src/libraries/qmfclient/ssosessionmanager.cpp | 2 +- - .../qmfmessageserver/qmailauthenticator.cpp | 2 +- - .../qmfmessageserver/qmailauthenticator.h | 2 +- - .../messageservices/imap/imapauthenticator.cpp | 50 +++++++++++----------- - .../messageservices/smtp/smtpauthenticator.cpp | 49 +++++++++++---------- - src/plugins/messageservices/smtp/smtpclient.cpp | 28 ++++++++++-- - src/plugins/messageservices/smtp/smtpclient.h | 1 + + src/libraries/qmfclient/ssosessionmanager.cpp | 2 +- + .../qmfmessageserver/qmailauthenticator.cpp | 2 +- + .../qmfmessageserver/qmailauthenticator.h | 2 +- + .../imap/imapauthenticator.cpp | 50 +++++++++---------- + .../smtp/smtpauthenticator.cpp | 49 +++++++++--------- + .../messageservices/smtp/smtpclient.cpp | 28 +++++++++-- + src/plugins/messageservices/smtp/smtpclient.h | 1 + 7 files changed, 77 insertions(+), 57 deletions(-) diff --git a/src/libraries/qmfclient/ssosessionmanager.cpp b/src/libraries/qmfclient/ssosessionmanager.cpp -index edb467d..dd469ae 100644 +index edb467d1..dd469aec 100644 --- a/src/libraries/qmfclient/ssosessionmanager.cpp +++ b/src/libraries/qmfclient/ssosessionmanager.cpp @@ -113,7 +113,7 @@ void SSOSessionManager::cancel() @@ -29,7 +29,7 @@ index edb467d..dd469ae 100644 Returns true if the account has one email service enabled and a valid identity stored in ths accounts-sso database, otherwise returns false. diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.cpp b/src/libraries/qmfmessageserver/qmailauthenticator.cpp -index 373bcf2..0827ab5 100644 +index 373bcf21..0827ab58 100644 --- a/src/libraries/qmfmessageserver/qmailauthenticator.cpp +++ b/src/libraries/qmfmessageserver/qmailauthenticator.cpp @@ -131,7 +131,7 @@ QByteArray QMailAuthenticator::getAuthentication(const QMailAccountConfiguration @@ -42,7 +42,7 @@ index 373bcf2..0827ab5 100644 QMailServiceConfiguration configuration(svcCfg); if (!configuration.value("smtpusername").isEmpty() && authType == QMail::CramMd5Mechanism) { diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.h b/src/libraries/qmfmessageserver/qmailauthenticator.h -index 3891139..04ded03 100644 +index 3891139d..04ded033 100644 --- a/src/libraries/qmfmessageserver/qmailauthenticator.h +++ b/src/libraries/qmfmessageserver/qmailauthenticator.h @@ -46,7 +46,7 @@ public: @@ -55,7 +55,7 @@ index 3891139..04ded03 100644 static QByteArray getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge); #endif diff --git a/src/plugins/messageservices/imap/imapauthenticator.cpp b/src/plugins/messageservices/imap/imapauthenticator.cpp -index 38dd4d9..46de9f4 100644 +index 38dd4d9f..46de9f49 100644 --- a/src/plugins/messageservices/imap/imapauthenticator.cpp +++ b/src/plugins/messageservices/imap/imapauthenticator.cpp @@ -109,6 +109,25 @@ static QMail::SaslMechanism authFromCapabilities(const QStringList &capabilities @@ -139,7 +139,7 @@ index 38dd4d9..46de9f4 100644 } } else { diff --git a/src/plugins/messageservices/smtp/smtpauthenticator.cpp b/src/plugins/messageservices/smtp/smtpauthenticator.cpp -index 8e57a76..100bdc2 100644 +index 8e57a76f..100bdc27 100644 --- a/src/plugins/messageservices/smtp/smtpauthenticator.cpp +++ b/src/plugins/messageservices/smtp/smtpauthenticator.cpp @@ -76,6 +76,25 @@ static SmtpConfiguration::AuthType authFromCapabilities(const QStringList &capab @@ -222,7 +222,7 @@ index 8e57a76..100bdc2 100644 } } else { diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp -index ba0d5cf..9d8dfbd 100644 +index ba0d5cf0..9d8dfbde 100644 --- a/src/plugins/messageservices/smtp/smtpclient.cpp +++ b/src/plugins/messageservices/smtp/smtpclient.cpp @@ -112,6 +112,7 @@ SmtpClient::SmtpClient(QObject* parent) @@ -276,7 +276,7 @@ index ba0d5cf..9d8dfbd 100644 } else { #ifdef USE_ACCOUNTS_QT diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h -index 1ca218a..96852b2 100644 +index 1ca218a8..96852b2b 100644 --- a/src/plugins/messageservices/smtp/smtpclient.h +++ b/src/plugins/messageservices/smtp/smtpclient.h @@ -167,6 +167,7 @@ private: @@ -288,5 +288,5 @@ index 1ca218a..96852b2 100644 QTimer *authTimeout; -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0011-Recreate-SSO-identity-for-smtp-in-case-of-failure.patch b/rpm/0011-Recreate-SSO-identity-for-smtp-in-case-of-failure.patch index 884c33d..6e00664 100644 --- a/rpm/0011-Recreate-SSO-identity-for-smtp-in-case-of-failure.patch +++ b/rpm/0011-Recreate-SSO-identity-for-smtp-in-case-of-failure.patch @@ -1,7 +1,7 @@ -From e0b72aea5aa65d271973b33810e8099151fcfd14 Mon Sep 17 00:00:00 2001 +From c9f9d1e64dd30cd28212b3de8d469c064c3e0d6e Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Mon, 19 Jan 2015 11:25:01 +0200 -Subject: [PATCH 11/17] Recreate SSO identity for smtp in case of failure. +Subject: [PATCH 11/24] Recreate SSO identity for smtp in case of failure. Similar to what is already done for IMAP. --- @@ -10,7 +10,7 @@ Similar to what is already done for IMAP. 2 files changed, 12 insertions(+) diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp -index 9d8dfbd..19f6988 100644 +index 9d8dfbde..19f69880 100644 --- a/src/plugins/messageservices/smtp/smtpclient.cpp +++ b/src/plugins/messageservices/smtp/smtpclient.cpp @@ -118,6 +118,8 @@ SmtpClient::SmtpClient(QObject* parent) @@ -52,7 +52,7 @@ index 9d8dfbd..19f6988 100644 operationFailed(QMailServiceAction::Status::ErrLoginFailed, error); } diff --git a/src/plugins/messageservices/smtp/smtpclient.h b/src/plugins/messageservices/smtp/smtpclient.h -index 96852b2..12003c7 100644 +index 96852b2b..12003c7e 100644 --- a/src/plugins/messageservices/smtp/smtpclient.h +++ b/src/plugins/messageservices/smtp/smtpclient.h @@ -175,6 +175,8 @@ private: @@ -65,5 +65,5 @@ index 96852b2..12003c7 100644 #endif }; -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0012-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch b/rpm/0012-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch index 6592abe..093c037 100644 --- a/rpm/0012-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch +++ b/rpm/0012-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch @@ -1,23 +1,23 @@ -From 3b02bcda8d18d3ebc173588db0e5ac3b4ab464aa Mon Sep 17 00:00:00 2001 +From fdfddcefb80e40927e63c40eeca4058c5f62e698 Mon Sep 17 00:00:00 2001 From: Valerio Valerio Date: Mon, 2 Feb 2015 17:03:21 +0200 -Subject: [PATCH 12/17] Listen to sync schedule changes from buteo sync +Subject: [PATCH 12/24] Listen to sync schedule changes from buteo sync framework. This commit introduces d-bus listeners inside IMAP4 service to react to changes in the account schedule related to always-on mode and activate/deactivate IMAP IDLE. --- - src/plugins/messageservices/imap/imap.pro | 1 + - src/plugins/messageservices/imap/imapclient.cpp | 64 ++++++++++--- - src/plugins/messageservices/imap/imapclient.h | 5 +- - src/plugins/messageservices/imap/imapservice.cpp | 110 ++++++++++++++++++++--- - src/plugins/messageservices/imap/imapservice.h | 4 + - src/tools/systemd/messageserver5.service | 2 +- + src/plugins/messageservices/imap/imap.pro | 1 + + .../messageservices/imap/imapclient.cpp | 64 ++++++++-- + src/plugins/messageservices/imap/imapclient.h | 5 +- + .../messageservices/imap/imapservice.cpp | 110 +++++++++++++++--- + .../messageservices/imap/imapservice.h | 4 + + src/tools/systemd/messageserver5.service | 2 +- 6 files changed, 160 insertions(+), 26 deletions(-) diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro -index 1b5742b..8a2258b 100644 +index 1b5742b4..8a2258bd 100644 --- a/src/plugins/messageservices/imap/imap.pro +++ b/src/plugins/messageservices/imap/imap.pro @@ -7,6 +7,7 @@ QT = core network qmfclient qmfclient-private qmfmessageserver @@ -29,7 +29,7 @@ index 1b5742b..8a2258b 100644 contains(DEFINES,QT_QMF_USE_ALIGNEDTIMER) { diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp -index 949c254..40bbe54 100644 +index 949c254c..40bbe543 100644 --- a/src/plugins/messageservices/imap/imapclient.cpp +++ b/src/plugins/messageservices/imap/imapclient.cpp @@ -447,7 +447,8 @@ ImapClient::ImapClient(QObject* parent) @@ -196,7 +196,7 @@ index 949c254..40bbe54 100644 - #include "imapclient.moc" diff --git a/src/plugins/messageservices/imap/imapclient.h b/src/plugins/messageservices/imap/imapclient.h -index bd4b320..d731165 100644 +index bd4b320f..d7311655 100644 --- a/src/plugins/messageservices/imap/imapclient.h +++ b/src/plugins/messageservices/imap/imapclient.h @@ -68,7 +68,6 @@ public: @@ -233,7 +233,7 @@ index bd4b320..d731165 100644 QMap detachedTempFiles; diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp -index c5c6118..157da85 100644 +index c5c61189..157da852 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp @@ -47,6 +47,12 @@ @@ -432,7 +432,7 @@ index c5c6118..157da85 100644 class ImapConfigurator : public QMailMessageServiceConfigurator diff --git a/src/plugins/messageservices/imap/imapservice.h b/src/plugins/messageservices/imap/imapservice.h -index b3e8dd9..9a28814 100644 +index b3e8dd97..9a28814f 100644 --- a/src/plugins/messageservices/imap/imapservice.h +++ b/src/plugins/messageservices/imap/imapservice.h @@ -89,6 +89,8 @@ protected slots: @@ -454,7 +454,7 @@ index b3e8dd9..9a28814 100644 }; diff --git a/src/tools/systemd/messageserver5.service b/src/tools/systemd/messageserver5.service -index a5aa05a..9622d70 100644 +index a5aa05a9..9622d701 100644 --- a/src/tools/systemd/messageserver5.service +++ b/src/tools/systemd/messageserver5.service @@ -2,7 +2,7 @@ @@ -467,5 +467,5 @@ index a5aa05a..9622d70 100644 [Service] -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0013-Do-AUTHENTICATE-PLAIN-in-two-stages.patch b/rpm/0013-Do-AUTHENTICATE-PLAIN-in-two-stages.patch index b7c03ef..9d71f49 100644 --- a/rpm/0013-Do-AUTHENTICATE-PLAIN-in-two-stages.patch +++ b/rpm/0013-Do-AUTHENTICATE-PLAIN-in-two-stages.patch @@ -1,19 +1,19 @@ -From 4a87f431dc1c8f4a99a7b767fc450f7255a6baab Mon Sep 17 00:00:00 2001 +From 2585663419f2286b3320439a9930e657a82d64a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= Date: Fri, 20 Feb 2015 15:06:21 +0200 -Subject: [PATCH 13/17] Do AUTHENTICATE PLAIN in two stages +Subject: [PATCH 13/24] Do AUTHENTICATE PLAIN in two stages Some servers(e.g yandex.ru) do not support AUTHENTICATE PLAIN in a single command, according to RFC4616 this way is optional, so we allways perform the authentication in two stages that is gurantee to be supported by all implementations of the protocol. --- - .../messageservices/imap/imapauthenticator.cpp | 11 ++++++++--- - src/plugins/ssoauth/password/passwordplugin.cpp | 20 +++++++++++--------- + .../imap/imapauthenticator.cpp | 11 +++++++--- + .../ssoauth/password/passwordplugin.cpp | 20 ++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/plugins/messageservices/imap/imapauthenticator.cpp b/src/plugins/messageservices/imap/imapauthenticator.cpp -index 46de9f4..97d9476 100644 +index 46de9f49..97d94764 100644 --- a/src/plugins/messageservices/imap/imapauthenticator.cpp +++ b/src/plugins/messageservices/imap/imapauthenticator.cpp @@ -44,11 +44,11 @@ @@ -53,7 +53,7 @@ index 46de9f4..97d9476 100644 return QMailAuthenticator::getResponse(svcCfg, challenge); #endif diff --git a/src/plugins/ssoauth/password/passwordplugin.cpp b/src/plugins/ssoauth/password/passwordplugin.cpp -index 20d2cf5..279f972 100644 +index 20d2cf57..279f9721 100644 --- a/src/plugins/ssoauth/password/passwordplugin.cpp +++ b/src/plugins/ssoauth/password/passwordplugin.cpp @@ -94,20 +94,22 @@ QMap > SSOPasswordPlugin::getIMAPAuthentication(const @@ -98,5 +98,5 @@ index 20d2cf5..279f972 100644 // Currently pop account does not have any auth settings, so only plain can be used -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0014-Prevent-push-enabled-status-to-go-out-of-sync.patch b/rpm/0014-Prevent-push-enabled-status-to-go-out-of-sync.patch index 746cbe6..649d1f4 100644 --- a/rpm/0014-Prevent-push-enabled-status-to-go-out-of-sync.patch +++ b/rpm/0014-Prevent-push-enabled-status-to-go-out-of-sync.patch @@ -1,14 +1,14 @@ -From 2f315e17d074d9a73c010b77958b22638fb412a5 Mon Sep 17 00:00:00 2001 +From 505f4031f439ba3b42358e2d03d29469a798340f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= Date: Mon, 23 Feb 2015 13:31:30 +0200 -Subject: [PATCH 14/17] Prevent push enabled status to go out of sync. +Subject: [PATCH 14/24] Prevent push enabled status to go out of sync. --- - src/plugins/messageservices/imap/imapservice.cpp | 57 ++++++++++++++---------- + .../messageservices/imap/imapservice.cpp | 57 +++++++++++-------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp -index 157da85..c8300aa 100644 +index 157da852..c8300aa4 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp @@ -65,7 +65,10 @@ QString connectionSettings(ImapConfiguration &config) @@ -131,5 +131,5 @@ index 157da85..c8300aa 100644 } } -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0015-Check-if-IDLE-connection-needs-to-be-established-aft.patch b/rpm/0015-Check-if-IDLE-connection-needs-to-be-established-aft.patch index 2fdaccc..9f598ab 100644 --- a/rpm/0015-Check-if-IDLE-connection-needs-to-be-established-aft.patch +++ b/rpm/0015-Check-if-IDLE-connection-needs-to-be-established-aft.patch @@ -1,7 +1,7 @@ -From 7521af99e6549f2394ec84495f36696b61866c2c Mon Sep 17 00:00:00 2001 +From 1939da8ce6faf3c02d064a64fe571eef783fe3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= Date: Mon, 11 May 2015 15:12:07 +0300 -Subject: [PATCH 15/17] Check if IDLE connection needs to be established after +Subject: [PATCH 15/24] Check if IDLE connection needs to be established after login. Fixes JB#28693 Some servers only advertise full capabilities after sucessful login, @@ -12,7 +12,7 @@ cases. 1 file changed, 10 insertions(+) diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp -index 40bbe54..d78d897 100644 +index 40bbe543..d78d897e 100644 --- a/src/plugins/messageservices/imap/imapclient.cpp +++ b/src/plugins/messageservices/imap/imapclient.cpp @@ -800,6 +800,16 @@ void ImapClient::commandTransition(ImapCommand command, OperationStatus status) @@ -33,5 +33,5 @@ index 40bbe54..d78d897 100644 bool compressCapable(_protocol.capabilities().contains("COMPRESS=DEFLATE", Qt::CaseInsensitive)); if (!_protocol.encrypted() && QMFALLOWCOMPRESS && compressCapable && !_protocol.compress()) { -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0016-Revert-Fix-bundled-zlib-detection.patch b/rpm/0016-Revert-Fix-bundled-zlib-detection.patch index 3073c14..187ba6a 100644 --- a/rpm/0016-Revert-Fix-bundled-zlib-detection.patch +++ b/rpm/0016-Revert-Fix-bundled-zlib-detection.patch @@ -1,7 +1,7 @@ -From 571935b04940e1b7321a059d2efcd599081dbc70 Mon Sep 17 00:00:00 2001 +From ad8c7c245ba4004e9737d384205a3a34d2767669 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Tue, 14 Aug 2018 14:04:19 +0300 -Subject: [PATCH 16/17] Revert "Fix bundled zlib detection" +Subject: [PATCH 16/24] Revert "Fix bundled zlib detection" This reverts commit 7e2579c1fbfc077f3d95eceed5c79236752acb87. @@ -12,7 +12,7 @@ qt gets updated. 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro -index 8a2258b..e4897df 100644 +index 8a2258bd..e4897df9 100644 --- a/src/plugins/messageservices/imap/imap.pro +++ b/src/plugins/messageservices/imap/imap.pro @@ -58,9 +58,17 @@ SOURCES += imapclient.cpp \ @@ -37,5 +37,5 @@ index 8a2258b..e4897df 100644 } -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0017-Add-signature-settings-in-account.patch b/rpm/0017-Add-signature-settings-in-account.patch index a9f8b83..0dc7f3c 100644 --- a/rpm/0017-Add-signature-settings-in-account.patch +++ b/rpm/0017-Add-signature-settings-in-account.patch @@ -1,16 +1,16 @@ -From 06256765a2a6e22f00aa2cbdfcd2be7c37555a34 Mon Sep 17 00:00:00 2001 +From 5aa26215ddcb4764fed2726369bb3f9c6b70a372 Mon Sep 17 00:00:00 2001 From: Damien Caliste Date: Mon, 5 Nov 2018 16:11:29 +0100 -Subject: [PATCH 17/17] Add signature settings in account +Subject: [PATCH 17/24] Add signature settings in account --- - src/libraries/qmfclient/qmailaccount.cpp | 48 ++++++++++++++++++++++++++++++++ - src/libraries/qmfclient/qmailaccount.h | 6 ++++ - src/libraries/qmfclient/qmailstore_p.cpp | 18 ++++++++++++ + src/libraries/qmfclient/qmailaccount.cpp | 48 ++++++++++++++++++++++++ + src/libraries/qmfclient/qmailaccount.h | 6 +++ + src/libraries/qmfclient/qmailstore_p.cpp | 18 +++++++++ 3 files changed, 72 insertions(+) diff --git a/src/libraries/qmfclient/qmailaccount.cpp b/src/libraries/qmfclient/qmailaccount.cpp -index 8579636..b477e90 100644 +index 85796363..b477e907 100644 --- a/src/libraries/qmfclient/qmailaccount.cpp +++ b/src/libraries/qmfclient/qmailaccount.cpp @@ -61,6 +61,7 @@ static quint64 canCreateFoldersFlag = 0; @@ -38,10 +38,11 @@ index 8579636..b477e90 100644 /*! Creates an uninitialised account object. -@@ -480,6 +484,50 @@ void QMailAccount::setSignature(const QString &str) +@@ -479,6 +483,50 @@ void QMailAccount::setSignature(const QString &str) + d->_signature = str; } - /*! ++/*! + Returns an id list configured for the account. These ids should be used to + numericaly sign an outgoing mail of this account. + @@ -85,12 +86,11 @@ index 8579636..b477e90 100644 + d->_cryptoSignatureType = type; +} + -+/*! + /*! Returns the time the account was last succesfully synchronized. - Should be updated by QMailRetrievalAction::retrieveMessageList() when an account is synchronized. diff --git a/src/libraries/qmfclient/qmailaccount.h b/src/libraries/qmfclient/qmailaccount.h -index 8ba3efa..9306dd9 100644 +index 8ba3efa9..9306dd9c 100644 --- a/src/libraries/qmfclient/qmailaccount.h +++ b/src/libraries/qmfclient/qmailaccount.h @@ -77,6 +77,7 @@ public: @@ -114,7 +114,7 @@ index 8ba3efa..9306dd9 100644 void setLastSynchronized(const QMailTimeStamp &synced); diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp -index 599b573..bf7331e 100644 +index ab509afd..a6913276 100644 --- a/src/libraries/qmfclient/qmailstore_p.cpp +++ b/src/libraries/qmfclient/qmailstore_p.cpp @@ -2671,6 +2671,10 @@ bool SSOAccountSatisfyTheProperty(Accounts::Account* ssoAccount, const QMailAcco @@ -128,7 +128,7 @@ index 599b573..bf7331e 100644 bool hasPersistentConnection = ssoAccount->valueAsBool("hasPersistentConnection", false); status &= (~QMailAccount::HasPersistentConnection); status |= hasPersistentConnection?(QMailAccount::HasPersistentConnection):0; -@@ -3224,6 +3228,8 @@ bool QMailStorePrivate::initStore() +@@ -3223,6 +3227,8 @@ bool QMailStorePrivate::initStore() 63, true, const_cast(&QMailMessage::Todo), t, false) || attemptRegisterStatusBit(QLatin1String("HasSignature"), QLatin1String("messagestatus"), 63, true, const_cast(&QMailMessage::HasSignature), t, false) @@ -137,7 +137,7 @@ index 599b573..bf7331e 100644 || attemptRegisterStatusBit(QLatin1String("NoNotification"), QLatin1String("messagestatus"), 63, true, const_cast(&QMailMessage::NoNotification), t, false); -@@ -3717,17 +3723,21 @@ QMailAccount QMailStorePrivate::extractAccount(const QSharedPointervalueAsBool("canTransmit", true); const bool& appendSignature = ssoAccount->valueAsBool("signatureEnabled", true); const bool& hasPersistentConnection = ssoAccount->valueAsBool("hasPersistentConnection", false); @@ -159,7 +159,7 @@ index 599b573..bf7331e 100644 if ((static_cast(ssoAccount->valueAsUInt64("lastSynchronized"))) == 0) { result.setLastSynchronized(QMailTimeStamp()); -@@ -6229,7 +6239,11 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptAddAccount(QMailAccou +@@ -6230,7 +6240,11 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptAddAccount(QMailAccou ssoAccount->setValue("signatureEnabled", appendSignature); const bool hasPersistentConnection = (account->status() & QMailAccount::HasPersistentConnection); ssoAccount->setValue("hasPersistentConnection", hasPersistentConnection); @@ -171,7 +171,7 @@ index 599b573..bf7331e 100644 ssoAccount->setValue("emailaddress", account->fromAddress().address()); ssoAccount->setValue("fullName", account->fromAddress().name()); //Account was never synced -@@ -7033,7 +7047,11 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateAccount(QMailAc +@@ -7034,7 +7048,11 @@ QMailStorePrivate::AttemptResult QMailStorePrivate::attemptUpdateAccount(QMailAc ssoAccount->setValue("signatureEnabled", signatureEnabled); bool hasPersistentConnection = account->status() & QMailAccount::HasPersistentConnection; ssoAccount->setValue("hasPersistentConnection", hasPersistentConnection); @@ -184,5 +184,5 @@ index 599b573..bf7331e 100644 ssoAccount->setValue("fullName", account->fromAddress().name()); if (account->lastSynchronized().isValid()) { -- -1.8.3-rc3 +2.17.1 diff --git a/rpm/0018-Use-socket-s-local-address-for-HELO-and-EHLO-message.patch b/rpm/0018-Use-socket-s-local-address-for-HELO-and-EHLO-message.patch index 3d584d9..2f7dce5 100644 --- a/rpm/0018-Use-socket-s-local-address-for-HELO-and-EHLO-message.patch +++ b/rpm/0018-Use-socket-s-local-address-for-HELO-and-EHLO-message.patch @@ -1,7 +1,7 @@ -From f1d94263e07c729a55abf227ca7a3fc4137a4445 Mon Sep 17 00:00:00 2001 +From 76dfe79d9e6dbed503ab459e4a108dfbc447a8fa Mon Sep 17 00:00:00 2001 From: Raine Makelainen Date: Tue, 23 Jul 2019 11:44:27 +0300 -Subject: [PATCH 18/18] Use socket's local address for HELO and EHLO messages +Subject: [PATCH 18/24] Use socket's local address for HELO and EHLO messages Signed-off-by: Raine Makelainen --- @@ -65,5 +65,5 @@ index 19f69880..0300dcf1 100644 status = Helo; } else { -- -2.21.0 +2.17.1 diff --git a/rpm/0019-Use-EightBit-encoding-instead-of-Base64-for-text-typ.patch b/rpm/0019-Use-EightBit-encoding-instead-of-Base64-for-text-typ.patch index 0acf8e0..43bfbbb 100644 --- a/rpm/0019-Use-EightBit-encoding-instead-of-Base64-for-text-typ.patch +++ b/rpm/0019-Use-EightBit-encoding-instead-of-Base64-for-text-typ.patch @@ -1,7 +1,7 @@ -From 6648e72b7db42dac51468c5225d89b2691019572 Mon Sep 17 00:00:00 2001 +From b315ca2e5901c4a139e99ebc2ef198ded1a1c227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= Date: Mon, 30 Sep 2019 14:11:57 +0300 -Subject: [PATCH] Use EightBit encoding instead of Base64 for text types +Subject: [PATCH 19/24] Use EightBit encoding instead of Base64 for text types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -33,5 +33,5 @@ index 71491f1a..d7678678 100644 addedSome = true; } -- -2.21.0 +2.17.1 diff --git a/rpm/0020-Follow-the-synchronizationEnabled-flag-when-folders.patch b/rpm/0020-Follow-the-synchronizationEnabled-flag-when-folders-.patch similarity index 83% rename from rpm/0020-Follow-the-synchronizationEnabled-flag-when-folders.patch rename to rpm/0020-Follow-the-synchronizationEnabled-flag-when-folders-.patch index 7fab476..8db7281 100644 --- a/rpm/0020-Follow-the-synchronizationEnabled-flag-when-folders.patch +++ b/rpm/0020-Follow-the-synchronizationEnabled-flag-when-folders-.patch @@ -1,7 +1,8 @@ -From e3cb15294cb3ec8a2d127b50cc3d9e79839ae2c7 Mon Sep 17 00:00:00 2001 +From 0316bec0142d035837e1ddbc14317ba4d8cc27d0 Mon Sep 17 00:00:00 2001 From: Damien Caliste Date: Fri, 24 Jan 2020 16:28:37 +0100 -Subject: [PATCH] Follow the synchronizationEnabled flag when folders are not specified +Subject: [PATCH 20/24] Follow the synchronizationEnabled flag when folders are + not specified If the synchronizationEnabled flag is set to false, a variety of strategy, like search, folder listing, will not search in @@ -13,12 +14,16 @@ It activates it only for message retrieval in all folders. Change-Id: Iebec872984c7e2650167ae585b06bfa3d8cd6990 --- + .../messageservices/imap/imapservice.cpp | 4 +++ + .../messageservices/imap/imapstrategy.cpp | 32 +++++++++++++------ + .../messageservices/imap/imapstrategy.h | 8 +++-- + 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp -index eca22f7..339d44e 100644 +index c8300aa4..86b88a2c 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp -@@ -213,6 +213,7 @@ +@@ -228,6 +228,7 @@ bool ImapService::Source::retrieveFolderList(const QMailAccountId &accountId, co _service->_client->strategyContext()->foldersOnlyStrategy.setBase(folderId); _service->_client->strategyContext()->foldersOnlyStrategy.setQuickList(!folderId.isValid()); _service->_client->strategyContext()->foldersOnlyStrategy.setDescending(descending); @@ -26,7 +31,7 @@ index eca22f7..339d44e 100644 appendStrategy(&_service->_client->strategyContext()->foldersOnlyStrategy); if(!_unavailable) return initiateStrategy(); -@@ -304,6 +305,7 @@ +@@ -322,6 +323,7 @@ bool ImapService::Source::retrieveMessageLists(const QMailAccountId &accountId, _service->_client->strategyContext()->retrieveMessageListStrategy.setOperation(_service->_client->strategyContext(), QMailRetrievalAction::Auto); _service->_client->strategyContext()->retrieveMessageListStrategy.selectedFoldersAppend(folderIds); @@ -34,7 +39,7 @@ index eca22f7..339d44e 100644 appendStrategy(&_service->_client->strategyContext()->retrieveMessageListStrategy); if(!_unavailable) return initiateStrategy(); -@@ -496,6 +498,7 @@ +@@ -529,6 +531,7 @@ bool ImapService::Source::retrieveAll(const QMailAccountId &accountId) _service->_client->strategyContext()->retrieveAllStrategy.setQuickList(false); _service->_client->strategyContext()->retrieveAllStrategy.setDescending(true); _service->_client->strategyContext()->retrieveAllStrategy.setOperation(_service->_client->strategyContext(), QMailRetrievalAction::Auto); @@ -42,7 +47,7 @@ index eca22f7..339d44e 100644 appendStrategy(&_service->_client->strategyContext()->retrieveAllStrategy); if(!_unavailable) return initiateStrategy(); -@@ -571,6 +574,7 @@ +@@ -607,6 +610,7 @@ bool ImapService::Source::synchronize(const QMailAccountId &accountId) _service->_client->strategyContext()->synchronizeAccountStrategy.setQuickList(false); _service->_client->strategyContext()->synchronizeAccountStrategy.setDescending(true); _service->_client->strategyContext()->synchronizeAccountStrategy.setOperation(_service->_client->strategyContext(), QMailRetrievalAction::Auto); @@ -51,10 +56,10 @@ index eca22f7..339d44e 100644 if(!_unavailable) return initiateStrategy(); diff --git a/src/plugins/messageservices/imap/imapstrategy.cpp b/src/plugins/messageservices/imap/imapstrategy.cpp -index 916afdf..142fd0c 100644 +index 916afdfd..142fd0c7 100644 --- a/src/plugins/messageservices/imap/imapstrategy.cpp +++ b/src/plugins/messageservices/imap/imapstrategy.cpp -@@ -2208,15 +2208,13 @@ +@@ -2208,15 +2208,13 @@ void ImapFolderListStrategy::processNextFolder(ImapStrategyContextBase *context) bool ImapFolderListStrategy::nextFolder() { @@ -72,7 +77,7 @@ index 916afdf..142fd0c 100644 } return false; -@@ -2233,11 +2231,6 @@ +@@ -2233,11 +2231,6 @@ void ImapFolderListStrategy::processFolder(ImapStrategyContextBase *context) context->progressChanged(++_processed, _processable); } @@ -84,7 +89,7 @@ index 916afdf..142fd0c 100644 void ImapFolderListStrategy::folderListCompleted(ImapStrategyContextBase *context) { // We have retrieved all the folders - process any messages -@@ -2369,6 +2362,27 @@ +@@ -2369,6 +2362,27 @@ void ImapSynchronizeBaseStrategy::previewDiscoveredMessages(ImapStrategyContextB } } @@ -113,10 +118,10 @@ index 916afdf..142fd0c 100644 { if (_retrieveUids.isEmpty()) { diff --git a/src/plugins/messageservices/imap/imapstrategy.h b/src/plugins/messageservices/imap/imapstrategy.h -index 1f418e4..260fd58 100644 +index 1f418e44..260fd580 100644 --- a/src/plugins/messageservices/imap/imapstrategy.h +++ b/src/plugins/messageservices/imap/imapstrategy.h -@@ -396,7 +396,6 @@ +@@ -396,7 +396,6 @@ protected: virtual void processNextFolder(ImapStrategyContextBase *context); virtual bool nextFolder(); virtual void processFolder(ImapStrategyContextBase *context); @@ -124,7 +129,7 @@ index 1f418e4..260fd58 100644 void updateUndiscoveredCount(ImapStrategyContextBase *context); -@@ -457,19 +456,23 @@ +@@ -457,19 +456,23 @@ private: class ImapSynchronizeBaseStrategy : public ImapFolderListStrategy { public: @@ -149,7 +154,7 @@ index 1f418e4..260fd58 100644 virtual void previewDiscoveredMessages(ImapStrategyContextBase *context); virtual bool selectNextPreviewFolder(ImapStrategyContextBase *context); -@@ -486,6 +489,7 @@ +@@ -486,6 +489,7 @@ protected: int _outstandingPreviews; private: @@ -157,3 +162,6 @@ index 1f418e4..260fd58 100644 uint _progress; uint _total; }; +-- +2.17.1 + diff --git a/rpm/0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnab.patch b/rpm/0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnabl.patch similarity index 79% rename from rpm/0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnab.patch rename to rpm/0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnabl.patch index 985f500..e987133 100644 --- a/rpm/0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnab.patch +++ b/rpm/0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnabl.patch @@ -1,7 +1,8 @@ -From 1bb1394a3501b593bc2ce0c42b13720cc67a9609 Mon Sep 17 00:00:00 2001 +From 6d06465fa8907cc428facfa673ede25de52dc46a Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones -Date: Fri, 07 Feb 2020 19:29:59 +0200 -Subject: [PATCH] Set new IMAP folders to inherit SynchronizationEnabled flag +Date: Fri, 7 Feb 2020 19:29:59 +0200 +Subject: [PATCH 21/24] Set new IMAP folders to inherit SynchronizationEnabled + flag When new folders are received from the server, the client-side SynchronizationEnabled flag must be set for them. Previously they were @@ -15,12 +16,14 @@ folder) then the flag is set to true as before. Change-Id: If43d5e2b4469a402d203841c04cc4b1b30ffc3b1 --- + src/plugins/messageservices/imap/imapclient.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp -index a710d48..7a6c80a 100644 +index d78d897e..cfb11519 100644 --- a/src/plugins/messageservices/imap/imapclient.cpp +++ b/src/plugins/messageservices/imap/imapclient.cpp -@@ -822,8 +822,11 @@ +@@ -950,8 +950,11 @@ void ImapClient::mailboxListed(const QString &flags, const QString &path) // This element needs to be created QMailFolder folder(mailboxPath, parentId, _config.id()); folder.setDisplayName(QMailCodec::decodeModifiedUtf7(*it)); @@ -33,3 +36,6 @@ index a710d48..7a6c80a 100644 // The reported flags pertain to the listed folder only QString folderFlags; +-- +2.17.1 + diff --git a/rpm/0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch b/rpm/0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch index a7b4581..db19771 100644 --- a/rpm/0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch +++ b/rpm/0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch @@ -1,7 +1,7 @@ -From 995f7313993ced632e883aa0eec9a4db580fa340 Mon Sep 17 00:00:00 2001 +From e898956d0b1a5da2ae55ae2ba0530d39e9835f67 Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones Date: Wed, 25 Mar 2020 11:59:52 +0200 -Subject: [PATCH 22/22] Set qmf-accountscheck to be run by the booster +Subject: [PATCH 22/24] Set qmf-accountscheck to be run by the booster In order for qmf-accountscheck to gain the privileges needed to read the accounts database, it must be invoked by the booster (it also needs @@ -44,5 +44,5 @@ index 689ad320..15aa630e 100644 + +OTHER_FILES += systemd/*.service -- -2.25.0 +2.17.1 diff --git a/rpm/0023-Retrieve-message-lists-based-on-the-folder-sync-poli.patch b/rpm/0023-Retrieve-message-lists-based-on-the-folder-sync-poli.patch index 869c19d..a311306 100644 --- a/rpm/0023-Retrieve-message-lists-based-on-the-folder-sync-poli.patch +++ b/rpm/0023-Retrieve-message-lists-based-on-the-folder-sync-poli.patch @@ -1,7 +1,7 @@ -From 315a8a1c60150145a42c21023095e878bc1f4a9b Mon Sep 17 00:00:00 2001 +From 0e6d9553c4306e1129a510c1a27d968daaa11eac Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones Date: Wed, 8 Jul 2020 15:51:08 +0000 -Subject: [PATCH] Retrieve message lists based on the folder sync policy +Subject: [PATCH 23/24] Retrieve message lists based on the folder sync policy Uses the folder sync policy extracted from the account and applies it when downloading messages from different folders. @@ -172,7 +172,7 @@ index 3d083d0f..fea94c53 100644 #endif diff --git a/src/plugins/messageservices/imap/imapservice.cpp b/src/plugins/messageservices/imap/imapservice.cpp -index 86b88a2c..71664b84 100644 +index 86b88a2c..3050abb3 100644 --- a/src/plugins/messageservices/imap/imapservice.cpp +++ b/src/plugins/messageservices/imap/imapservice.cpp @@ -228,7 +228,7 @@ bool ImapService::Source::retrieveFolderList(const QMailAccountId &accountId, co @@ -212,7 +212,7 @@ index 86b88a2c..71664b84 100644 _service->_client->strategyContext()->retrieveMessageListStrategy.setOperation(_service->_client->strategyContext(), QMailRetrievalAction::Auto); _service->_client->strategyContext()->retrieveMessageListStrategy.selectedFoldersAppend(folderIds); - _service->_client->strategyContext()->retrieveMessageListStrategy.setIgnoreSyncFlag(!_folderIds.isEmpty()); -+ _service->_client->strategyContext()->retrieveMessageListStrategy.setFolderSyncPolicy(folderSyncPolicy); ++ _service->_client->strategyContext()->retrieveMessageListStrategy.setFolderSyncPolicy(_folderIds.isEmpty() ? folderSyncPolicy : QMailAccount::SyncEverything); appendStrategy(&_service->_client->strategyContext()->retrieveMessageListStrategy); if(!_unavailable) return initiateStrategy(); @@ -384,5 +384,5 @@ index 3b8663a7..7b6492ab 100644 _service->_client.newConnection(); _unavailable = true; -- -2.26.2 +2.17.1 diff --git a/rpm/0024-Apply-folder-policy-to-always-on-connection.patch b/rpm/0024-Apply-folder-policy-to-always-on-connection.patch index 26b3654..f2c0881 100644 --- a/rpm/0024-Apply-folder-policy-to-always-on-connection.patch +++ b/rpm/0024-Apply-folder-policy-to-always-on-connection.patch @@ -1,7 +1,7 @@ -From d1f516d5bf10f6b0b2f4ee68b4d20d16a00989d2 Mon Sep 17 00:00:00 2001 +From b40310c55a1d555c9e9fbe486ecc89b58ca9e7f6 Mon Sep 17 00:00:00 2001 From: David Llewellyn-Jones Date: Wed, 22 Jul 2020 11:08:24 +0000 -Subject: [PATCH] Apply folder policy to always on connection +Subject: [PATCH 24/24] Apply folder policy to always on connection Changes the configuration so that the push folders are generated from the the policy and folder flags, rather than a separate configuration @@ -124,5 +124,5 @@ index 07289a1c..c8dc7b9e 100644 int ImapConfiguration::checkInterval() const -- -2.26.2 +2.17.1 diff --git a/rpm/qmf-qt5.spec b/rpm/qmf-qt5.spec index fc80d1e..d1e013a 100644 --- a/rpm/qmf-qt5.spec +++ b/rpm/qmf-qt5.spec @@ -29,15 +29,15 @@ BuildRequires: gpgme-devel BuildRequires: systemd Requires: buteo-syncfw-qt5 >= 0.7.16 -Patch1: 0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch -Patch2: 0002-Introduce-acceptUntrustedCertificates-configuration.patch -Patch3: 0003-fix-tests-installation-path.patch -Patch4: 0004-Accounts-qt-integration.patch -Patch5: 0005-Start-messageserver-on-system-startup-in-case-there-.patch -Patch6: 0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch -Patch7: 0007-Use-Qt5-booster-to-save-memory.patch -Patch8: 0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch -Patch9: 0009-Introduce-discovery-of-authentication-from-the-anoun.patch +Patch1: 0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch +Patch2: 0002-Introduce-acceptUntrustedCertificates-configuration.patch +Patch3: 0003-fix-tests-installation-path.patch +Patch4: 0004-Accounts-qt-integration.patch +Patch5: 0005-Start-messageserver-on-system-startup-in-case-there-.patch +Patch6: 0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch +Patch7: 0007-Use-Qt5-booster-to-save-memory.patch +Patch8: 0008-Introduce-QMailAccount-HasPersistentConnection-statu.patch +Patch9: 0009-Introduce-discovery-of-authentication-from-the-anoun.patch Patch10: 0010-Handle-SMTP-response-504.patch Patch11: 0011-Recreate-SSO-identity-for-smtp-in-case-of-failure.patch Patch12: 0012-Listen-to-sync-schedule-changes-from-buteo-sync-fram.patch @@ -48,8 +48,8 @@ Patch16: 0016-Revert-Fix-bundled-zlib-detection.patch Patch17: 0017-Add-signature-settings-in-account.patch Patch18: 0018-Use-socket-s-local-address-for-HELO-and-EHLO-message.patch Patch19: 0019-Use-EightBit-encoding-instead-of-Base64-for-text-typ.patch -Patch20: 0020-Follow-the-synchronizationEnabled-flag-when-folders.patch -Patch21: 0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnab.patch +Patch20: 0020-Follow-the-synchronizationEnabled-flag-when-folders-.patch +Patch21: 0021-Set-new-IMAP-folders-to-inherit-SynchronizationEnabl.patch Patch22: 0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch Patch23: 0023-Retrieve-message-lists-based-on-the-folder-sync-poli.patch Patch24: 0024-Apply-folder-policy-to-always-on-connection.patch