v21.6.2-1

Author: TerrorJack

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
           podman build \
             --network host \
             --pull \
-            --squash \
+            --squash-all \
             --tag rust:alpine-mimalloc \
             .
           popd
@@ -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:

build.sh

@@ -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" \
@@ -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

use-etc-ssl-certs.patch

@@ -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