gentoo resync : 24.12.2018

5 files changed, 70 insertions, 6 deletions

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 6b36ca2c5c99..2876dffeac94 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,7 @@
-DIST messagelib-18.04.3.tar.xz 10461448 BLAKE2B 812f5679a6bbca72da39c980ce10581b96cc844a7c38b87a9d5ea5eb6b6ec58b26b561fd4abdd782d39012d314aa0a5134683454a604ba28a1cdd301ea53f25a SHA512 4aed5990ccb9f5f1fbe5b6d71a63a2ec2f342a7eee81953417f3ab9537200fe66f95d742ffd6ba4f2a9f794b0b119db2e3f3d0766344c8459e1b23b043f11fce
+AUX messagelib-18.08.3-CVE-2018-19516.patch 1088 BLAKE2B 720f3c72fe0e02b68c2d84a0b748dea6bd992ecdd52f40a0e7d5b6955322539db08ab7b4db2a4276f41d831160d4821cfd7460dbf3122fcdafec78bcf6edff90 SHA512 bcf557ea46ab6ed277a3730eff5560912ab0c55dbf48a8a8cb953916c6af887b9d520cb657a3cd6904d67133cf9a4ec8c99b69b9e1648f3b326d46f51d96e075
+AUX messagelib-18.08.3-newmail-crash.patch 1100 BLAKE2B f3f566f1fe5541d5ac4de5193893696cfce8552058300684ae72f28655062347eba83d5f739cb9edfeef6bd4611586df3bcaa7489e3018b405b825334a4a6bc1 SHA512 10775b6ea3cf6cf144aac6214a192bad891f7cfe44e6c373c5da6ca5cb2b1a532b189a569a2a48127ef569713af3fc040d62ba31968a476a83ad7b712549a955
 DIST messagelib-18.08.3.tar.xz 10417308 BLAKE2B 7b2df9549c5b691dbbf902fe9fc74978d1904d7c4e3c64f67a731cc0ac7590a46e9adb3475ad8324c4752a09e2e8a7626bb9e620aefd4f7ad0b0074d8d3fa4b0 SHA512 b7e26a9588c82ee6840602e712e46394b236d65eec55ced005fe5db2c375f99ad684c0e3c4a50e80315db346def9a86b56c403bf084e3face5e29ef7f2eb028b
-EBUILD messagelib-18.04.3.ebuild 1937 BLAKE2B 2237b3b9c9742e7db917847cb813d8a84ee64de76870e5a3c5cb2400b2faf67fc63e5c08ab68d436b02a4e0500bd847c32e915eb01c1c17914a32907505ea6d4 SHA512 29b95b086b5e8b2a4edb98b10ca1b7b7d88afa8f557496c7a88557631b6fa47c05085e7e7a234a6fc8df2319eb8aba4e9aaaaa405530925564311f54038ddb77
-EBUILD messagelib-18.08.3.ebuild 1899 BLAKE2B 29d1da4b1d45a544ed77e9093c9b8c1d23020fd1f9f571f7365fd6aa4b693fafc7c207b38faaad4570ffcad10b7d40345090000cb91c9e35f9cf6635e792f087 SHA512 06af0f8e792867f2267cba4ea79d0b4c99f8f2142832d0af616584c26f2bed2f875ba4a60f7dfe73878a24e0ebf1d80f1b8f4c1d628a69d38dcee19b5a11b38e
+DIST messagelib-18.12.0.tar.xz 10428548 BLAKE2B 4c85c1c05ddd3f6fec2cda830b0501589b2ffa5c59b7d650c175d1599169d0d4126ede90f6658bc2930881943de637b5fd1fded111bd37aaa8f256d54c044445 SHA512 71893c5f2aa60940f442854565ccd11a8e2463565d539699b4227d846469286800f671c2adc2c875fcd83c3a8b83bb7037b2b4670b5cfe7b12d7e3e651f95f33
+EBUILD messagelib-18.08.3-r2.ebuild 1990 BLAKE2B c84bc610f23be28f887e0f890b086e5247b4739d35edaadac650b0cae2c284a03ce23e1556537b1b7980aadb725d8962569c9a969378c39272cbed5dd9fe5ed2 SHA512 a6a1b031d1fa88774a1729d00b238063d476b45c95295dd9c71d79988ae09beafb79cb894fa9b170126deaa76d4690e47bddce8181753eb388e34c142bbd0ba9
+EBUILD messagelib-18.12.0.ebuild 1899 BLAKE2B 29d1da4b1d45a544ed77e9093c9b8c1d23020fd1f9f571f7365fd6aa4b693fafc7c207b38faaad4570ffcad10b7d40345090000cb91c9e35f9cf6635e792f087 SHA512 06af0f8e792867f2267cba4ea79d0b4c99f8f2142832d0af616584c26f2bed2f875ba4a60f7dfe73878a24e0ebf1d80f1b8f4c1d628a69d38dcee19b5a11b38e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
new file mode 100644
index 000000000000..21108ae1fb6f
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
@@ -0,0 +1,29 @@
+From 1fd737870f5a9c5bf44ad9fbd153ab4cf44e135d Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 23 Nov 2018 07:37:02 +0100
+Subject: [PATCH] Exclude Refresh from MetaData (Not necessary)
+
+---
+ .../src/messagepartthemes/default/defaultrenderer.cpp       | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+index a7ffe824..d5d41cf6 100644
+--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
++++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+@@ -308,6 +308,12 @@ QString processHtml(const QString &htmlSource, QString &extraHead)
+             return htmlSource;
+         }
+         extraHead = s.mid(startIndex + 6 , endIndex - startIndex - 6);
++
++        //Don't authorize to refresh content.
++        if (s.contains(QStringLiteral("http-equiv=\"REFRESH\""), Qt::CaseInsensitive)) {
++            extraHead.clear();
++        }
++
+         s = s.mid(endIndex + 7).trimmed();
+     }
+ 
+-- 
+2.19.2
+
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
new file mode 100644
index 000000000000..f80f8201effa
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
@@ -0,0 +1,29 @@
+From 32bbd45cdbbb8c60105ced80debab1eb6ed40226 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 29 Nov 2018 09:21:24 -0500
+Subject: templateparserextracthtmlinfo.cpp - deleteLater in dtor
+
+ack'd by Laurent
+BUG: 401337
+FIXED-IN: 18.12.0
+---
+ templateparser/src/templateparserextracthtmlinfo.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/templateparser/src/templateparserextracthtmlinfo.cpp b/templateparser/src/templateparserextracthtmlinfo.cpp
+index 72dddbd..c99eb0a 100644
+--- a/templateparser/src/templateparserextracthtmlinfo.cpp
++++ b/templateparser/src/templateparserextracthtmlinfo.cpp
+@@ -31,8 +31,8 @@ TemplateParserExtractHtmlInfo::TemplateParserExtractHtmlInfo(QObject *parent)
+ 
+ TemplateParserExtractHtmlInfo::~TemplateParserExtractHtmlInfo()
+ {
+-    delete mTemplateWebEngineView;
+-    delete mExtractHtmlElementWebEngineView;
++    mTemplateWebEngineView->deleteLater();
++    mExtractHtmlElementWebEngineView->deleteLater();
+ }
+ 
+ void TemplateParserExtractHtmlInfo::setHtmlForExtractingTextPlain(const QString &html)
+-- 
+cgit v0.11.2
diff --git a/kde-apps/messagelib/messagelib-18.04.3.ebuild b/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
index b030a12737fb..ef7a91078b58 100644
--- a/kde-apps/messagelib/messagelib-18.04.3.ebuild
+++ b/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KDE_TEST="forceoptional-recursive"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -60,7 +60,6 @@ DEPEND="
 	>=dev-libs/grantlee-5.1.0:5
 "
 RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-16.08.50:5
 	!kde-apps/kdepim-common-libs:4
 	!kde-apps/kdepim-l10n
 	!=kde-apps/kmail-4.4*:4
@@ -68,3 +67,8 @@ RDEPEND="${DEPEND}
 
 # bug 579630
 RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-newmail-crash.patch"
+	"${FILESDIR}/${PN}-18.08.3-CVE-2018-19516.patch"
+)
diff --git a/kde-apps/messagelib/messagelib-18.08.3.ebuild b/kde-apps/messagelib/messagelib-18.12.0.ebuild
index fd87e77d18be..fd87e77d18be 100644
--- a/kde-apps/messagelib/messagelib-18.08.3.ebuild
+++ b/kde-apps/messagelib/messagelib-18.12.0.ebuild