diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2011-11-08 12:16:29 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2011-11-08 12:16:29 +0000 |
| commit | 33aa1d43a992acbbbec2d1a1597f9082303e17a1 (patch) | |
| tree | dd9f6d648676a358ef4b49221c7487daa6cb956b /eclass | |
| parent | Add ~x86-fbsd (diff) | |
| download | gentoo-2-33aa1d43a992acbbbec2d1a1597f9082303e17a1.tar.gz gentoo-2-33aa1d43a992acbbbec2d1a1597f9082303e17a1.tar.bz2 gentoo-2-33aa1d43a992acbbbec2d1a1597f9082303e17a1.zip | |
Fix sandbox access violation on /root/GNUstep, bug #383665
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/gnustep-base.eclass | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 05deaee66efd..84db8a2ceb69 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.3 2011/11/08 01:05:22 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.4 2011/11/08 12:16:29 voyageur Exp $ + + 08 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> gnustep-base.eclass: + Fix sandbox access violation on /root/GNUstep, bug #383665 08 Nov 2011; Michael Pagano <mpagano@gentoo.org> kernel-2.eclass: Modify to support new location of 2.6 kernels on kernel.org and mirrors 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 ) |