Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-libs/nodejs/files/
Date: Thu, 09 Jan 2020 17:18:16
Message-Id: 1578589922.bf5756f387615487efa629c938d40714fffc74e8.steils@gentoo
1 commit: bf5756f387615487efa629c938d40714fffc74e8
2 Author: Sandino Araico Sanchez <sandino <AT> sandino <DOT> net>
3 AuthorDate: Wed Jan 8 03:02:56 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 9 17:12:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=bf5756f3
7
8 net-libs/nodejs: add missing paxmarking patch
9
10 Signed-off-by: Sandino Araico Sanchez <sandino <AT> sandino.net>
11 Closes: https://github.com/gentoo/libressl/pull/314
12 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
13
14 .../nodejs/files/nodejs-13.2.0-paxmarking.patch | 71 ++++++++++++++++++++++
15 1 file changed, 71 insertions(+)
16
17 diff --git a/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
18 new file mode 100644
19 index 0000000..143e416
20 --- /dev/null
21 +++ b/net-libs/nodejs/files/nodejs-13.2.0-paxmarking.patch
22 @@ -0,0 +1,71 @@
23 + Bug: 694100
24 + Add actions for pax marking mkcodecache and node_mksnapshot
25 + to disable mprotect for pax enable kernel.
26 + Reported-by: Attila Tóth <atoth@××××××××××.hu>
27 + Co-developed-by: Attila Tóth <atoth@××××××××××.hu>
28 + Signed-off-by: Magnus Granberg <zorry@g.o>
29 +
30 +--- a/node.gyp 2019-10-23 11:52:41.000000000 +0200
31 ++++ a/node.gyp 2019-11-12 20:58:43.957881862 +0100
32 +@@ -233,7 +233,9 @@
33 + 'deps/acorn-plugins/acorn-static-class-features/index.js',
34 + ],
35 + 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
36 ++ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
37 + 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
38 ++ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
39 + 'conditions': [
40 + [ 'node_shared=="true"', {
41 + 'node_target_type%': 'shared_library',
42 +@@ -436,10 +438,24 @@
43 + ],
44 + 'actions': [
45 + {
46 ++ 'action_name': 'run_pax_mkcodecache',
47 ++ 'inputs': [
48 ++ '<(mkcodecache_exec)',
49 ++ ],
50 ++ 'outputs': [
51 ++ '<(mkcodecache_u_exec)',
52 ++ ],
53 ++ 'action': [
54 ++ 'bash',
55 ++ '-c',
56 ++ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
57 ++ ],
58 ++ },
59 ++ {
60 + 'action_name': 'run_mkcodecache',
61 + 'process_outputs_as_sources': 1,
62 + 'inputs': [
63 +- '<(mkcodecache_exec)',
64 ++ '<(mkcodecache_u_exec)',
65 + ],
66 + 'outputs': [
67 + '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
68 +@@ -461,10 +477,24 @@
69 + ],
70 + 'actions': [
71 + {
72 ++ 'action_name': 'run_pax_mksnapshot',
73 ++ 'inputs': [
74 ++ '<(node_mksnapshot_exec)',
75 ++ ],
76 ++ 'outputs': [
77 ++ '<(node_mksnapshot_u_exec)',
78 ++ ],
79 ++ 'action': [
80 ++ 'bash',
81 ++ '-c',
82 ++ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
83 ++ ],
84 ++ },
85 ++ {
86 + 'action_name': 'node_mksnapshot',
87 + 'process_outputs_as_sources': 1,
88 + 'inputs': [
89 +- '<(node_mksnapshot_exec)',
90 ++ '<(node_mksnapshot_u_exec)',
91 + ],
92 + 'outputs': [
93 + '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',