From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1139908-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 63D44138239
	for <garchives@archives.gentoo.org>; Thu, 23 Jan 2020 17:59:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 961F3E0A8E;
	Thu, 23 Jan 2020 17:59:46 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 7B117E0A8E
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Jan 2020 17:59:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id C292934E0B6
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Jan 2020 17:59:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 00C7017
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Jan 2020 17:59:42 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1579802236.ae029bbb6836e5a68d87309f7e321dd1062f6c70.whissi@gentoo>
Subject: [gentoo-commits] proj/genkernel:master commit in: /
X-VCS-Repository: proj/genkernel
X-VCS-Files: gen_funcs.sh
X-VCS-Directories: /
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: ae029bbb6836e5a68d87309f7e321dd1062f6c70
X-VCS-Branch: master
Date: Thu, 23 Jan 2020 17:59:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b0a7f05f-fedd-492c-ba54-76c5d2533ae3
X-Archives-Hash: 22f038d0f0ecc846051026991d134a7a

commit:     ae029bbb6836e5a68d87309f7e321dd1062f6c70
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 17:55:55 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 17:57:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ae029bbb

sandbox: Set unique SANDBOX_LOG values to avoid collisions

Bug: https://bugs.gentoo.org/704848
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 821f150..1297732 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -750,6 +750,7 @@ dropbear_create_key() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
@@ -827,6 +828,7 @@ dropbear_generate_key_info_file() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
@@ -1057,6 +1059,29 @@ get_tc_vars() {
 	echo "${tc_vars[@]}"
 }
 
+# @FUNCTION: get_temp_file
+# @USAGE: [<TEMPLATE>] [<TMPDIR>]
+# @DESCRIPTION:
+# Create and return a temporary file (wrapper for mktemp with
+# built-in error checking and handling).
+#
+# <TEMPLATE> TEMPLATE must contain at least 3 consecutive 'X's in
+#            last component.
+#            Defaults to tmp_XXXXXXXX
+#
+# <TMPDIR>   Directory where the temporary file will be created in.
+#            Defaults to $TEMP
+get_temp_file() {
+	local template=${1:-"tmp_XXXXXXXX"}
+	local tmpdir=${2:-"${TEMP}"}
+	local tempfile=$(mktemp -p "${tmpdir}" ${template} 2>/dev/null)
+
+	[ -z "${tempfile}" ] \
+		&& gen_die "$(get_useful_function_stack "${FUNCNAME}")'mktemp -p \"${tmpdir}\" ${template}' failed!"
+
+	echo "${tempfile}"
+}
+
 get_useful_function_stack() {
 	local end_function=${1:-${FUNCNAME}}
 	local n_functions=${#FUNCNAME[@]}
@@ -1422,6 +1447,7 @@ gkbuild() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi
 
@@ -1477,6 +1503,7 @@ unpack() {
 
 	if isTrue "${SANDBOX}"
 	then
+		envvars+=( "SANDBOX_LOG='$(get_temp_file "sandbox_XXXXXX.log")'" )
 		envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
 	fi