[SCM] rekonq packaging branch, master, updated. 0e65c6e8cde1a51a0ea709c9df97f8e2ab20ccab

[Felix Geyer]

The following commit has been merged in the master branch:
commit e555a689c634ed0e6297b53ab0a71b803e7feb78
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Mar 26 18:49:54 2011 +0100

    Drop CVE-2010-2536_fix_xss_vulnerabilities.diff, fixed upstream.
---
 debian/changelog                                   |    1 +
 .../CVE-2010-2536_fix_xss_vulnerabilities.diff     |   30 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e443d1d..f92e56a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ rekonq (0.6.95-1) UNRELEASED; urgency=low
   * Switch to debhelper compat level 8.
   * Set homepage to http://rekonq.kde.org/.
   * Add kget as a suggests of rekonq.
+  * Drop CVE-2010-2536_fix_xss_vulnerabilities.diff, fixed upstream.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 26 Mar 2011 18:28:18 +0100
 
diff --git a/debian/patches/CVE-2010-2536_fix_xss_vulnerabilities.diff b/debian/patches/CVE-2010-2536_fix_xss_vulnerabilities.diff
deleted file mode 100644
index 51deaf9..0000000
--- a/debian/patches/CVE-2010-2536_fix_xss_vulnerabilities.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1fd48c700abb6d7ff56fded1e39a1418cc573216 Mon Sep 17 00:00:00 2001
-From: Andrea Diamantini <adjam7 at gmail.com>
-Date: Sat, 31 Jul 2010 01:08:41 +0200
-Subject: [PATCH] Applying Eelko's patch against XSS vulnerability
-
-Are we yet vulnerable?
-
-CCBUG:217464
----
- src/webpage.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-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"));
--- 
-1.6.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 313ef1b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-CVE-2010-2536_fix_xss_vulnerabilities.diff

-- 
rekonq packaging