Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2e38563af940c3d28ab35a28b396da4d71dcfe39
commit 2e38563af940c3d28ab35a28b396da4d71dcfe39 Author: crazy <[email protected]> Date: Thu Apr 14 23:35:56 2016 +0200 kwebkitpart-1.3.4-1-x86_64 * removed , replaced by kdewebkit diff --git a/source/kde-extra/kwebkitpart/CVE-2014-8600.patch b/source/kde-extra/kwebkitpart/CVE-2014-8600.patch deleted file mode 100644 index 79efc11..0000000 --- a/source/kde-extra/kwebkitpart/CVE-2014-8600.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 641aa7c75631084260ae89aecbdb625e918c6689 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <[email protected]> -Date: Thu, 13 Nov 2014 15:06:01 +0100 -Subject: [PATCH] Sanitize html - -As discussed by the security team ---- - src/webpage.cpp | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/webpage.cpp b/src/webpage.cpp -index df1c41c..3e20b38 100644 ---- a/src/webpage.cpp -+++ b/src/webpage.cpp -@@ -226,23 +226,26 @@ QString WebPage::errorPage(int code, const QString& text, const KUrl& reqUrl) co - doc += QL1S( "<h3>" ); - doc += i18n( "Details of the Request:" ); - doc += QL1S( "</h3><ul><li>" ); -- doc += i18n( "URL: %1", reqUrl.url() ); -+ // escape URL twice: once for i18n, and once for HTML. -+ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) ); - doc += QL1S( "</li><li>" ); - - const QString protocol (reqUrl.protocol()); - if ( !protocol.isNull() ) { -- doc += i18n( "Protocol: %1", protocol ); -+ // escape protocol twice: once for i18n, and once for HTML. -+ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) ); - doc += QL1S( "</li><li>" ); - } - - doc += i18n( "Date and Time: %1", - KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) ); - doc += QL1S( "</li><li>" ); -- doc += i18n( "Additional Information: %1" , text ); -+ // escape text twice: once for i18n, and once for HTML. -+ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) ); - doc += QL1S( "</li></ul><h3>" ); - doc += i18n( "Description:" ); - doc += QL1S( "</h3><p>" ); -- doc += description; -+ doc += Qt::escape( description ); - doc += QL1S( "</p>" ); - - if ( causes.count() ) { --- -1.9.3 - diff --git a/source/kde-extra/kwebkitpart/FrugalBuild b/source/kde-extra/kwebkitpart/FrugalBuild deleted file mode 100644 index 3ab6048..0000000 --- a/source/kde-extra/kwebkitpart/FrugalBuild +++ /dev/null @@ -1,31 +0,0 @@ -# Compiling Time: 0.04 SBU -# Maintainer: James Buren <[email protected]> - -pkgname=kwebkitpart -pkgver=1.3.4 -pkgrel=1 -pkgdesc="An implementation of webkit for KDE." -url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"; -depends=('kdebase-runtime') -makedepends=('kdelibs-compiletime') -groups=('kde-extra') -archs=('i686' 'x86_64') -_F_scm_type="git" -_F_scm_url="git://anongit.kde.org/kwebkitpart" -_F_scm_tag="v$pkgver" -Finclude kde scm -up2date="lynx -dump $url | sed -n 's|.*v\([0-9].*[0-9]\).*|\1|p' | head -1" -source=() - -# FSA fix *** -source=(${source[@]} CVE-2014-8600.patch) -sha1sums=(${sha1sums[@]} '556c1cb8cd9430c39871b4c13f895c45200a6d55') -# *********** - -build() -{ - Funpack_scm - KDE_build -} - -# optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
