Skip to content

Commit

Permalink
v21.6.2-1
Browse files Browse the repository at this point in the history
  • Loading branch information
TerrorJack committed Feb 20, 2024
1 parent 3cf54e0 commit 5f3ef60
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
podman build \
--network host \
--pull \
--squash \
--squash-all \
--tag rust:alpine-mimalloc \
.
popd
Expand All @@ -38,6 +38,12 @@ jobs:
rust:alpine-mimalloc \
/workspace/build.sh
- name: test-node
run: |
tar xJf node-v*-linux-x64-static.tar.xz
export PATH=$PWD/node-v*-linux-x64-static/bin:$PATH
npm install @bjorn3/browser_wasi_shim
- name: upload-artifact
uses: actions/upload-artifact@v4
with:
Expand Down
3 changes: 1 addition & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cd "$(mktemp -d)"

curl -f -L --retry 5 https://nodejs.org/dist/$node_ver/node-$node_ver.tar.gz | tar xz --strip-components=1
patch -p1 -i /workspace/node-clang-lto.diff
patch -p1 -i /workspace/use-etc-ssl-certs.patch

make -j"$(nproc)" binary \
AR="llvm-ar" \
Expand All @@ -24,6 +25,4 @@ make -j"$(nproc)" binary \
CONFIG_FLAGS="--enable-lto --experimental-enable-pointer-compression --fully-static --openssl-use-def-ca-store" \
VARIATION="static"

out/Release/node -e 'console.log(6*7)' | grep -F 42

mv node-$node_ver-linux-x64-static.tar.xz /workspace
13 changes: 13 additions & 0 deletions use-etc-ssl-certs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/deps/openssl/openssl/include/internal/cryptlib.h b/deps/openssl/openssl/include/internal/cryptlib.h
index 329ef62..9a8df64 100644
--- a/deps/openssl/openssl/include/internal/cryptlib.h
+++ b/deps/openssl/openssl/include/internal/cryptlib.h
@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
# ifndef OPENSSL_SYS_VMS
# define X509_CERT_AREA OPENSSLDIR
# define X509_CERT_DIR OPENSSLDIR "/certs"
-# define X509_CERT_FILE OPENSSLDIR "/cert.pem"
+# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt"
# define X509_PRIVATE_DIR OPENSSLDIR "/private"
# define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf"
# else

0 comments on commit 5f3ef60

Please sign in to comment.