3 files changed, 0 insertions, 78 deletions
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 4ff910e504e1..5974383cabe4 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,2 +1 @@
-DIST ktnef-16.12.2.tar.xz 232628 SHA256 afb7e458ce84b443d6cefef58b9be8e983e77bbdee4154c47a50f11b33d4a945 SHA512 7062acc6ad7265327d5a4c7b4e318d1e42ac62c82c3fa10a2f1e3bbee7a3855670a26c9e1da0b88e2359ca1a8a59d9bfc51f612c3cc6f11508017e48fe659d2a WHIRLPOOL f1793d5684ce510202fb02236824855130846abcd5df9d9fcdc7f944784bfdd776c66830a5a9a60f8f156384df88baa68296bd94c4715229c97cafddab58d53d
 DIST ktnef-16.12.3.tar.xz 232752 SHA256 367869340b7b88701f75dbb668827145a4e25780820d6e8a094b71c9d781686c SHA512 ec4d8d5b74eae06d4f9be31a474aceb4927c6426e8d63472f8dd1601ebf51edb950bd683e37869724d9f930538fe5326578e66309096250ccbc004188b845cd8 WHIRLPOOL e4992ea20d09a249087d68d1f5fca02d8d2d1e6bd9760a355334f6771c679e2c0a1073c02f60c00f4e9fb2de57ec815dbd7417094df0ec4d12efe13fd9ed8c9f
diff --git a/kde-apps/libktnef/files/libktnef-16.12.2-directory-traversal.patch b/kde-apps/libktnef/files/libktnef-16.12.2-directory-traversal.patch
deleted file mode 100644
index d41b4f9c56f8..000000000000
--- a/kde-apps/libktnef/files/libktnef-16.12.2-directory-traversal.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 4ff38aa15487d69021aacad4b078500f77fb4ae8
-Author: Albert Astals Cid <aacid@kde.org>
-Date:   Mon Feb 27 19:03:49 2017 +0100
-
-    Fix Directory Traversal problem in ktnef
-    
-    Reported by Eric Sesterhenn
-    
-    Patch reviewed by Laurent Montel
-    
-    CCMAIL: eric.sesterhenn@x41-dsec.de
-
-diff --git a/src/ktnefparser.cpp b/src/ktnefparser.cpp
-index ce40e40..0678003 100644
---- a/src/ktnefparser.cpp
-+++ b/src/ktnefparser.cpp
-@@ -41,7 +41,9 @@
- 
- #include <QtCore/QDateTime>
- #include <QtCore/QDataStream>
-+#include <QtCore/QDir>
- #include <QtCore/QFile>
-+#include <QtCore/QFileInfo>
- #include <QtCore/QVariant>
- #include <QtCore/QList>
- 
-@@ -446,7 +448,9 @@ bool KTNEFParser::extractFile(const QString &filename) const
- bool KTNEFParser::ParserPrivate::extractAttachmentTo(KTNEFAttach *att,
-         const QString &dirname)
- {
--    QString filename = dirname + QLatin1Char('/');
-+    const QString destDir(QDir(dirname).absolutePath()); // get directory path without any "." or ".."
-+
-+    QString filename = destDir + QLatin1Char('/');
-     if (!att->fileName().isEmpty()) {
-         filename += att->fileName();
-     } else {
-@@ -462,6 +466,15 @@ bool KTNEFParser::ParserPrivate::extractAttachmentTo(KTNEFAttach *att,
-     if (!device_->seek(att->offset())) {
-         return false;
-     }
-+
-+    const QFileInfo fi(filename);
-+    if (!fi.absoluteFilePath().startsWith(destDir)) {
-+        qWarning() << "Attempted extract into" << fi.absoluteFilePath()
-+                   << "which is outside of the extraction root folder" << destDir << "."
-+                   << "Changing export of contained files to extraction root folder.";
-+        filename = destDir + QLatin1Char('/') + fi.fileName();
-+    }
-+
-     QSaveFile outfile(filename);
-     if (!outfile.open(QIODevice::WriteOnly)) {
-         return false;
diff --git a/kde-apps/libktnef/libktnef-16.12.2-r1.ebuild b/kde-apps/libktnef/libktnef-16.12.2-r1.ebuild
deleted file mode 100644
index e759f310c122..000000000000
--- a/kde-apps/libktnef/libktnef-16.12.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-KMNAME="ktnef"
-inherit kde5
-
-DESCRIPTION="Library for handling TNEF data"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-directory-traversal.patch" )