summaryrefslogtreecommitdiff
path: root/net-libs/nodejs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-22 07:31:18 +0100
commit908778078736bd36f7a60a2d576d415cb8e000fa (patch)
treec6a4796c48b608c14dc7e9674cdbd38f905e3c15 /net-libs/nodejs
parent185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
gentoo resync : 22.05.2021
Diffstat (limited to 'net-libs/nodejs')
-rw-r--r--net-libs/nodejs/Manifest14
-rw-r--r--net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch95
-rw-r--r--net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch71
-rw-r--r--net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch119
-rw-r--r--net-libs/nodejs/nodejs-12.22.1-r1.ebuild22
-rw-r--r--net-libs/nodejs/nodejs-14.17.0.ebuild (renamed from net-libs/nodejs/nodejs-14.16.1-r1.ebuild)3
-rw-r--r--net-libs/nodejs/nodejs-16.1.0.ebuild4
-rw-r--r--net-libs/nodejs/nodejs-16.2.0.ebuild234
-rw-r--r--net-libs/nodejs/nodejs-99999999.ebuild6
9 files changed, 480 insertions, 88 deletions
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 567e36b6643c..389319e12d1d 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,21 +1,25 @@
AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
AUX nodejs-12.20.1-fix_ppc64_crashes.patch 1788 BLAKE2B 48a5c5343b654fe57f021644c063b98db32bc634dc1ac5ef4ef9fbc3a1988ae3c7ae51ca989715154f5167ce985b742806de667bf6126bcf535f0ebae448b5ce SHA512 804347c985e59c9e3852af4c3d807ebaff95f1afe88a6ec5785baef51ba6ab9b3257d202fdddc5daa982fd06324a8f828f7d8dca8f99e071c52decea6cb00b83
+AUX nodejs-12.22.1-jinja_collections_abc.patch 3159 BLAKE2B 52de2f76151fffa436bf8a53ef6f38cee0cc566832a31c68cfb8fd36a82a187cebe389041355137b2f2a53454e26b0460bfc8a63154528d51264aa01503db10f SHA512 197ae5b316af6a253614fb0f9cdef644678a9eede770b3443ab417397c40caea1fc00c7300dd67af859ffeab56a851b70778bc68bc915559fab1f3dcb27c0461
AUX nodejs-12.22.1-uvwasi_shared_libuv.patch 297 BLAKE2B 1f23155371499f891cf796c9b5c8b4c7f69074550ab2de15971a2b53f80eaaeb32aacc661fcd305de68c188302d2ce16db7b702b28fbbfc37b666b370e2159e7 SHA512 31572ac8332a9551d3273516c91665d6064ae905b8676fe12aacaa1f10f3302dc31e41ea328452685be75c4956a1d7f4833df31dca35d8259d0fc13534547de4
AUX nodejs-12.22.1-v8_icu69.patch 2923 BLAKE2B 0e4da87a091dde4f84a980d43223f8d085b50e4cb16fac66d0a275a2257f8b61e1a2996e8a4a469f282c1a7ab622d9b9183b1801818af3ca40051fb4661e8f12 SHA512 e30ecb75b3fdf33cf9efa74250e4b91ab9ebfb81cce4d6f926c6a04cc20bf8222f68b2af4eecbbcd77fa5bc922b8a62be8fe8d918e309baccc09dafa40029e10
-AUX nodejs-13.2.0-paxmarking.patch 2710 BLAKE2B 9e63761ce7160434f7f9e5ef76ffd4d0fd61deb24cacd9ac4736bcc74145090d730c6b1d0a60cf9c815a08f22c7925e0719dae835a0ede0b65bb8af53418e016 SHA512 e5aae8fd9758fc1dbfc77f9dbfb62b90941a4b2e9e06a6d70f47aa6462d120e61a1774ba8526b2033161195040326d1b5ad643a816552154ff69a8e2548b3d70
AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380
AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
+AUX nodejs-16.1.0-ppc64-segfault.patch 4664 BLAKE2B fd66e8e6332b763b008b56dcbf6c755e80f3494f995beef0b2d041c52fafdcfda8122de633754c989bf7c033e0980515e33b6369c19a5a8f7cbba269d798feeb SHA512 d1e886cafb64108f4c0a7200f8994c30fb15c60b3090bd151a080d2df71afec6996de408fa0dc671093c4c7c2312f4dfc4eee09bbc777cc00f7e122e6dce3a59
AUX nodejs-16.1.0-test-repl-history-navigation.patch 1970 BLAKE2B 7c33e36c1faafabff42e0b98ca83fe25433fadfc77196158abb2a7e6fdaad09fcdeb0aed75a1424e8e96425b10a7e396b21cd8ac3cb06f20a632f4cf38b76060 SHA512 d53bc20931bc3f6c20ed0d9b050e95a2aa698b9dd73d0faf8628e6e0f07c030c3dd4d6504ec4b962c9932384d85683188692ef3fac264a73785f3c961ce72454
AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0
DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0
+DIST node-v14.17.0.tar.xz 33484212 BLAKE2B 0ad045b7e0b96f564f42cef703338fece2167cb8bfe32840b765b137e01491a43a9c31ce290a3379ffa834ddfe4e2e1f42f95d4d0014240151b06313e0339383 SHA512 7a7683523904580462077c8bf3ee9640f1b674c7df55655049ca50ca3cfdb2973b13088f2b65e4eccf4df2641cd9c86c9716bcd160a5d5863a969cb1e88de093
DIST node-v16.1.0.tar.xz 33770472 BLAKE2B 2b7cf5f07dbf72eb25018cd046ce15cf6c5a444225e34d425614c19e69888b4f5c9488b079fed12e6fe52cb8dfdee20cf61c4df5a39f53e60b95c4da445f2091 SHA512 dc12078203940e7b280198ae15f51f68aaefcf8cab71a9f988952e67045e4b16dc48ec471abcc497bd15b0b426c06678e376b53762349d6568b48d52888cc2d5
-EBUILD nodejs-12.22.1-r1.ebuild 6976 BLAKE2B 65c091a3834df7f256fe9f24d81c4a350bc80d2c73c97190d376d65106948511843ad5610bbfaced8dcd8a2839abfb402f9119d8142354e5fb2b0ec53e601005 SHA512 06f2f07ba8a0e5173549fbf3d01ff92e58e3ed4c7f3cb048d03e561f58ce1d79112c25c6486625c7b971d8118860ffe75f493b5ea684359709a74e43a4e50276
+DIST node-v16.2.0.tar.xz 33786196 BLAKE2B be2784332cbbfa58cf24f830cd88117378c51b413167b6443ed90176bb0bd429005a99b5148f5d8315fd751dd34d83192c2a09753f84faf3d91080fa6e5eab44 SHA512 bf86427d29679f47d0596c532e84790ceea1784b4a06fc2a63969a1bdbf853b06d14f264c416f357c8ef097189566a44f962a678b5026bb4f781557f7b2bd363
+EBUILD nodejs-12.22.1-r1.ebuild 7045 BLAKE2B e9dde41d247bb9f8c072b0aabe3f04ab263ef1ea3b6bb14057087847a5642556d1c0f9d46257422850446ad21b847ffb1505e3651aa78096a9e7b40733d55faa SHA512 ece228de136e6041b996a8d9ed0099ddad524309c8e00738233476f72463fff9e306aa3211c4a914e3599f8951579a05fdbeb412693401dcd97852d638f5b426
EBUILD nodejs-12.22.1.ebuild 6412 BLAKE2B 7e5671b07a93b739c8b3a84730f0a873dc18c6746fe25a112ef8efc6bcc44c5c68a4df3eb16cea05cbe0ef786857a4b417c463ae3469d3d09c1d1bb1ae5e1725 SHA512 b38fef7e77ac63f589d52b4836483aaa36ec36597f130e83334b3a59a9bc7e7c98fa3d2ada868472db556240b355ebf4415b656823adc60b5f1965a010e97a4a
-EBUILD nodejs-14.16.1-r1.ebuild 7025 BLAKE2B abaf829b8f37b6f985319e770e5888c376e3845eeca30ec4f40d8bfbb0f7205ea030d42c74e0c0364d9f7cef35ecbc79f241daa92c4ff85999f1c7d675f5f502 SHA512 f3a4580d9396a6bd2993219e85eb50d7653e0f49ac6c8ee04c2020430d2e21ba1f4d2002d8595ca338a791b96bc0ce4457080cd1104fa2b5f0dd45b484ffc9b5
EBUILD nodejs-14.16.1.ebuild 6109 BLAKE2B 55b923b81044645154639c0768f2905b612dcea70e703451bc5bb0868f17c7c635017ab9d390cff31c2903e0b0226e5c5c0a5323d73eecb3ea730ca7ace83cc7 SHA512 017c31360f866ea46b435dcf1ba84cb8075bcdf3925da51e1c81a0b3f0a73e3b4f31b0192ea6efa890e64eb9d3ccf548fc57f17bb44f5c20c5cdf0736b287eb3
-EBUILD nodejs-16.1.0.ebuild 6669 BLAKE2B 4411616ca4379b122d832a32801aee91dcdd4d4396f02c3a1b0ef2c48a69108eff7ec0739ab435479a6a94c203ac8fdd3bf2eb98fee4d6ee21cde54a7346118e SHA512 758c31953bb6e94794ce6877d3196b4d89d196a2ba5cb27d51c51c5a6676a400662bfce9a2fa3a9c9e95d7ece8bf64e2eb46c62370f1d8babbaac06ab6060709
-EBUILD nodejs-99999999.ebuild 6486 BLAKE2B c686818d5a5f832f3520ef3c4c5458526aac4894c251a2c589bcfff5e313b7b7602fb7d58bc89e7fbfdea28eeb4b570748026d38e8060430aea1b983b49a7698 SHA512 49a89ee3ef022a9d1866a33a4643d23f362c39442725a7267aa55c12898dd7d96dceb95fc44bdf36112b18c93ec9dde6124cec34b3b277e4be2fa740ffde4b4a
+EBUILD nodejs-14.17.0.ebuild 7083 BLAKE2B 9f8bfa1c3d01f79f62faf84764279727eb2bb27909c51e14dfdbd3540b8ea01e17b6eb789da165e309d5876fb362ef84b92fd63eeeff6aecd00ac0323231461c SHA512 f52f9c57ec23e60949246362205bcf3f5f61314d81c22c291caca23c5f706ae799e00456b387a3f375e7fc9e8c0f037b7de44fd14c1b9e1981bd7f56158c842a
+EBUILD nodejs-16.1.0.ebuild 6814 BLAKE2B ef9da264584d3bfdcc3c9c07d69bdeadc2e00a5bf094534799367488a27df0aa2dc296f9fde63683c0a43f095231f4d117268006947f01c2514704a1f40e1b66 SHA512 8eeba25b13eba364657c2e7999b9eccf18b6da0462911b5b95788639b3598c2f87593dd62dd4c6e173bf608790bc231cbf5cb8ce99678f49d69e7c06867881fc
+EBUILD nodejs-16.2.0.ebuild 6751 BLAKE2B 36bde76cfbfd2b96f332934993eab783ba8aa3fb1f86f027d91a9e5db5850c88bfd6e97ad2dd0c1e882999588cd90ff519879558ba66156ca577011c00e916d0 SHA512 e3938639db32b7ace5c84db61e2b9e84cf39581df42f06287063efcae02ddd7f5d2b0c1b60bdc8914e09651c44dce2cbf9549b5985a8dc381209b5463054a871
+EBUILD nodejs-99999999.ebuild 6590 BLAKE2B 893ec3a62202b9c38aa213175c405da66490b53bff00394d5b5d71508212735c12665dc88ca9929687aa43d36522ba7bc44a9cd3c88272ec55e807ebf48d194e SHA512 66c8892ddf86330fceebcc8646460f03eb9d719a878198c2953f4f72b39154a1aad290e200e40211d0cd3595d8f5939eac6fd1e7178c66d7ce5050592aa720e1
MISC metadata.xml 1000 BLAKE2B 4785dba31037ad28281266047c8e59cd1d3e0e723128831f3aebc0436727b41c283284a450b5c619868e0317d3bc61e239a85e0d47773e9867f2606d5dd59047 SHA512 6556cf00ea009b394a56de614226b8cf0e04e868f47d827dba1907b5d89b957d738e4529b6338126cff9ccbd573c4451e9c2d5d4f93e4e4dad376e88419ef489
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
new file mode 100644
index 000000000000..5f0df09b6e2e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -0,0 +1,95 @@
+--- a/deps/v8/third_party/jinja2/tests.py
++++ b/deps/v8/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+
+ # register the context as mapping if possible
+ try:
+- from collections import Mapping
++ from collections.abc import Mapping
+ Mapping.register(Context)
+ except ImportError:
+ pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+ pass
+
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+
+ # register the LRU cache as mutable mapping if possible
+ try:
+- from collections import MutableMapping
++ from collections.abc import MutableMapping
+ MutableMapping.register(LRUCache)
+ except ImportError:
+ pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+
+ # register the context as mapping if possible
+ try:
+- from collections import Mapping
++ from collections.abc import Mapping
+ Mapping.register(Context)
+ except ImportError:
+ pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+ pass
+
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
deleted file mode 100644
index 1061255e1637..000000000000
--- a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
+++ /dev/null
@@ -1,71 +0,0 @@
- Bug: 694100
- Add actions for pax marking mkcodecache and node_mksnapshot
- to disable mprotect for pax enable kernel.
- Reported-by: Attila Tóth <atoth@atoth.sote.hu>
- Co-developed-by: Attila Tóth <atoth@atoth.sote.hu>
- Signed-off-by: Magnus Granberg <zorry@gentoo.org>
-
---- a/node.gyp 2019-10-23 11:52:41.000000000 +0200
-+++ a/node.gyp 2019-11-12 20:58:43.957881862 +0100
-@@ -233,7 +233,9 @@
- 'deps/acorn-plugins/acorn-static-class-features/index.js',
- ],
- 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
-+ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
- 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
-+ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
- 'conditions': [
- [ 'node_shared=="true"', {
- 'node_target_type%': 'shared_library',
-@@ -436,10 +438,24 @@
- ],
- 'actions': [
- {
-+ 'action_name': 'run_pax_mkcodecache',
-+ 'inputs': [
-+ '<(mkcodecache_exec)',
-+ ],
-+ 'outputs': [
-+ '<(mkcodecache_u_exec)',
-+ ],
-+ 'action': [
-+ 'bash',
-+ '-c',
-+ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
-+ ],
-+ },
-+ {
- 'action_name': 'run_mkcodecache',
- 'process_outputs_as_sources': 1,
- 'inputs': [
-- '<(mkcodecache_exec)',
-+ '<(mkcodecache_u_exec)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -461,10 +477,24 @@
- ],
- 'actions': [
- {
-+ 'action_name': 'run_pax_mksnapshot',
-+ 'inputs': [
-+ '<(node_mksnapshot_exec)',
-+ ],
-+ 'outputs': [
-+ '<(node_mksnapshot_u_exec)',
-+ ],
-+ 'action': [
-+ 'bash',
-+ '-c',
-+ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
-+ ],
-+ },
-+ {
- 'action_name': 'node_mksnapshot',
- 'process_outputs_as_sources': 1,
- 'inputs': [
-- '<(node_mksnapshot_exec)',
-+ '<(node_mksnapshot_u_exec)',
- ],
- 'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
diff --git a/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch b/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
new file mode 100644
index 000000000000..5ddd1fe7d08d
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-16.1.0-ppc64-segfault.patch
@@ -0,0 +1,119 @@
+From ca4bf75504d07db5e1e66ec5c867cd76c90268af Mon Sep 17 00:00:00 2001
+From: Junliang Yan <jyan@ca.ibm.ca>
+Date: Tue, 11 May 2021 08:57:03 -0400
+Subject: [PATCH] ppc: Prevent trampoline emission on deoptimization table generation
+
+The deoptimization table needs to be continuously, so we need to block
+trampoline pool emission during the whole process.
+
+bug: v8:11759
+Change-Id: Ie5e0ffe27dc8e6cdb18985dc2cf26bdadeff318f
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2881918
+Commit-Queue: Junliang Yan <junyan@redhat.com>
+Reviewed-by: Jakob Gruber <jgruber@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#74506}
+X-Gentoo-bug: https://bugs.gentoo.org/785751
+Backported by gyakovlev@gentoo.org
+---
+
+diff --git a/src/codegen/ppc/assembler-ppc.h b/src/codegen/ppc/assembler-ppc.h
+index 794b917..ae04118 100644
+--- a/deps/v8/src/codegen/ppc/assembler-ppc.h
++++ b/deps/v8/src/codegen/ppc/assembler-ppc.h
+@@ -195,6 +195,12 @@
+
+ void MaybeEmitOutOfLineConstantPool() { EmitConstantPool(); }
+
++ inline void CheckTrampolinePoolQuick(int extra_space = 0) {
++ if (pc_offset() >= next_trampoline_check_ - extra_space) {
++ CheckTrampolinePool();
++ }
++ }
++
+ // Label operations & relative jumps (PPUM Appendix D)
+ //
+ // Takes a branch opcode (cc) and a label (L) and generates
+@@ -1334,12 +1340,6 @@
+ }
+
+ inline void UntrackBranch();
+- void CheckTrampolinePoolQuick() {
+- if (pc_offset() >= next_trampoline_check_) {
+- CheckTrampolinePool();
+- }
+- }
+-
+ // Instruction generation
+ void a_form(Instr instr, DoubleRegister frt, DoubleRegister fra,
+ DoubleRegister frb, RCBit r);
+diff --git a/src/compiler/backend/code-generator.cc b/src/compiler/backend/code-generator.cc
+index 023e697..62e57fe 100644
+--- a/deps/v8/src/compiler/backend/code-generator.cc
++++ b/deps/v8/src/compiler/backend/code-generator.cc
+@@ -416,23 +416,29 @@
+ std::sort(deoptimization_exits_.begin(), deoptimization_exits_.end(), cmp);
+ }
+
+- for (DeoptimizationExit* exit : deoptimization_exits_) {
+- if (exit->emitted()) continue;
+- if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
+- exit->set_deoptimization_id(next_deoptimization_id_++);
+- }
+- result_ = AssembleDeoptimizerCall(exit);
+- if (result_ != kSuccess) return;
++ {
++#ifdef V8_TARGET_ARCH_PPC64
++ v8::internal::Assembler::BlockTrampolinePoolScope block_trampoline_pool(
++ tasm());
++#endif
++ for (DeoptimizationExit* exit : deoptimization_exits_) {
++ if (exit->emitted()) continue;
++ if (Deoptimizer::kSupportsFixedDeoptExitSizes) {
++ exit->set_deoptimization_id(next_deoptimization_id_++);
++ }
++ result_ = AssembleDeoptimizerCall(exit);
++ if (result_ != kSuccess) return;
+
+- // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
+- // order, which is always the case since they are added to
+- // deoptimization_exits_ in that order, and the optional sort operation
+- // above preserves that order.
+- if (exit->kind() == DeoptimizeKind::kLazy) {
+- int trampoline_pc = exit->label()->pos();
+- last_updated = safepoints()->UpdateDeoptimizationInfo(
+- exit->pc_offset(), trampoline_pc, last_updated,
+- exit->deoptimization_id());
++ // UpdateDeoptimizationInfo expects lazy deopts to be visited in pc_offset
++ // order, which is always the case since they are added to
++ // deoptimization_exits_ in that order, and the optional sort operation
++ // above preserves that order.
++ if (exit->kind() == DeoptimizeKind::kLazy) {
++ int trampoline_pc = exit->label()->pos();
++ last_updated = safepoints()->UpdateDeoptimizationInfo(
++ exit->pc_offset(), trampoline_pc, last_updated,
++ exit->deoptimization_id());
++ }
+ }
+ }
+
+diff --git a/src/compiler/backend/ppc/code-generator-ppc.cc b/src/compiler/backend/ppc/code-generator-ppc.cc
+index 3e4e94a..0281376 100644
+--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
+@@ -4296,7 +4296,15 @@
+
+ void CodeGenerator::PrepareForDeoptimizationExits(
+ ZoneDeque<DeoptimizationExit*>* exits) {
+- // __ EmitConstantPool();
++ int total_size = 0;
++ for (DeoptimizationExit* exit : deoptimization_exits_) {
++ total_size += (exit->kind() == DeoptimizeKind::kLazy)
++ ? Deoptimizer::kLazyDeoptExitSize
++ : Deoptimizer::kNonLazyDeoptExitSize;
++ }
++
++ __ CheckTrampolinePoolQuick(total_size);
++ DCHECK(Deoptimizer::kSupportsFixedDeoptExitSizes);
+ }
+
+ void CodeGenerator::AssembleMove(InstructionOperand* source,
diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
index 84110ff87064..9c4fe05c005f 100644
--- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
PYTHON_REQ_USE="threads(+)"
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -30,6 +30,8 @@ REQUIRED_USE="
system-ssl? ( ssl )
"
+RESTRICT="!test? ( test )"
+
RDEPEND="
>=app-arch/brotli-1.0.9
>=dev-libs/libuv-1.39.0:=
@@ -53,11 +55,11 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
"${FILESDIR}"/${PN}-99999999-llhttp.patch
)
-RESTRICT="test"
pkg_pretend() {
(use x86 && ! use cpu_flags_x86_sse2) && \
@@ -100,12 +102,8 @@ src_prepare() {
sed -i -e "/'-O3'/d" common.gypi node.gypi || die
- # Avoid a test that I've only been able to reproduce from emerge. It doesnt
- # seem sandbox related either (invoking it from a sandbox works fine).
- # The issue is that no stdin handle is openened when asked for one.
- # It doesn't really belong upstream , so it'll just be removed until someone
- # with more gentoo-knowledge than me (jbergstroem) figures it out.
- rm test/parallel/test-stdout-close-unref.js || die
+ # Known-to-fail test of a deprecated, legacy HTTP parser. Just don't bother.
+ rm -f test/parallel/test-http-transfer-encoding-smuggling-legacy.js
# debug builds. change install path, remove optimisations and override buildtype
if use debug; then
@@ -228,8 +226,14 @@ src_install() {
}
src_test() {
+ # parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+ if has usersandbox ${FEATURES}; then
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+ fi
+
out/${BUILDTYPE}/cctest || die
- "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+ "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
}
pkg_postinst() {
diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.17.0.ebuild
index 82f78fb0068e..6f3e887f73d1 100644
--- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.17.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
PYTHON_REQ_USE="threads(+)"
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch
diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild
index f8ca995c2e13..e1f164dff75c 100644
--- a/net-libs/nodejs/nodejs-16.1.0.ebuild
+++ b/net-libs/nodejs/nodejs-16.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
PYTHON_REQ_USE="threads(+)"
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -47,9 +47,11 @@ BDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}"
PATCHES=(
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
"${FILESDIR}"/${PN}-16.1.0-test-repl-history-navigation.patch
+ "${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
)
pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-16.2.0.ebuild b/net-libs/nodejs/nodejs-16.2.0.ebuild
new file mode 100644
index 000000000000..95fb8c3f56fe
--- /dev/null
+++ b/net-libs/nodejs/nodejs-16.2.0.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/nodejs/node"
+ SLOT="0"
+else
+ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+ SLOT="0/$(ver_cut 1)"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+ S="${WORKDIR}/node-v${PV}"
+fi
+
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
+REQUIRED_USE="inspector? ( icu ssl )
+ npm? ( ssl )
+ system-icu? ( icu )
+ system-ssl? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-arch/brotli-1.0.9
+ >=dev-libs/libuv-1.40.0:=
+ >=net-dns/c-ares-1.17.0
+ >=net-libs/nghttp2-1.41.0
+ sys-libs/zlib
+ system-icu? ( >=dev-libs/icu-67:= )
+ system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
+BDEPEND="${PYTHON_DEPS}
+ sys-apps/coreutils
+ virtual/pkgconfig
+ systemtap? ( dev-util/systemtap )
+ test? ( net-misc/curl )
+ pax_kernel? ( sys-apps/elfix )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch
+ "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
+ "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+ "${FILESDIR}"/${PN}-16.1.0-ppc64-segfault.patch #785751, drop after it stops applying
+)
+
+pkg_pretend() {
+ (use x86 && ! use cpu_flags_x86_sse2) && \
+ die "Your CPU doesn't support the required SSE2 instruction."
+
+ if [[ ${MERGE_TYPE} != "binary" ]]; then
+ if use lto; then
+ if tc-is-gcc; then
+ if [[ $(gcc-major-version) -ge 11 ]]; then
+ # Bug #787158
+ die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild"
+ fi
+ else
+ # configure.py will abort on this later if we do not
+ die "${PN} only supports LTO for gcc"
+ fi
+ fi
+ fi
+}
+
+src_prepare() {
+ tc-export AR CC CXX PKG_CONFIG
+ export V=1
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # https://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+ # Avoid writing a depfile, not useful
+ sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+ sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ # We need to disable mprotect on two files when it builds Bug 694100.
+ use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+ # All this test does is check if the npm CLI produces warnings of any sort,
+ # failing if it does. Overkill, much? Especially given one possible warning
+ # is that there is a newer version of npm available upstream (yes, it does
+ # use the network if available), thus making it a real possibility for this
+ # test to begin failing one day even though it was fine before.
+ rm -f test/parallel/test-release-npm.js
+
+ default
+}
+
+src_configure() {
+ xdg_environment_reset
+
+ # LTO compiler flags are handled by configure.py itself
+ filter-flags '-flto*'
+
+ local myconf=(
+ --shared-brotli
+ --shared-cares
+ --shared-libuv
+ --shared-nghttp2
+ --shared-zlib
+ )
+ use debug && myconf+=( --debug )
+ use lto && myconf+=( --enable-lto )
+ if use system-icu; then
+ myconf+=( --with-intl=system-icu )
+ elif use icu; then
+ myconf+=( --with-intl=full-icu )
+ else
+ myconf+=( --with-intl=none )
+ fi
+ use inspector || myconf+=( --without-inspector )
+ use npm || myconf+=( --without-npm )
+ use snapshot || myconf+=( --without-node-snapshot )
+ if use ssl; then
+ use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+ else
+ myconf+=( --without-ssl )
+ fi
+
+ local myarch=""
+ case ${ABI} in
+ amd64) myarch="x64";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ ppc64) myarch="ppc64";;
+ x32) myarch="x32";;
+ x86) myarch="ia32";;
+ *) myarch="${ABI}";;
+ esac
+
+ GYP_DEFINES="linux_use_gold_flags=0
+ linux_use_bundled_binutils=0
+ linux_use_bundled_gold=0" \
+ "${EPYTHON}" configure.py \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ $(use_with systemtap dtrace) \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ default
+
+ pax-mark -m "${ED}"/usr/bin/node
+
+ # set up a symlink structure that node-gyp expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ if use doc; then
+ docinto html
+ dodoc -r "${S}"/doc/*
+ fi
+
+ if use npm; then
+ keepdir /etc/npm
+
+ # Install bash completion for `npm`
+ local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
+ "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+ newbashcomp "${tmp_npm_completion_file}" npm
+
+ # Move man pages
+ doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+ # Clean up
+ rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile}
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man}
+
+ local find_exp="-or -name"
+ local find_name=()
+ for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+ ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+ "*.md" "*.markdown" "*.bat" "*.cmd"; do
+ find_name+=( ${find_exp} "${match}" )
+ done
+
+ # Remove various development and/or inappropriate files and
+ # useless docs of dependend packages.
+ find "${LIBDIR}"/node_modules \
+ \( -type d -name examples \) -or \( -type f \( \
+ -iname "LICEN?E*" \
+ "${find_name[@]}" \
+ \) \) -exec rm -rf "{}" \;
+ fi
+
+ mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+ # parallel/test-fs-mkdir is known to fail with FEATURES=usersandbox
+ if has usersandbox ${FEATURES}; then
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+ fi
+
+ out/${BUILDTYPE}/cctest || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 2b81f6a39ed8..2d45db3952a5 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
PYTHON_REQ_USE="threads(+)"
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
@@ -46,6 +46,10 @@ BDEPEND="${PYTHON_DEPS}
pax_kernel? ( sys-apps/elfix )"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch # still needed as of 2021-05-13
+)
+
pkg_pretend() {
(use x86 && ! use cpu_flags_x86_sse2) && \
die "Your CPU doesn't support the required SSE2 instruction."