Merge branch 'jb32000' into 'master'

Rebase on upstream after fix to decrease count on EXPUNGE

See merge request mer-core/messagingframework!31

rpm/0001-Stop-_incomingDataTimer-when-imapprotocol-object-is-.patch

@@ -1,7 +1,7 @@
-From 861537a78563e2a4cc92bcd1913f021421b7b8e6 Mon Sep 17 00:00:00 2001
+From 39a360d49653006e951b96315aa0e4587f9a6fcd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
 Date: Mon, 23 Feb 2015 13:08:24 +0200
-Subject: [PATCH 01/19] Stop _incomingDataTimer when imapprotocol object is
+Subject: [PATCH 01/17] Stop _incomingDataTimer when imapprotocol object is
  destroyed.
 
 A crash occurs in case the timer is active and the object is destroyed.
@@ -10,10 +10,10 @@ 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 6de98d68..2c945d3f 100644
+index 4df62a5..984e263 100644
 --- a/src/plugins/messageservices/imap/imapprotocol.cpp
 +++ b/src/plugins/messageservices/imap/imapprotocol.cpp
-@@ -3012,6 +3012,9 @@ ImapProtocol::ImapProtocol()
+@@ -3019,6 +3019,9 @@ ImapProtocol::ImapProtocol()
 
  ImapProtocol::~ImapProtocol()
  {
@@ -24,5 +24,5 @@ index 6de98d68..2c945d3f 100644
      delete _fsm;
  }
 -- 
-2.17.2
+1.8.3-rc3
 

rpm/0002-Introduce-acceptUntrustedCertificates-configuration.patch

@@ -1,27 +1,27 @@
-From 036c88b752d8926f1a699452a121f88c211c92ce Mon Sep 17 00:00:00 2001
+From bd8c9b6476c2ce24179c39b1c7624a0de260627a Mon Sep 17 00:00:00 2001
 From: Pekka Vuorela <pekka.vuorela@jolla.com>
 Date: Mon, 13 Aug 2018 15:45:24 +0300
-Subject: [PATCH 02/19] Introduce acceptUntrustedCertificates() configuration.
+Subject: [PATCH 02/17] Introduce acceptUntrustedCertificates() configuration.
 
 ---
- 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 ++
+ 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 ++
  14 files changed, 117 insertions(+), 28 deletions(-)
 
 diff --git a/src/libraries/qmfclient/qmailserviceaction.h b/src/libraries/qmfclient/qmailserviceaction.h
-index 3f6a1421..6ba4020e 100644
+index 3f6a142..6ba4020 100644
 --- a/src/libraries/qmfclient/qmailserviceaction.h
 +++ b/src/libraries/qmfclient/qmailserviceaction.h
 @@ -99,6 +99,8 @@ public:
@@ -34,7 +34,7 @@ index 3f6a1421..6ba4020e 100644
          };
 
 diff --git a/src/libraries/qmfmessageserver/qmailtransport.cpp b/src/libraries/qmfmessageserver/qmailtransport.cpp
-index e2699b24..b9d8e52a 100644
+index e2699b2..b9d8e52 100644
 --- a/src/libraries/qmfmessageserver/qmailtransport.cpp
 +++ b/src/libraries/qmfmessageserver/qmailtransport.cpp
 @@ -47,6 +47,7 @@
@@ -102,7 +102,7 @@ index e2699b24..b9d8e52a 100644
 
  /*! \internal */
 diff --git a/src/libraries/qmfmessageserver/qmailtransport.h b/src/libraries/qmfmessageserver/qmailtransport.h
-index 9b56ed64..f8113661 100644
+index 9b56ed6..f811366 100644
 --- a/src/libraries/qmfmessageserver/qmailtransport.h
 +++ b/src/libraries/qmfmessageserver/qmailtransport.h
 @@ -35,6 +35,9 @@
@@ -143,7 +143,7 @@ index 9b56ed64..f8113661 100644
 
  #endif
 diff --git a/src/plugins/messageservices/imap/imapconfiguration.cpp b/src/plugins/messageservices/imap/imapconfiguration.cpp
-index b4004bd6..07289a1c 100644
+index b4004bd..07289a1 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 b4004bd6..07289a1c 100644
 
  void ImapConfigurationEditor::setDeleteMail(bool b)
 diff --git a/src/plugins/messageservices/imap/imapconfiguration.h b/src/plugins/messageservices/imap/imapconfiguration.h
-index f0c0569a..69dc8ad1 100644
+index f0c0569..69dc8ad 100644
 --- a/src/plugins/messageservices/imap/imapconfiguration.h
 +++ b/src/plugins/messageservices/imap/imapconfiguration.h
 @@ -85,6 +85,10 @@ public:
@@ -198,10 +198,10 @@ index f0c0569a..69dc8ad1 100644
 
      void setDeleteMail(bool b);
 diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp
-index 2c945d3f..35614ea5 100644
+index 984e263..f82df5a 100644
 --- a/src/plugins/messageservices/imap/imapprotocol.cpp
 +++ b/src/plugins/messageservices/imap/imapprotocol.cpp
-@@ -3053,10 +3053,18 @@ bool ImapProtocol::open( const ImapConfiguration& config, qint64 bufferSize)
+@@ -3060,10 +3060,18 @@ bool ImapProtocol::open( const ImapConfiguration& config, qint64 bufferSize)
                  this, SLOT(connected(QMailTransport::EncryptType)));
          connect(_transport, SIGNAL(readyRead()),
                  this, SLOT(incomingData()));
@@ -222,7 +222,7 @@ index 2c945d3f..35614ea5 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 aaa2a97f..7bfbea06 100644
+index aaa2a97..7bfbea0 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 aaa2a97f..7bfbea06 100644
  {
  #if 0
 diff --git a/src/plugins/messageservices/imap/imaptransport.h b/src/plugins/messageservices/imap/imaptransport.h
-index a1c50426..50c12e51 100644
+index a1c5042..50c12e5 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 a1c50426..50c12e51 100644
      void test();
 
 diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
-index 16562e0b..595c62a9 100644
+index 85ac855..b8aa5c7 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 16562e0b..595c62a9 100644
  }
 
 diff --git a/src/plugins/messageservices/pop/popconfiguration.cpp b/src/plugins/messageservices/pop/popconfiguration.cpp
-index b56dba07..5c6754f9 100644
+index b56dba0..5c6754f 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 b56dba07..5c6754f9 100644
 
  void PopConfigurationEditor::setDeleteMail(bool b)
 diff --git a/src/plugins/messageservices/pop/popconfiguration.h b/src/plugins/messageservices/pop/popconfiguration.h
-index 1644faad..fe0119c3 100644
+index 1644faa..fe0119c 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 1644faad..fe0119c3 100644
 
      void setDeleteMail(bool b);
 diff --git a/src/plugins/messageservices/smtp/smtpclient.cpp b/src/plugins/messageservices/smtp/smtpclient.cpp
-index 3560881d..876247d7 100644
+index 2789397..9e1e219 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 3560881d..876247d7 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 e8807cc7..23d43949 100644
+index e8807cc..23d4394 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 e8807cc7..23d43949 100644
  {
      setValue("smtpusername", str);
 diff --git a/src/plugins/messageservices/smtp/smtpconfiguration.h b/src/plugins/messageservices/smtp/smtpconfiguration.h
-index e8b28a6b..ed115d53 100644
+index e8b28a6..ed115d5 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 e8b28a6b..ed115d53 100644
      void setSmtpPassword(const QString& password);
      void setSmtpAuthentication(int t);
 -- 
-2.17.2
+1.8.3-rc3
 

rpm/0003-fix-tests-installation-path.patch

@@ -1,19 +1,19 @@
-From ff786f09e3d6edd8a11b173f4ce6cb9e7917f971 Mon Sep 17 00:00:00 2001
+From 7f641c940ef2ca28f1c21a245870f4c56721c280 Mon Sep 17 00:00:00 2001
 From: Valerio Valerio <valerio.valerio@jollamobile.com>
 Date: Tue, 30 Apr 2013 14:38:17 +0300
-Subject: [PATCH 03/19] fix tests installation path.
+Subject: [PATCH 03/17] fix tests installation path.
 
 ---
- .../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 +-
+ 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 +-
  6 files changed, 536 insertions(+), 536 deletions(-)
 
 diff --git a/benchmarks/tst_messageserver/tst_messageserver.pro b/benchmarks/tst_messageserver/tst_messageserver.pro
-index 2d50131a..1dc2ddd5 100644
+index 2d50131..1dc2ddd 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 2d50131a..1dc2ddd5 100644
  BASE=../../
  include($$BASE/common.pri)
 diff --git a/tests/qt5/tests.xml b/tests/qt5/tests.xml
-index ffbb593f..ac9464a6 100644
+index ffbb593..ac9464a 100644
 --- a/tests/qt5/tests.xml
 +++ b/tests/qt5/tests.xml
 @@ -5,123 +5,123 @@
@@ -1462,7 +1462,7 @@ index ffbb593f..ac9464a6 100644
           <environments>
              <scratchbox>true</scratchbox>
 diff --git a/tests/tests.pri b/tests/tests.pri
-index 623b19ca..1d3ba39e 100644
+index 623b19c..1d3ba39 100644
 --- a/tests/tests.pri
 +++ b/tests/tests.pri
 @@ -3,7 +3,7 @@ QT += testlib
@@ -1475,7 +1475,7 @@ index 623b19ca..1d3ba39e 100644
  include(../common.pri)
 
 diff --git a/tests/tests.pro b/tests/tests.pro
-index cac44948..cae08159 100644
+index cac4494..cae0815 100644
 --- a/tests/tests.pro
 +++ b/tests/tests.pro
 @@ -41,5 +41,5 @@ CONFIG += unittest
@@ -1486,7 +1486,7 @@ index cac44948..cae08159 100644
 +test_description.path  = /opt/tests/qmf-qt5/test-definition
  INSTALLS += test_description
 diff --git a/tests/tests.xml b/tests/tests.xml
-index 3a708ed0..b8fff814 100644
+index 3a708ed..b8fff81 100644
 --- a/tests/tests.xml
 +++ b/tests/tests.xml
 @@ -5,123 +5,123 @@
@@ -2922,7 +2922,7 @@ index 3a708ed0..b8fff814 100644
           <environments>
              <scratchbox>true</scratchbox>
 diff --git a/tests/tst_python_email/tst_python_email.pro b/tests/tst_python_email/tst_python_email.pro
-index 4cde1fe3..204ecd5a 100644
+index 4cde1fe..204ecd5 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 4cde1fe3..204ecd5a 100644
 
  INSTALLS += testdata
 -- 
-2.17.2
+1.8.3-rc3