gentoo auto-resync : 15:09:2023 - 04:49:10

3 files changed, 91 insertions, 2 deletions

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 93489c158f00..2e2705f9e408 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,7 @@
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9
 AUX nodejs-20.3.0-gcc14.patch 1119 BLAKE2B 6be4d981ce94f618aa4a07766e8fa1c99e3825cee7374cae5c76264c961083604ce408a7847de54ae6c72d36c6b0cbe34921e69a800ebebc5553cdaead2cbaa5 SHA512 8137b7ac6b5920c7f16b6409923092f3eb3c4f81887035e1840ae61deb61090d88d6184c36db4bcf7249fa6d7a21687788616b2aee51cb6bdc08cb78ed656e5d
+AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8
 DIST node-v16.20.2.tar.xz 36834468 BLAKE2B 88bd0d91a6b69f7e5fba2b087684b07b8986fd1492f51f6fdccc02f043970303808c0cc1eeda29670aacddd4234ec3181752c916fefee060624b0462dff8cbcf SHA512 c7953630b7d0eb832ab5a4b839c07e6505cf5f4e37853f59cd0ffc6b8742ac2ecaba20bfb47d8995ef88f3c7005bb456c1eb70cb2fc6b6fc506e1d8b81f25cb4
 DIST node-v18.17.1.tar.xz 40788836 BLAKE2B 50e0dc0eecd68620ffa7457319e71124bbba302f6acff79286a30cf97442fb09a96cf8781456bafd5c2e497ba88cf392c141f0e221683da421b87f653b1ad7ca SHA512 fd6f586447ecd44ac6738da1cf7d54e74bd33ffd1ee1acc2e0e1bdaf0031bcaef85751d3dd590bb278eb502daf9c77f0763b5a181a30ee4cf537aef254629622
 DIST node-v20.5.1.tar.xz 41532256 BLAKE2B b26fbe8be7e3330b69ae0f630cabba7dee7879ae829c2c743491d26d9623c3170de85e4e7c0629993257935841978343c1ded2870ece24365784581c8be0143b SHA512 2828930bf2df0769ec7116fc6b89c7069294426b937ce38543426e0108a8c953301c523eb03419e35a993773895d74b28838bec96ffc01ab0e138a4b2a52737d
@@ -10,6 +11,6 @@ EBUILD nodejs-16.20.2.ebuild 6492 BLAKE2B dfe025a55b69ff058e890fd743d968ea298aac
 EBUILD nodejs-18.17.1.ebuild 7464 BLAKE2B e43f7c5e5a74460dfe517e443eda9349aeb1aa17fc4db719ef1f68d2d6b560f9fa33f06a7900d918db5912475c47192380d2ec6d0437e1583c0fab2c105b96b9 SHA512 9af59096060b0291aea6fb97d7c87e961e2e1315e5345503c629518d35335db6f5d15ba25f0d0af6f47074cfb72d7ec8a59b1a6fbf042ccbd0d4cd6ec98ef66d
 EBUILD nodejs-20.5.1.ebuild 7442 BLAKE2B 74548b5481ca33fe976e63a1436b395114875bca3d37c5f64b9aa7a8cbb86c45abe96cf17518a41e517ec12d840db7ef91b30aac7a9cce5451a5c3c0bfd6d173 SHA512 46a4771c4ec467884a2e1abd3f1ef864259cde863547ce73dfa98239a28495583b523958f183ac8cafaf56035e1263cff4dfb3eefb0c254478ec9c19ba4b8152
 EBUILD nodejs-20.6.0.ebuild 7486 BLAKE2B 6ea11def13407f00e99a182f094ae14faff86fe3bb3e6683add7479da017732bd0ab32de91762360a6cb9d911d8f4aef541ade41e42be07a39430fa07a24ca52 SHA512 da4374b8e9263b0693423359add241663842825c5b0820d7fe842d2fcf658b3df5f4987e615bbea64c59ea7c52b83f305c77486353e80c2e884385a4d0fba229
-EBUILD nodejs-20.6.1.ebuild 7486 BLAKE2B 6ea11def13407f00e99a182f094ae14faff86fe3bb3e6683add7479da017732bd0ab32de91762360a6cb9d911d8f4aef541ade41e42be07a39430fa07a24ca52 SHA512 da4374b8e9263b0693423359add241663842825c5b0820d7fe842d2fcf658b3df5f4987e615bbea64c59ea7c52b83f305c77486353e80c2e884385a4d0fba229
+EBUILD nodejs-20.6.1.ebuild 7485 BLAKE2B 9391bf2a61da2e8667f33a7f042b51955c4e352b5d2a872e3dc7e48d03ff7f2eebe5cf334e3f43ba288a28cce5b5bcbcd0a2c7542182acb803812705fe4302fe SHA512 4d7f415d5f38b074a121e7bc26145b9cd9ed1fbdcad13519659c0e139f1cc12dcb1e61a4abf744939b8e117ac18ed171e327832cfc616827fda3bf83896e5730
 EBUILD nodejs-99999999.ebuild 7391 BLAKE2B 9036b0461f447aee6e75723085bae591264f0bb20aa33480398b5f17458912e2a8f75a6c76c3761879e216e437a0cb2c9eda8aeb84c3f65fd0c1ce590cc6c7b5 SHA512 ea53f8f425b2ea902d6e1b2e24ce9eaab9b290e672d432241a22dbd7ca23c8357e5f9cb438da16f5aa3cb6d9cb0cf7e1af426e1c733f0631b560e0b758d21ded
 MISC metadata.xml 986 BLAKE2B 67133c97db85eced638323a93514e084da381b7cbebcab2f0f2ce2781cf0da02be705ab5781c18205a8d4e8b679b6f77f3c9e97ea6ef72b36b6a8a854a39617d SHA512 3f749720ea0623fefa703f8b4563ebabfd5e4aeff4f2e8998576860177d3b1a075afaabc2aa0dc5100df59b3cb787d70d44284976bad3409966b68c11ec64d7a
diff --git a/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch
new file mode 100644
index 000000000000..32fbe2d1d00a
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-20.6.0-paxmarking.patch
@@ -0,0 +1,88 @@
+diff --git a/node.gyp b/node.gyp
+index 49e39c3ce8..767ebc4e5f 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -369,6 +369,7 @@
+       'src/quic/transportparams.h',
+     ],
+     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
++    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)',
+     'conditions': [
+       ['GENERATOR == "ninja"', {
+@@ -626,11 +627,25 @@
+           'conditions': [
+             ['node_snapshot_main!=""', {
+               '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)',
+                     '<(node_snapshot_main)',
+                   ],
+                   'outputs': [
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index f822c056e5..8b2820abf7 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -9,6 +9,7 @@
+     'v8_vector_stores%': 0,
+     'v8_embed_script%': "",
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
+     'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
+     'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
+@@ -1520,7 +1521,7 @@
+       ],
+     },  # bytecode_builtins_list_generator
+     {
+-      'target_name': 'mksnapshot',
++      'target_name': 'mksnapshot_u',
+       'type': 'executable',
+       'dependencies': [
+         'v8_base_without_compiler',
+@@ -1545,6 +1546,27 @@
+           'ldflags': [ '-fno-lto' ],
+         }],
+       ],
++    },  # mksnapshot_u
++    {
++      'target_name': 'mksnapshot',
++      'type': 'none',
++      'dependencies': ['mksnapshot_u'],
++      'actions': [
++        {
++          'action_name': 'paxmark_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'action': [
++            'bash',
++            '-c',
++            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
++          ],
++        },
++      ],
+     },  # mksnapshot
+     {
+       'target_name': 'torque',
diff --git a/net-libs/nodejs/nodejs-20.6.1.ebuild b/net-libs/nodejs/nodejs-20.6.1.ebuild
index a70dfde5f996..ad9c3ca7ca9d 100644
--- a/net-libs/nodejs/nodejs-20.6.1.ebuild
+++ b/net-libs/nodejs/nodejs-20.6.1.ebuild
@@ -108,7 +108,7 @@ src_prepare() {
 	fi
 
 	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch )
+	use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch )
 
 	default
 }