old

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 10 insertions, 107 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/Manifest b/www-client/rekonq/Manifest
index 7dd611572c53..f54ab045a70f 100644
--- a/www-client/rekonq/Manifest
+++ b/www-client/rekonq/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX rekonq-0.5.0-cve-2010-2536.patch 778 RMD160 e8ffe697a203f3a30b888039ccd72c732b96642b SHA1 d53444702f6b249410b8c7441655e00af78759fe SHA256 13149d61d1d891319b0932823100eda15237bfe831ac604e964261246d221583
-AUX rekonq-0.6.1-cve-2010-2536.patch 974 RMD160 a657303ff7c24865e6c7f481dbc6f43223562f1c SHA1 885d6194f8732a52f56d52a5b9dd537a1ad75b11 SHA256 d20b86d6f653da0009fe75003429080e1e679966cef1a3993d9c53daf433bd52
-AUX rekonq-0.6.1-tests.patch 442 RMD160 dfcff09e3f0886aa908937f7ecca6a4b0801c061 SHA1 4eb6fa367ceab478dd602868569449bdff22a159 SHA256 3e1485d56f8963ad56fbe9cbcc425e90e7836b3b233b0eeca5f522b9b39cab3e
-DIST rekonq-0.6.1.tar.bz2 1246263 RMD160 e3b349272f437b24eddeb828417ce24da3c2ba38 SHA1 b3d1688032d4413cb1e5dc0b486a7b4864ec8ea5 SHA256 7e9d322d26cc9f643b47f3ca7ca4be8afae626c783933c836fcf9249e045fec1
 DIST rekonq-0.7.0.tar.bz2 1936429 RMD160 3058149a92523884a72b5f1a101e3134c40d3e1d SHA1 960cd9a3bfe5f87e577cc9324bbf1915c0f89dcc SHA256 3cb0092e3cbdc65daad618f65125c4d7f0564cbae47e51b6a86aca515844f191
-EBUILD rekonq-0.6.1.ebuild 1001 RMD160 8dbeef01b677daaa18b24f55d9fa9b1a726753e3 SHA1 29876ba7923428edc37e6eed7d6dfaec256f001b SHA256 5527ee56a63bf3d314e07f0ee3689735163f870724a2f9a4d7cf01e572e5698d
 EBUILD rekonq-0.7.0.ebuild 878 RMD160 35964d59f6364ac37452572a5d04b897b8108e52 SHA1 beae4dee806bab5d84eda6bd692cb328cd09b94c SHA256 2ba652ef9155832fcf1ab493badc83c5bf5f0f6bbd754b4d8533ab50363ec3b0
-MISC ChangeLog 3700 RMD160 7d6bdda15488bdae73c76a83bb326463514d78b8 SHA1 84132f2e4155dea5682ace9d38e5bcc37fc23cab SHA256 9cb27994333948317b6f1b7bdad5bcd060d362dec67d03c5f8d89d69a70f05a8
+MISC ChangeLog 3903 RMD160 34ed48ee611f8ac7bc8b2769e73e0050968c55cc SHA1 75c2425f73867fa108154ad390349771426b0e31 SHA256 815b7945bd8d6c2138c7ca4ff280b16d8da83b4b29da19d5e11133071f54f0a2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2YmooACgkQHB6c3gNBRYc9OQCfRgd6RyTPcEcJ1q3gfS/Z3Bg1
-Wo0AoMMLiOm7tdtrzLqUuELARzG/J9M4
-=w9d2
+iEYEARECAAYFAk2263AACgkQHB6c3gNBRYdz7wCdH1z7EpMoEXb4iRWs40jDpr9W
+FeUAoLoCFwQh9xgoPikNxqx/+9CbwvDD
+=dW2Y
 -----END PGP SIGNATURE-----
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" )