diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD index 48b78907508..4da80ad75a8 100644 --- a/main/nodejs/APKBUILD +++ b/main/nodejs/APKBUILD @@ -6,6 +6,8 @@ # Maintainer: Jakub Jirutka # # secfixes: +# 14.15.1-r0: +# - CVE-2020-8277 # 12.18.4-r0: # - CVE-2020-8201 # - CVE-2020-8252 @@ -55,7 +57,7 @@ pkgname=nodejs # Note: Update only to even-numbered versions (e.g. 6.y.z, 8.y.z)! # Odd-numbered versions are supported only for 9 months by upstream. -pkgver=12.19.0 +pkgver=14.15.1 pkgrel=0 pkgdesc="JavaScript runtime built on V8 engine - LTS version" url="https://nodejs.org/" @@ -156,7 +158,7 @@ npm() { mv "$pkgdir"/usr/lib/node_modules/npm "$subpkgdir"/usr/lib/node_modules/ } -sha512sums="8ad4c4a9d05f8b0ea36173398906faf0ec2f9e76bc3e3f12efb1c46adbc14710f694b6845355a4a7179e82860a6f619bbc0fd0c4ec2312023a740fe1d512ebd7 node-v12.19.0.tar.gz -3c536776e2ecb5dc677bf711a09418085b3c5e931a6eaf647f47c28e194d5c6dec354d4e7a039a5805b30fc7e83140594851e18d9120f523eec2f93539eac4db dont-run-gyp-files-for-bundled-deps.patch -a4e1e7bd4f32ee30ebd319ac0c2fc751166f8fdd27f491709003dfebda51cbece9412630f0b98f0b85253ccc4f066c82997ad68abb9b87dc0b47c24d09a0643a unbundle-uv.patch -a63b42c08b55139c1c363f6ba8aba9d85a0621b383ed514f7562cfa02f0cc290785d7cfe09892ac39962980d1b318957511f57b3f9b9d1fbc8704c0603597c9a link-with-libatomic-on-mips32.patch" +sha512sums="842edcf9a328a66657aeb363091c2d3581c310bc302950960a6263736b22da75ed035771ade1c602dca1d8ce73edb717a91921d520c4222d38bebc2a9b4c5105 node-v14.15.1.tar.gz +940cc90aaa77a531cde13e31918a9978f9478936c3851038bcdf2869e64de03ce84dec5a46519469a90a8ba2853226825452d23d9347752abdbe04e944c083eb dont-run-gyp-files-for-bundled-deps.patch +5557b95869832915e338c934d9f511ca3e37a8a8781dc565b93e2661c86ec250e1532d658faf99004f16d451d9a18873bf4923804180f01a46b3d65122b43548 unbundle-uv.patch +44e81fbf254bd79e38b813f7f5a1336df854588939cba50aaec600660495f9b7745a7049a99eb59d15a51100b3a44f66892a902d7fc32e1399b51883ad4c02cf link-with-libatomic-on-mips32.patch" diff --git a/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch b/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch index db2ab01c66e..35a0153353e 100644 --- a/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch +++ b/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch @@ -13,8 +13,8 @@ Node.js 7.2.0 echo "'test-code-cache' target is a noop" out/Makefile: config.gypi common.gypi node.gyp \ -- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ -+ deps/http_parser/http_parser.gyp \ +- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ ++ deps/llhttp/llhttp.gyp \ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp $(PYTHON) tools/gyp_node.py -f make diff --git a/main/nodejs/link-with-libatomic-on-mips32.patch b/main/nodejs/link-with-libatomic-on-mips32.patch index 64a2d580e7f..ed200334ccc 100644 --- a/main/nodejs/link-with-libatomic-on-mips32.patch +++ b/main/nodejs/link-with-libatomic-on-mips32.patch @@ -1,6 +1,6 @@ --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp -@@ -1168,6 +1168,11 @@ +@@ -1266,6 +1266,11 @@ ['want_separate_host_toolset', { 'toolsets': ['host', 'target'], }], @@ -14,7 +14,7 @@ 'defines': ['USING_V8_PLATFORM_SHARED'], --- a/node.gyp +++ b/node.gyp -@@ -350,6 +350,11 @@ +@@ -381,6 +381,11 @@ 'msvs_disabled_warnings!': [4244], 'conditions': [ @@ -23,6 +23,6 @@ + 'libraries': [ '-latomic' ], + }, + }], - [ 'node_intermediate_lib_type=="static_library" and ' - 'node_shared=="true" and OS=="aix"', { - # For AIX, shared lib is linked by static lib and .exp. In the + [ 'error_on_warn=="true"', { + 'cflags': ['-Werror'], + 'xcode_settings': { diff --git a/main/nodejs/unbundle-uv.patch b/main/nodejs/unbundle-uv.patch index 38025e8c7e8..f84623707da 100644 --- a/main/nodejs/unbundle-uv.patch +++ b/main/nodejs/unbundle-uv.patch @@ -1,7 +1,7 @@ --- a/deps/uvwasi/uvwasi.gyp +++ b/deps/uvwasi/uvwasi.gyp -@@ -16,7 +16,6 @@ - 'src/wasi_rights.c', +@@ -19,7 +19,6 @@ + 'src/wasi_serdes.c', ], 'dependencies': [ - '../uv/uv.gyp:libuv',