[SCM] kmail packaging branch, master, updated. debian/16.04.3-1-115-g2204e19
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 2 16:51:02 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kmail.git;a=commitdiff;h=e5604d2
The following commit has been merged in the master branch:
commit e5604d279bd6d2c40d76785c2e2ec129a28eb001
Author: Jonathan Riddell <jr at jriddell.org>
Date: Thu Oct 6 23:16:26 2016 +0100
not for kmail
---
debian/patches/kde_01_CVE-2016-7968.diff | 323 -------------------------------
debian/patches/kde_02-CVE-2016-7966.diff | 21 --
debian/patches/series | 2 -
3 files changed, 346 deletions(-)
diff --git a/debian/patches/kde_01_CVE-2016-7968.diff b/debian/patches/kde_01_CVE-2016-7968.diff
deleted file mode 100644
index 8d8020e..0000000
--- a/debian/patches/kde_01_CVE-2016-7968.diff
+++ /dev/null
@@ -1,323 +0,0 @@
-From: Montel Laurent <montel at kde.org>
-Date: Mon, 03 Oct 2016 09:47:11 +0000
-Subject: Now we can use messageviewer without javascript enabled.
-X-Git-Url: http://quickgit.kde.org/?p=messagelib.git&a=commitdiff&h=f601f9ffb706f7d3a5893b04f067a1f75da62c99
----
-Now we can use messageviewer without javascript enabled.
----
-
-
---- a/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp
-+++ b/messageviewer/src/htmlwriter/webengineparthtmlwriter.cpp
-@@ -61,7 +61,9 @@
- insertExtraHead();
- mExtraHead.clear();
- }
-+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
- mHtml = removeJscripts(mHtml);
-+#endif
- mHtmlView->setHtml(mHtml, QUrl(QStringLiteral("file:///")));
- mHtmlView->show();
- mHtml.clear();
-
---- a/messageviewer/src/scamdetection/scamdetectionwebengine.cpp
-+++ b/messageviewer/src/scamdetection/scamdetectionwebengine.cpp
-@@ -23,6 +23,7 @@
- #include "settings/messageviewersettings.h"
- #include "MessageViewer/ScamCheckShortUrl"
- #include "webengineviewer/webenginescript.h"
-+#include <WebEngineViewer/WebEngineManageScript>
-
- #include <KLocalizedString>
-
-@@ -84,7 +85,13 @@
- void ScamDetectionWebEngine::scanPage(QWebEnginePage *page)
- {
- if (MessageViewer::MessageViewerSettings::self()->scamDetectionEnabled()) {
-+#if QT_VERSION >= 0x050700
-+ page->runJavaScript(WebEngineViewer::WebEngineScript::findAllAnchorsAndForms(),
-+ WebEngineViewer::WebEngineManageScript::scriptWordId(),
-+ invoke(this, &ScamDetectionWebEngine::handleScanPage));
-+#else
- page->runJavaScript(WebEngineViewer::WebEngineScript::findAllAnchorsAndForms(), invoke(this, &ScamDetectionWebEngine::handleScanPage));
-+#endif
- }
- }
-
-
---- a/messageviewer/src/viewer/viewer.cpp
-+++ b/messageviewer/src/viewer/viewer.cpp
-@@ -31,6 +31,7 @@
- #include "settings/messageviewersettings.h"
- #include "viewer/webengine/mailwebengineview.h"
- #include <WebEngineViewer/WebHitTestResult>
-+#include <WebEngineViewer/WebEngineManageScript>
- #include "viewer/mimeparttree/mimetreemodel.h"
- #include "viewer/mimeparttree/mimeparttreeview.h"
- #include "widgets/zoomactionmenu.h"
-@@ -636,9 +637,13 @@
- void Viewer::runJavaScript(const QString &code)
- {
- Q_D(Viewer);
-- d->mViewer->page()->runJavaScript(code);
--}
--
--}
--
--
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ d->mViewer->page()->runJavaScript(code, WebEngineViewer::WebEngineManageScript::scriptWordId());
-+#else
-+ d->mViewer->page()->runJavaScript(code);
-+#endif
-+}
-+
-+}
-+
-+
-
---- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-+++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-@@ -43,7 +43,11 @@
- void MailWebEnginePage::initialize()
- {
- profile()->setHttpCacheType(QWebEngineProfile::MemoryHttpCache);
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
-+#else
- settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
-+#endif
- settings()->setAttribute(QWebEngineSettings::PluginsEnabled, false);
- settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
- settings()->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, false);
-
---- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
-+++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
-@@ -25,6 +25,7 @@
- #include "loadexternalreferencesurlinterceptor/loadexternalreferencesurlinterceptor.h"
- #include "cidreferencesurlinterceptor/cidreferencesurlinterceptor.h"
- #include <WebEngineViewer/NetworkAccessManagerWebEngine>
-+#include <WebEngineViewer/WebEngineManageScript>
-
- #include "scamdetection/scamdetectionwebengine.h"
- #include "scamdetection/scamcheckshorturl.h"
-@@ -110,7 +111,11 @@
-
- void MailWebEngineView::runJavaScriptInWordId(const QString &script)
- {
-+#if QT_VERSION >= 0x050700
-+ page()->runJavaScript(script, WebEngineViewer::WebEngineManageScript::scriptWordId());
-+#else
- page()->runJavaScript(script);
-+#endif
- }
-
- void MailWebEngineView::initializeScripts()
-@@ -269,8 +274,13 @@
-
- void MailWebEngineView::scrollToAnchor(const QString &anchor)
- {
-- //TODO add wordid here too
-+#if QT_VERSION >= 0x050700
-+ page()->runJavaScript(WebEngineViewer::WebEngineScript::searchElementPosition(anchor),
-+ WebEngineViewer::WebEngineManageScript::scriptWordId(),
-+ invoke(this, &MailWebEngineView::handleScrollToAnchor));
-+#else
- page()->runJavaScript(WebEngineViewer::WebEngineScript::searchElementPosition(anchor), invoke(this, &MailWebEngineView::handleScrollToAnchor));
-+#endif
- }
-
- void MailWebEngineView::handleScrollToAnchor(const QVariant &result)
-
---- a/messageviewer/src/viewer/webengine/tests/testmailwebengine.cpp
-+++ b/messageviewer/src/viewer/webengine/tests/testmailwebengine.cpp
-@@ -27,6 +27,7 @@
- #include <QWebEngineSettings>
-
- #include <MessageViewer/MailWebEngineView>
-+#include <WebEngineViewer/WebEngineManageScript>
-
- TestMailWebEngine::TestMailWebEngine(QWidget *parent)
- : QWidget(parent)
-@@ -75,12 +76,20 @@
-
- void TestMailWebEngine::slotScrollDown()
- {
-+#if QT_VERSION >= 0x050700
-+ mTestWebEngine->page()->runJavaScript(WebEngineViewer::WebEngineScript::scrollDown(10), WebEngineViewer::WebEngineManageScript::scriptWordId());
-+#else
- mTestWebEngine->page()->runJavaScript(WebEngineViewer::WebEngineScript::scrollDown(10));
-+#endif
- }
-
- void TestMailWebEngine::slotScrollUp()
- {
-+#if QT_VERSION >= 0x050700
-+ mTestWebEngine->page()->runJavaScript(WebEngineViewer::WebEngineScript::scrollUp(10), WebEngineViewer::WebEngineManageScript::scriptWordId());
-+#else
- mTestWebEngine->page()->runJavaScript(WebEngineViewer::WebEngineScript::scrollUp(10));
-+#endif
- }
-
- void TestMailWebEngine::slotZoomDown()
-
---- a/webengineviewer/src/CMakeLists.txt
-+++ b/webengineviewer/src/CMakeLists.txt
-@@ -179,6 +179,7 @@
- WebEngineView
- WebHitTest
- WebEngineScript
-+ WebEngineManageScript
- WebEnginePrintMessageBox
- WebEngineExportHtmlPageJob
- REQUIRED_HEADERS WebEngineViewer_webengine_misc_HEADERS
-
---- a/webengineviewer/src/tests/testjquerysupportwebengine.cpp
-+++ b/webengineviewer/src/tests/testjquerysupportwebengine.cpp
-@@ -27,6 +27,7 @@
- #include <QPushButton>
- #include <QMessageBox>
- #include <QTextEdit>
-+#include <WebEngineViewer/WebEngineManageScript>
-
- TestJQuerySupportWebEngine::TestJQuerySupportWebEngine(QWidget *parent)
- : QWidget(parent)
-@@ -57,7 +58,11 @@
- {
- const QString code = mEditor->toPlainText();
- if (!code.isEmpty()) {
-+#if QT_VERSION >= 0x050700
-+ pageView->page()->runJavaScript(code, WebEngineViewer::WebEngineManageScript::scriptWordId());
-+#else
- pageView->page()->runJavaScript(code);
-+#endif
- }
- }
-
-
---- a/webengineviewer/src/webengineaccesskey/webengineaccesskey.cpp
-+++ b/webengineviewer/src/webengineaccesskey/webengineaccesskey.cpp
-@@ -20,6 +20,7 @@
- #include "webengineaccesskey.h"
- #include "webengineaccesskeyanchor.h"
- #include "webengineaccesskeyutils.h"
-+#include "webenginemanagescript.h"
-
- #include <KActionCollection>
- #include <QKeyEvent>
-@@ -385,7 +386,13 @@
- void WebEngineAccessKey::showAccessKeys()
- {
- d->mAccessKeyActivated = WebEngineAccessKeyPrivate::Activated;
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ d->mWebEngine->page()->runJavaScript(WebEngineViewer::WebEngineAccessKeyUtils::script(),
-+ WebEngineManageScript::scriptWordId(),
-+ invoke(this, &WebEngineAccessKey::handleSearchAccessKey));
-+#else
- d->mWebEngine->page()->runJavaScript(WebEngineViewer::WebEngineAccessKeyUtils::script(), invoke(this, &WebEngineAccessKey::handleSearchAccessKey));
--}
--
--
-+#endif
-+}
-+
-+
-
---- a/webengineviewer/src/webenginemanagescript.cpp
-+++ b/webengineviewer/src/webenginemanagescript.cpp
-@@ -54,7 +54,7 @@
- script.setName(scriptName);
- script.setInjectionPoint(injectionPoint);
- script.setRunsOnSubFrames(true);
-- script.setWorldId(QWebEngineScript::MainWorld);
-+ script.setWorldId(scriptWordId());
- }
- script.setSourceCode(source);
- profile->scripts()->insert(script);
-
---- a/webengineviewer/src/webenginemanagescript.h
-+++ b/webengineviewer/src/webenginemanagescript.h
-@@ -22,17 +22,20 @@
-
- #include <QObject>
- #include <QWebEngineScript>
-+#include "webengineviewer_export.h"
-
- class QWebEngineProfile;
- namespace WebEngineViewer
- {
--class WebEngineManageScript : public QObject
-+class WEBENGINEVIEWER_EXPORT WebEngineManageScript : public QObject
- {
- Q_OBJECT
- public:
- explicit WebEngineManageScript(QObject *parent = Q_NULLPTR);
- ~WebEngineManageScript();
- void addScript(QWebEngineProfile *profile, const QString &source, const QString &scriptName, QWebEngineScript::InjectionPoint injectionPoint);
-+
-+ static qint32 scriptWordId() { return (QWebEngineScript::UserWorld + 1); }
- };
- }
- #endif // WEBENGINEMANAGESCRIPT_H
-
---- a/webengineviewer/src/webengineview.cpp
-+++ b/webengineviewer/src/webengineview.cpp
-@@ -57,6 +57,11 @@
- WebEngineView::~WebEngineView()
- {
- delete d;
-+}
-+
-+WebEngineManageScript *WebEngineView::webEngineManagerScript() const
-+{
-+ return d->mManagerScript;
- }
-
- void WebEngineView::initializeJQueryScript()
-
---- a/webengineviewer/src/webengineview.h
-+++ b/webengineviewer/src/webengineview.h
-@@ -26,6 +26,7 @@
- namespace WebEngineViewer
- {
- class WebEngineViewPrivate;
-+class WebEngineManageScript;
- class WEBENGINEVIEWER_EXPORT WebEngineView : public QWebEngineView
- {
- Q_OBJECT
-@@ -41,6 +42,9 @@
-
- void addScript(const QString &source, const QString &scriptName, QWebEngineScript::InjectionPoint injectionPoint);
- void initializeJQueryScript();
-+
-+ WebEngineManageScript *webEngineManagerScript() const;
-+
- protected:
- bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE;
- QWebEngineView *createWindow(QWebEnginePage::WebWindowType type) Q_DECL_OVERRIDE;
-
---- a/webengineviewer/src/webhittest.cpp
-+++ b/webengineviewer/src/webhittest.cpp
-@@ -20,6 +20,7 @@
- #include "webhittest.h"
- #include "webhittestresult.h"
- #include <QWebEnginePage>
-+#include "webenginemanagescript.h"
-
- using namespace WebEngineViewer;
- template<typename Arg, typename R, typename C>
-@@ -113,7 +114,13 @@
-
- const QString &js = source.arg(pos.x()).arg(pos.y());
- d->m_pageUrl = page->url();
-+#if QT_VERSION >= 0x050700
-+ page->runJavaScript(js,
-+ WebEngineViewer::WebEngineManageScript::scriptWordId(),
-+ invoke(this, &WebHitTest::handleHitTest));
-+#else
- page->runJavaScript(js, invoke(this, &WebHitTest::handleHitTest));
-+#endif
- }
-
- WebHitTest::~WebHitTest()
-
diff --git a/debian/patches/kde_02-CVE-2016-7966.diff b/debian/patches/kde_02-CVE-2016-7966.diff
deleted file mode 100644
index 99e3af5..0000000
--- a/debian/patches/kde_02-CVE-2016-7966.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Montel Laurent <montel at kde.org>
-Date: Thu, 29 Sep 2016 14:03:09 +0000
-Subject: Disable some js feature
-X-Git-Url: http://quickgit.kde.org/?p=messagelib.git&a=commitdiff&h=dfc6a86f1b25f1da04b8f1df5320fcdd7085bcc1
----
-Disable some js feature
----
-
-
---- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-+++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
-@@ -50,6 +50,8 @@
- settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, false);
- settings()->setAttribute(QWebEngineSettings::XSSAuditingEnabled, false);
- settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
-+ settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, false);
-+ settings()->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false);
- #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
- settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false);
- settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
-
diff --git a/debian/patches/series b/debian/patches/series
index c196574..cd7537b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
debianize_akregator_default.diff
kubuntu_debianize_akregator_default.diff
-kde_01_CVE-2016-7968.diff
-kde_02-CVE-2016-7966.diff
--
kmail packaging
More information about the pkg-kde-commits
mailing list