diff options
author | Adriaan de Groot <adridg@FreeBSD.org> | 2019-08-15 10:01:34 +0000 |
---|---|---|
committer | Adriaan de Groot <adridg@FreeBSD.org> | 2019-08-15 10:01:34 +0000 |
commit | 0a7455c83ce45910f0ee6965d5db7b95bc54c9db (patch) | |
tree | ba72125e7521f7704b77323205dcde5c796ca7bb /devel/kf5-kconfig | |
parent | 949aa029a9916060e028096dff572f2f2fceebb7 (diff) | |
download | ports-0a7455c83ce45910f0ee6965d5db7b95bc54c9db.tar.gz ports-0a7455c83ce45910f0ee6965d5db7b95bc54c9db.zip |
Notes
Diffstat (limited to 'devel/kf5-kconfig')
-rw-r--r-- | devel/kf5-kconfig/Makefile | 1 | ||||
-rw-r--r-- | devel/kf5-kconfig/distinfo | 6 | ||||
-rw-r--r-- | devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 | 139 |
3 files changed, 3 insertions, 143 deletions
diff --git a/devel/kf5-kconfig/Makefile b/devel/kf5-kconfig/Makefile index c1ab8c41d64a..1a0dece833f9 100644 --- a/devel/kf5-kconfig/Makefile +++ b/devel/kf5-kconfig/Makefile @@ -2,7 +2,6 @@ PORTNAME= kconfig DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-kconfig/distinfo b/devel/kf5-kconfig/distinfo index 71f5b2c49998..80432a5c5c86 100644 --- a/devel/kf5-kconfig/distinfo +++ b/devel/kf5-kconfig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1562535591 -SHA256 (KDE/frameworks/5.60.0/kconfig-5.60.0.tar.xz) = 541acceead9ca516e3562109e7e94351ce378c234bea968c8dfde78f00559233 -SIZE (KDE/frameworks/5.60.0/kconfig-5.60.0.tar.xz) = 240404 +TIMESTAMP = 1565636863 +SHA256 (KDE/frameworks/5.61.0/kconfig-5.61.0.tar.xz) = 94c0e292a5d57e014aa745be6b59a989118ead1252d56c768f2719b5c6471372 +SIZE (KDE/frameworks/5.61.0/kconfig-5.61.0.tar.xz) = 240508 diff --git a/devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 b/devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 deleted file mode 100644 index f348c1182926..000000000000 --- a/devel/kf5-kconfig/files/patch-git-5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 +++ /dev/null @@ -1,139 +0,0 @@ -commit 5d3e71b1d2ecd2cb2f910036e614ffdfc895aa22 -Author: David Faure <faure@kde.org> -Date: Wed Aug 7 09:35:36 2019 +0200 - - 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 -diff --git autotests/kconfigtest.cpp autotests/kconfigtest.cpp -index 410b5b8..9af3b46 100644 ---- autotests/kconfigtest.cpp -+++ autotests/kconfigtest.cpp -@@ -38,7 +38,7 @@ - #include <utime.h> - #endif - #ifndef Q_OS_WIN --#include <unistd.h> // gethostname -+#include <unistd.h> // 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 docs/options.md docs/options.md -index c634c00..4a6e9bc 100644 ---- docs/options.md -+++ 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 src/core/kconfig.cpp src/core/kconfig.cpp -index e1b11ed..f6824ce 100644 ---- src/core/kconfig.cpp -+++ src/core/kconfig.cpp -@@ -28,19 +28,6 @@ - #include <cstdlib> - #include <fcntl.h> - --#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 <unistd.h> --#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; |