From 584ec624854ea0f4f755b189414bc9e0dabaa6e0 Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Mon, 25 Sep 2023 21:11:05 +0000
Subject: [PATCH 1/2] fix(solo): use alternative endo init

Work around babel dep override mistake
---
 packages/solo/src/entrypoint.js      | 2 +-
 packages/solo/src/pipe-entrypoint.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/solo/src/entrypoint.js b/packages/solo/src/entrypoint.js
index bde40a0f0f1..4ca2f5601af 100755
--- a/packages/solo/src/entrypoint.js
+++ b/packages/solo/src/entrypoint.js
@@ -7,7 +7,7 @@ import 'esm';
 
 // we need to enable Math.random as a workaround for 'brace-expansion' module
 // (dep chain: temp->glob->minimatch->brace-expansion)
-import '@endo/init';
+import '@endo/init/legacy.js';
 
 import process from 'process';
 import path from 'path';
diff --git a/packages/solo/src/pipe-entrypoint.js b/packages/solo/src/pipe-entrypoint.js
index aff13418c2a..0914ccfa36e 100644
--- a/packages/solo/src/pipe-entrypoint.js
+++ b/packages/solo/src/pipe-entrypoint.js
@@ -1,7 +1,7 @@
 /* global process */
 // @ts-check
 import '@endo/init/pre-bundle-source.js';
-import '@endo/init';
+import '@endo/init/unsafe-fast.js';
 
 import { parse, stringify } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';

From 877c1a13dfdf03f040d3118416e59e58240090ce Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Wed, 27 Sep 2023 00:37:19 +0000
Subject: [PATCH 2/2] fix(internal): severe override taming for bundle-source

Work around babel dep override mistake
---
 packages/internal/src/node/createBundles.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/internal/src/node/createBundles.js b/packages/internal/src/node/createBundles.js
index e78078bd744..d17d1bb45ea 100644
--- a/packages/internal/src/node/createBundles.js
+++ b/packages/internal/src/node/createBundles.js
@@ -1,3 +1,4 @@
+/* global process */
 // Use modules not prefixed with `node:` since some deploy scripts may
 // still be running in esm emulation
 import path from 'path';
@@ -29,7 +30,13 @@ export const createBundlesFromAbsolute = async sourceBundles => {
 
   for (const args of cacheToArgs.values()) {
     console.log(BUNDLE_SOURCE_PROGRAM, ...args);
-    const { status } = spawnSync(prog, args, { stdio: 'inherit' });
+    const env = /** @type {NodeJS.ProcessEnv} */ (
+      /** @type {unknown} */ ({
+        __proto__: process.env,
+        LOCKDOWN_OVERRIDE_TAMING: 'severe',
+      })
+    );
+    const { status } = spawnSync(prog, args, { stdio: 'inherit', env });
     status === 0 ||
       Fail`${q(BUNDLE_SOURCE_PROGRAM)} failed with status ${q(status)}`;
   }