From owner-svn-ports-all@freebsd.org Wed Apr 12 15:44:26 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B85BD3BCB0; Wed, 12 Apr 2017 15:44:26 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C5AF0A8D; Wed, 12 Apr 2017 15:44:25 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3CFiOMn004977; Wed, 12 Apr 2017 15:44:24 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3CFiOGL004975; Wed, 12 Apr 2017 15:44:24 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201704121544.v3CFiOGL004975@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Wed, 12 Apr 2017 15:44:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438362 - in head/x11/lightdm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2017 15:44:26 -0000 Author: woodsb02 Date: Wed Apr 12 15:44:24 2017 New Revision: 438362 URL: https://svnweb.freebsd.org/changeset/ports/438362 Log: 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 MFH: 2017Q2 Modified: head/x11/lightdm/Makefile head/x11/lightdm/files/patch-src_process.c Modified: head/x11/lightdm/Makefile ============================================================================== --- head/x11/lightdm/Makefile Wed Apr 12 15:23:26 2017 (r438361) +++ head/x11/lightdm/Makefile Wed Apr 12 15:44:24 2017 (r438362) @@ -3,7 +3,7 @@ PORTNAME= lightdm PORTVERSION= 1.20.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ Modified: head/x11/lightdm/files/patch-src_process.c ============================================================================== --- head/x11/lightdm/files/patch-src_process.c Wed Apr 12 15:23:26 2017 (r438361) +++ head/x11/lightdm/files/patch-src_process.c Wed Apr 12 15:44:24 2017 (r438362) @@ -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); +