diff options
Diffstat (limited to 'databases/mongosh/files')
5 files changed, 20 insertions, 38 deletions
diff --git a/databases/mongosh/files/node-modules-patches/patch-node__modules_kerberos_binding.gyp b/databases/mongosh/files/node-modules-patches/patch-node__modules_kerberos_binding.gyp index 089a54df37ae..c0f0668169eb 100644 --- a/databases/mongosh/files/node-modules-patches/patch-node__modules_kerberos_binding.gyp +++ b/databases/mongosh/files/node-modules-patches/patch-node__modules_kerberos_binding.gyp @@ -15,7 +15,7 @@ - ['(OS=="mac" or OS=="linux") and (kerberos_use_rtld!="true")', { + ['(OS=="mac" or OS=="linux" or OS=="freebsd") and (kerberos_use_rtld!="true")', { + 'include_dirs': [ -+ '/usr/local/include' ++ '%%LOCALBASE%%/include' + ], 'link_settings': { 'libraries': [ diff --git a/databases/mongosh/files/node-modules-patches/patch-node__modules_mongodb-client-encryption_binding.gyp b/databases/mongosh/files/node-modules-patches/patch-node__modules_mongodb-client-encryption_binding.gyp index c4ad4896eb5c..f29e77d4c33a 100644 --- a/databases/mongosh/files/node-modules-patches/patch-node__modules_mongodb-client-encryption_binding.gyp +++ b/databases/mongosh/files/node-modules-patches/patch-node__modules_mongodb-client-encryption_binding.gyp @@ -7,9 +7,9 @@ - 'link_settings': { 'libraries': ['-lmongocrypt'] } + 'include_dirs': [ + '/usr/include', -+ '/usr/local/include' ++ '%%LOCALBASE%%/include' + ], -+ 'link_settings': { 'libraries': ['-L/usr/local/lib -lmongocrypt'] } ++ 'link_settings': { 'libraries': ['-L%%LOCALBASE%%/lib -lmongocrypt'] } }], ['libmongocrypt_link_type=="static"', { 'conditions': [ diff --git a/databases/mongosh/files/patch-package.json b/databases/mongosh/files/patch-package.json index 6ab96895758d..a2ff3090a9ec 100644 --- a/databases/mongosh/files/patch-package.json +++ b/databases/mongosh/files/patch-package.json @@ -1,27 +1,18 @@ ---- package.json.orig 2024-10-28 16:25:21 UTC +--- package.json.orig 2025-07-02 13:57:45 UTC +++ package.json -@@ -33,7 +33,7 @@ - "start-browser": "npm run start --workspace @mongosh/browser-repl", - "start": "npm run start-cli", - "precompile-exec": "npm run compile-cli", -- "compile-exec": "npm run evergreen-release compile", -+ "compile-exec": "SEGMENT_API_KEY=dummy npm run evergreen-release compile", - "compile-all": "npm run compile-compass && npm run compile-exec", - "evergreen-release": "cd packages/build && npm run evergreen-release --", - "release": "cd packages/build && npm run release --", -@@ -66,7 +66,6 @@ +@@ -69,7 +69,6 @@ "postcreate-static-analysis-report": "mongodb-sbom-tools sarif-to-markdown --sarif=.sbom/codeql.sarif.json --md=.sbom/codeql.md", "where": "monorepo-where", "reformat": "npm run reformat --workspaces --if-present", - "prepare": "husky", "precommit": "precommit", - "preinstall": "node scripts/sort-workspaces.js" - }, -@@ -108,7 +107,6 @@ + "preinstall": "node scripts/sort-workspaces.js", + "bump-auxiliary": "npm run bump-auxiliary --workspace @mongosh/build", +@@ -114,7 +113,6 @@ "duplexpair": "^1.0.2", "find-up": "^5.0.0", "glob": "^10.3.12", - "husky": "^9.0.11", "mocha": "^10.2.0", - "mongodb": "^6.9.0", - "mongodb-runner": "^5.7.0", + "mongodb": "^6.16.0", + "mongodb-runner": "^5.7.1", diff --git a/databases/mongosh/files/patch-scripts_nodejs-patches_002-workaround-node-bug-52229 b/databases/mongosh/files/patch-scripts_nodejs-patches_002-workaround-node-bug-52229 index bed349e3cb91..b21fb545eb49 100644 --- a/databases/mongosh/files/patch-scripts_nodejs-patches_002-workaround-node-bug-52229 +++ b/databases/mongosh/files/patch-scripts_nodejs-patches_002-workaround-node-bug-52229 @@ -1,17 +1,19 @@ ---- scripts/nodejs-patches/002-workaround-node-bug-52229.orig 2024-05-16 08:32:21 UTC +--- scripts/nodejs-patches/002-workaround-node-bug-52229.orig 2025-07-02 13:57:45 UTC +++ scripts/nodejs-patches/002-workaround-node-bug-52229 -@@ -2,13 +2,12 @@ diff --git a/common.gypi b/common.gypi - index efcd8da84815..fe11453f09b5 100644 +@@ -2,7 +2,7 @@ diff --git a/common.gypi b/common.gypi + index 888b8b94ca1a..375956862d2d 100644 --- a/common.gypi +++ b/common.gypi --@@ -268,6 +268,9 @@ -+@@ -268,6 +268,8 @@ - # Defines these mostly for node-gyp to pickup. - 'defines': [ +-@@ -270,7 +270,10 @@ ++@@ -270,7 +270,9 @@ '_GLIBCXX_USE_CXX11_ABI=1', + # This help forks when building Node.js on a 32-bit arch as + # libuv is always compiled with _FILE_OFFSET_BITS=64 +@@ -10,7 +10,6 @@ index 888b8b94ca1a..375956862d2d 100644 + + '_FILE_OFFSET_BITS=64', + # Work around https://github.com/nodejs/node/issues/52229 + "NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT=1", -+ "NAPI_EXPERIMENTAL=1", ], - + # Forcibly disable -Werror. We support a wide range of compilers, it's diff --git a/databases/mongosh/files/patch-scripts_sort-workspaces.js b/databases/mongosh/files/patch-scripts_sort-workspaces.js deleted file mode 100644 index 0fe4e6da9222..000000000000 --- a/databases/mongosh/files/patch-scripts_sort-workspaces.js +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/sort-workspaces.js.orig 2024-05-03 16:42:16 UTC -+++ scripts/sort-workspaces.js -@@ -22,7 +22,7 @@ async function main() { - )); - - // should use the scopes in lerna.json -- const { stdout } = await exec('npx -y lerna ls --all --no-since --toposort --json'); -+ const { stdout } = await exec('npx -y lerna ls --all --toposort --json'); - packageJSON.workspaces = JSON.parse(stdout).map(({ location }) => path.relative(monorepoRoot, location)); - - await fs.writeFile( |