From 99b03e20d0f46363229ae1a34725d74e43b0ae3f Mon Sep 17 00:00:00 2001 From: Slendi Date: Mon, 12 Jun 2023 13:32:33 +0300 Subject: [PATCH 1/3] pkg(holyc-1.0.0): Added holyc 1.0.0 This patch adds support for the HolyC programming language by Terry A. Davis. The compiler used is based on a modified version of the 3Days compiler. Both 3Days and the fork used here do not have a specific version so 1.0.0 has been used and will be used forwards in future commits unless 3Days gets versioning (which it wont since development stopped). Signed-off-by: Slendi --- packages/holyc/1.0.0/build.sh | 22 ++++++++++++++++++++++ packages/holyc/1.0.0/environment | 1 + packages/holyc/1.0.0/metadata.json | 5 +++++ packages/holyc/1.0.0/run | 3 +++ packages/holyc/1.0.0/test.HC | 1 + 5 files changed, 32 insertions(+) create mode 100755 packages/holyc/1.0.0/build.sh create mode 100644 packages/holyc/1.0.0/environment create mode 100644 packages/holyc/1.0.0/metadata.json create mode 100644 packages/holyc/1.0.0/run create mode 100644 packages/holyc/1.0.0/test.HC diff --git a/packages/holyc/1.0.0/build.sh b/packages/holyc/1.0.0/build.sh new file mode 100755 index 0000000..6929c35 --- /dev/null +++ b/packages/holyc/1.0.0/build.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +PREFIX=$(realpath $(dirname $0)) + +mkdir -p build + +cd build + +curl https://git.xslendi.xyz/slendi/3Days/archive/main.tar.gz -o 3days.tar.gz + +tar xzf 3days.tar.gz --strip-components=1 +rm 3days.tar.gz + +make + +cp -v 3d_loader $PREFIX/. +cp -rv T $PREFIX/. + +cd .. + +rm -rf build + diff --git a/packages/holyc/1.0.0/environment b/packages/holyc/1.0.0/environment new file mode 100644 index 0000000..977a5e8 --- /dev/null +++ b/packages/holyc/1.0.0/environment @@ -0,0 +1 @@ +export PATH=$PWD/bin:$PATH diff --git a/packages/holyc/1.0.0/metadata.json b/packages/holyc/1.0.0/metadata.json new file mode 100644 index 0000000..3113f44 --- /dev/null +++ b/packages/holyc/1.0.0/metadata.json @@ -0,0 +1,5 @@ +{ + "language": "holyc", + "version": "1.0.0", + "aliases": ["hc"] +} diff --git a/packages/holyc/1.0.0/run b/packages/holyc/1.0.0/run new file mode 100644 index 0000000..b249787 --- /dev/null +++ b/packages/holyc/1.0.0/run @@ -0,0 +1,3 @@ +#!/bin/bash + +3d_loader -T $PWD/bin/ -c "$@" diff --git a/packages/holyc/1.0.0/test.HC b/packages/holyc/1.0.0/test.HC new file mode 100644 index 0000000..b490971 --- /dev/null +++ b/packages/holyc/1.0.0/test.HC @@ -0,0 +1 @@ +"OK"; From 6ef0cdf7b4c96e71d49ae267dc905c177ede1d51 Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Sat, 8 Feb 2025 15:10:50 +0200 Subject: [PATCH 2/3] Provide HOME in sandbox (#702) --- api/src/job.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/src/job.js b/api/src/job.js index d46120b..31f688d 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -156,6 +156,8 @@ class Job { '-s', '-c', '/box/submission', + '-E', + 'HOME=/tmp', '-e', `--dir=${this.runtime.pkgdir}`, `--dir=/etc:noexec`, From 1d55a41a2d563318388596b46d7da772027339ba Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Sat, 8 Feb 2025 20:46:46 +0200 Subject: [PATCH 3/3] Explicitly provide env vars instead of inheriting them from parent (#703) --- api/src/job.js | 8 +++----- api/src/runtime.js | 10 +--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/api/src/job.js b/api/src/job.js index 31f688d..8c3fa79 100644 --- a/api/src/job.js +++ b/api/src/job.js @@ -158,7 +158,9 @@ class Job { '/box/submission', '-E', 'HOME=/tmp', - '-e', + ...this.runtime.env_vars.flat_map(v => ['-E', v]), + '-E', + `PISTON_LANGUAGE=${this.runtime.language}`, `--dir=${this.runtime.pkgdir}`, `--dir=/etc:noexec`, `--processes=${this.runtime.max_process_count}`, @@ -177,10 +179,6 @@ class Job { ...args, ], { - env: { - ...this.runtime.env_vars, - PISTON_LANGUAGE: this.runtime.language, - }, stdio: 'pipe', } ); diff --git a/api/src/runtime.js b/api/src/runtime.js index 9a2adf4..90a2225 100644 --- a/api/src/runtime.js +++ b/api/src/runtime.js @@ -178,15 +178,7 @@ class Runtime { const env_file = path.join(this.pkgdir, '.env'); const env_content = fss.read_file_sync(env_file).toString(); - this._env_vars = {}; - - env_content - .trim() - .split('\n') - .map(line => line.split('=', 2)) - .forEach(([key, val]) => { - this._env_vars[key.trim()] = val.trim(); - }); + this._env_vars = env_content.trim().split('\n'); } return this._env_vars;