Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mailcommon for openSUSE:Factory checked in at 2021-09-04 22:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailcommon (Old) and /work/SRC/openSUSE:Factory/.mailcommon.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailcommon" Sat Sep 4 22:33:37 2021 rev:67 rq:916013 version:21.08.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mailcommon/mailcommon.changes 2021-08-16 10:09:17.135260462 +0200 +++ /work/SRC/openSUSE:Factory/.mailcommon.new.1899/mailcommon.changes 2021-09-04 22:35:47.376186109 +0200 @@ -1,0 +2,13 @@ +Wed Sep 1 12:39:28 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.1 +- Changes since 21.08.0: + * Fix CryptoUtils::assembleMessage() to not add bogus text/plain content-type + * Fix FilterActionEncryptTest, workaround now expired key in test data + * filter tests: adapt to kmime enforcing explicit Content-Type + * FavoriteProxyTest: adapt test for dropping option on favourites + +------------------------------------------------------------------- Old: ---- mailcommon-21.08.0.tar.xz mailcommon-21.08.0.tar.xz.sig New: ---- mailcommon-21.08.1.tar.xz mailcommon-21.08.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailcommon.spec ++++++ --- /var/tmp/diff_new_pack.sejTu0/_old 2021-09-04 22:35:47.888186788 +0200 +++ /var/tmp/diff_new_pack.sejTu0/_new 2021-09-04 22:35:47.896186798 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: mailcommon -Version: 21.08.0 +Version: 21.08.1 Release: 0 Summary: Base KDE PIM library for mail-handling applications License: GPL-2.0-only AND LGPL-2.1-or-later ++++++ mailcommon-21.08.0.tar.xz -> mailcommon-21.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/CMakeLists.txt new/mailcommon-21.08.1/CMakeLists.txt --- old/mailcommon-21.08.0/CMakeLists.txt 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/CMakeLists.txt 2021-08-20 14:18:35.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.0") +set(PIM_VERSION "5.18.1") project(mailcommon VERSION ${PIM_VERSION}) @@ -26,18 +26,18 @@ set(QT_REQUIRED_VERSION "5.15.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.18.0") -set(AKONADICONTACT_LIB_VERSION "5.18.0") -set(MESSAGELIB_LIB_VERSION "5.18.0") -set(KMIME_LIB_VERSION "5.18.0") -set(KMAILTRANSPORT_LIB_VERSION "5.18.0") -set(MAILIMPORTER_LIB_VERSION "5.18.0") -set(LIBKDEPIM_LIB_VERSION "5.18.0") -set(PIMCOMMON_LIB_VERSION "5.18.0") -set(GRANTLEETHEME_LIB_VERSION "5.18.0") +set(AKONADIMIME_LIB_VERSION "5.18.1") +set(AKONADICONTACT_LIB_VERSION "5.18.1") +set(MESSAGELIB_LIB_VERSION "5.18.1") +set(KMIME_LIB_VERSION "5.18.1") +set(KMAILTRANSPORT_LIB_VERSION "5.18.1") +set(MAILIMPORTER_LIB_VERSION "5.18.1") +set(LIBKDEPIM_LIB_VERSION "5.18.1") +set(PIMCOMMON_LIB_VERSION "5.18.1") +set(GRANTLEETHEME_LIB_VERSION "5.18.1") set(PHONON_LIB_VERSION "4.10.60") -set(AKONADI_VERSION "5.18.0") +set(AKONADI_VERSION "5.18.1") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/autotests/favoritestest.cpp new/mailcommon-21.08.1/autotests/favoritestest.cpp --- old/mailcommon-21.08.0/autotests/favoritestest.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/autotests/favoritestest.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -111,7 +111,8 @@ const QModelIndex firstRowIndex = orderProxy->index(0, 0); QVERIFY(firstRowIndex.isValid()); QCOMPARE(firstRowIndex.data().toString(), QStringLiteral("res2")); - QVERIFY((orderProxy->flags(firstRowIndex) & Qt::ItemIsDropEnabled) == 0); + // we can drop emails + QVERIFY((orderProxy->flags(firstRowIndex) & Qt::ItemIsDropEnabled) != 0); } #include "favoritestest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/autotests/foldertreewidgettest.cpp new/mailcommon-21.08.1/autotests/foldertreewidgettest.cpp --- old/mailcommon-21.08.0/autotests/foldertreewidgettest.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/autotests/foldertreewidgettest.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -61,9 +61,9 @@ mTopModel = mFolderTreeWidget->folderTreeView()->model(); // One knut resource is already defined in the unittestenv, so that it's below "Search" in the ETM. - QTRY_COMPARE(mCollectionModel->rowCount(), 2); - QCOMPARE(mTopModel->rowCount(), 1); // Search doesn't appear yet - mFolderNames = QStringList{"res1"}; + QTRY_COMPARE(mCollectionModel->rowCount(), 4); + QCOMPARE(mTopModel->rowCount(), 3); // Search doesn't appear yet + mFolderNames = QStringList{QStringLiteral("res3"), QStringLiteral("res1"), QStringLiteral("res2")}; QCOMPARE(collectNames(mTopModel), mFolderNames); } @@ -85,12 +85,11 @@ QVERIFY(searchCol.isValid()); // Check it appeared in the tree, under a Search toplevel item - QTRY_COMPARE(mCollectionModel->rowCount(), 2); - QTRY_COMPARE(mTopModel->rowCount(), 2); + QTRY_COMPARE(mCollectionModel->rowCount(), 4); + QTRY_COMPARE(mTopModel->rowCount(), 4); const QStringList names = collectNames(mTopModel); - QCOMPARE(names, - QStringList() << "res1" - << "Search"); + const QStringList expectedNames{"res3", "res1", "res2", "Search"}; + QCOMPARE(names, expectedNames); const int rowOfSearch = names.indexOf("Search"); const QModelIndex searchParent = mTopModel->index(rowOfSearch, 0); QCOMPARE(mTopModel->rowCount(searchParent), 1); // the actual child search folder @@ -108,7 +107,7 @@ AKVERIFYEXEC(delJob); // Check it disappeared from the tree, as well as the toplevel item - QTRY_COMPARE(mTopModel->rowCount(), 1); + QTRY_COMPARE(mTopModel->rowCount(), 3); QCOMPARE(collectNames(mTopModel), mFolderNames); QCOMPARE(collectNames(mFolderTreeWidget->entityOrderProxy()), mFolderNames); @@ -135,7 +134,7 @@ // Create resources const int numResources = numFolders.count(); - for (int i = 1 /*first one already created*/; i < numResources; ++i) { + for (int i = 3 /*first three already created*/; i < numResources; ++i) { auto agentCreateJob = new AgentInstanceCreateJob(agentType); AKVERIFYEXEC(agentCreateJob); const QString identifier = agentCreateJob->instance().identifier(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/po/zh_CN/libmailcommon.po new/mailcommon-21.08.1/po/zh_CN/libmailcommon.po --- old/mailcommon-21.08.0/po/zh_CN/libmailcommon.po 2021-08-06 02:24:46.000000000 +0200 +++ new/mailcommon-21.08.1/po/zh_CN/libmailcommon.po 2021-08-31 02:38:57.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-07-15 01:41+0000\n" -"PO-Revision-Date: 2021-07-26 13:50\n" +"PO-Revision-Date: 2021-08-30 11:45\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/filter/autotests/filteractionaddheadertest.cpp new/mailcommon-21.08.1/src/filter/autotests/filteractionaddheadertest.cpp --- old/mailcommon-21.08.0/src/filter/autotests/filteractionaddheadertest.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/src/filter/autotests/filteractionaddheadertest.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -116,6 +116,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; const QByteArray output = @@ -124,6 +125,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "testheader: foo\n" "\n" "test"; @@ -152,6 +154,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "testheader: bla\n" "\n" "test"; @@ -161,6 +164,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "testheader: foo\n" "\n" "test"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/filter/autotests/filteractionremoveheadertest.cpp new/mailcommon-21.08.1/src/filter/autotests/filteractionremoveheadertest.cpp --- old/mailcommon-21.08.0/src/filter/autotests/filteractionremoveheadertest.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/src/filter/autotests/filteractionremoveheadertest.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -64,6 +64,7 @@ "testheader: foo\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; const QByteArray output = @@ -72,6 +73,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; @@ -98,6 +100,7 @@ "testheader2: foo\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; @@ -126,6 +129,7 @@ "testheader: bla\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; const QByteArray output = @@ -134,6 +138,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/filter/autotests/filteractionreplytotest.cpp new/mailcommon-21.08.1/src/filter/autotests/filteractionreplytotest.cpp --- old/mailcommon-21.08.0/src/filter/autotests/filteractionreplytotest.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/src/filter/autotests/filteractionreplytotest.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -40,6 +40,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; const QByteArray output = @@ -48,6 +49,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "Reply-To: [email protected]\n" "\n" "test"; @@ -76,6 +78,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "Reply-To: [email protected]\n" "\n" "test"; @@ -85,6 +88,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "Reply-To: [email protected]\n" "\n" "test"; @@ -117,6 +121,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "Reply-To: [email protected]\n" "\n" "test"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/filter/autotests/filteractionrewriteheadertest.cpp new/mailcommon-21.08.1/src/filter/autotests/filteractionrewriteheadertest.cpp --- old/mailcommon-21.08.0/src/filter/autotests/filteractionrewriteheadertest.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/src/filter/autotests/filteractionrewriteheadertest.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -93,6 +93,7 @@ "testheader: foo\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; const QByteArray output = @@ -101,6 +102,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "testheader: bla\n" "\n" "test"; @@ -127,6 +129,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "\n" "test"; @@ -152,6 +155,7 @@ "Subject: test\n" "Date: Wed, 01 Apr 2015 09:33:01 +0200\n" "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" "testheader: bla\n" "\n" "test"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/filter/autotests/gpghome/gpg.conf new/mailcommon-21.08.1/src/filter/autotests/gpghome/gpg.conf --- old/mailcommon-21.08.0/src/filter/autotests/gpghome/gpg.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/mailcommon-21.08.1/src/filter/autotests/gpghome/gpg.conf 2021-08-20 14:18:35.000000000 +0200 @@ -0,0 +1,3 @@ +# TODO: replace test keys with some which do not expire +# so this special setup is not needed and the test can check normal operation +faked-system-time 20180110T154812 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/folder/foldertreeview.cpp new/mailcommon-21.08.1/src/folder/foldertreeview.cpp --- old/mailcommon-21.08.0/src/folder/foldertreeview.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/src/folder/foldertreeview.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -273,7 +273,7 @@ return; } - if (id > header()->count()) { + if (id >= header()->count()) { return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-21.08.0/src/util/cryptoutils.cpp new/mailcommon-21.08.1/src/util/cryptoutils.cpp --- old/mailcommon-21.08.0/src/util/cryptoutils.cpp 2021-08-03 07:20:14.000000000 +0200 +++ new/mailcommon-21.08.1/src/util/cryptoutils.cpp 2021-08-20 14:18:35.000000000 +0200 @@ -166,9 +166,17 @@ out->setBody(const_cast<KMime::Content *>(newContent)->encodedBody()); out->parse(); + // remove default explicit content headers added by KMime::Content::parse() + QVector<KMime::Headers::Base *> headers = out->headers(); + for (const auto hdr : std::as_const(headers)) { + if (isContentHeader(hdr)) { + out->removeHeader(hdr->type()); + } + } + // Copy over headers from the original message, except for CT, CTE and CD // headers, we want to preserve those from the new content - QVector<KMime::Headers::Base *> headers = orig->headers(); + headers = orig->headers(); for (const auto hdr : std::as_const(headers)) { if (isContentHeader(hdr)) { continue;
