소스 검색

upgrading package: node15 15.0.0.20201014 -> 15.0.0

Ralf S. Engelschall 5 년 전
부모
커밋
bec8ee48b1
2개의 변경된 파일156개의 추가작업 그리고 103개의 파일을 삭제
  1. 144 74
      node15/node15.patch
  2. 12 29
      node15/node15.spec

+ 144 - 74
node15/node15.patch

@@ -1,6 +1,6 @@
 Index: common.gypi
---- common.gypi.orig	2020-10-14 08:30:28.000000000 +0200
-+++ common.gypi	2020-10-14 09:10:42.748417000 +0200
+--- common.gypi.orig	2020-10-20 13:49:48.000000000 +0200
++++ common.gypi	2020-10-21 08:41:40.962107000 +0200
 @@ -173,7 +173,7 @@
              }],
            ],
@@ -32,8 +32,8 @@ Index: common.gypi
          },
          'target_conditions': [
 Index: deps/uv/common.gypi
---- deps/uv/common.gypi.orig	2020-10-14 08:30:29.000000000 +0200
-+++ deps/uv/common.gypi	2020-10-14 09:10:42.748580000 +0200
+--- deps/uv/common.gypi.orig	2020-10-20 13:49:49.000000000 +0200
++++ deps/uv/common.gypi	2020-10-21 08:41:40.962264000 +0200
 @@ -46,7 +46,7 @@
        'Release': {
          'defines': [ 'NDEBUG' ],
@@ -44,8 +44,8 @@ Index: deps/uv/common.gypi
          'msvs_settings': {
            'VCCLCompilerTool': {
 Index: deps/uv/uv.gyp
---- deps/uv/uv.gyp.orig	2020-10-14 08:30:29.000000000 +0200
-+++ deps/uv/uv.gyp	2020-10-14 09:10:42.748728000 +0200
+--- deps/uv/uv.gyp.orig	2020-10-20 13:49:49.000000000 +0200
++++ deps/uv/uv.gyp	2020-10-21 08:41:40.962404000 +0200
 @@ -178,7 +178,7 @@
              'src/unix/udp.c',
            ],
@@ -56,8 +56,8 @@ Index: deps/uv/uv.gyp
                ['OS=="solaris"', {
                  'ldflags': [ '-pthreads' ],
 Index: deps/v8/src/base/platform/platform-freebsd.cc
---- deps/v8/src/base/platform/platform-freebsd.cc.orig	2020-10-14 08:30:29.000000000 +0200
-+++ deps/v8/src/base/platform/platform-freebsd.cc	2020-10-14 09:10:42.748864000 +0200
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig	2020-10-20 13:49:49.000000000 +0200
++++ deps/v8/src/base/platform/platform-freebsd.cc	2020-10-21 08:41:40.962535000 +0200
 @@ -28,6 +28,7 @@
  #include <strings.h>    // index
  
@@ -67,23 +67,23 @@ Index: deps/v8/src/base/platform/platform-freebsd.cc
  #undef MAP_TYPE
  
 Index: deps/v8/src/builtins/base.tq
---- deps/v8/src/builtins/base.tq.orig	2020-10-14 08:30:29.000000000 +0200
-+++ deps/v8/src/builtins/base.tq	2020-10-14 09:10:42.749151000 +0200
-@@ -1089,10 +1089,6 @@
-   return UnsafeCast<Map>(LoadNativeContext(
-       context)[NativeContextSlot::JS_ARRAY_PACKED_ELEMENTS_MAP_INDEX]);
+--- deps/v8/src/builtins/base.tq.orig	2020-10-20 13:49:49.000000000 +0200
++++ deps/v8/src/builtins/base.tq	2020-10-21 08:42:03.761004000 +0200
+@@ -1120,10 +1120,6 @@
+ macro GetFastPackedElementsJSArrayMap(implicit context: Context)(): Map {
+   return *NativeContextSlot(ContextSlot::JS_ARRAY_PACKED_ELEMENTS_MAP_INDEX);
  }
 -macro GetFastPackedSmiElementsJSArrayMap(implicit context: Context)(): Map {
--  return UnsafeCast<Map>(LoadNativeContext(
--      context)[NativeContextSlot::JS_ARRAY_PACKED_SMI_ELEMENTS_MAP_INDEX]);
+-  return *NativeContextSlot(
+-      ContextSlot::JS_ARRAY_PACKED_SMI_ELEMENTS_MAP_INDEX);
 -}
  macro GetProxyRevocableResultMap(implicit context: Context)(): Map {
-   return UnsafeCast<Map>(LoadNativeContext(
-       context)[NativeContextSlot::PROXY_REVOCABLE_RESULT_MAP_INDEX]);
+   return *NativeContextSlot(ContextSlot::PROXY_REVOCABLE_RESULT_MAP_INDEX);
+ }
 Index: deps/v8/src/objects/js-array.tq
---- deps/v8/src/objects/js-array.tq.orig	2020-10-14 08:30:30.000000000 +0200
-+++ deps/v8/src/objects/js-array.tq	2020-10-14 09:10:42.749319000 +0200
-@@ -9,9 +9,6 @@
+--- deps/v8/src/objects/js-array.tq.orig	2020-10-20 13:49:50.000000000 +0200
++++ deps/v8/src/objects/js-array.tq	2020-10-21 08:41:40.966912000 +0200
+@@ -26,9 +26,6 @@
  }
  
  extern class JSArray extends JSObject {
@@ -93,7 +93,7 @@ Index: deps/v8/src/objects/js-array.tq
    length: Number;
  }
  
-@@ -25,15 +22,6 @@
+@@ -42,15 +39,6 @@
    };
  }
  
@@ -110,8 +110,8 @@ Index: deps/v8/src/objects/js-array.tq
  // holey elements when the global NoElementsProtector is not invalidated.
  transient type FastJSArray extends JSArray;
 Index: deps/v8/src/wasm/wasm-result.cc
---- deps/v8/src/wasm/wasm-result.cc.orig	2020-10-14 08:30:30.000000000 +0200
-+++ deps/v8/src/wasm/wasm-result.cc	2020-10-14 09:10:42.749443000 +0200
+--- deps/v8/src/wasm/wasm-result.cc.orig	2020-10-20 13:49:50.000000000 +0200
++++ deps/v8/src/wasm/wasm-result.cc	2020-10-21 08:41:40.962676000 +0200
 @@ -2,6 +2,8 @@
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
@@ -122,8 +122,8 @@ Index: deps/v8/src/wasm/wasm-result.cc
  
  #include "src/execution/isolate-inl.h"
 Index: lib/dns.js
---- lib/dns.js.orig	2020-10-14 08:30:31.000000000 +0200
-+++ lib/dns.js	2020-10-14 09:10:42.749578000 +0200
+--- lib/dns.js.orig	2020-10-20 13:49:51.000000000 +0200
++++ lib/dns.js	2020-10-21 08:41:40.962816000 +0200
 @@ -144,6 +144,10 @@
    req.hostname = hostname;
    req.oncomplete = all ? onlookupall : onlookup;
@@ -136,9 +136,9 @@ Index: lib/dns.js
      req, toASCII(hostname), family, hints, verbatim
    );
 Index: lib/internal/modules/cjs/loader.js
---- lib/internal/modules/cjs/loader.js.orig	2020-10-14 08:30:31.000000000 +0200
-+++ lib/internal/modules/cjs/loader.js	2020-10-14 09:10:42.749796000 +0200
-@@ -1188,7 +1188,10 @@
+--- lib/internal/modules/cjs/loader.js.orig	2020-10-20 13:49:51.000000000 +0200
++++ lib/internal/modules/cjs/loader.js	2020-10-21 08:41:40.963030000 +0200
+@@ -1199,7 +1199,10 @@
      path.resolve(process.execPath, '..') :
      path.resolve(process.execPath, '..', '..');
  
@@ -151,8 +151,8 @@ Index: lib/internal/modules/cjs/loader.js
    if (homeDir) {
      paths.unshift(path.resolve(homeDir, '.node_libraries'));
 Index: src/crypto/crypto_aes.cc
---- src/crypto/crypto_aes.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_aes.cc	2020-10-14 09:15:54.705151000 +0200
+--- src/crypto/crypto_aes.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_aes.cc	2020-10-21 08:41:40.963181000 +0200
 @@ -10,8 +10,8 @@
  #include "threadpoolwork-inl.h"
  #include "v8.h"
@@ -165,8 +165,8 @@ Index: src/crypto/crypto_aes.cc
  #include <vector>
  
 Index: src/crypto/crypto_bio.cc
---- src/crypto/crypto_bio.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_bio.cc	2020-10-14 09:16:05.219659000 +0200
+--- src/crypto/crypto_bio.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_bio.cc	2020-10-21 08:41:40.963317000 +0200
 @@ -25,7 +25,7 @@
  #include "allocated_buffer-inl.h"
  #include "util-inl.h"
@@ -177,8 +177,8 @@ Index: src/crypto/crypto_bio.cc
  #include <climits>
  #include <cstring>
 Index: src/crypto/crypto_common.cc
---- src/crypto/crypto_common.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_common.cc	2020-10-14 09:16:26.569865000 +0200
+--- src/crypto/crypto_common.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_common.cc	2020-10-21 08:41:40.963497000 +0200
 @@ -11,14 +11,14 @@
  #include "memory_tracker-inl.h"
  #include "v8.h"
@@ -203,8 +203,8 @@ Index: src/crypto/crypto_common.cc
  #include <string>
  #include <unordered_map>
 Index: src/crypto/crypto_common.h
---- src/crypto/crypto_common.h.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_common.h	2020-10-14 09:16:31.790174000 +0200
+--- src/crypto/crypto_common.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_common.h	2020-10-21 08:41:40.963606000 +0200
 @@ -5,8 +5,8 @@
  
  #include "node_crypto.h"
@@ -217,8 +217,8 @@ Index: src/crypto/crypto_common.h
  #include <string>
  #include <unordered_map>
 Index: src/crypto/crypto_context.cc
---- src/crypto/crypto_context.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_context.cc	2020-10-14 09:16:38.370970000 +0200
+--- src/crypto/crypto_context.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_context.cc	2020-10-21 08:41:40.963818000 +0200
 @@ -11,10 +11,10 @@
  #include "util.h"
  #include "v8.h"
@@ -234,8 +234,8 @@ Index: src/crypto/crypto_context.cc
  
  namespace node {
 Index: src/crypto/crypto_dsa.cc
---- src/crypto/crypto_dsa.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_dsa.cc	2020-10-14 09:16:48.247639000 +0200
+--- src/crypto/crypto_dsa.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_dsa.cc	2020-10-21 08:41:40.963942000 +0200
 @@ -7,8 +7,8 @@
  #include "threadpoolwork-inl.h"
  #include "v8.h"
@@ -248,8 +248,8 @@ Index: src/crypto/crypto_dsa.cc
  #include <cstdio>
  
 Index: src/crypto/crypto_ecdh.cc
---- src/crypto/crypto_ecdh.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_ecdh.cc	2020-10-14 09:16:56.121513000 +0200
+--- src/crypto/crypto_ecdh.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_ecdh.cc	2020-10-21 08:41:40.964104000 +0200
 @@ -10,9 +10,9 @@
  #include "threadpoolwork-inl.h"
  #include "v8.h"
@@ -264,8 +264,8 @@ Index: src/crypto/crypto_ecdh.cc
  namespace node {
  
 Index: src/crypto/crypto_keys.h
---- src/crypto/crypto_keys.h.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_keys.h	2020-10-14 09:17:17.281346000 +0200
+--- src/crypto/crypto_keys.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_keys.h	2020-10-21 08:41:40.964232000 +0200
 @@ -11,7 +11,7 @@
  #include "node_worker.h"
  #include "v8.h"
@@ -276,8 +276,8 @@ Index: src/crypto/crypto_keys.h
  #include <memory>
  #include <string>
 Index: src/crypto/crypto_rsa.cc
---- src/crypto/crypto_rsa.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_rsa.cc	2020-10-14 09:17:28.135947000 +0200
+--- src/crypto/crypto_rsa.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_rsa.cc	2020-10-21 08:41:40.964367000 +0200
 @@ -10,8 +10,8 @@
  #include "threadpoolwork-inl.h"
  #include "v8.h"
@@ -290,8 +290,8 @@ Index: src/crypto/crypto_rsa.cc
  namespace node {
  
 Index: src/crypto/crypto_spkac.h
---- src/crypto/crypto_spkac.h.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_spkac.h	2020-10-14 09:17:41.275045000 +0200
+--- src/crypto/crypto_spkac.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_spkac.h	2020-10-21 08:41:40.964474000 +0200
 @@ -6,7 +6,7 @@
  #include "env.h"
  #include "v8.h"
@@ -302,8 +302,8 @@ Index: src/crypto/crypto_spkac.h
  namespace node {
  namespace crypto {
 Index: src/crypto/crypto_timing.cc
---- src/crypto/crypto_timing.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_timing.cc	2020-10-14 09:17:50.286190000 +0200
+--- src/crypto/crypto_timing.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_timing.cc	2020-10-21 08:41:40.964577000 +0200
 @@ -5,7 +5,7 @@
  #include "v8.h"
  #include "node.h"
@@ -313,9 +313,21 @@ Index: src/crypto/crypto_timing.cc
  
  namespace node {
  
+Index: src/crypto/crypto_tls.h
+--- src/crypto/crypto_tls.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_tls.h	2020-10-21 08:41:40.964703000 +0200
+@@ -32,7 +32,7 @@
+ #include "stream_wrap.h"
+ #include "v8.h"
+ 
+-#include <openssl/ssl.h>
++#include "openssl/ssl.h"
+ 
+ #include <string>
+ 
 Index: src/crypto/crypto_util.h
---- src/crypto/crypto_util.h.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/crypto/crypto_util.h	2020-10-14 09:18:05.460298000 +0200
+--- src/crypto/crypto_util.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/crypto/crypto_util.h	2020-10-21 08:41:40.964861000 +0200
 @@ -12,15 +12,15 @@
  #include "v8.h"
  #include "string_bytes.h"
@@ -341,8 +353,8 @@ Index: src/crypto/crypto_util.h
  
  #include <algorithm>
 Index: src/inspector_socket_server.cc
---- src/inspector_socket_server.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/inspector_socket_server.cc	2020-10-14 09:10:42.749943000 +0200
+--- src/inspector_socket_server.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/inspector_socket_server.cc	2020-10-21 08:41:40.964998000 +0200
 @@ -20,7 +20,7 @@
                              bool include_protocol);
  namespace {
@@ -353,8 +365,8 @@ Index: src/inspector_socket_server.cc
  };
  
 Index: src/node_constants.cc
---- src/node_constants.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/node_constants.cc	2020-10-14 09:10:42.750132000 +0200
+--- src/node_constants.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/node_constants.cc	2020-10-21 08:41:40.965179000 +0200
 @@ -36,10 +36,10 @@
  
  
@@ -370,8 +382,8 @@ Index: src/node_constants.cc
  #endif  // HAVE_OPENSSL
  
 Index: src/node_metadata.cc
---- src/node_metadata.cc.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/node_metadata.cc	2020-10-14 09:13:59.680820000 +0200
+--- src/node_metadata.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/node_metadata.cc	2020-10-21 08:41:40.965287000 +0200
 @@ -10,7 +10,7 @@
  #include "zlib.h"
  
@@ -381,21 +393,79 @@ Index: src/node_metadata.cc
  #endif  // HAVE_OPENSSL
  
  #if defined(NODE_EXPERIMENTAL_QUIC) && NODE_EXPERIMENTAL_QUIC
-Index: src/tls_wrap.h
---- src/tls_wrap.h.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/tls_wrap.h	2020-10-14 09:10:42.750464000 +0200
-@@ -32,7 +32,7 @@
- #include "stream_wrap.h"
- #include "v8.h"
+Index: src/quic/node_quic_crypto.cc
+--- src/quic/node_quic_crypto.cc.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/quic/node_quic_crypto.cc	2020-10-21 08:41:40.965441000 +0200
+@@ -16,12 +16,12 @@
+ #include <ngtcp2/ngtcp2.h>
+ #include <ngtcp2/ngtcp2_crypto.h>
+ #include <nghttp3/nghttp3.h>  // NGHTTP3_ALPN_H3
+-#include <openssl/bio.h>
+-#include <openssl/err.h>
+-#include <openssl/evp.h>
+-#include <openssl/kdf.h>
+-#include <openssl/ssl.h>
+-#include <openssl/x509v3.h>
++#include "openssl/bio.h"
++#include "openssl/err.h"
++#include "openssl/evp.h"
++#include "openssl/kdf.h"
++#include "openssl/ssl.h"
++#include "openssl/x509v3.h"
+ 
+ #include <iterator>
+ #include <numeric>
+Index: src/quic/node_quic_crypto.h
+--- src/quic/node_quic_crypto.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/quic/node_quic_crypto.h	2020-10-21 08:41:40.965550000 +0200
+@@ -9,7 +9,7 @@
+ 
+ #include <ngtcp2/ngtcp2.h>
+ #include <ngtcp2/ngtcp2_crypto.h>
+-#include <openssl/ssl.h>
++#include "openssl/ssl.h"
+ 
+ namespace node {
+ 
+Index: src/quic/node_quic_session-inl.h
+--- src/quic/node_quic_session-inl.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/quic/node_quic_session-inl.h	2020-10-21 08:41:40.965683000 +0200
+@@ -11,7 +11,7 @@
+ #include "node_quic_socket-inl.h"
+ #include "node_quic_stream-inl.h"
+ 
+-#include <openssl/ssl.h>
++#include "openssl/ssl.h"
+ #include <memory>
+ #include <string>
  
+Index: src/quic/node_quic_session.h
+--- src/quic/node_quic_session.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/quic/node_quic_session.h	2020-10-21 08:41:40.965900000 +0200
+@@ -25,7 +25,7 @@
+ #include <ngtcp2/ngtcp2.h>
+ #include <ngtcp2/ngtcp2_crypto.h>
+ #include <nghttp3/nghttp3.h>
 -#include <openssl/ssl.h>
 +#include "openssl/ssl.h"
  
+ #include <unordered_map>
  #include <string>
+Index: src/quic/node_quic_util.h
+--- src/quic/node_quic_util.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/quic/node_quic_util.h	2020-10-21 08:41:40.966031000 +0200
+@@ -11,7 +11,7 @@
+ #include "memory_tracker.h"
  
+ #include <ngtcp2/ngtcp2.h>
+-#include <openssl/ssl.h>
++#include "openssl/ssl.h"
+ 
+ #include <algorithm>
+ #include <functional>
 Index: src/util.h
---- src/util.h.orig	2020-10-14 08:30:31.000000000 +0200
-+++ src/util.h	2020-10-14 09:10:42.750631000 +0200
+--- src/util.h.orig	2020-10-20 13:49:51.000000000 +0200
++++ src/util.h	2020-10-21 08:41:40.966191000 +0200
 @@ -157,14 +157,23 @@
      }                                                                         \
    } while (0)
@@ -429,9 +499,9 @@ Index: src/util.h
    ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__)
  
 Index: tools/install.py
---- tools/install.py.orig	2020-10-14 08:30:32.000000000 +0200
-+++ tools/install.py	2020-10-14 09:10:42.750752000 +0200
-@@ -151,10 +151,7 @@
+--- tools/install.py.orig	2020-10-20 13:49:52.000000000 +0200
++++ tools/install.py	2020-10-21 08:41:40.966312000 +0200
+@@ -147,10 +147,7 @@
    action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
    action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
  
@@ -444,8 +514,8 @@ Index: tools/install.py
    if 'true' == variables.get('node_install_npm'): npm_files(action)
  
 Index: tools/v8_gypfiles/toolchain.gypi
---- tools/v8_gypfiles/toolchain.gypi.orig	2020-10-14 08:30:32.000000000 +0200
-+++ tools/v8_gypfiles/toolchain.gypi	2020-10-14 09:10:42.750976000 +0200
+--- tools/v8_gypfiles/toolchain.gypi.orig	2020-10-20 13:49:52.000000000 +0200
++++ tools/v8_gypfiles/toolchain.gypi	2020-10-21 08:41:40.966526000 +0200
 @@ -1080,12 +1080,6 @@
        ['OS=="solaris"', {
          'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
@@ -482,9 +552,9 @@ Index: tools/v8_gypfiles/toolchain.gypi
                  'cflags': ['-O2'],
                  'cflags!': ['-O3'],
 Index: tools/v8_gypfiles/v8.gyp
---- tools/v8_gypfiles/v8.gyp.orig	2020-10-14 08:30:32.000000000 +0200
-+++ tools/v8_gypfiles/v8.gyp	2020-10-14 09:10:42.751206000 +0200
-@@ -173,7 +173,6 @@
+--- tools/v8_gypfiles/v8.gyp.orig	2020-10-20 13:49:52.000000000 +0200
++++ tools/v8_gypfiles/v8.gyp	2020-10-21 08:41:40.966774000 +0200
+@@ -181,7 +181,6 @@
        "<(V8_ROOT)/src/objects/template-objects.tq",
        "<(V8_ROOT)/src/objects/template.tq",
        "<(V8_ROOT)/src/wasm/wasm-objects.tq",

+ 12 - 29
node15/node15.spec

@@ -22,12 +22,8 @@
 ##
 
 #   package version
-%define       V_snap_base  15.0.0
-%define       V_snap_type  nightly
-%define       V_snap_date  20201014
-%define       V_snap_hash  d5e64952fe
-%define       V_opkg       %{V_snap_base}.%{V_snap_date}
-%define       V_dist       %{V_snap_base}-%{V_snap_type}%{V_snap_date}%{V_snap_hash}
+%define       V_opkg       15.0.0
+%define       V_dist       15.0.0
 
 #   package information
 Name:         node15
@@ -40,22 +36,22 @@ Class:        PLUS
 Group:        Web
 License:      MIT/BSD
 Version:      %{V_opkg}
-Release:      20201014
+Release:      20201021
 
 #   package options
 %option       with_icu   yes
 %option       with_node  no
 
 #   list of sources
-Source0:      https://nodejs.org/download/%{V_snap_type}/v%{V_dist}/node-v%{V_dist}.tar.gz
+Source0:      https://nodejs.org/download/release/v%{V_dist}/node-v%{V_dist}.tar.xz
 Source1:      node.c
 Patch0:       node15.patch
 
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20160101, make, gcc, gcc::with_cxx = yes, python2, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20160101
-BuildPreReq:  openssl11, libexecinfo, zlib, ares, libuv, nghttp2
-PreReq:       openssl11, libexecinfo, zlib, ares, libuv, nghttp2
+BuildPreReq:  openssl11, libexecinfo, zlib, libuv, nghttp2
+PreReq:       openssl11, libexecinfo, zlib, libuv, nghttp2
 %if "%{with_icu}" == "yes"
 BuildPreReq:  icu
 PreReq:       icu
@@ -70,20 +66,10 @@ Provides:     node = %{version}
     on Google V8 JavaScript virtual machine version 8.4.371.19.
 
 %track
-    prog node15:base = {
-        version   = %{V_snap_base}
-        url       = https://nodejs.org/download/%{V_snap_type}/
-        regex     = v(\d+\.\d+\.\d+)-%{V_snap_type}\d{8}[\da-f]{10}/
-    }
-    prog node15:date = {
-        version   = %{V_snap_date}
-        url       = https://nodejs.org/download/%{V_snap_type}/
-        regex     = v\d+\.\d+\.\d+-%{V_snap_type}(\d{8})[\da-f]{10}/
-    }
-    prog node15:hash = {
-        version   = %{V_snap_hash}
-        url       = https://nodejs.org/download/%{V_snap_type}/
-        regex     = v\d+\.\d+\.\d+-%{V_snap_type}(\d{8}[\da-f]{10})/
+    prog node15 = {
+        version   = %{V_dist}
+        url       = https://nodejs.org/download/release/
+        regex     = v(15\.\d+\.\d+)/
     }
 
 %prep
@@ -94,8 +80,9 @@ Provides:     node = %{version}
     #   provide local tool wrapper scripts as we cannot
     #   reliably pass the includes via configure variables
     cflags="-I`pwd`/deps/v8"
-    cflags="$cflags -I`pwd`/deps/uv/include"
     cflags="$cflags -I`pwd`/deps/v8/include"
+    cflags="$cflags -I`pwd`/deps/uv/include"
+    cflags="$cflags -I`pwd`/deps/cares/include"
 %if "%{with_icu}" != "yes"
     cflags="$cflags -I`pwd`/deps/icu-small/source/common"
 %endif
@@ -134,10 +121,6 @@ Provides:     node = %{version}
         --shared-zlib-includes=%{l_prefix}/include \
         --shared-zlib-libpath=%{l_prefix}/lib \
         --shared-zlib-libname="z" \
-        --shared-cares \
-        --shared-cares-includes=%{l_prefix}/include \
-        --shared-cares-libpath=%{l_prefix}/lib \
-        --shared-cares-libname="ares" \
         --shared-libuv \
         --shared-libuv-includes=%{l_prefix}/include \
         --shared-libuv-libpath=%{l_prefix}/lib \