diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-02 21:58:00 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-02 21:58:00 +0000 |
commit | 298a064cbac18a7a40afb3a47dfa230fd976bcea (patch) | |
tree | 72bbbd9777d2d6d6fcb39ee96ec18b6edf243de5 /kde-base/kdelibs/files | |
parent | Bump to 0.10.0, new slot, ebuild from the GNOME overlay (diff) | |
download | gentoo-2-298a064cbac18a7a40afb3a47dfa230fd976bcea.tar.gz gentoo-2-298a064cbac18a7a40afb3a47dfa230fd976bcea.tar.bz2 gentoo-2-298a064cbac18a7a40afb3a47dfa230fd976bcea.zip |
Drop KDE 4.4
(Portage version: 2.1.9.49/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base/kdelibs/files')
4 files changed, 0 insertions, 97 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch deleted file mode 100644 index 9a81db700566..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.4.5-cve20111168.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/khtml/khtml_part.cpp -+++ b/khtml/khtml_part.cpp -@@ -1848,7 +1848,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.4.5-formpainter.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch deleted file mode 100644 index 8fd94b269913..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.4.5-formpainter.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: kdelibs/khtml/khtmlview.cpp -=================================================================== ---- kdelibs/khtml/khtmlview.cpp (Revision 1185321) -+++ kdelibs/khtml/khtmlview.cpp (Revision 1185322) -@@ -2135,17 +2135,6 @@ - case QEvent::DragLeave: - case QEvent::Drop: - return false; -- case QEvent::Paint: { -- QRect r = static_cast<QPaintEvent*>(e)->rect(); -- r = r.intersect( widget()->rect() ); -- if (r.isValid() && !r.isEmpty()) { -- r.setX(r.x() +contentsX()); -- r.setY(r.y() +contentsY()); -- QPaintEvent pe(r); -- paintEvent(&pe); -- } -- return true; -- } - default: - break; - } diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-hostname.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-hostname.patch deleted file mode 100644 index d4f7db5c1c40..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.4.5-hostname.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ruN kdelibs-4.4.5.orig/kio/kio/tcpslavebase.cpp kdelibs-4.4.5/kio/kio/tcpslavebase.cpp ---- kdelibs-4.4.5.orig/kio/kio/tcpslavebase.cpp 2010-04-29 21:52:23.000000000 +0200 -+++ kdelibs-4.4.5/kio/kio/tcpslavebase.cpp 2011-03-09 10:31:37.000000000 +0100 -@@ -490,8 +490,6 @@ - // 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); - QRegExp domainMatcher(QString(), Qt::CaseInsensitive, QRegExp::Wildcard); - QMutableListIterator<KSslError> it(d->sslErrors); - while (it.hasNext()) { -@@ -499,16 +498,29 @@ - // *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; -- } -- foreach (const QString &dp, domainPatterns) { -- domainMatcher.setPattern(dp); -- if (domainMatcher.exactMatch(d->host)) { -- it.remove(); -- } -+ -+ // Remove all HostNameMismatch, we have to redo name checking later. -+ if (it.next().error() == KSslError::HostNameMismatch) { -+ 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) { -+ domainMatcher.setPattern(dp); -+ if (domainMatcher.exactMatch(d->host)) { -+ names_match = true; -+ break; -+ } -+ } -+ if (!names_match) { -+ d->sslErrors.insert(0, KSslError(KSslError::HostNameMismatch, peerCert)); -+ } - - // The app side needs the metadata now for the SSL error dialog (if any) but - // the same metadata will be needed later, too. When "later" arrives the slave diff --git a/kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch b/kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch deleted file mode 100644 index fc17b20aaaa4..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.4.5-qt471.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdelibs-4.4.5/kded/kded.cpp -+++ kdelibs-4.4.5/kded/kded.cpp -@@ -72,7 +72,7 @@ - static bool bCheckUpdates; - static bool bCheckHostname; - --extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&)); -+extern void qDBusAddSpyHook(void (*)(const QDBusMessage&)); - - static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0) - { |