old

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

5 files changed, 6 insertions, 98 deletions

diff --git a/www-client/rekonq/ChangeLog b/www-client/rekonq/ChangeLog
index dd1650ad2e4b..e9d6381c88c5 100644
--- a/www-client/rekonq/ChangeLog
+++ b/www-client/rekonq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/rekonq
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.25 2011/04/03 16:09:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.26 2011/04/26 15:58:36 scarabeus Exp $
+
+  26 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/rekonq-0.5.0-cve-2010-2536.patch, -rekonq-0.6.1.ebuild,
+  -files/rekonq-0.6.1-cve-2010-2536.patch, -files/rekonq-0.6.1-tests.patch:
+  old
 
 *rekonq-0.7.0 (03 Apr 2011)
 
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
deleted file mode 100644
index 4fb9e8660bbb..000000000000
--- a/www-client/rekonq/files/rekonq-0.5.0-cve-2010-2536.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/rekonq-0.6.1-cve-2010-2536.patch b/www-client/rekonq/files/rekonq-0.6.1-cve-2010-2536.patch
deleted file mode 100644
index f84c0a1c13ab..000000000000
--- a/www-client/rekonq/files/rekonq-0.6.1-cve-2010-2536.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/rekonq-0.6.1-tests.patch b/www-client/rekonq/files/rekonq-0.6.1-tests.patch
deleted file mode 100644
index 364cd72e73de..000000000000
--- a/www-client/rekonq/files/rekonq-0.6.1-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN rekonq-0.6.1.orig/src/tests/protocolhandler_test.cpp rekonq-0.6.1/src/tests/protocolhandler_test.cpp
---- rekonq-0.6.1.orig/src/tests/protocolhandler_test.cpp	2010-10-05 16:03:58.000000000 +0200
-+++ rekonq-0.6.1/src/tests/protocolhandler_test.cpp	2011-01-14 23:37:27.000000000 +0100
-@@ -23,6 +23,8 @@
- 
- #include "protocolhandler.h"
- 
-+#include <QWebView>
-+#include <QNetworkRequest>
- 
- class ProtocolhandlerTest : public QObject
- {
diff --git a/www-client/rekonq/rekonq-0.6.1.ebuild b/www-client/rekonq/rekonq-0.6.1.ebuild
deleted file mode 100644
index a45950d2f4c8..000000000000
--- a/www-client/rekonq/rekonq-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 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.5 2011/03/10 13:05:20 angelos Exp $
-
-EAPI=3
-
-WEBKIT_REQUIRED=always
-QT_MINIMAL="4.7"
-KDE_MINIMAL="4.5"
-VIRTUALX_REQUIRED=test
-
-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.kde.org/"
-
-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"
-	"${FILESDIR}/${P}-tests.patch" )