svn commit: r436048 - in branches/2017Q1/x11/kde4-runtime: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Mon Mar 13 10:03:17 2017
New Revision: 436048
URL: https://svnweb.freebsd.org/changeset/ports/436048

Log:
  MFH: r435966
  
  Add patch for CVE-2016-7787 in kdesu.
  
  Security:	41fe4724-06a2-11e7-8e3e-5453ed2e2b49
  
  Approved by:	ports-secteam (junovitch)

Added:
  branches/2017Q1/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp
     - copied unchanged from r435966, head/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp
Modified:
  branches/2017Q1/x11/kde4-runtime/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/x11/kde4-runtime/Makefile
==============================================================================
--- branches/2017Q1/x11/kde4-runtime/Makefile	Mon Mar 13 09:44:15 2017	(r436047)
+++ branches/2017Q1/x11/kde4-runtime/Makefile	Mon Mar 13 10:03:17 2017	(r436048)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 kde kde-kde4
 
 MAINTAINER=	kde at FreeBSD.org

Copied: branches/2017Q1/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp (from r435966, head/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/x11/kde4-runtime/files/patch-kdesu_kdesu_kdesu.cpp	Mon Mar 13 10:03:17 2017	(r436048, copy of r435966, head/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)