diff --git a/.gitignore b/.gitignore index 42c891d..2b76a2d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /plasma-workspace-5.20.3.tar.xz /plasma-workspace-5.20.4.tar.xz /plasma-workspace-5.20.5.tar.xz +/plasma-workspace-5.20.90.tar.xz diff --git a/0416-libkworkspace-Only-update-env-vars-with-alphanumeric.patch b/0416-libkworkspace-Only-update-env-vars-with-alphanumeric.patch deleted file mode 100644 index 2cf9895..0000000 --- a/0416-libkworkspace-Only-update-env-vars-with-alphanumeric.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 10780187f57ab6e68fa08386321f2d0274b951df Mon Sep 17 00:00:00 2001 -From: Jonas Lundholm Bertelsen -Date: Wed, 13 Jan 2021 01:29:44 +0100 -Subject: [PATCH 416/419] [libkworkspace] Only update env vars with - alphanumeric_ names - -It gives issues with systemd to try and pass it env var names with eg. -'%' in them. That to such a degree that if invalid names are passed, -none are set [1]. This change ensures compatibility by skipping any -non-alphanumerical (and _) variable names. - -[1] https://bugzilla.redhat.com/show_bug.cgi?id=1754395 ---- - libkworkspace/updatelaunchenvjob.cpp | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/libkworkspace/updatelaunchenvjob.cpp b/libkworkspace/updatelaunchenvjob.cpp -index f01a4c144..b7e124c71 100644 ---- a/libkworkspace/updatelaunchenvjob.cpp -+++ b/libkworkspace/updatelaunchenvjob.cpp -@@ -28,6 +28,7 @@ public: - explicit Private(UpdateLaunchEnvJob *q); - void monitorReply(const QDBusPendingReply<> &reply); - -+ static bool isPosixName(const QString &name); - static bool isSystemdApprovedValue(const QString &value); - - UpdateLaunchEnvJob *q; -@@ -82,6 +83,10 @@ void UpdateLaunchEnvJob::start() - QStringList systemdUpdates; - - for (const auto &varName : d->environment.keys()) { -+ if (!Private::isPosixName(varName)){ -+ qWarning() << "Skipping syncing of environment variable " << varName << "as name contains unsupported characters"; -+ continue; -+ } - const QString value = d->environment.value(varName); - - // KLauncher -@@ -136,6 +141,25 @@ void UpdateLaunchEnvJob::start() - d->monitorReply(systemdActivationReply); - } - -+bool UpdateLaunchEnvJob::Private::isPosixName(const QString &name) -+{ -+ // Posix says characters like % should be 'tolerated', but it gives issues in practice. -+ // https://bugzilla.redhat.com/show_bug.cgi?id=1754395 -+ // https://bugzilla.redhat.com/show_bug.cgi?id=1879216 -+ // Ensure systemd compat by only allowing alphanumerics and _ in names. -+ bool first = true; -+ for (const QChar c : name) { -+ if (first && !c.isLetter() && c != QChar('_')) { -+ return false; -+ } else if (first) { -+ first = false; -+ } else if (!c.isLetterOrNumber() && c != QChar('_')) { -+ return false; -+ } -+ } -+ return !first; -+} -+ - bool UpdateLaunchEnvJob::Private::isSystemdApprovedValue(const QString &value) - { - // systemd code checks that a value contains no control characters except \n \t --- -2.29.2 - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 518bf92..8fe3d14 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -15,8 +15,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.20.5 -Release: 4%{?dist} +Version: 5.20.90 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -57,7 +57,6 @@ Patch105: plasma-workspace-5.7.3-folderview_layout.patch ## upstream Patches lookaside cache ## upstream Patches (master branch) -Patch416: 0416-libkworkspace-Only-update-env-vars-with-alphanumeric.patch # udev BuildRequires: zlib-devel @@ -403,7 +402,6 @@ BuildArch: noarch %setup -q -a 20 ## upstream patches -%patch416 -p1 -b 0416 %patch100 -p1 -b .konsole-in-contextmenu # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex @@ -700,6 +698,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Thu Jan 21 2021 Jan Grulich - 5.20.90-1 +- 5.20.90 (beta) + * Thu Jan 14 2021 Rex Dieter - 5.20.5-4 - rebuild (gpsd) - update URL diff --git a/sources b/sources index e24a8fc..504bb16 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.20.5.tar.xz) = bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f +SHA512 (plasma-workspace-5.20.90.tar.xz) = 06c75637600053a8329791c58d2500f9f29f539e9b54a430f3ac7d81d8515a5ef412f972a0b564b46081da558b8facbce4d3f713ebd658e0e66350b409425b87