CVS commit: pkgsrc/lang/nodejs

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri May 27 17:02:36 UTC 2022

Modified Files:
        pkgsrc/lang/nodejs: distinfo
Added Files:
        pkgsrc/lang/nodejs/patches: patch-src_crypto_crypto__rsa.cc

Log Message:
nodejs: fix build with old OpenSSL before 1.1.1e


To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-src_crypto_crypto__rsa.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.213 pkgsrc/lang/nodejs/distinfo:1.214
--- pkgsrc/lang/nodejs/distinfo:1.213   Wed May 18 18:26:51 2022
+++ pkgsrc/lang/nodejs/distinfo Fri May 27 17:02:36 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.213 2022/05/18 18:26:51 adam Exp $
+$NetBSD: distinfo,v 1.214 2022/05/27 17:02:36 tnn Exp $
 
 BLAKE2s (node-v18.2.0.tar.xz) = f21fc01f787369be3ee9a37ec61723b36a2ed3f58aca4d28866daf8dbb07137a
 SHA512 (node-v18.2.0.tar.xz) = 9d7d6017374bc14e9cd447bceb3ab9d3b4d421c30d422c6f4eb429c67f1deb2c04778216cccb11ecbe510f18b821891d9311c035f5a81cc6a5e8adae202e9b33
@@ -18,6 +18,7 @@ SHA1 (patch-deps_v8_src_compiler_types.h
 SHA1 (patch-deps_v8_src_heap_code-range.cc) = b281f76f4e3d8e562f596235049a6be7c5ff4de2
 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
 SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa
+SHA1 (patch-src_crypto_crypto__rsa.cc) = 9ffd8de2fac76014696c8dfac7ba200eab56f6f6
 SHA1 (patch-src_inspector__agent.cc) = 3fd3d71f9d6013a6eb2a79e0442b31d2e2408a2f
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = 570fe9889767c555468a225cd7f0b398ea6a193c

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-src_crypto_crypto__rsa.cc
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-src_crypto_crypto__rsa.cc:1.1
--- /dev/null   Fri May 27 17:02:36 2022
+++ pkgsrc/lang/nodejs/patches/patch-src_crypto_crypto__rsa.cc  Fri May 27 17:02:36 2022
@@ -0,0 +1,37 @@
+$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;