gentoo resync : 24.12.2018

2 files changed, 58 insertions, 0 deletions

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