From 697ee44dcb59db19f9949754a1fc6c22edfecb59 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 2 Dec 2019 18:14:29 +0100 Subject: kde-frameworks: Drop KDE Frameworks 5.60.0 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner --- kde-frameworks/kconfig/Manifest | 1 - .../files/kconfig-5.60.0-CVE-2019-14744.patch | 147 --------------------- kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild | 38 ------ 3 files changed, 186 deletions(-) delete mode 100644 kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch delete mode 100644 kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild (limited to 'kde-frameworks/kconfig') diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest index 15d750a0b6ac..41d7e7d474d6 100644 --- a/kde-frameworks/kconfig/Manifest +++ b/kde-frameworks/kconfig/Manifest @@ -1,2 +1 @@ -DIST kconfig-5.60.0.tar.xz 240404 BLAKE2B 92855462c8be4b95adcd87100bceb68975f2f5f5f943c7f5cc91b2c7bf14e43227f7c572663a7ad7fac3a993a2a3bcd77d11ad0a8abb24c2fe68f07ad61e1d17 SHA512 76aa15e9e1630c687ff7cc6b77060c74472f307442d07ae09d5f4aa61d7b6f29f3f1d270218c6d7fea8e86eb9dda43c96821d19d827a781c7f71da6135d98753 DIST kconfig-5.64.0.tar.xz 242300 BLAKE2B 0784340620eb46c5ed5b4c54ee05c09322eead72edb78f5abce7317340081aefeb553027036a7e662e9dade4bf8f697f4d42ff9325693eb95fe832c5a8f7cd82 SHA512 14e2f58a095eba2ae7e96523602b3426734e8147b60cbfb25068b8be8e8442d3f70489252f21bd3f8367d3c6af146d274205161b104b7dc6f2b0890f48b0816d diff --git a/kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch b/kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch deleted file mode 100644 index e8a799ca5d2d..000000000000 --- a/kde-frameworks/kconfig/files/kconfig-5.60.0-CVE-2019-14744.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Wed, 7 Aug 2019 09:35:36 +0200 -Subject: Security: remove support for $(...) in config keys with [$e] marker. - -Summary: -It is very unclear at this point what a valid use case for this feature -would possibly be. The old documentation only mentions $(hostname) as -an example, which can be done with $HOSTNAME instead. - -Note that $(...) is still supported in Exec lines of desktop files, -this does not require [$e] anyway (and actually works better without it, -otherwise the $ signs need to be doubled to obey kconfig $e escaping rules...). - -Test Plan: -ctest passes; various testcases with $(...) in desktop files, -directory files, and config files, no longer execute commands. - -Reviewers: mdawson, aacid, broulik, davidedmundson, kossebau, apol, sitter, security-team - -Reviewed By: mdawson, davidedmundson - -Subscribers: ZaWertun, rikmills, fvogt, ngraham, kde-frameworks-devel - -Tags: #frameworks - -Differential Revision: https://phabricator.kde.org/D22979 ---- - autotests/kconfigtest.cpp | 10 ++-------- - docs/options.md | 11 ++++------- - src/core/kconfig.cpp | 37 +------------------------------------ - 3 files changed, 7 insertions(+), 51 deletions(-) - -diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp -index 410b5b8..9af3b46 100644 ---- a/autotests/kconfigtest.cpp -+++ b/autotests/kconfigtest.cpp -@@ -38,7 +38,7 @@ - #include - #endif - #ifndef Q_OS_WIN --#include // gethostname -+#include // getuid - #endif - - KCONFIGGROUP_DECLARE_ENUM_QOBJECT(KConfigTest, Testing) -@@ -546,14 +546,8 @@ void KConfigTest::testPath() - QCOMPARE(group.readPathEntry("withBraces", QString()), QString("file://" + HOMEPATH)); - QVERIFY(group.hasKey("URL")); - QCOMPARE(group.readEntry("URL", QString()), QString("file://" + HOMEPATH)); --#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC) -- // I don't know if this will work on windows -- // This test hangs on OS X - QVERIFY(group.hasKey("hostname")); -- char hostname[256]; -- QVERIFY(::gethostname(hostname, sizeof(hostname)) == 0); -- QCOMPARE(group.readEntry("hostname", QString()), QString::fromLatin1(hostname)); --#endif -+ QCOMPARE(group.readEntry("hostname", QString()), QStringLiteral("(hostname)")); // the $ got removed because empty var name - QVERIFY(group.hasKey("noeol")); - QCOMPARE(group.readEntry("noeol", QString()), QString("foo")); - -diff --git a/docs/options.md b/docs/options.md -index c634c00..4a6e9bc 100644 ---- a/docs/options.md -+++ b/docs/options.md -@@ -67,18 +67,15 @@ environment variables (and `XDG_CONFIG_HOME` in particular). - Shell Expansion - --------------- - --If an entry is marked with `$e`, environment variables and shell commands will --be expanded. -+If an entry is marked with `$e`, environment variables will be expanded. - - Name[$e]=$USER -- Host[$e]=$(hostname) - - When the "Name" entry is read `$USER` will be replaced with the value of the --`$USER` environment variable, and `$(hostname)` will be replaced with the output --of the `hostname` command. -+`$USER` environment variable. - --Note that the application will replace `$USER` and `$(hostname)` with their --respective expanded values after saving. To prevent this combine the `$e` option -+Note that the application will replace `$USER` with its -+expanded value after saving. To prevent this combine the `$e` option - with `$i` (immmutable) option. For example: - - Name[$ei]=$USER -diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp -index e1b11ed..f6824ce 100644 ---- a/src/core/kconfig.cpp -+++ b/src/core/kconfig.cpp -@@ -28,19 +28,6 @@ - #include - #include - --#ifdef _MSC_VER --static inline FILE *popen(const char *cmd, const char *mode) --{ -- return _popen(cmd, mode); --} --static inline int pclose(FILE *stream) --{ -- return _pclose(stream); --} --#else --#include --#endif -- - #include "kconfigbackend_p.h" - #include "kconfiggroup.h" - -@@ -183,29 +170,7 @@ QString KConfigPrivate::expandString(const QString &value) - int nDollarPos = aValue.indexOf(QLatin1Char('$')); - while (nDollarPos != -1 && nDollarPos + 1 < aValue.length()) { - // there is at least one $ -- if (aValue[nDollarPos + 1] == QLatin1Char('(')) { -- int nEndPos = nDollarPos + 1; -- // the next character is not $ -- while ((nEndPos <= aValue.length()) && (aValue[nEndPos] != QLatin1Char(')'))) { -- nEndPos++; -- } -- nEndPos++; -- QString cmd = aValue.mid(nDollarPos + 2, nEndPos - nDollarPos - 3); -- -- QString result; -- --// FIXME: wince does not have pipes --#ifndef _WIN32_WCE -- FILE *fs = popen(QFile::encodeName(cmd).data(), "r"); -- if (fs) { -- QTextStream ts(fs, QIODevice::ReadOnly); -- result = ts.readAll().trimmed(); -- pclose(fs); -- } --#endif -- aValue.replace(nDollarPos, nEndPos - nDollarPos, result); -- nDollarPos += result.length(); -- } else if (aValue[nDollarPos + 1] != QLatin1Char('$')) { -+ if (aValue[nDollarPos + 1] != QLatin1Char('$')) { - int nEndPos = nDollarPos + 1; - // the next character is not $ - QStringRef aVarName; --- -cgit v1.1 - diff --git a/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild b/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild deleted file mode 100644 index 051742601b42..000000000000 --- a/kde-frameworks/kconfig/kconfig-5.60.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework for reading and writing configuration" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="dbus nls" - -BDEPEND=" - nls? ( $(add_qt_dep linguist-tools) ) -" -RDEPEND=" - $(add_qt_dep qtgui) - $(add_qt_dep qtxml) - dbus? ( $(add_qt_dep qtdbus) ) -" -DEPEND="${RDEPEND} - test? ( $(add_qt_dep qtconcurrent) ) -" - -# bug 560086 -RESTRICT+=" test" - -DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md ) - -PATCHES=( "${FILESDIR}/${P}-CVE-2019-14744.patch") - -src_configure() { - local mycmakeargs=( - -DKCONFIG_USE_DBUS=$(usex dbus) - ) - kde5_src_configure -} -- cgit v1.2.3-65-gdbad