[kdelibs] adjust patch to apply cleanly

[Lukas Tinkl]

commit ca3920c5b09db7e51003b0f89db612654f32f7db
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Oct 4 18:07:19 2011 +0200

    adjust patch to apply cleanly

 kdelibs-4.7.1-CVE-2011-3365.patch |   45 ++++++++++---------------------------
 1 files changed, 12 insertions(+), 33 deletions(-)
---
diff --git a/kdelibs-4.7.1-CVE-2011-3365.patch b/kdelibs-4.7.1-CVE-2011-3365.patch
index f01d6f1..3506dee 100644
--- a/kdelibs-4.7.1-CVE-2011-3365.patch
+++ b/kdelibs-4.7.1-CVE-2011-3365.patch
@@ -1,17 +1,7 @@
-commit 9ca2b26fc67c3f921e1943c1725fca623e395854
-Author: David Faure <faure at kde.org>
-Date:   Thu Jun 30 23:43:45 2011 +0200
-
-    Security fix: don't interpret html tags
-    
-    Credits to Tim Brown for the find.
-    (cherry picked from commit bd70d4e589711fda9ab07738c46e37eee8376214)
-
-diff --git a/kio/kssl/ksslcertificatebox.cpp b/kio/kssl/ksslcertificatebox.cpp
-index 4ffc613..094787a 100644
---- a/kio/kssl/ksslcertificatebox.cpp
-+++ b/kio/kssl/ksslcertificatebox.cpp
-@@ -36,6 +36,10 @@ KSslCertificateBox::KSslCertificateBox(QWidget *parent)
+diff -ur kdelibs-orig/kio/kssl/ksslcertificatebox.cpp kdelibs-4.7.1/kio/kssl/ksslcertificatebox.cpp
+--- kdelibs-orig/kio/kssl/ksslcertificatebox.cpp	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.7.1/kio/kssl/ksslcertificatebox.cpp	2011-10-04 18:05:51.542741747 +0200
+@@ -36,6 +36,10 @@
     d(new KSslCertificateBoxPrivate())
  {
      d->ui.setupUi(this);
@@ -22,23 +12,12 @@ index 4ffc613..094787a 100644
  }
  
  
-commit 90607b28d21fefc43657ca08b889bdb174c31fab
-Author: David Faure <faure at kde.org>
-Date:   Wed Sep 28 17:26:47 2011 +0200
-
-    Use HTML escaping on texts that come from the website
-    
-    Interestingly enough, this is yet another use case for moving Qt::escape
-    to QtCore, which I made a merge request for.
-    (cherry picked from commit 86622e4db182f4b914169f72ebd1e66d708e9f87)
-
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 33f4cb1..6447a02 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -99,6 +99,27 @@
- //authentication handlers
- #include "httpauthentication.cpp"
+diff -ur kdelibs-orig/kioslave/http/http.cpp kdelibs-4.7.1/kioslave/http/http.cpp
+--- kdelibs-orig/kioslave/http/http.cpp	2011-08-22 15:22:03.000000000 +0200
++++ kdelibs-4.7.1/kioslave/http/http.cpp	2011-10-04 18:05:51.544741717 +0200
+@@ -86,6 +86,27 @@
+ //string parsing helpers and HeaderTokenizer implementation
+ #include "parsinghelpers.cpp"
  
 +// KDE5 TODO (QT5) : use QString::htmlEscape or whatever https://qt.gitorious.org/qt/qtbase/merge_requests/56
 +// ends up with.
@@ -64,7 +43,7 @@ index 33f4cb1..6447a02 100644
  
  // see filenameFromUrl(): a sha1 hash is 160 bits
  static const int s_hashedUrlBits = 160;   // this number should always be divisible by eight
-@@ -3410,7 +3431,7 @@ endParsing:
+@@ -3431,7 +3452,7 @@
                                  authinfo.url = reqUrl;
                                  authinfo.keepPassword = true;
                                  authinfo.comment = i18n("<b>%1</b> at <b>%2</b>",
@@ -73,7 +52,7 @@ index 33f4cb1..6447a02 100644
  
                                  if (!openPasswordDialog(authinfo, errorMsg)) {
                                      if (sendErrorPageNotification()) {
-@@ -5122,7 +5143,7 @@ void HTTPProtocol::proxyAuthenticationForSocket(const QNetworkProxy &proxy, QAut
+@@ -5262,7 +5283,7 @@
                             "to access any sites.");
          info.keepPassword = true;
          info.commentLabel = i18n("Proxy:");