old

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

9 files changed, 10 insertions, 271 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 313957117f6d..134e03c2db95 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.749 2011/05/03 21:48:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.750 2011/05/04 11:17:26 scarabeus Exp $
+
+  04 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/kdelibs-4.5.2-open-https.patch,
+  -files/kdelibs-4.5.5-cve20111168.patch,
+  -files/kdelibs-4.5.73-module-suffix.patch,
+  -files/kdelibs-4.5.74-klauncher_mac.patch,
+  -files/kdelibs-4.6.0-hostname.patch, -files/kdelibs-4.6.0-logoutcrash.patch,
+  -files/kdelibs-4.6.1-cve20111168.patch, -files/kdelibs-4.6.1-sslproxy.patch:
+  old
 
   03 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdelibs-4.6.2-r3.ebuild:
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch b/kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch
deleted file mode 100644
index cbce1f4d0966..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.2-open-https.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- branches/KDE/4.5/kdelibs/kio/kio/krun.cpp	2010/10/06 22:28:05	1183316
-+++ branches/KDE/4.5/kdelibs/kio/kio/krun.cpp	2010/10/06 22:33:23	1183317
-@@ -375,6 +375,7 @@
-             }
-             else { // if no KDE app, be a bit over-generic
-                 supportedProtocols.append("http");
-+                supportedProtocols.append("https"); // #253294
-                 supportedProtocols.append("ftp");
-             }
-         }
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.5-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.5.5-cve20111168.patch
deleted file mode 100644
index 356f30a61046..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.5-cve20111168.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/khtml/khtml_part.cpp
-+++ b/khtml/khtml_part.cpp
-@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode
-   stream >> errorName >> techName >> description >> causes >> solutions;
- 
-   QString url, protocol, datetime;
--  url = Qt::escape( reqUrl.prettyUrl() );
-+
-+  // This is somewhat confusing, but we have to escape the externally-
-+  // controlled URL twice: once for i18n, and once for HTML.
-+  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
-   protocol = reqUrl.protocol();
-   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
-                                                 KLocale::LongDate );
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
deleted file mode 100644
index 1b517d9e94a4..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -purN kdelibs-4.3.80.orig/config.h.cmake kdelibs-4.3.80/config.h.cmake
---- kdelibs-4.3.80.orig/config.h.cmake	2009-10-26 05:15:52.000000000 -0400
-+++ kdelibs-4.3.80/config.h.cmake	2009-12-14 16:56:15.667194286 -0500
-@@ -12,6 +12,7 @@
- #define kde_socklen_t socklen_t
- 
- #define KDELIBSUFF "${KDELIBSUFF}"
-+#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"
- 
- /****************************/
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp kdelibs-4.3.80/kdecore/util/klibloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp	2008-05-21 07:09:15.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibloader.cpp	2009-12-14 16:56:15.668194094 -0500
-@@ -57,7 +57,7 @@ KLibLoader::~KLibLoader()
- {
- }
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- 
- extern QString findLibrary(const QString &name, const KComponentData &cData);
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp kdelibs-4.3.80/kdecore/util/klibrary.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp	2009-10-02 10:55:11.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibrary.cpp	2009-12-14 16:57:24.317056608 -0500
-@@ -27,7 +27,7 @@
- #include <kpluginfactory.h>
- #include <kdebug.h>
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- extern QString findLibraryInternal(const QString &name, const KComponentData &cData);
- 
- int kLibraryDebugArea() {
-diff -purN kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp kdelibs-4.3.80/kdecore/util/kpluginloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp	2009-10-15 12:35:55.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/kpluginloader.cpp	2009-12-14 16:57:58.533877037 -0500
-@@ -27,6 +27,8 @@
- #include "klibrary.h"
- #include <kdebug.h>
- 
-+#include <config.h>
-+
- #include <QtCore/QLibrary>
- #include <QtCore/QDir>
- #include <QtCore/QFileInfo>
-@@ -54,26 +54,38 @@
-     KLibrary *lib;
- };
- 
--inline QString makeLibName( const QString &libname )
-+inline QString makeLibName( const QString &libname, const QString &type )
- {
- #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
-     if (!libname.endsWith(".dll"))
-         return libname + ".dll";
-     return libname;
--#else
-+#else // Q_OS_WIN
-     int pos = libname.lastIndexOf(QLatin1Char('/'));
-     if (pos < 0)
-       pos = 0;
-     if (libname.indexOf(QLatin1Char('.'), pos) < 0) {
--        const char* const extList[] = { ".so", ".dylib", ".bundle", ".sl" };
-+#ifdef Q_OS_MAC
-+               // Libraries are always .dylib
-+               if (type.compare("lib") == 0) {
-+                       return libname + ".dylib";
-+               }
-+               // Modules mostly go .bundle but we'll use CMake smartness
-+               else {
-+                       return libname + KDE_MODULE_SUFFIX;
-+               }
-+#else // Q_OS_MAC
-+               // Prefer the value specified by cmake for the target, fall back to standard
-+        const char* const extList[] = { KDE_MODULE_SUFFIX, ".so", ".sl" };
-         for (uint i = 0; i < sizeof(extList) / sizeof(*extList); ++i) {
-             const QString lib = libname + QString::fromLatin1(extList[i]);
-             if (QLibrary::isLibrary(lib))
-                 return lib;
-         }
-+#endif // Q_OS_MAC
-     }
-     return libname;
--#endif
-+#endif // Q_OS_WIN
- }
- 
- #ifdef Q_OS_WIN
-@@ -82,12 +94,13 @@
- 
- QString findLibraryInternal(const QString &name, const KComponentData &cData)
- {
--    // Convert name to a valid platform libname
--    QString libname = makeLibName(name);
-     QFileInfo fileinfo(name);
-     bool hasPrefix = fileinfo.fileName().startsWith(QLatin1String("lib"));
-     bool kdeinit = fileinfo.fileName().startsWith(QLatin1String("libkdeinit4_"));
- 
-+    // Convert name to a valid platform libname depending on requested type.
-+    QString libname = makeLibName(name, kdeinit ? "lib" : "module");
-+
-     if (hasPrefix && !kdeinit)
-         kDebug(kLibraryDebugArea()) << "plugins should not have a 'lib' prefix:" << libname;
- #ifdef Q_CC_MSVC
diff --git a/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch b/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch
deleted file mode 100644
index b9869a836d8d..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kinit/klauncher.cpp.orig	2010-11-06 23:35:26.000000000 +0300
-+++ kinit/klauncher.cpp	2010-11-07 02:45:19.000000000 +0300
-@@ -1151,6 +1151,12 @@
-     kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol
-      << " args=" << arg_list << endl;
- 
-+#ifdef Q_WS_MAC
-+    arg_list.prepend(KLibLoader::findLibrary(name));
-+    name = KStandardDirs::locate("exe", QString::fromLatin1("kioslave"));
-+    arg_list.prepend(name);
-+#endif
-+
- #ifdef Q_OS_UNIX
-     if (mSlaveDebug == arg1)
-     {
-@@ -1161,8 +1167,10 @@
-     }
-     if (mSlaveValgrind == arg1)
-     {
-+#ifdef Q_WS_MAC
-        arg_list.prepend(::findLibrary(name, KGlobal::mainComponent()));
-        arg_list.prepend(KStandardDirs::locate("exe", QString::fromLatin1("kioslave")));
-+#endif
-        name = QString::fromLatin1("valgrind");
-        if (!mSlaveValgrindSkin.isEmpty()) {
-            arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin);
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-hostname.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-hostname.patch
deleted file mode 100644
index 4bc0ac85f03b..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.0-hostname.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 76f935197599a335a5fe09b78751ddb455248cf7
-Author: David Faure <faure@kde.org>
-Date:   Mon Jan 31 14:51:52 2011 +0100
-
-    Harden SSL verification against poisoned DNS attacks
-    
-    ... in the case of certificates that are issued against an IP address rather than a hostname.
-    Patch by Tomas Hoger / Red Hat Security Response Team, reviewed by Jeff Mitchell and Richard Moore.
-
-diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
-index 9cddd41..3e6cdf6 100644
---- a/kio/kio/tcpslavebase.cpp
-+++ b/kio/kio/tcpslavebase.cpp
-@@ -550,23 +550,34 @@ TCPSlaveBase::SslResult TCPSlaveBase::startTLSInternal(uint v_)
-     // domain<->certificate matching here.
-     d->sslErrors = d->socket.sslErrors();
-     QSslCertificate peerCert = d->socket.peerCertificateChain().first();
--    QStringList domainPatterns(peerCert.subjectInfo(QSslCertificate::CommonName));
--    domainPatterns += peerCert.alternateSubjectNames().values(QSsl::DnsEntry);
-     QMutableListIterator<KSslError> it(d->sslErrors);
-     while (it.hasNext()) {
-         // As of 4.4.0 Qt does not assign a certificate to the QSslError it emits
-         // *in the case of HostNameMismatch*. A HostNameMismatch, however, will always
-         // be an error of the peer certificate so we just don't check the error's
-         // certificate().
--        if (it.next().error() != KSslError::HostNameMismatch) {
--            continue;
-+
-+        // Remove all HostNameMismatch, we have to redo name checking later.
-+        if (it.next().error() == KSslError::HostNameMismatch) {
-+            it.remove();
-         }
--        Q_FOREACH (const QString &dp, domainPatterns) {
--            if (isMatchingHostname(dp, d->host)) {
--                it.remove();
--            }
-+    }
-+    // Redo name checking here and (re-)insert HostNameMismatch to sslErrors if
-+    // host name does not match any of the names in server certificate.
-+    // QSslSocket may not report HostNameMismatch error, when server
-+    // certificate was issued for the IP we are connecting to.
-+    QStringList domainPatterns(peerCert.subjectInfo(QSslCertificate::CommonName));
-+    domainPatterns += peerCert.alternateSubjectNames().values(QSsl::DnsEntry);
-+    bool names_match = false;
-+    foreach (const QString &dp, domainPatterns) {
-+        if (isMatchingHostname(dp, d->host)) {
-+            names_match = true;
-+            break;
-         }
-     }
-+    if (!names_match) {
-+        d->sslErrors.insert(0, KSslError(KSslError::HostNameMismatch, peerCert));
-+    }
- 
-     // TODO: review / rewrite / remove the comment
-     // The app side needs the metadata now for the SSL error dialog (if any) but
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch
deleted file mode 100644
index 5fd8d0a5c313..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.0-logoutcrash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 709f75ac353cd735ccac31f87363ea90dde345d3
-Author: Marco Martin <notmart@gmail.com>
-Date:   Tue Feb 1 21:15:49 2011 +0100
-
-    don't collapse when it's destroying
-    try to not crash upon deletion of the extender
-
-diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp
-index bdbc886..3e5809f 100644
---- a/plasma/extenders/extenderitem.cpp
-+++ b/plasma/extenders/extenderitem.cpp
-@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
- 
- void ExtenderItem::setCollapsed(bool collapsed)
- {
-+    if (extender()->d->destroying) {
-+        return;
-+    }
-+
-     config().writeEntry("isCollapsed", collapsed);
-     d->collapsed = collapsed;
-     d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget"));
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.1-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.6.1-cve20111168.patch
deleted file mode 100644
index 007eef91085c..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.1-cve20111168.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/khtml/khtml_part.cpp
-+++ b/khtml/khtml_part.cpp
-@@ -1804,7 +1804,10 @@ void KHTMLPart::htmlError( int errorCode
-   stream >> errorName >> techName >> description >> causes >> solutions;
- 
-   QString url, protocol, datetime;
--  url = Qt::escape( reqUrl.prettyUrl() );
-+
-+  // This is somewhat confusing, but we have to escape the externally-
-+  // controlled URL twice: once for i18n, and once for HTML.
-+  url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
-   protocol = reqUrl.protocol();
-   datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
-                                                 KLocale::LongDate );
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.1-sslproxy.patch b/kde-base/kdelibs/files/kdelibs-4.6.1-sslproxy.patch
deleted file mode 100644
index a07a8d3be8e4..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.1-sslproxy.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit caa5ead18c00c8924f5b03d6495148e51e8f3cdf
-Author: Dawit Alemayehu <adawit@kde.org>
-Date:   Fri Mar 4 18:58:28 2011 -0500
-
-    Fix the issue of HTTPS over proxy not working properly when connecting to two or more secure sites.
-    
-    BUG:155707
-    FIXED-IN:4.6.2
-
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 534de3b..25cb1cc 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -2089,7 +2089,7 @@ bool HTTPProtocol::httpShouldCloseConnection()
-   // TODO compare current proxy state against proxy needs of next request,
-   // *when* we actually have variable proxy settings!
- 
--  if (isValidProxy(m_request.proxyUrl))  {
-+  if (isHttpProxy(m_request.proxyUrl) && !isAutoSsl())  {
-       return !isCompatibleNextUrl(m_server.proxyUrl, m_request.proxyUrl);
-   }
-   return !isCompatibleNextUrl(m_server.url, m_request.url);