[patch] nodejs-20.3.0-paxmarking.patch

nodejs-20.3.0-paxmarking.patch (text/plain), 3.28 KB, created by Attila Tóth on 2023-07-06 14:37:44 UTC

diff -urNp node-v20.3.0-orig/node.gyp node-v20.3.0-dwok/node.gyp
--- node-v20.3.0-orig/node.gyp	2023-06-13 22:51:58.736682504 +0200
+++ node-v20.3.0-dwok/node.gyp	2023-06-13 22:52:17.680986081 +0200
@@ -362,6 +362,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"', {
@@ -640,10 +641,24 @@
             }, {
               'actions': [
                 {
+                  'action_name': 'run_pax_mksnapshot',
+                  'inputs': [
+                    '<(node_mksnapshot_exec)',
+                  ],
+                  'outputs': [
+                    '<(node_mksnapshot_u_exec)',
+                  ],
+                  'action': [
+                    '/bin/bash',
+                    '-c',
+                    '/bin/mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && /usr/sbin/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 -urNp node-v20.3.0-orig/tools/v8_gypfiles/v8.gyp node-v20.3.0-dwok/tools/v8_gypfiles/v8.gyp
--- node-v20.3.0-orig/tools/v8_gypfiles/v8.gyp	2023-06-13 22:51:58.764682953 +0200
+++ node-v20.3.0-dwok/tools/v8_gypfiles/v8.gyp	2023-06-13 22:52:17.680986081 +0200
@@ -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': [
+            '/bin/bash',
+            '-c',
+            '/bin/cp <(mksnapshot_u_exec) <(mksnapshot_exec) && /usr/sbin/paxmark.sh m <(mksnapshot_exec)'
+          ],
+        },
+      ],
     },  # mksnapshot
     {
       'target_name': 'torque',