From 55aa25e3b0011233ab8c6e77619e8eb5c03e2175 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Mon, 12 Feb 2018 11:55:20 +0300
Subject: [PATCH] plasma-workspace:rebuild

---
 ...02ce50edc3891f1fa41173132c820b917d57.patch | 31 +++++++++++++++++++
 desktop/kde/plasma/plasma-workspace/pspec.xml |  4 +--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 desktop/kde/plasma/plasma-workspace/files/f32002ce50edc3891f1fa41173132c820b917d57.patch

diff --git a/desktop/kde/plasma/plasma-workspace/files/f32002ce50edc3891f1fa41173132c820b917d57.patch b/desktop/kde/plasma/plasma-workspace/files/f32002ce50edc3891f1fa41173132c820b917d57.patch
new file mode 100644
index 0000000000..f9beeae840
--- /dev/null
+++ b/desktop/kde/plasma/plasma-workspace/files/f32002ce50edc3891f1fa41173132c820b917d57.patch
@@ -0,0 +1,31 @@
+From f32002ce50edc3891f1fa41173132c820b917d57 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 5 Feb 2018 13:12:51 +0100
+Subject: Make sure device paths are quoted
+
+in the case a vfat removable device has $() or `` in its label,
+such as $(touch foo) the quoted command may get executed,
+leaving an attack vector. Use KMacroExpander::expandMacrosShellQuote
+to make sure everything is quoted and not interpreted as a command
+
+BUG:389815
+---
+ soliduiserver/deviceserviceaction.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/soliduiserver/deviceserviceaction.cpp b/soliduiserver/deviceserviceaction.cpp
+index f49c967..738b27c 100644
+--- a/soliduiserver/deviceserviceaction.cpp
++++ b/soliduiserver/deviceserviceaction.cpp
+@@ -158,7 +158,7 @@ void DelayedExecutor::delayedExecute(const QString &udi)
+ 
+     QString exec = m_service.exec();
+     MacroExpander mx(device);
+-    mx.expandMacros(exec);
++    mx.expandMacrosShellQuote(exec);
+ 
+     KRun::runCommand(exec, QString(), m_service.icon(), 0);
+     deleteLater();
+-- 
+cgit v0.11.2
+
diff --git a/desktop/kde/plasma/plasma-workspace/pspec.xml b/desktop/kde/plasma/plasma-workspace/pspec.xml
index a951d97bba..2f59cfa334 100755
--- a/desktop/kde/plasma/plasma-workspace/pspec.xml
+++ b/desktop/kde/plasma/plasma-workspace/pspec.xml
@@ -88,7 +88,7 @@
         </BuildDependencies>
         <Patches>
             <!--dirty fix for qt5.6.0 --> 
-<!--             <Patch level="1">build_fix-qt.patch</Patch> -->
+            <Patch level="1">f32002ce50edc3891f1fa41173132c820b917d57.patch</Patch>
         </Patches>
     </Source>
 
@@ -291,7 +291,7 @@
 
     <History>
         <Update release="19">
-            <Date>2018-02-03</Date>
+            <Date>2018-02-12</Date>
             <Version>5.11.5</Version>
             <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>