[SCM] kcoreaddons packaging branch, master, updated. debian/5.28.0-1-6-gba9f151

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 43d54455d1a9b3cb972f6e034149d6eb3d451f73
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 31 15:52:23 2017 +0200

    Add new upstream patch: Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch
---
 ...nsafe-characters-incorrectly-parsed-as-pa.patch | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch b/debian/patches/Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch
new file mode 100644
index 0000000..8b5af89
--- /dev/null
+++ b/debian/patches/Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch
@@ -0,0 +1,43 @@
+From: Montel Laurent <montel at kde.org>
+Date: Tue, 17 Jan 2017 07:41:53 +0100
+Subject: Fix Bug 363427 - unsafe characters incorrectly parsed as part of URL
+
+Fix [Please visit our booth 24-25 http://example.com/]
+CCBUG:363427
+---
+ autotests/ktexttohtmltest.cpp | 8 ++++++++
+ src/lib/text/ktexttohtml.cpp  | 2 ++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/autotests/ktexttohtmltest.cpp b/autotests/ktexttohtmltest.cpp
+index f48a31c..0c14623 100644
+--- a/autotests/ktexttohtmltest.cpp
++++ b/autotests/ktexttohtmltest.cpp
+@@ -416,6 +416,14 @@ void KTextToHTMLTest::testHtmlConvert_data()
+    QTest::newRow("url-with-ref-in-[") << "https://www.kde.org[1]"
+                                << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
+                                << "<a href=\"https://www.kde.org\">https://www.kde.org</a>[1]";
++
++   QTest::newRow("url-with-ref-in-[2") << "[http://www.example.org/][whatever]"
++                               << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
++                               << "[<a href=\"http://www.example.org/\">http://www.example.org/</a>][whatever]";
++
++   QTest::newRow("url-with-ref-in-]") << "[Please visit our booth 24-25 http://example.com/]"
++                               << KTextToHTML::Options(KTextToHTML::PreserveSpaces)
++                               << "[Please visit our booth 24-25 <a href=\"http://example.com/\">http://example.com/</a>]";
+ }
+ 
+ 
+diff --git a/src/lib/text/ktexttohtml.cpp b/src/lib/text/ktexttohtml.cpp
+index ecc1d22..d6c1f1c 100644
+--- a/src/lib/text/ktexttohtml.cpp
++++ b/src/lib/text/ktexttohtml.cpp
+@@ -238,6 +238,8 @@ QString KTextToHTMLHelper::getUrl(bool *badurl)
+                 previousCharIsSpace = true;
+             } else if (!previousIsAnAnchor && mText[mPos] == QLatin1Char('[')) {
+                 break;
++            } else if (!previousIsAnAnchor && mText[mPos] == QLatin1Char(']')) {
++                break;
+             } else { // skip whitespace
+                 if (previousCharIsSpace && mText[mPos] == QLatin1Char('<')) {
+                     url.append(QLatin1Char(' '));
diff --git a/debian/patches/series b/debian/patches/series
index aa2bbd3..eefe20e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Fix-Bug-343275-1-added-at-the-end-of-a-hyperlink.patch
+Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch

-- 
kcoreaddons packaging