[SCM] kcoreaddons packaging branch, master, updated. debian/5.37.0-2-101-ga15783a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=15b18d2

The following commit has been merged in the master branch:
commit 15b18d2100285dc6e69a6852f2e0c9740059c73a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Oct 6 23:27:40 2016 +0100

    patch not needed in unstable
---
 debian/patches/kde_01_CVE-2016-7966.diff | 71 --------------------------------
 debian/patches/series                    |  1 -
 2 files changed, 72 deletions(-)

diff --git a/debian/patches/kde_01_CVE-2016-7966.diff b/debian/patches/kde_01_CVE-2016-7966.diff
deleted file mode 100644
index c1bf19c..0000000
--- a/debian/patches/kde_01_CVE-2016-7966.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/autotests/kjobtest.cpp b/autotests/kjobtest.cpp
-index 88be4ac..139b9be 100644
---- a/autotests/kjobtest.cpp
-+++ b/autotests/kjobtest.cpp
-@@ -276,6 +276,7 @@ void KJobTest::testDelegateUsage()
-     TestJob *job1 = new TestJob;
-     TestJob *job2 = new TestJob;
-     TestJobUiDelegate *delegate = new TestJobUiDelegate;
-+    QPointer<TestJobUiDelegate> guard(delegate);
- 
-     QVERIFY(job1->uiDelegate() == 0);
-     job1->setUiDelegate(delegate);
-@@ -284,6 +285,10 @@ void KJobTest::testDelegateUsage()
-     QVERIFY(job2->uiDelegate() == 0);
-     job2->setUiDelegate(delegate);
-     QVERIFY(job2->uiDelegate() == 0);
-+
-+    delete job1;
-+    delete job2;
-+    QVERIFY(guard.isNull()); // deleted by job1
- }
- 
- void KJobTest::testNestedExec()
-diff --git a/autotests/ktexttohtmltest.cpp b/autotests/ktexttohtmltest.cpp
-index 474f0ca..c5690e8 100644
---- a/autotests/ktexttohtmltest.cpp
-+++ b/autotests/ktexttohtmltest.cpp
-@@ -30,6 +30,15 @@ QTEST_MAIN(KTextToHTMLTest)
- 
- Q_DECLARE_METATYPE(KTextToHTML::Options)
- 
-+#ifndef Q_OS_WIN
-+void initLocale()
-+{
-+    setenv("LC_ALL", "en_US.utf-8", 1);
-+}
-+Q_CONSTRUCTOR_FUNCTION(initLocale)
-+#endif
-+
-+
- void KTextToHTMLTest::testGetEmailAddress()
- {
-     // empty input
-@@ -372,6 +381,17 @@ void KTextToHTMLTest::testHtmlConvert_data()
-     QTest::newRow("url-in-parenthesis-3") << "bla (http://www.kde.org - section 5.2)"
-                                           << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
-                                           << "bla (<a href=\"http://www.kde.org\">http://www.kde.org</a> - section 5.2)";
-+    
-+   // Fix url as foo <<url> <url>> when we concatened them.
-+   QTest::newRow("url-with-url") << "foo <http://www.kde.org/ <http://www.kde.org/>>"
-+                               << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
-+                               << "foo <<a href=\"http://www.kde.org/ \">http://www.kde.org/ </a><<a href=\"http://www.kde.org/\">http://www.kde.org/</a>>>";
-+
-+   //Fix url exploit
-+   QTest::newRow("url-exec-html") << "https://\"><!--"
-+                               << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
-+                               << "https://\"><!--";
-+
- }
- 
- 
-diff --git a/autotests/kurlmimedatatest.cpp b/autotests/kurlmimedatatest.cpp
-index 5e55d9e..264879f 100644
---- a/autotests/kurlmimedatatest.cpp
-+++ b/autotests/kurlmimedatatest.cpp
-@@ -135,4 +135,5 @@ void KUrlMimeDataTest::testMostLocalUrlList()
-         QCOMPARE(qurls[i], static_cast<QUrl>(localUrls[i]));
-     }
- 
-+    delete mimeData;
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1dfe8cd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kde_01_CVE-2016-7966.diff

-- 
kcoreaddons packaging