From 33aa1d43a992acbbbec2d1a1597f9082303e17a1 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Tue, 8 Nov 2011 12:16:29 +0000 Subject: Fix sandbox access violation on /root/GNUstep, bug #383665 --- eclass/gnustep-base.eclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'eclass/gnustep-base.eclass') diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass index 7825efe0a04e..8d8629b06994 100644 --- a/eclass/gnustep-base.eclass +++ b/eclass/gnustep-base.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.19 2011/06/28 15:27:23 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.20 2011/11/08 12:16:29 voyageur Exp $ # @ECLASS: gnustep-base.eclass # @MAINTAINER: @@ -124,8 +124,7 @@ egnustep_env() { if [[ ! -f ${T}/GNUstep.conf ]]; then cp "${EPREFIX}"/etc/GNUstep/GNUstep.conf "${T}" \ || die "GNUstep.conf copy failed" - sed -e "s#\(GNUSTEP_USER_DIR=\).*#\1${T}#" \ - -e "s#\(GNUSTEP_USER_DEFAULTS_DIR=\).*#\1${T}/Defaults#" \ + sed -e "s#\(GNUSTEP_USER_.*DIR.*=\)#\1${T}/#" \ -i "${T}"/GNUstep.conf || die "GNUstep.conf sed failed" fi @@ -147,8 +146,6 @@ egnustep_env() { DESTDIR="${D}" \ HOME="${T}" \ GNUSTEP_CONFIG_FILE="${T}"/GNUstep.conf \ - GNUSTEP_USER_DIR="${T}" \ - GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \ GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \ TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \ messages=yes ) -- cgit v1.2.3-65-gdbad