Date: Tue, 25 Apr 2017 03:11:48 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r439357 - in branches/2017Q2/x11/lightdm: . files Message-ID: <201704250311.v3P3Bm3P024568@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Tue Apr 25 03:11:48 2017 New Revision: 439357 URL: https://svnweb.freebsd.org/changeset/ports/439357 Log: MFH: r438362 x11/lightdm: Use correct replacement for clearenv() The previous patch to replace the Linux clearenv(3) function did not actually clear the environment, but instead created a new environment variable named environ with the value "NULL". PR: 218564 Reported by: jbeich Obtained from: FreeBSD env(1) command Approved by: ports-secteam (junovitch) Modified: branches/2017Q2/x11/lightdm/Makefile branches/2017Q2/x11/lightdm/files/patch-src_process.c Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/x11/lightdm/Makefile ============================================================================== --- branches/2017Q2/x11/lightdm/Makefile Tue Apr 25 02:53:03 2017 (r439356) +++ branches/2017Q2/x11/lightdm/Makefile Tue Apr 25 03:11:48 2017 (r439357) @@ -3,7 +3,7 @@ PORTNAME= lightdm PORTVERSION= 1.20.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ Modified: branches/2017Q2/x11/lightdm/files/patch-src_process.c ============================================================================== --- branches/2017Q2/x11/lightdm/files/patch-src_process.c Tue Apr 25 02:53:03 2017 (r439356) +++ branches/2017Q2/x11/lightdm/files/patch-src_process.c Tue Apr 25 03:11:48 2017 (r439357) @@ -1,11 +1,20 @@ ---- src/process.c.orig 2016-12-08 21:38:14 UTC +--- src/process.c.orig 2017-04-12 15:33:03 UTC +++ src/process.c -@@ -231,7 +231,7 @@ process_start (Process *process, gboolea +@@ -228,11 +228,16 @@ process_start (Process *process, gboolean block) + + /* Set environment */ + if (process->priv->clear_environment) ++ { #ifdef HAVE_CLEARENV clearenv (); #else - environ = NULL; -+ putenv ("environ=NULL"); ++ extern char **environ; ++ char *cleanenv[1]; ++ environ = cleanenv; ++ cleanenv[0] = NULL; #endif ++ } for (i = 0; i < env_length; i++) setenv (env_keys[i], env_values[i], TRUE); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704250311.v3P3Bm3P024568>