summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2011-12-04 06:52:39 +0000
committerBrian Harring <ferringb@gentoo.org>2011-12-04 06:52:39 +0000
commitbaf2579e254de90639daff5460bf062f3e7a0a79 (patch)
tree2438ecb3832b335876dc44c0221f6c3a0e6236e1
parentRestore dependency on dev-libs/libnl:1.1, remove faulty patch (bug #385875, c... (diff)
downloadgentoo-2-baf2579e254de90639daff5460bf062f3e7a0a79.tar.gz
gentoo-2-baf2579e254de90639daff5460bf062f3e7a0a79.tar.bz2
gentoo-2-baf2579e254de90639daff5460bf062f3e7a0a79.zip
Fix IFS=: bleeding out from java-vm_sandbox-predict invocations
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/java-vm-2.eclass6
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index cd99fc6366d3..bb2e88fcf2c7 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.33 2011/12/03 20:43:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.34 2011/12/04 06:52:39 ferringb Exp $
+
+ 04 Dec 2011; Brian Harring <ferringb@gentoo.org> java-vm-2.eclass:
+ Fix IFS=: bleeding out from java-vm_sandbox-predict invocations.
03 Dec 2011; Ulrich Mueller <ulm@gentoo.org> elisp.eclass,
elisp-common.eclass:
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 554f9e5715fa..c215a9b161d0 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.40 2011/11/24 20:05:01 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.41 2011/12/04 06:52:39 ferringb Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -250,7 +250,9 @@ java-vm_sandbox-predict() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
local path path_arr=("$@")
- IFS=":" path="${path_arr[*]}"
+ # subshell this to prevent IFS bleeding out dependant on bash version.
+ # could use local, which *should* work, but that requires a lot of testing.
+ path=$(IFS=":" echo "${path_arr[*]}")
dodir /etc/sandbox.d
echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
|| die "Failed to write sandbox control file"