From 3268ea3354d7bb8667ac7d0a885bcb54004fda49 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Thu, 19 Feb 2015 07:01:08 +0000 Subject: Remove unused patches. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) --- kde-base/kdelibs/ChangeLog | 9 +++- .../files/kdelibs-4.13.1-kio-diskfree.patch | 49 ------------------- .../files/kdelibs-4.13.2-CVE-2014-3494.patch | 55 ---------------------- .../files/kdelibs-4.13.3-CVE-2014-5033.patch | 53 --------------------- .../kdelibs/files/kdelibs-4.7.96-mimetypes.patch | 38 --------------- 5 files changed, 8 insertions(+), 196 deletions(-) delete mode 100644 kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch delete mode 100644 kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch (limited to 'kde-base') diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index eff4b75c4058..2c6a81843009 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1048 2015/02/18 16:26:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1049 2015/02/19 07:01:08 kensington Exp $ + + 19 Feb 2015; Michael Palimaka + -files/kdelibs-4.13.1-kio-diskfree.patch, + -files/kdelibs-4.13.2-CVE-2014-3494.patch, + -files/kdelibs-4.13.3-CVE-2014-5033.patch, + -files/kdelibs-4.7.96-mimetypes.patch: + Remove unused patches. 18 Feb 2015; Michał Górny -kdelibs-4.12.5-r2.ebuild: Remove KDE SC 4.12 diff --git a/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch b/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch deleted file mode 100644 index 98bae45942d7..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a -Author: Tomáš Trnka -Date: Sun May 25 16:12:36 2014 +0200 - - Revert "Avoid unnecessary automounting in KDiskFreeSpaceInfo::freeSpaceInfo" - - This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5. - - It breaks KIO on CIFS mounts as the check for automounts copied over - from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches - CIFS as well (and for some weird reason KIO checks for available space - before trying to copy files). - - We'll probably have to return to v1 of the abovementioned commit, i.e. - checking for "autofs" explicitly. However, more testing is apparently - necessary to avoid further nasty surprises. - - REVIEW: 117044 - BUG: 334776 - FIXED-IN: 4.13.2 - -diff --git a/kio/kfile/kdiskfreespaceinfo.cpp b/kio/kfile/kdiskfreespaceinfo.cpp -index 5c1fa72..f11eb09 100644 ---- a/kio/kfile/kdiskfreespaceinfo.cpp -+++ b/kio/kfile/kdiskfreespaceinfo.cpp -@@ -33,7 +33,6 @@ - #include - #include - #else --#include - #include - #endif - -@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo( const QString& path ) - #else - struct statvfs statvfs_buf; - -- // Ignore autofs mountpoints as statvfs would trigger (expensive) automounting -- // This also matches "special" filesystems like /proc where free space has no meaning -- if (mp) { -- QFileInfo fi(info.d->mountPoint); -- if (fi.isDir() && fi.size() == 0) { -- return info; -- } -- } -- - // Prefer mountPoint if available, so that it even works with non-existing files. - const QString pathArg = info.d->mountPoint.isEmpty() ? path : info.d->mountPoint; - if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) { diff --git a/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch b/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch deleted file mode 100644 index 648d4fd7d4b8..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: David Faure -Date: Wed, 18 Jun 2014 18:29:04 +0000 -Subject: Don't require a job to handle messageboxes. -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d ---- -Don't require a job to handle messageboxes. - -The POP3 ioslave doesn't have a job when it gets here. ---- - - ---- a/kio/kio/usernotificationhandler.cpp -+++ b/kio/kio/usernotificationhandler.cpp -@@ -19,7 +19,7 @@ - #include "usernotificationhandler_p.h" - - #include "slave.h" --#include "job_p.h" -+#include "jobuidelegate.h" - - #include - -@@ -76,19 +76,18 @@ - - if (m_cachedResults.contains(key)) { - result = *(m_cachedResults[key]); -- } else if (r->slave->job()) { -- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); -- if (jobPrivate) { -- result = jobPrivate->requestMessageBox(r->type, -- r->data.value(MSG_TEXT).toString(), -- r->data.value(MSG_CAPTION).toString(), -- r->data.value(MSG_YES_BUTTON_TEXT).toString(), -- r->data.value(MSG_NO_BUTTON_TEXT).toString(), -- r->data.value(MSG_YES_BUTTON_ICON).toString(), -- r->data.value(MSG_NO_BUTTON_ICON).toString(), -- r->data.value(MSG_DONT_ASK_AGAIN).toString(), -- r->data.value(MSG_META_DATA).toMap()); -- } -+ } else { -+ JobUiDelegate ui; -+ const JobUiDelegate::MessageBoxType type = static_cast(r->type); -+ result = ui.requestMessageBox(type, -+ r->data.value(MSG_TEXT).toString(), -+ r->data.value(MSG_CAPTION).toString(), -+ r->data.value(MSG_YES_BUTTON_TEXT).toString(), -+ r->data.value(MSG_NO_BUTTON_TEXT).toString(), -+ r->data.value(MSG_YES_BUTTON_ICON).toString(), -+ r->data.value(MSG_NO_BUTTON_ICON).toString(), -+ r->data.value(MSG_DONT_ASK_AGAIN).toString(), -+ r->data.value(MSG_META_DATA).toMap()); - m_cachedResults.insert(key, new int(result)); - } - } else { - diff --git a/kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch b/kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch deleted file mode 100644 index 6d059b52eb31..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.13.3-CVE-2014-5033.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c36bf4f314e6ee1203898697abe294ed0c8dcb32 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" -Date: Mon, 21 Jul 2014 22:52:40 +0200 -Subject: [PATCH] Use dbus system bus name instead of PID for authentication. - -Using the PID for authentication is prone to a PID reuse -race condition, and a security issue. - -REVIEW: 119323 ---- - kdecore/auth/backends/polkit-1/Polkit1Backend.cpp | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -index cd7f6f3..732d2cb 100644 ---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp -@@ -144,7 +144,7 @@ void Polkit1Backend::setupAction(const QString &action) - - Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - { -- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid()); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID())); - PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject, - PolkitQt1::Authority::None); - switch (r) { -@@ -160,21 +160,12 @@ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action) - - QByteArray Polkit1Backend::callerID() const - { -- QByteArray a; -- QDataStream s(&a, QIODevice::WriteOnly); -- s << QCoreApplication::applicationPid(); -- -- return a; -+ return QDBusConnection::systemBus().baseService().toUtf8(); - } - - bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID) - { -- QDataStream s(&callerID, QIODevice::ReadOnly); -- qint64 pid; -- -- s >> pid; -- -- PolkitQt1::UnixProcessSubject subject(pid); -+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID)); - PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); - - PolkitResultEventLoop e; --- -1.8.5.5 - diff --git a/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch deleted file mode 100644 index 049cef87c03b..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.7.96-mimetypes.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur kdelibs-4.8.49.9999.orig/mimetypes/kde.xml kdelibs-4.8.49.9999/mimetypes/kde.xml ---- kdelibs-4.8.49.9999.orig/mimetypes/kde.xml 2011-12-27 04:20:35.982831561 +0100 -+++ kdelibs-4.8.49.9999/mimetypes/kde.xml 2011-12-27 04:30:15.747168085 +0100 -@@ -178,34 +178,6 @@ - - - -- -- -- all files and folders -- -- -- all files -- -- -- -- -- mms: URIs -- -- -- mmst: URIs -- -- -- mmsu: URIs -- -- -- pnm: URIs -- -- -- rtspt: URIs -- -- -- rtspu: URIs -- -- - - - fonts package -- cgit v1.2.3-65-gdbad