summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2002-09-07 16:38:27 +0000
committerDaniel Robbins <drobbins@gentoo.org>2002-09-07 16:38:27 +0000
commitffcd1b16ae90f774b2795e7fc01e5f36b113a39c (patch)
tree19fb1bd1970db0f7e3a376b6c3e2e86daa2a4a90 /sys-apps
parentHOMEPAGE updatE (diff)
downloadhistorical-ffcd1b16ae90f774b2795e7fc01e5f36b113a39c.tar.gz
historical-ffcd1b16ae90f774b2795e7fc01e5f36b113a39c.tar.bz2
historical-ffcd1b16ae90f774b2795e7fc01e5f36b113a39c.zip
sandbox fix
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/portage-2.0.36.ebuild15
1 files changed, 8 insertions, 7 deletions
diff --git a/sys-apps/portage/portage-2.0.36.ebuild b/sys-apps/portage/portage-2.0.36.ebuild
index 3e02da1c5149..2820763e7333 100644
--- a/sys-apps/portage/portage-2.0.36.ebuild
+++ b/sys-apps/portage/portage-2.0.36.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.36.ebuild,v 1.1 2002/09/04 17:09:09 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.36.ebuild,v 1.2 2002/09/07 16:38:27 drobbins Exp $
# If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
# cause everything to segfault !!
@@ -114,14 +114,15 @@ pkg_postinst() {
fi
local x
+
+ #disable global sandbox if it's active (it's been deprecated)
+ if [ -f /etc/ld.so.preload ] ; then
+ cp /etc/ld.so.preload ${T}
+ grep -v libsandbox ${T}/ld.so.preload > /etc/ld.so.preload
+ fi
+
#remove possible previous sandbox files that could cause conflicts
if [ -d /usr/lib/sandbox ]; then
- if [ -f /etc/ld.so.preload ]; then
- mv /etc/ld.so.preload /etc/ld.so.preload_orig
- grep -v libsandbox.so /etc/ld.so.preload_orig > /etc/ld.so.preload
- rm /etc/ld.so.preload_orig
- fi
-
rm -f ${ROOT}/usr/lib/portage/bin/ebuild.sh.orig
rm -f ${ROOT}/usr/lib/portage/pym/portage.py.orig
rm -f ${ROOT}/usr/bin/sandbox