Fri May 27 17:02:36 2022 UTC ()
nodejs: fix build with old OpenSSL before 1.1.1e


(tnn)
diff -r1.213 -r1.214 pkgsrc/lang/nodejs/distinfo
diff -r0 -r1.1 pkgsrc/lang/nodejs/patches/patch-src_crypto_crypto__rsa.cc
cvs diff -r1.213 -r1.214 pkgsrc/lang/nodejs/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/nodejs/distinfo 2022/05/18 18:26:51 1.213
+++ pkgsrc/lang/nodejs/distinfo 2022/05/27 17:02:36 1.214
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.213 2022/05/18 18:26:51 adam Exp $ 1$NetBSD: distinfo,v 1.214 2022/05/27 17:02:36 tnn Exp $
2 2
3BLAKE2s (node-v18.2.0.tar.xz) = f21fc01f787369be3ee9a37ec61723b36a2ed3f58aca4d28866daf8dbb07137a 3BLAKE2s (node-v18.2.0.tar.xz) = f21fc01f787369be3ee9a37ec61723b36a2ed3f58aca4d28866daf8dbb07137a
4SHA512 (node-v18.2.0.tar.xz) = 9d7d6017374bc14e9cd447bceb3ab9d3b4d421c30d422c6f4eb429c67f1deb2c04778216cccb11ecbe510f18b821891d9311c035f5a81cc6a5e8adae202e9b33 4SHA512 (node-v18.2.0.tar.xz) = 9d7d6017374bc14e9cd447bceb3ab9d3b4d421c30d422c6f4eb429c67f1deb2c04778216cccb11ecbe510f18b821891d9311c035f5a81cc6a5e8adae202e9b33
5Size (node-v18.2.0.tar.xz) = 36873192 bytes 5Size (node-v18.2.0.tar.xz) = 36873192 bytes
6SHA1 (patch-common.gypi) = 80f3645498853b9939167d152365b4fa49528b70 6SHA1 (patch-common.gypi) = 80f3645498853b9939167d152365b4fa49528b70
7SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32 7SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32
8SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3 8SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
9SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa7899d9e5cf 9SHA1 (patch-deps_uvwasi_include_wasi__serdes.h) = 32b85ef5824b96b35aba9280bbe7aa7899d9e5cf
10SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = b47025f33d2991275bbcd15dbabb28900afab0e1 10SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = b47025f33d2991275bbcd15dbabb28900afab0e1
11SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8 11SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8
12SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 099d538e33611c7094d89669287de7b2a17c4b6e 12SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 099d538e33611c7094d89669287de7b2a17c4b6e
13SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6 13SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = 802a95f1b1d131e0d85c1f99c659cc68b31ba2f6
14SHA1 (patch-deps_v8_src_base_strings.h) = 4d2b37491f2f74f1a573f8c1942790204e23a8bb 14SHA1 (patch-deps_v8_src_base_strings.h) = 4d2b37491f2f74f1a573f8c1942790204e23a8bb
15SHA1 (patch-deps_v8_src_codegen_arm_cpu-arm.cc) = 84c75d61bc99c2ff9adeac3152f5b11ebb0e582b 15SHA1 (patch-deps_v8_src_codegen_arm_cpu-arm.cc) = 84c75d61bc99c2ff9adeac3152f5b11ebb0e582b
16SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc 16SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
17SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5 17SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5
18SHA1 (patch-deps_v8_src_heap_code-range.cc) = b281f76f4e3d8e562f596235049a6be7c5ff4de2 18SHA1 (patch-deps_v8_src_heap_code-range.cc) = b281f76f4e3d8e562f596235049a6be7c5ff4de2
19SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3 19SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
20SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa 20SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
 21SHA1 (patch-src_crypto_crypto__rsa.cc) = 9ffd8de2fac76014696c8dfac7ba200eab56f6f6
21SHA1 (patch-src_inspector__agent.cc) = 3fd3d71f9d6013a6eb2a79e0442b31d2e2408a2f 22SHA1 (patch-src_inspector__agent.cc) = 3fd3d71f9d6013a6eb2a79e0442b31d2e2408a2f
22SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff 23SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
23SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = 570fe9889767c555468a225cd7f0b398ea6a193c 24SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = 570fe9889767c555468a225cd7f0b398ea6a193c
24SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 4ee24115f5e97ffbd23aaa6dc62f408d381d4e22 25SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 4ee24115f5e97ffbd23aaa6dc62f408d381d4e22
25SHA1 (patch-tools_install.py) = c01515e3001bebd50f12bcada548f1cc0c25a49f 26SHA1 (patch-tools_install.py) = c01515e3001bebd50f12bcada548f1cc0c25a49f
26SHA1 (patch-tools_v8_gypfiles_v8.gyp) = 997748c6663e7931ead02ee47654933ec051e688 27SHA1 (patch-tools_v8_gypfiles_v8.gyp) = 997748c6663e7931ead02ee47654933ec051e688
File Added: pkgsrc/lang/nodejs/patches/patch-src_crypto_crypto__rsa.cc
$NetBSD: patch-src_crypto_crypto__rsa.cc,v 1.1 2022/05/27 17:02:36 tnn Exp $

Fix build with old OpenSSL 1.1.1d, as in NetBSD 9.0

--- src/crypto/crypto_rsa.cc.orig	2022-05-17 11:37:46.000000000 +0000
+++ src/crypto/crypto_rsa.cc
@@ -12,6 +12,30 @@
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER <0x1010105fL
+struct rsa_st {
+  int pad;
+  int32_t version;
+  void *meth;
+  void *engine;
+  void *n;
+  void *e;
+  void *d;
+  void *p;
+  void *q;
+  void *dmp1;
+  void *dmq1;
+  void *iqmp;
+  void *prime_infos;
+  RSA_PSS_PARAMS *pss;
+};
+
+static const RSA_PSS_PARAMS *RSA_get0_pss_params(const RSA *r)
+{
+  return r->pss;
+}
+#endif
+
 namespace node {
 
 using v8::ArrayBuffer;