aboutsummaryrefslogtreecommitdiff
path: root/x11/kde4-runtime
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2017-03-11 21:42:56 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2017-03-11 21:42:56 +0000
commit764393921fc6888e82600b0785c1ea36a9035c3a (patch)
tree410bba5fb915111e636db88b98b6c1625ef42a97 /x11/kde4-runtime
parentbb2d316d26611c9feea6ee5b7f05bcb3e7f344ee (diff)
downloadports-764393921fc6888e82600b0785c1ea36a9035c3a.tar.gz
ports-764393921fc6888e82600b0785c1ea36a9035c3a.zip
Notes
Diffstat (limited to 'x11/kde4-runtime')
-rw-r--r--x11/kde4-runtime/Makefile2
-rw-r--r--x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp27
2 files changed, 28 insertions, 1 deletions
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 357860de5b46..904f9037ac19 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 kde kde-kde4
MAINTAINER= kde@FreeBSD.org
diff --git a/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp b/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp
new file mode 100644
index 000000000000..2b0b1754bedc
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp
@@ -0,0 +1,27 @@
+Fix for https://www.kde.org/info/security/advisory-20160930-1.txt
+--- kdesu/kdesu/kdesu.cpp.orig 2014-10-30 23:50:20 UTC
++++ kdesu/kdesu/kdesu.cpp
+@@ -141,6 +141,10 @@ int main(int argc, char *argv[])
+ {
+ KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
+ }
++ if (result == -2)
++ {
++ KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
++ }
+
+ return result;
+ }
+@@ -367,6 +371,12 @@ static int startApp()
+ kDebug() << "Don't need password!!\n";
+ }
+
++ for (const QChar character : QString::fromLocal8Bit(command)) {
++ if (!character.isPrint() && character.category() != QChar::Other_Surrogate) {
++ return -2;
++ }
++ }
++
+ // Start the dialog
+ QString password;
+ if (needpw)