1 |
commit: c2390a856ea0fc637d077170b3343e2c5523a4b6 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 3 18:34:30 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 3 19:09:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2390a85 |
7 |
|
8 |
sys-apps/sandbox: Remove permanently masked 2.11 versions |
9 |
|
10 |
profiles/package.mask | 7 -- |
11 |
sys-apps/sandbox/Manifest | 1 - |
12 |
.../sandbox/files/sandbox-2.11-exec-hash.patch | 96 ------------------ |
13 |
.../sandbox/files/sandbox-2.11-exec-prelink.patch | 107 --------------------- |
14 |
sys-apps/sandbox/files/sandbox-2.11-execvpe.patch | 30 ------ |
15 |
sys-apps/sandbox/sandbox-2.11-r3.ebuild | 84 ---------------- |
16 |
sys-apps/sandbox/sandbox-2.11-r4.ebuild | 85 ---------------- |
17 |
sys-apps/sandbox/sandbox-2.11-r5.ebuild | 86 ----------------- |
18 |
8 files changed, 496 deletions(-) |
19 |
|
20 |
diff --git a/profiles/package.mask b/profiles/package.mask |
21 |
index fc1839fe154..4d05da5c52c 100644 |
22 |
--- a/profiles/package.mask |
23 |
+++ b/profiles/package.mask |
24 |
@@ -696,13 +696,6 @@ x11-libs/gtk+:1 |
25 |
=dev-db/redis-3.2.8-r1 |
26 |
=dev-db/redis-3.2.8-r3 |
27 |
|
28 |
-# Ian Stakenvicius (17 Nov 2016) |
29 |
-# Does not honour LD_LIBRARY_PATH set in the environment, causing |
30 |
-# all mozilla packages to fail in src_install() when xpcshell is |
31 |
-# called in ${WORKDIR}, #580726 |
32 |
-# Segfaults when creating directories #578582 |
33 |
-=sys-apps/sandbox-2.11* |
34 |
- |
35 |
# Michał Górny <mgorny@g.o> (17 Nov 2016) |
36 |
# New version masked for testing. It supports source-window buffer size |
37 |
# over 2G but it 'currently performs 3-5% slower and has 1-2% worse |
38 |
|
39 |
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest |
40 |
index fb977aaa2c7..5ca84948432 100644 |
41 |
--- a/sys-apps/sandbox/Manifest |
42 |
+++ b/sys-apps/sandbox/Manifest |
43 |
@@ -1,5 +1,4 @@ |
44 |
DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192 |
45 |
-DIST sandbox-2.11.tar.xz 423492 SHA256 a1cb203f95057176ca0c5b53b8b9dafd41d1b64a6cf5039a9e1fb4a51b17f237 SHA512 0aa6c773c109749180442d1a46d1b957dea0c30f893e4be1ac0b410e1aad48fdd2972ec591aa2da3a0c74b32d2b7bd51b7c2263bd7b26f8a34bb762d8a48ea0b WHIRLPOOL a2222cc778f2181473cf23b46a62257e5f3857edebb457dcf230f02da0d153e38a28f78a20dee67c9e564c10239d8bd6982a6e894de666f6eff4550f7ad8cdee |
46 |
DIST sandbox-2.12.tar.xz 424252 SHA256 265a490a8c528237c55ad26dfd7f62336fa5727c82358fc9cfbaa2e52c47fc50 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9 WHIRLPOOL 4f3089746a11616c60057165f387122b74e8d2f30a2d77db296405a2b6f401fc625645bca73092436162f5d98a88bfb2a3b42909b0eceb9a59ab810d803441b0 |
47 |
DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03 |
48 |
DIST sandbox-2.7.tar.xz 390304 SHA256 d6e1230180d84fb64c9788dd372a73a1cd2496ead91cad333a211320d3041149 SHA512 81056460afabe3f9163594f662f5faf87b6dfe8511a001fc4d6ce0171492eb29f3b645a45320032d34475bb2c24bf212d1d05b50878a340f1e2ca580f8f8f38a WHIRLPOOL ad070df6351537e49f939ba195f27ccf5e4566bb8b6e4ba391ab8174771eacf909571284c6fa873d5b55e8540605d2766a3de5d451b6af132c0ff6d96e43f554 |
49 |
|
50 |
diff --git a/sys-apps/sandbox/files/sandbox-2.11-exec-hash.patch b/sys-apps/sandbox/files/sandbox-2.11-exec-hash.patch |
51 |
deleted file mode 100644 |
52 |
index 8a4cd9b0b9b..00000000000 |
53 |
--- a/sys-apps/sandbox/files/sandbox-2.11-exec-hash.patch |
54 |
+++ /dev/null |
55 |
@@ -1,96 +0,0 @@ |
56 |
-From e11815bb7f0656f39e122073e0e3284ec7f5d021 Mon Sep 17 00:00:00 2001 |
57 |
-From: Mike Frysinger <vapier@g.o> |
58 |
-Date: Tue, 29 Mar 2016 23:35:44 -0400 |
59 |
-Subject: [PATCH] libsandbox: fix symtab walking with some ELFs |
60 |
-MIME-Version: 1.0 |
61 |
-Content-Type: text/plain; charset=UTF-8 |
62 |
-Content-Transfer-Encoding: 8bit |
63 |
- |
64 |
-The strtab assumption works if there is no SysV hash table. |
65 |
-Add logic to handle that scenario. |
66 |
- |
67 |
-URL: https://bugs.gentoo.org/578524 |
68 |
-Reported-by: Toralf Förster <toralf.foerster@×××.de> |
69 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
70 |
---- |
71 |
- libsandbox/wrapper-funcs/__wrapper_exec.c | 30 +++++++++++++++++------------- |
72 |
- 1 file changed, 17 insertions(+), 13 deletions(-) |
73 |
- |
74 |
-diff --git a/libsandbox/wrapper-funcs/__wrapper_exec.c b/libsandbox/wrapper-funcs/__wrapper_exec.c |
75 |
-index f7f51ab..d372366 100644 |
76 |
---- a/libsandbox/wrapper-funcs/__wrapper_exec.c |
77 |
-+++ b/libsandbox/wrapper-funcs/__wrapper_exec.c |
78 |
-@@ -83,10 +83,10 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
79 |
- ({ \ |
80 |
- Elf##n##_Ehdr *ehdr = (void *)elf; \ |
81 |
- Elf##n##_Phdr *phdr = (void *)(elf + ehdr->e_phoff); \ |
82 |
-- Elf##n##_Addr vaddr, filesz, vsym = 0, vstr = 0; \ |
83 |
-- Elf##n##_Off offset, symoff = 0, stroff = 0; \ |
84 |
-+ Elf##n##_Addr vaddr, filesz, vsym = 0, vstr = 0, vhash = 0; \ |
85 |
-+ Elf##n##_Off offset, symoff = 0, stroff = 0, hashoff = 0; \ |
86 |
- Elf##n##_Dyn *dyn; \ |
87 |
-- Elf##n##_Sym *sym; \ |
88 |
-+ Elf##n##_Sym *sym, *symend; \ |
89 |
- uint##n##_t ent_size = 0, str_size = 0; \ |
90 |
- bool dynamic = false; \ |
91 |
- size_t i; \ |
92 |
-@@ -106,6 +106,7 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
93 |
- case DT_SYMENT: ent_size = dyn->d_un.d_val; break; \ |
94 |
- case DT_STRTAB: vstr = dyn->d_un.d_val; break; \ |
95 |
- case DT_STRSZ: str_size = dyn->d_un.d_val; break; \ |
96 |
-+ case DT_HASH: vhash = dyn->d_un.d_val; break; \ |
97 |
- } \ |
98 |
- ++dyn; \ |
99 |
- } \ |
100 |
-@@ -123,6 +124,8 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
101 |
- symoff = offset + (vsym - vaddr); \ |
102 |
- if (vstr >= vaddr && vstr < vaddr + filesz) \ |
103 |
- stroff = offset + (vstr - vaddr); \ |
104 |
-+ if (vhash >= vaddr && vhash < vaddr + filesz) \ |
105 |
-+ hashoff = offset + (vhash - vaddr); \ |
106 |
- } \ |
107 |
- \ |
108 |
- /* Finally walk the symbol table. This should generally be fast as \ |
109 |
-@@ -130,18 +133,20 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
110 |
- * out there do not export any symbols at all. \ |
111 |
- */ \ |
112 |
- if (symoff && stroff) { \ |
113 |
-- sym = (void *)(elf + symoff); \ |
114 |
-+ /* Hash entries are always 32-bits. */ \ |
115 |
-+ uint32_t *hashes = (void *)(elf + hashoff); \ |
116 |
- /* Nowhere is the # of symbols recorded, or the size of the symbol \ |
117 |
-- * table. Instead, we do what glibc does: assume that the string \ |
118 |
-- * table always follows the symbol table. This seems like a poor \ |
119 |
-- * assumption to make, but glibc has gotten by this long. We could \ |
120 |
-- * rely on DT_HASH and walking all the buckets to find the largest \ |
121 |
-- * symbol index, but that's also a bit hacky. \ |
122 |
-+ * table. Instead, we do what glibc does: use the sysv hash table \ |
123 |
-+ * if it exists, else assume that the string table always directly \ |
124 |
-+ * follows the symbol table. This seems like a poor assumption to \ |
125 |
-+ * make, but glibc has gotten by this long. \ |
126 |
- * \ |
127 |
- * We don't sanity check the ranges here as you aren't executing \ |
128 |
- * corrupt programs in the sandbox. \ |
129 |
- */ \ |
130 |
-- for (i = 0; i < (vstr - vsym) / ent_size; ++i) { \ |
131 |
-+ sym = (void *)(elf + symoff); \ |
132 |
-+ symend = vhash ? (sym + hashes[1]) : (void *)(elf + stroff); \ |
133 |
-+ while (sym < symend) { \ |
134 |
- char *symname = (void *)(elf + stroff + sym->st_name); \ |
135 |
- if (ELF##n##_ST_VISIBILITY(sym->st_other) == STV_DEFAULT && \ |
136 |
- sym->st_shndx != SHN_UNDEF && sym->st_shndx < SHN_LORESERVE && \ |
137 |
-@@ -149,9 +154,8 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
138 |
- /* Minor optimization to avoid strcmp. */ \ |
139 |
- symname[0] == '_' && symname[1] == '_') { \ |
140 |
- /* Blacklist internal C library symbols. */ \ |
141 |
-- size_t j; \ |
142 |
-- for (j = 0; j < ARRAY_SIZE(libc_alloc_syms); ++j) \ |
143 |
-- if (!strcmp(symname, libc_alloc_syms[j])) { \ |
144 |
-+ for (i = 0; i < ARRAY_SIZE(libc_alloc_syms); ++i) \ |
145 |
-+ if (!strcmp(symname, libc_alloc_syms[i])) { \ |
146 |
- run_in_process = false; \ |
147 |
- goto use_trace; \ |
148 |
- } \ |
149 |
--- |
150 |
-2.7.4 |
151 |
- |
152 |
|
153 |
diff --git a/sys-apps/sandbox/files/sandbox-2.11-exec-prelink.patch b/sys-apps/sandbox/files/sandbox-2.11-exec-prelink.patch |
154 |
deleted file mode 100644 |
155 |
index 067824f7e70..00000000000 |
156 |
--- a/sys-apps/sandbox/files/sandbox-2.11-exec-prelink.patch |
157 |
+++ /dev/null |
158 |
@@ -1,107 +0,0 @@ |
159 |
-From 5628d830548e91819953d2d14397170e219df7c6 Mon Sep 17 00:00:00 2001 |
160 |
-From: Mike Frysinger <vapier@g.o> |
161 |
-Date: Wed, 16 Nov 2016 15:59:28 -0500 |
162 |
-Subject: [PATCH] libsandbox: fix symtab walking with prelinked ELFs |
163 |
- |
164 |
-When prelink runs on an ELF, it moves the string table from right |
165 |
-after the symbol table to the end, and then replaces the string |
166 |
-table with its liblist table. This ends up breaking sandbox's |
167 |
-assumption that the string table always follows the symbol table |
168 |
-leading to prelinked ELFs crashing. |
169 |
- |
170 |
-Update the range check to use the liblist table when available. |
171 |
-Since the prelink code has this logic hardcoded (swapping the |
172 |
-string table for the liblist table), this should be OK for now. |
173 |
- |
174 |
-URL: https://bugs.gentoo.org/599894 |
175 |
-Reported-by: Anders Larsson <anders.gentoo@×××××××.xyz> |
176 |
-Reported-by: Kenton Groombridge <rustyvega@×××××××.net> |
177 |
-Reported-by: Marien Zwart <marien.zwart@×××××.com> |
178 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
179 |
---- |
180 |
- libsandbox/wrapper-funcs/__wrapper_exec.c | 39 ++++++++++++++++++++++--------- |
181 |
- 1 file changed, 28 insertions(+), 11 deletions(-) |
182 |
- |
183 |
-diff --git a/libsandbox/wrapper-funcs/__wrapper_exec.c b/libsandbox/wrapper-funcs/__wrapper_exec.c |
184 |
-index d372366c5478..226c0c0f4407 100644 |
185 |
---- a/libsandbox/wrapper-funcs/__wrapper_exec.c |
186 |
-+++ b/libsandbox/wrapper-funcs/__wrapper_exec.c |
187 |
-@@ -83,8 +83,8 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
188 |
- ({ \ |
189 |
- Elf##n##_Ehdr *ehdr = (void *)elf; \ |
190 |
- Elf##n##_Phdr *phdr = (void *)(elf + ehdr->e_phoff); \ |
191 |
-- Elf##n##_Addr vaddr, filesz, vsym = 0, vstr = 0, vhash = 0; \ |
192 |
-- Elf##n##_Off offset, symoff = 0, stroff = 0, hashoff = 0; \ |
193 |
-+ Elf##n##_Addr vaddr, filesz, vsym = 0, vstr = 0, vhash = 0, vliblist = 0; \ |
194 |
-+ Elf##n##_Off offset, symoff = 0, stroff = 0, hashoff = 0, liblistoff = 0; \ |
195 |
- Elf##n##_Dyn *dyn; \ |
196 |
- Elf##n##_Sym *sym, *symend; \ |
197 |
- uint##n##_t ent_size = 0, str_size = 0; \ |
198 |
-@@ -102,11 +102,12 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
199 |
- dyn = (void *)(elf + phdr[i].p_offset); \ |
200 |
- while (dyn->d_tag != DT_NULL) { \ |
201 |
- switch (dyn->d_tag) { \ |
202 |
-- case DT_SYMTAB: vsym = dyn->d_un.d_val; break; \ |
203 |
-- case DT_SYMENT: ent_size = dyn->d_un.d_val; break; \ |
204 |
-- case DT_STRTAB: vstr = dyn->d_un.d_val; break; \ |
205 |
-- case DT_STRSZ: str_size = dyn->d_un.d_val; break; \ |
206 |
-- case DT_HASH: vhash = dyn->d_un.d_val; break; \ |
207 |
-+ case DT_SYMTAB: vsym = dyn->d_un.d_val; break; \ |
208 |
-+ case DT_SYMENT: ent_size = dyn->d_un.d_val; break; \ |
209 |
-+ case DT_STRTAB: vstr = dyn->d_un.d_val; break; \ |
210 |
-+ case DT_STRSZ: str_size = dyn->d_un.d_val; break; \ |
211 |
-+ case DT_HASH: vhash = dyn->d_un.d_val; break; \ |
212 |
-+ case DT_GNU_LIBLIST: vliblist = dyn->d_un.d_val; break; \ |
213 |
- } \ |
214 |
- ++dyn; \ |
215 |
- } \ |
216 |
-@@ -126,6 +127,8 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
217 |
- stroff = offset + (vstr - vaddr); \ |
218 |
- if (vhash >= vaddr && vhash < vaddr + filesz) \ |
219 |
- hashoff = offset + (vhash - vaddr); \ |
220 |
-+ if (vliblist >= vaddr && vliblist < vaddr + filesz) \ |
221 |
-+ liblistoff = offset + (vliblist - vaddr); \ |
222 |
- } \ |
223 |
- \ |
224 |
- /* Finally walk the symbol table. This should generally be fast as \ |
225 |
-@@ -133,19 +136,33 @@ static bool sb_check_exec(const char *filename, char *const argv[]) |
226 |
- * out there do not export any symbols at all. \ |
227 |
- */ \ |
228 |
- if (symoff && stroff) { \ |
229 |
-- /* Hash entries are always 32-bits. */ \ |
230 |
-- uint32_t *hashes = (void *)(elf + hashoff); \ |
231 |
- /* Nowhere is the # of symbols recorded, or the size of the symbol \ |
232 |
- * table. Instead, we do what glibc does: use the sysv hash table \ |
233 |
- * if it exists, else assume that the string table always directly \ |
234 |
- * follows the symbol table. This seems like a poor assumption to \ |
235 |
-- * make, but glibc has gotten by this long. \ |
236 |
-+ * make, but glibc has gotten by this long. See determine_info in \ |
237 |
-+ * glibc's elf/dl-addr.c. \ |
238 |
-+ * \ |
239 |
-+ * Turns out prelink will violate that assumption. Fortunately it \ |
240 |
-+ * will insert its liblist at the same location all the time -- it \ |
241 |
-+ * replaces the string table with its liblist table. \ |
242 |
-+ * \ |
243 |
-+ * Long term, we should behave the same as glibc and walk the gnu \ |
244 |
-+ * hash table first before falling back to the raw symbol table. \ |
245 |
- * \ |
246 |
- * We don't sanity check the ranges here as you aren't executing \ |
247 |
- * corrupt programs in the sandbox. \ |
248 |
- */ \ |
249 |
- sym = (void *)(elf + symoff); \ |
250 |
-- symend = vhash ? (sym + hashes[1]) : (void *)(elf + stroff); \ |
251 |
-+ if (vhash) { \ |
252 |
-+ /* Hash entries are always 32-bits. */ \ |
253 |
-+ uint32_t *hashes = (void *)(elf + hashoff); \ |
254 |
-+ symend = sym + hashes[1]; \ |
255 |
-+ } else if (vliblist) \ |
256 |
-+ symend = (void *)(elf + liblistoff); \ |
257 |
-+ else \ |
258 |
-+ symend = (void *)(elf + stroff); \ |
259 |
-+ \ |
260 |
- while (sym < symend) { \ |
261 |
- char *symname = (void *)(elf + stroff + sym->st_name); \ |
262 |
- if (ELF##n##_ST_VISIBILITY(sym->st_other) == STV_DEFAULT && \ |
263 |
--- |
264 |
-2.10.2 |
265 |
- |
266 |
|
267 |
diff --git a/sys-apps/sandbox/files/sandbox-2.11-execvpe.patch b/sys-apps/sandbox/files/sandbox-2.11-execvpe.patch |
268 |
deleted file mode 100644 |
269 |
index 7e8130b51e6..00000000000 |
270 |
--- a/sys-apps/sandbox/files/sandbox-2.11-execvpe.patch |
271 |
+++ /dev/null |
272 |
@@ -1,30 +0,0 @@ |
273 |
-From 31a135d261a9bc1d65b1fa484345a858bab84db8 Mon Sep 17 00:00:00 2001 |
274 |
-From: Mike Frysinger <vapier@g.o> |
275 |
-Date: Wed, 30 Mar 2016 01:17:21 -0400 |
276 |
-Subject: [PATCH] libsandbox: whitelist execvpe |
277 |
-MIME-Version: 1.0 |
278 |
-Content-Type: text/plain; charset=UTF-8 |
279 |
-Content-Transfer-Encoding: 8bit |
280 |
- |
281 |
-URL: https://bugs.gentoo.org/578516 |
282 |
-Reported-by: Toralf Förster <toralf.foerster@×××.de> |
283 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
284 |
---- |
285 |
- libsandbox/libsandbox.c | 1 + |
286 |
- 1 file changed, 1 insertion(+) |
287 |
- |
288 |
-diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c |
289 |
-index cbe1aa1..e809308 100644 |
290 |
---- a/libsandbox/libsandbox.c |
291 |
-+++ b/libsandbox/libsandbox.c |
292 |
-@@ -710,6 +710,7 @@ static int check_access(sbcontext_t *sbcontext, int sb_nr, const char *func, |
293 |
- sb_nr == SB_NR_EXECV || |
294 |
- sb_nr == SB_NR_EXECVP || |
295 |
- sb_nr == SB_NR_EXECVE || |
296 |
-+ sb_nr == SB_NR_EXECVPE || |
297 |
- sb_nr == SB_NR_FEXECVE)) |
298 |
- { |
299 |
- retval = check_prefixes(sbcontext->read_prefixes, |
300 |
--- |
301 |
-2.7.4 |
302 |
- |
303 |
|
304 |
diff --git a/sys-apps/sandbox/sandbox-2.11-r3.ebuild b/sys-apps/sandbox/sandbox-2.11-r3.ebuild |
305 |
deleted file mode 100644 |
306 |
index e49dd8c5a1a..00000000000 |
307 |
--- a/sys-apps/sandbox/sandbox-2.11-r3.ebuild |
308 |
+++ /dev/null |
309 |
@@ -1,84 +0,0 @@ |
310 |
-# Copyright 1999-2016 Gentoo Foundation |
311 |
-# Distributed under the terms of the GNU General Public License v2 |
312 |
- |
313 |
-# |
314 |
-# don't monkey with this ebuild unless contacting portage devs. |
315 |
-# period. |
316 |
-# |
317 |
- |
318 |
-EAPI="5" |
319 |
- |
320 |
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils |
321 |
- |
322 |
-DESCRIPTION="sandbox'd LD_PRELOAD hack" |
323 |
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" |
324 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
325 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
326 |
- |
327 |
-LICENSE="GPL-2" |
328 |
-SLOT="0" |
329 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
330 |
-IUSE="" |
331 |
- |
332 |
-DEPEND="app-arch/xz-utils |
333 |
- >=app-misc/pax-utils-0.1.19" #265376 |
334 |
-RDEPEND="" |
335 |
- |
336 |
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" |
337 |
- |
338 |
-sandbox_death_notice() { |
339 |
- ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" |
340 |
- ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" |
341 |
-} |
342 |
- |
343 |
-src_prepare() { |
344 |
- epatch "${FILESDIR}"/${P}-execvpe.patch #578516 |
345 |
- epatch "${FILESDIR}"/${P}-exec-hash.patch #578524 |
346 |
- epatch "${FILESDIR}"/${P}-exec-prelink.patch #599894 |
347 |
- epatch_user |
348 |
-} |
349 |
- |
350 |
-multilib_src_configure() { |
351 |
- filter-lfs-flags #90228 |
352 |
- |
353 |
- local myconf=() |
354 |
- host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 |
355 |
- |
356 |
- ECONF_SOURCE="${S}" \ |
357 |
- econf "${myconf[@]}" |
358 |
-} |
359 |
- |
360 |
-multilib_src_test() { |
361 |
- # Default sandbox build will run with --jobs set to # cpus. |
362 |
- emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" |
363 |
-} |
364 |
- |
365 |
-multilib_src_install_all() { |
366 |
- doenvd "${FILESDIR}"/09sandbox |
367 |
- |
368 |
- keepdir /var/log/sandbox |
369 |
- fowners root:portage /var/log/sandbox |
370 |
- fperms 0770 /var/log/sandbox |
371 |
- |
372 |
- cd "${S}" |
373 |
- dodoc AUTHORS ChangeLog* NEWS README |
374 |
-} |
375 |
- |
376 |
-pkg_preinst() { |
377 |
- chown root:portage "${ED}"/var/log/sandbox |
378 |
- chmod 0770 "${ED}"/var/log/sandbox |
379 |
- |
380 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
381 |
- local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') |
382 |
- if [[ -n ${old} ]] ; then |
383 |
- elog "Removing old sandbox libraries for you:" |
384 |
- find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete |
385 |
- fi |
386 |
- fi |
387 |
-} |
388 |
- |
389 |
-pkg_postinst() { |
390 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
391 |
- chmod 0755 "${EROOT}"/etc/sandbox.d #265376 |
392 |
- fi |
393 |
-} |
394 |
|
395 |
diff --git a/sys-apps/sandbox/sandbox-2.11-r4.ebuild b/sys-apps/sandbox/sandbox-2.11-r4.ebuild |
396 |
deleted file mode 100644 |
397 |
index 0cba4b731e7..00000000000 |
398 |
--- a/sys-apps/sandbox/sandbox-2.11-r4.ebuild |
399 |
+++ /dev/null |
400 |
@@ -1,85 +0,0 @@ |
401 |
-# Copyright 1999-2016 Gentoo Foundation |
402 |
-# Distributed under the terms of the GNU General Public License v2 |
403 |
- |
404 |
-# |
405 |
-# don't monkey with this ebuild unless contacting portage devs. |
406 |
-# period. |
407 |
-# |
408 |
- |
409 |
-EAPI="5" |
410 |
- |
411 |
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils |
412 |
- |
413 |
-DESCRIPTION="sandbox'd LD_PRELOAD hack" |
414 |
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" |
415 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
416 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
417 |
- |
418 |
-LICENSE="GPL-2" |
419 |
-SLOT="0" |
420 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
421 |
-IUSE="" |
422 |
- |
423 |
-DEPEND="app-arch/xz-utils |
424 |
- >=app-misc/pax-utils-0.1.19" #265376 |
425 |
-RDEPEND="" |
426 |
- |
427 |
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" |
428 |
- |
429 |
-sandbox_death_notice() { |
430 |
- ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" |
431 |
- ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" |
432 |
-} |
433 |
- |
434 |
-src_prepare() { |
435 |
- epatch "${FILESDIR}"/${P}-execvpe.patch #578516 |
436 |
- epatch "${FILESDIR}"/${P}-exec-hash.patch #578524 |
437 |
- epatch "${FILESDIR}"/${P}-exec-prelink.patch #599894 |
438 |
- epatch "${FILESDIR}"/${PN}-2.10-fix-opendir.patch #553092 |
439 |
- epatch_user |
440 |
-} |
441 |
- |
442 |
-multilib_src_configure() { |
443 |
- filter-lfs-flags #90228 |
444 |
- |
445 |
- local myconf=() |
446 |
- host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 |
447 |
- |
448 |
- ECONF_SOURCE="${S}" \ |
449 |
- econf "${myconf[@]}" |
450 |
-} |
451 |
- |
452 |
-multilib_src_test() { |
453 |
- # Default sandbox build will run with --jobs set to # cpus. |
454 |
- emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" |
455 |
-} |
456 |
- |
457 |
-multilib_src_install_all() { |
458 |
- doenvd "${FILESDIR}"/09sandbox |
459 |
- |
460 |
- keepdir /var/log/sandbox |
461 |
- fowners root:portage /var/log/sandbox |
462 |
- fperms 0770 /var/log/sandbox |
463 |
- |
464 |
- cd "${S}" |
465 |
- dodoc AUTHORS ChangeLog* NEWS README |
466 |
-} |
467 |
- |
468 |
-pkg_preinst() { |
469 |
- chown root:portage "${ED}"/var/log/sandbox |
470 |
- chmod 0770 "${ED}"/var/log/sandbox |
471 |
- |
472 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
473 |
- local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') |
474 |
- if [[ -n ${old} ]] ; then |
475 |
- elog "Removing old sandbox libraries for you:" |
476 |
- find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete |
477 |
- fi |
478 |
- fi |
479 |
-} |
480 |
- |
481 |
-pkg_postinst() { |
482 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
483 |
- chmod 0755 "${EROOT}"/etc/sandbox.d #265376 |
484 |
- fi |
485 |
-} |
486 |
|
487 |
diff --git a/sys-apps/sandbox/sandbox-2.11-r5.ebuild b/sys-apps/sandbox/sandbox-2.11-r5.ebuild |
488 |
deleted file mode 100644 |
489 |
index 48dd1a7ad99..00000000000 |
490 |
--- a/sys-apps/sandbox/sandbox-2.11-r5.ebuild |
491 |
+++ /dev/null |
492 |
@@ -1,86 +0,0 @@ |
493 |
-# Copyright 1999-2016 Gentoo Foundation |
494 |
-# Distributed under the terms of the GNU General Public License v2 |
495 |
- |
496 |
-# |
497 |
-# don't monkey with this ebuild unless contacting portage devs. |
498 |
-# period. |
499 |
-# |
500 |
- |
501 |
-EAPI="5" |
502 |
- |
503 |
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils |
504 |
- |
505 |
-DESCRIPTION="sandbox'd LD_PRELOAD hack" |
506 |
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" |
507 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
508 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
509 |
- |
510 |
-LICENSE="GPL-2" |
511 |
-SLOT="0" |
512 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
513 |
-IUSE="" |
514 |
- |
515 |
-DEPEND="app-arch/xz-utils |
516 |
- >=app-misc/pax-utils-0.1.19" #265376 |
517 |
-RDEPEND="" |
518 |
- |
519 |
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" |
520 |
- |
521 |
-sandbox_death_notice() { |
522 |
- ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" |
523 |
- ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" |
524 |
-} |
525 |
- |
526 |
-src_prepare() { |
527 |
- epatch "${FILESDIR}"/${P}-execvpe.patch #578516 |
528 |
- epatch "${FILESDIR}"/${P}-exec-hash.patch #578524 |
529 |
- epatch "${FILESDIR}"/${P}-exec-prelink.patch #599894 |
530 |
- epatch "${FILESDIR}"/${PN}-2.10-fix-opendir.patch #553092 |
531 |
- epatch "${FILESDIR}"/${P}-symlinkat-renameat.patch #612202 |
532 |
- epatch_user |
533 |
-} |
534 |
- |
535 |
-multilib_src_configure() { |
536 |
- filter-lfs-flags #90228 |
537 |
- |
538 |
- local myconf=() |
539 |
- host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 |
540 |
- |
541 |
- ECONF_SOURCE="${S}" \ |
542 |
- econf "${myconf[@]}" |
543 |
-} |
544 |
- |
545 |
-multilib_src_test() { |
546 |
- # Default sandbox build will run with --jobs set to # cpus. |
547 |
- emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" |
548 |
-} |
549 |
- |
550 |
-multilib_src_install_all() { |
551 |
- doenvd "${FILESDIR}"/09sandbox |
552 |
- |
553 |
- keepdir /var/log/sandbox |
554 |
- fowners root:portage /var/log/sandbox |
555 |
- fperms 0770 /var/log/sandbox |
556 |
- |
557 |
- cd "${S}" |
558 |
- dodoc AUTHORS ChangeLog* NEWS README |
559 |
-} |
560 |
- |
561 |
-pkg_preinst() { |
562 |
- chown root:portage "${ED}"/var/log/sandbox |
563 |
- chmod 0770 "${ED}"/var/log/sandbox |
564 |
- |
565 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
566 |
- local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') |
567 |
- if [[ -n ${old} ]] ; then |
568 |
- elog "Removing old sandbox libraries for you:" |
569 |
- find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete |
570 |
- fi |
571 |
- fi |
572 |
-} |
573 |
- |
574 |
-pkg_postinst() { |
575 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
576 |
- chmod 0755 "${EROOT}"/etc/sandbox.d #265376 |
577 |
- fi |
578 |
-} |