commit: 7fe59bffcf1eed0024af98446d2494ed7016f794 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jun 5 20:46:41 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jun 5 20:47:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe59bff
kde-misc/kwebkitpart: Drop slot 4 No reverse-deps left. Package-Manager: Portage-2.3.5, Repoman-2.3.1 kde-misc/kwebkitpart/Manifest | 1 - .../files/kwebkitpart-1.3.4-CVE-2014-8600.patch | 45 ---------------------- kde-misc/kwebkitpart/kwebkitpart-1.3.4-r1.ebuild | 18 --------- 3 files changed, 64 deletions(-) diff --git a/kde-misc/kwebkitpart/Manifest b/kde-misc/kwebkitpart/Manifest index 96ae92bcb84..63030675366 100644 --- a/kde-misc/kwebkitpart/Manifest +++ b/kde-misc/kwebkitpart/Manifest @@ -1,2 +1 @@ -DIST kwebkitpart-1.3.4.tar.bz2 105696 SHA256 c3eb488104b4fae3a11cb0a93b5a02dcf12ecea14b366338daf8a40456af40f9 SHA512 5b24fe4ef2bb20d17016369fa1450cf333c266e665018be6fb2b923c8680c410e8cb4c6a55b960f14bfb624cf0cce3adc25fe0b533fd9baa059e918e6d4b3be0 WHIRLPOOL c5d89c8f52aefe0f5d971fe739dcfb25f9bc8447d136c351f0881aa7c3adb630d6df1cc221034a074924c3286ea88a428cafcae49b10d7fd681a793eefb68502 DIST kwebkitpart-1.4.0_pre20170128.tar.xz 106960 SHA256 ba836438033651d42c2ff95a6790f4180be4b76d6ca87eee1eb7247fc2440ea7 SHA512 6cb2c54df8d7488c4af3c6873461d4fc9053774df2a8fb7eea80ec50c9c1122fbb47d72b3f9256eeeed5f0335675c2125e7baee7e5a775ee8776b7cf64d0a0fd WHIRLPOOL f46a6bfce4de17f0c0e48ec74a61938b4a511a28a6292be00ee7d474c2c34e014cf8d789d0f44593defe32b309d4fb570818a11637f6e19deec38f6179ee3410 diff --git a/kde-misc/kwebkitpart/files/kwebkitpart-1.3.4-CVE-2014-8600.patch b/kde-misc/kwebkitpart/files/kwebkitpart-1.3.4-CVE-2014-8600.patch deleted file mode 100644 index f5050abaa5b..00000000000 --- a/kde-misc/kwebkitpart/files/kwebkitpart-1.3.4-CVE-2014-8600.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Albert Astals Cid <[email protected]> -Date: Thu, 13 Nov 2014 14:06:01 +0000 -Subject: Sanitize html -X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689 ---- -Sanitize html - -As discussed by the security team ---- - - ---- a/src/webpage.cpp -+++ b/src/webpage.cpp -@@ -226,23 +226,26 @@ - 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() ) { - diff --git a/kde-misc/kwebkitpart/kwebkitpart-1.3.4-r1.ebuild b/kde-misc/kwebkitpart/kwebkitpart-1.3.4-r1.ebuild deleted file mode 100644 index 2722f5e4516..00000000000 --- a/kde-misc/kwebkitpart/kwebkitpart-1.3.4-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WEBKIT_REQUIRED="always" -inherit kde4-base - -DESCRIPTION="A WebKit KPart for Konqueror" -HOMEPAGE="https://projects.kde.org/projects/extragear/base/kwebkitpart"; -SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.bz2"; - -LICENSE="LGPL-2" -SLOT="4" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -IUSE="debug" - -PATCHES=( "${FILESDIR}/${P}-CVE-2014-8600.patch" )
