Version bump, remove old

(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

4 files changed, 75 insertions, 26 deletions

diff --git a/www-client/rekonq/ChangeLog b/www-client/rekonq/ChangeLog
index c86b849c4443..aa9be6ba82fc 100644
--- a/www-client/rekonq/ChangeLog
+++ b/www-client/rekonq/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2010/10/12 18:20:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.14 2010/11/07 18:44:54 tampakrap Exp $
+
+*rekonq-0.6.1 (07 Nov 2010)
+
+  07 Nov 2010; <tampakrap@gentoo.org> -rekonq-0.5.0.ebuild,
+  +rekonq-0.6.1.ebuild, +files/rekonq-0.6.1-cve-2010-2536.patch:
+  Version bump, remove old
 
   12 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
   rekonq-0.5.0-r1.ebuild:
diff --git a/www-client/rekonq/files/rekonq-0.6.1-cve-2010-2536.patch b/www-client/rekonq/files/rekonq-0.6.1-cve-2010-2536.patch
new file mode 100644
index 000000000000..f84c0a1c13ab
--- /dev/null
+++ b/www-client/rekonq/files/rekonq-0.6.1-cve-2010-2536.patch
@@ -0,0 +1,26 @@
+diff --git a/src/webpage.cpp b/src/webpage.cpp
+index 9be0d3c..386f209 100644
+--- a/src/webpage.cpp
++++ b/src/webpage.cpp
+@@ -68,6 +68,9 @@
+ 
+ // Qt Includes
+ #include <QtCore/QFileInfo>
++
++#include <QtGui/QTextDocument>
++
+ #include <QtDBus/QDBusConnection>
+ #include <QtDBus/QDBusConnectionInterface>
+ #include <QtDBus/QDBusInterface>
+@@ -589,7 +592,10 @@ QString WebPage::errorPage(QNetworkReply *reply)
+     }
+ 
+     QString title = i18n("There was a problem while loading the page");
+-    QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery | QUrl::RemovePath);
++    
++    // NOTE: 
++    // this, to be sure BUG 217464 (Universal XSS) has been fixed..
++    QString urlString = Qt::escape(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.ebuild b/www-client/rekonq/rekonq-0.5.0.ebuild
deleted file mode 100644
index e658763c28db..000000000000
--- a/www-client/rekonq/rekonq-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.ebuild,v 1.3 2010/08/09 17:01:17 reavertm Exp $
-
-EAPI=2
-
-WEBKIT_REQUIRED=always
-KDE_DOC_DIRS="docs"
-inherit kde4-base
-
-DESCRIPTION="A browser based on qt-webkit"
-HOMEPAGE="http://rekonq.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +handbook"
-
-DEPEND="
-	x11-libs/gtk+:2
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
diff --git a/www-client/rekonq/rekonq-0.6.1.ebuild b/www-client/rekonq/rekonq-0.6.1.ebuild
new file mode 100644
index 000000000000..5b73c4effa94
--- /dev/null
+++ b/www-client/rekonq/rekonq-0.6.1.ebuild
@@ -0,0 +1,42 @@
+# 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.6.1.ebuild,v 1.1 2010/11/07 18:44:54 tampakrap Exp $
+
+EAPI=3
+
+WEBKIT_REQUIRED=always
+QT_MINIMAL="4.7"
+KDE_MINIMAL="4.5"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS_DIR="i18n"
+	KDE_LINGUAS="ca cs da de el en_GB es et fr hu it ja ko lt nb
+	nds nl pt_BR pt ru sl sr 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"
+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" )