Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=26003d9a57c8145657ad22d0468f220a4958f6ae
commit 26003d9a57c8145657ad22d0468f220a4958f6ae Author: kikadf <[email protected]> Date: Mon Nov 24 09:09:27 2014 +0100 kdebase-runtime--2-x86_64 * Fix CVE-2014-8600 diff --git a/source/kde/kdebase-runtime/CVE-2014-8600.patch b/source/kde/kdebase-runtime/CVE-2014-8600.patch new file mode 100644 index 0000000..b844660 --- /dev/null +++ b/source/kde/kdebase-runtime/CVE-2014-8600.patch @@ -0,0 +1,20 @@ +diff -up kde-runtime-4.14.3/kioslave/bookmarks/kio_bookmarks.cpp.me kde-runtime-4.14.3/kioslave/bookmarks/kio_bookmarks.cpp +--- kde-runtime-4.14.3/kioslave/bookmarks/kio_bookmarks.cpp.me 2014-11-17 11:53:22.952583226 +0100 ++++ kde-runtime-4.14.3/kioslave/bookmarks/kio_bookmarks.cpp 2014-11-17 11:56:11.094159901 +0100 +@@ -22,6 +22,7 @@ + #include <stdlib.h> + + #include <qregexp.h> ++#include <qtextdocument.h> + + #include <kapplication.h> + #include <kcmdlineargs.h> +@@ -197,7 +198,7 @@ void BookmarksProtocol::get( const KUrl& + echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); + } else { + echoHead(); +- echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>"); ++ echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>"); + } + finished(); + } diff --git a/source/kde/kdebase-runtime/FrugalBuild b/source/kde/kdebase-runtime/FrugalBuild index b433099..7e78fbe 100644 --- a/source/kde/kdebase-runtime/FrugalBuild +++ b/source/kde/kdebase-runtime/FrugalBuild @@ -4,7 +4,7 @@ options+=('asneeded') pkgname=kdebase-runtime -pkgrel=1 +pkgrel=2 pkgdesc="Programs and libraries needed at runtime by other KDE4 applications" groups=('kde') archs=('i686' 'x86_64') @@ -372,6 +372,11 @@ subrodepends=("${subrodepends[@]}" subgroups=("${subgroups[@]}" "kde kde-core kde-runtime") subarchs=("${subarchs[@]}" "i686 x86_64") +# FSA fix *** +source=(${source[@]} CVE-2014-8600.patch) +sha1sums=(${sha1sums[@]} 'f1d421b9b00a96a939a1baeae8c8e1f0fa45ba10') +# *********** + build() { KDE_make_split _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
