Revision bump, add patch for CVE-2010-2536, and small cleanup: EAPI3, merge with live ebuild

Package-Manager: portage-2.2_rc94/cvs/Linux x86_64

4 files changed, 66 insertions, 2 deletions

diff --git a/www-client/rekonq/ChangeLog b/www-client/rekonq/ChangeLog
index a53f7ff668d9..f5ca99b9427f 100644
--- a/www-client/rekonq/ChangeLog
+++ b/www-client/rekonq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/rekonq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.11 2010/08/09 17:01:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.12 2010/10/12 18:11:58 tampakrap Exp $
+
+*rekonq-0.5.0-r1 (12 Oct 2010)
+
+  12 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  +rekonq-0.5.0-r1.ebuild, +files/rekonq-0.5.0-cve-2010-2536.patch:
+  Revision bump, add patch for CVE-2010-2536, and small cleanup: EAPI3,
+  merge with live ebuild
 
   09 Aug 2010; Maciej Mrozowski <reavertm@gentoo.org> rekonq-0.5.0.ebuild:
   Remove unnecessary KDE_MINIMAL, QA
diff --git a/www-client/rekonq/Manifest b/www-client/rekonq/Manifest
index 1aedfd0adef1..077a4b83aede 100644
--- a/www-client/rekonq/Manifest
+++ b/www-client/rekonq/Manifest
@@ -1,4 +1,6 @@
+AUX rekonq-0.5.0-cve-2010-2536.patch 778 RMD160 e8ffe697a203f3a30b888039ccd72c732b96642b SHA1 d53444702f6b249410b8c7441655e00af78759fe SHA256 13149d61d1d891319b0932823100eda15237bfe831ac604e964261246d221583
 DIST rekonq-0.5.0.tar.bz2 1155863 RMD160 ba03cb878a2437242161c827cc632e8153d5e865 SHA1 c8d1c1bb531a6183497bf947dbed60e44de989ec SHA256 a8dcf9dc81fa46a042171a29837bc1a53e0d92936afc34f6917740da7734a162
+EBUILD rekonq-0.5.0-r1.ebuild 912 RMD160 7495549522326a2fbf5979d50ec615b606f1b0d9 SHA1 3f65228eab079760b6d9846f9703c4c58ac77b90 SHA256 6f430a7632c8e5e77254ace253cfa8e28bda84fb6464d0fa144960e317f9dbb9
 EBUILD rekonq-0.5.0.ebuild 565 RMD160 9e4866d0bbcb5d89c79e2a6f4d8ea292ccb392b5 SHA1 60b75556b8338fd67398a338f64ff30a20e45c04 SHA256 bf42b5cc040ec8c94004621e32f8546c229285add790f7c8fb64c94f41f47586
-MISC ChangeLog 1763 RMD160 cae8dadc9bb8146695598adeb651b6a8eaa41170 SHA1 24c893e1cce80728e0bd74907cf318ae5130343d SHA256 16ec9056f427228c3ccd3e91e3d094cabecf5fc007e75bf29d2ed0e9b85cebad
+MISC ChangeLog 2018 RMD160 506af28b29d788a13b32f7674d32b4dee52e8010 SHA1 8d54b72bd97cbd81881c379f8710294bcac00a19 SHA256 ee5207463f360d8c67c5bbdfc2b19a5e3bb2759ae783b0bd7a035aeac23a90cf
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/www-client/rekonq/files/rekonq-0.5.0-cve-2010-2536.patch b/www-client/rekonq/files/rekonq-0.5.0-cve-2010-2536.patch
new file mode 100644
index 000000000000..4fb9e8660bbb
--- /dev/null
+++ b/www-client/rekonq/files/rekonq-0.5.0-cve-2010-2536.patch
@@ -0,0 +1,15 @@
+diff --git a/src/webpage.cpp b/src/webpage.cpp
+index a63940b..ea2add6 100644
+--- a/src/webpage.cpp
++++ b/src/webpage.cpp
+@@ -577,8 +577,8 @@ QString WebPage::errorPage(QNetworkReply *reply)
+         return QString("Couldn't open the rekonqinfo.html file");
+     }
+ 
+-    QString title = i18n("Error loading: %1", reply->url().toString());
+-    QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery);
++    QString title = i18n("There was a problem while loading the page");
++    QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery | QUrl::RemovePath);
+ 
+     QString iconPath = QString("file://") + KIconLoader::global()->iconPath("dialog-warning" , KIconLoader::Small);
+     iconPath.replace(QL1S("16"), QL1S("128"));
diff --git a/www-client/rekonq/rekonq-0.5.0-r1.ebuild b/www-client/rekonq/rekonq-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..40e21f33e447
--- /dev/null
+++ b/www-client/rekonq/rekonq-0.5.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-0.5.0-r1.ebuild,v 1.1 2010/10/12 18:11:58 tampakrap Exp $
+
+EAPI=3
+
+WEBKIT_REQUIRED=always
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="cs da de en_GB es et fr hu it lt nds pt_BR pt ru sv uk zh_CN"
+	KDE_DOC_DIRS="docs"
+	KDE_HANDBOOK="optional"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+else
+	EGIT_REPO_URI="git://git.kde.org/rekonq.git"
+	GIT_ECLASS="git"
+	QT_MINIMAL="4.7"
+	KDE_MINIMAL="4.5"
+fi
+
+inherit kde4-base ${GIT_ECLASS}
+
+unset GIT_ECLASS
+
+DESCRIPTION="A browser based on qt-webkit"
+HOMEPAGE="http://rekonq.sourceforge.net/"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=x11-libs/qt-xmlpatterns-${QT_MINIMAL}
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cve-2010-2536.patch" )