summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-11-15 20:44:23 +0100
committerJohannes Huber <johu@gentoo.org>2016-11-15 20:47:49 +0100
commit698dfba548a163f798b2cc31857228f55b671281 (patch)
treebb235af296bd8b2cb1e21c07c2c96e5991ed3e7e /kde-apps/kdepimlibs
parentkde-apps: Version bump KDE Applications 16.08.3 (diff)
downloadgentoo-698dfba548a163f798b2cc31857228f55b671281.tar.gz
gentoo-698dfba548a163f798b2cc31857228f55b671281.tar.bz2
gentoo-698dfba548a163f798b2cc31857228f55b671281.zip
kde-apps: Remove KDE Applications 16.08.2
Package-Manager: portage-2.3.2
Diffstat (limited to 'kde-apps/kdepimlibs')
-rw-r--r--kde-apps/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch15
-rw-r--r--kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch94
2 files changed, 0 insertions, 109 deletions
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch b/kde-apps/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch
deleted file mode 100644
index 2df44a733084..000000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure that the Boost headers are actually found, since they are
-referenced in the kdepimlibs headers.
-Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323
-
---- KdepimLibsConfig.cmake.in.org 2012-08-13 12:46:24.000000000 +0400
-+++ KdepimLibsConfig.cmake.in 2012-09-06 08:53:53.000000000 +0400
-@@ -15,7 +15,7 @@
- set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
- set(KDEPIMLIBS_DBUS_SERVICES_DIR "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
- set(KDEPIMLIBS_INCLUDE_DIR "@KDEPIMLIBS_INCLUDE_DIR@")
--set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")
-+set(KDEPIMLIBS_INCLUDE_DIRS "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
- set(KDEPIMLIBS_LIB_DIR "@KDEPIMLIBS_LIB_DIR@")
- set(KDEPIMLIBS_BIN_DIR "@KDEPIMLIBS_BIN_DIR@")
- set(KDEPIMLIBS_LIBEXEC_DIR "@KDEPIMLIBS_LIBEXEC_DIR@")
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch b/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch
deleted file mode 100644
index b6f278a6b0a4..000000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 176fee25ca79145ab5c8e2275d248f1a46a8d8cf Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel@kde.org>
-Date: Fri, 30 Sep 2016 15:55:35 +0200
-Subject: [PATCH] Backport avoid to transform as a url when we have a quote
-
----
- kpimutils/linklocator.cpp | 30 +++++++++++++++++++++++++++---
- kpimutils/linklocator.h | 3 ++-
- 2 files changed, 29 insertions(+), 4 deletions(-)
-
-diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp
-index f5d9afd..f30e8fc 100644
---- a/kpimutils/linklocator.cpp
-+++ b/kpimutils/linklocator.cpp
-@@ -95,6 +95,12 @@ int LinkLocator::maxAddressLen() const
-
- QString LinkLocator::getUrl()
- {
-+ return getUrlAndCheckValidHref();
-+}
-+
-+
-+QString LinkLocator::getUrlAndCheckValidHref(bool *badurl)
-+{
- QString url;
- if ( atUrl() ) {
- // NOTE: see http://tools.ietf.org/html/rfc3986#appendix-A and especially appendix-C
-@@ -129,13 +135,26 @@ QString LinkLocator::getUrl()
-
- url.reserve( maxUrlLen() ); // avoid allocs
- int start = mPos;
-+ bool previousCharIsADoubleQuote = false;
- while ( ( mPos < (int)mText.length() ) &&
- ( mText[mPos].isPrint() || mText[mPos].isSpace() ) &&
- ( ( afterUrl.isNull() && !mText[mPos].isSpace() ) ||
- ( !afterUrl.isNull() && mText[mPos] != afterUrl ) ) ) {
- if ( !mText[mPos].isSpace() ) { // skip whitespace
-- url.append( mText[mPos] );
-- if ( url.length() > maxUrlLen() ) {
-+ if (mText[mPos] == QLatin1Char('>') && previousCharIsADoubleQuote) {
-+ //it's an invalid url
-+ if (badurl) {
-+ *badurl = true;
-+ }
-+ return QString();
-+ }
-+ if (mText[mPos] == QLatin1Char('"')) {
-+ previousCharIsADoubleQuote = true;
-+ } else {
-+ previousCharIsADoubleQuote = false;
-+ }
-+ url.append( mText[mPos] );
-+ if ( url.length() > maxUrlLen() ) {
- break;
- }
- }
-@@ -367,7 +386,12 @@ QString LinkLocator::convertToHtml( const QString &plainText, int flags,
- } else {
- const int start = locator.mPos;
- if ( !( flags & IgnoreUrls ) ) {
-- str = locator.getUrl();
-+ bool badUrl = false;
-+ str = locator.getUrlAndCheckValidHref(&badUrl);
-+ if (badUrl) {
-+ return locator.mText;
-+ }
-+
- if ( !str.isEmpty() ) {
- QString hyperlink;
- if ( str.left( 4 ) == QLatin1String("www.") ) {
-diff --git a/kpimutils/linklocator.h b/kpimutils/linklocator.h
-index 3049397..375498d 100644
---- a/kpimutils/linklocator.h
-+++ b/kpimutils/linklocator.h
-@@ -107,6 +107,7 @@ class KPIMUTILS_EXPORT LinkLocator
- @return The URL at the current scan position, or an empty string.
- */
- QString getUrl();
-+ QString getUrlAndCheckValidHref(bool *badurl = 0);
-
- /**
- Attempts to grab an email address. If there is an @ symbol at the
-@@ -155,7 +156,7 @@ class KPIMUTILS_EXPORT LinkLocator
- */
- static QString pngToDataUrl( const QString & iconPath );
-
-- protected:
-+protected:
- /**
- The plaintext string being scanned for URLs and email addresses.
- */
---
-2.7.3
-