1 |
commit: b83a18ad65d0de328f173700d4625abc0c27ef34 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 24 08:24:49 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 24 08:28:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b83a18ad |
7 |
|
8 |
sys-apps/sandbox: Clean old up |
9 |
|
10 |
sys-apps/sandbox/Manifest | 1 - |
11 |
.../sandbox/files/sandbox-2.10-disable-same.patch | 77 ------------- |
12 |
.../sandbox/files/sandbox-2.10-fix-opendir.patch | 79 ------------- |
13 |
.../files/sandbox-2.10-memory-corruption.patch | 42 ------- |
14 |
.../files/sandbox-2.11-symlinkat-renameat.patch | 124 --------------------- |
15 |
sys-apps/sandbox/sandbox-2.10-r3.ebuild | 84 -------------- |
16 |
sys-apps/sandbox/sandbox-2.10-r4.ebuild | 85 -------------- |
17 |
7 files changed, 492 deletions(-) |
18 |
|
19 |
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest |
20 |
index fb01669ce96..ef5db1c5aa7 100644 |
21 |
--- a/sys-apps/sandbox/Manifest |
22 |
+++ b/sys-apps/sandbox/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 |
25 |
DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9 |
26 |
DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf |
27 |
|
28 |
diff --git a/sys-apps/sandbox/files/sandbox-2.10-disable-same.patch b/sys-apps/sandbox/files/sandbox-2.10-disable-same.patch |
29 |
deleted file mode 100644 |
30 |
index 296b322b0c5..00000000000 |
31 |
--- a/sys-apps/sandbox/files/sandbox-2.10-disable-same.patch |
32 |
+++ /dev/null |
33 |
@@ -1,77 +0,0 @@ |
34 |
-From 7a923f646ce10b7dec3c7ae5fe2079c10aa21752 Mon Sep 17 00:00:00 2001 |
35 |
-From: Mike Frysinger <vapier@g.o> |
36 |
-Date: Sun, 20 Dec 2015 16:08:16 -0500 |
37 |
-Subject: [PATCH] libsbutil: gnulib: hand disable same_name usage |
38 |
- |
39 |
-We don't provide same_name because the one caller we don't use, but it |
40 |
-relies on gc-sections to avoid link errors. That flag doesn't work on |
41 |
-ia64 though, so we need to hand delete the one caller. Ugh. |
42 |
- |
43 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
44 |
---- |
45 |
- libsbutil/gnulib/hash-triple.c | 9 --------- |
46 |
- libsbutil/gnulib/same.h | 25 ------------------------- |
47 |
- 2 files changed, 34 deletions(-) |
48 |
- delete mode 100644 libsbutil/gnulib/same.h |
49 |
- |
50 |
-diff --git a/libsbutil/gnulib/hash-triple.c b/libsbutil/gnulib/hash-triple.c |
51 |
-index c3b6d9f..06cfbdf 100644 |
52 |
---- a/libsbutil/gnulib/hash-triple.c |
53 |
-+++ b/libsbutil/gnulib/hash-triple.c |
54 |
-@@ -24,7 +24,6 @@ |
55 |
- #include <string.h> |
56 |
- |
57 |
- #include "hash-pjw.h" |
58 |
--#include "same.h" |
59 |
- #include "same-inode.h" |
60 |
- |
61 |
- #define STREQ(a, b) (strcmp (a, b) == 0) |
62 |
-@@ -52,14 +51,6 @@ triple_hash_no_name (void const *x, size_t table_size) |
63 |
- |
64 |
- /* Compare two F_triple structs. */ |
65 |
- bool |
66 |
--triple_compare (void const *x, void const *y) |
67 |
--{ |
68 |
-- struct F_triple const *a = x; |
69 |
-- struct F_triple const *b = y; |
70 |
-- return (SAME_INODE (*a, *b) && same_name (a->name, b->name)) ? true : false; |
71 |
--} |
72 |
-- |
73 |
--bool |
74 |
- triple_compare_ino_str (void const *x, void const *y) |
75 |
- { |
76 |
- struct F_triple const *a = x; |
77 |
-diff --git a/libsbutil/gnulib/same.h b/libsbutil/gnulib/same.h |
78 |
-deleted file mode 100644 |
79 |
-index ee313c5..0000000 |
80 |
---- a/libsbutil/gnulib/same.h |
81 |
-+++ /dev/null |
82 |
-@@ -1,25 +0,0 @@ |
83 |
--/* Determine whether two file names refer to the same file. |
84 |
-- |
85 |
-- Copyright (C) 1997-2000, 2003-2004, 2009-2015 Free Software Foundation, Inc. |
86 |
-- |
87 |
-- This program is free software: you can redistribute it and/or modify |
88 |
-- it under the terms of the GNU General Public License as published by |
89 |
-- the Free Software Foundation; either version 3 of the License, or |
90 |
-- (at your option) any later version. |
91 |
-- |
92 |
-- This program is distributed in the hope that it will be useful, |
93 |
-- but WITHOUT ANY WARRANTY; without even the implied warranty of |
94 |
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
95 |
-- GNU General Public License for more details. |
96 |
-- |
97 |
-- You should have received a copy of the GNU General Public License |
98 |
-- along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
99 |
-- |
100 |
--#ifndef SAME_H_ |
101 |
--# define SAME_H_ 1 |
102 |
-- |
103 |
--# include <stdbool.h> |
104 |
-- |
105 |
--bool same_name (const char *source, const char *dest); |
106 |
-- |
107 |
--#endif /* SAME_H_ */ |
108 |
--- |
109 |
-2.6.2 |
110 |
- |
111 |
|
112 |
diff --git a/sys-apps/sandbox/files/sandbox-2.10-fix-opendir.patch b/sys-apps/sandbox/files/sandbox-2.10-fix-opendir.patch |
113 |
deleted file mode 100644 |
114 |
index 2ff89bcdfcb..00000000000 |
115 |
--- a/sys-apps/sandbox/files/sandbox-2.10-fix-opendir.patch |
116 |
+++ /dev/null |
117 |
@@ -1,79 +0,0 @@ |
118 |
-From 3f668dc6ba1910085e61b3a24167ab1352c60d92 Mon Sep 17 00:00:00 2001 |
119 |
-From: Mart Raudsepp <leio@g.o> |
120 |
-Date: Fri, 11 Nov 2016 12:34:48 +0200 |
121 |
-Subject: [PATCH] libsandbox: do not abort with a long name to opendir |
122 |
- |
123 |
-Add a pre-check for opendir that catches too long name arguments |
124 |
-given to opendir, as it would get messed up and abort before it |
125 |
-even gets to the open*() syscall (which would handle it correctly), |
126 |
-due to opendir going through before_syscall/check_syscall, even |
127 |
-though it isn't a true syscall and it getting cut to SB_PATH_MAX |
128 |
-inbetween and getting confused somewhere. |
129 |
- |
130 |
-URL: https://bugs.gentoo.org/553092 |
131 |
-Signed-off-by: Mart Raudsepp <leio@g.o> |
132 |
---- |
133 |
- libsandbox/wrapper-funcs/opendir.c | 2 ++ |
134 |
- libsandbox/wrapper-funcs/opendir_pre_check.c | 26 ++++++++++++++++++++++++++ |
135 |
- libsandbox/wrappers.h | 1 + |
136 |
- 3 files changed, 29 insertions(+) |
137 |
- create mode 100644 libsandbox/wrapper-funcs/opendir_pre_check.c |
138 |
- |
139 |
-diff --git a/libsandbox/wrapper-funcs/opendir.c b/libsandbox/wrapper-funcs/opendir.c |
140 |
-index 7670775..70c2692 100644 |
141 |
---- a/libsandbox/wrapper-funcs/opendir.c |
142 |
-+++ b/libsandbox/wrapper-funcs/opendir.c |
143 |
-@@ -10,4 +10,6 @@ |
144 |
- #define WRAPPER_SAFE() SB_SAFE(name) |
145 |
- #define WRAPPER_RET_TYPE DIR * |
146 |
- #define WRAPPER_RET_DEFAULT NULL |
147 |
-+#define WRAPPER_PRE_CHECKS() sb_opendir_pre_check(STRING_NAME, name) |
148 |
-+ |
149 |
- #include "__wrapper_simple.c" |
150 |
-diff --git a/libsandbox/wrapper-funcs/opendir_pre_check.c b/libsandbox/wrapper-funcs/opendir_pre_check.c |
151 |
-new file mode 100644 |
152 |
-index 0000000..60c869f |
153 |
---- /dev/null |
154 |
-+++ b/libsandbox/wrapper-funcs/opendir_pre_check.c |
155 |
-@@ -0,0 +1,26 @@ |
156 |
-+/* |
157 |
-+ * opendir() pre-check. |
158 |
-+ * |
159 |
-+ * Copyright 1999-2016 Gentoo Foundation |
160 |
-+ * Licensed under the GPL-2 |
161 |
-+ */ |
162 |
-+ |
163 |
-+bool sb_opendir_pre_check(const char *func, const char *name) |
164 |
-+{ |
165 |
-+ /* If length of name is larger than PATH_MAX, we would mess it up |
166 |
-+ * before it reaches the open syscall, which would cleanly error out |
167 |
-+ * via sandbox as well (actually with much smaller lengths than even |
168 |
-+ * PATH_MAX). |
169 |
-+ * So error out early in this case, in order to avoid an abort in |
170 |
-+ * check_syscall later on, which gets ran for opendir, despite it not |
171 |
-+ * being a syscall. |
172 |
-+ */ |
173 |
-+ if (strnlen(name, PATH_MAX) == PATH_MAX) { |
174 |
-+ errno = ENAMETOOLONG; |
175 |
-+ sb_debug_dyn("EARLY FAIL: %s(%s): %s\n", |
176 |
-+ func, name, strerror(errno)); |
177 |
-+ return false; |
178 |
-+ } |
179 |
-+ |
180 |
-+ return true; |
181 |
-+} |
182 |
-diff --git a/libsandbox/wrappers.h b/libsandbox/wrappers.h |
183 |
-index 0aa58bb..bf5bf64 100644 |
184 |
---- a/libsandbox/wrappers.h |
185 |
-+++ b/libsandbox/wrappers.h |
186 |
-@@ -27,6 +27,7 @@ attribute_hidden bool sb_fopen64_pre_check (const char *func, const char *pathn |
187 |
- attribute_hidden bool sb_mkdirat_pre_check (const char *func, const char *pathname, int dirfd); |
188 |
- attribute_hidden bool sb_openat_pre_check (const char *func, const char *pathname, int dirfd, int flags); |
189 |
- attribute_hidden bool sb_openat64_pre_check (const char *func, const char *pathname, int dirfd, int flags); |
190 |
-+attribute_hidden bool sb_opendir_pre_check (const char *func, const char *name); |
191 |
- attribute_hidden bool sb_unlinkat_pre_check (const char *func, const char *pathname, int dirfd); |
192 |
- attribute_hidden bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd, |
193 |
- char *dirfd_path, size_t dirfd_path_len); |
194 |
--- |
195 |
-2.9.0 |
196 |
- |
197 |
|
198 |
diff --git a/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch b/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch |
199 |
deleted file mode 100644 |
200 |
index 7dd27c9d224..00000000000 |
201 |
--- a/sys-apps/sandbox/files/sandbox-2.10-memory-corruption.patch |
202 |
+++ /dev/null |
203 |
@@ -1,42 +0,0 @@ |
204 |
-From 529a388ebb1b4e9d6ad8a1bb61dd8211833a5976 Mon Sep 17 00:00:00 2001 |
205 |
-From: Denis Lisov <dennis.lissov@×××××.com> |
206 |
-Date: Sat, 19 Dec 2015 19:13:58 +0300 |
207 |
-Subject: [PATCH] libsandbox: fix old_malloc_size check on realloc |
208 |
- |
209 |
-Realloc uses SB_MALLOC_TO_SIZE assuming it returns the usable size, |
210 |
-while it is really the mmap size, which is greater. Thus it may fail |
211 |
-to reallocate even if required. |
212 |
- |
213 |
-URL: https://bugs.gentoo.org/568714 |
214 |
-Signed-off-by: Denis Lisov <dennis.lissov@×××××.com> |
215 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
216 |
---- |
217 |
- libsandbox/memory.c | 5 +++-- |
218 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
219 |
- |
220 |
-diff --git a/libsandbox/memory.c b/libsandbox/memory.c |
221 |
-index 8581128..a2d69a2 100644 |
222 |
---- a/libsandbox/memory.c |
223 |
-+++ b/libsandbox/memory.c |
224 |
-@@ -40,7 +40,8 @@ static int sb_munmap(void *addr, size_t length) |
225 |
- |
226 |
- #define SB_MALLOC_TO_MMAP(ptr) ((void*)((uintptr_t)(ptr) - MIN_ALIGN)) |
227 |
- #define SB_MMAP_TO_MALLOC(ptr) ((void*)((uintptr_t)(ptr) + MIN_ALIGN)) |
228 |
--#define SB_MALLOC_TO_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr))) |
229 |
-+#define SB_MALLOC_TO_MMAP_SIZE(ptr) (*((size_t*)SB_MALLOC_TO_MMAP(ptr))) |
230 |
-+#define SB_MALLOC_TO_SIZE(ptr) (SB_MALLOC_TO_MMAP_SIZE(ptr) - MIN_ALIGN) |
231 |
- |
232 |
- void *malloc(size_t size) |
233 |
- { |
234 |
-@@ -57,7 +58,7 @@ void free(void *ptr) |
235 |
- { |
236 |
- if (ptr == NULL) |
237 |
- return; |
238 |
-- if (munmap(SB_MALLOC_TO_MMAP(ptr), SB_MALLOC_TO_SIZE(ptr))) |
239 |
-+ if (munmap(SB_MALLOC_TO_MMAP(ptr), SB_MALLOC_TO_MMAP_SIZE(ptr))) |
240 |
- sb_ebort("sandbox memory corruption with free(%p): %s\n", |
241 |
- ptr, strerror(errno)); |
242 |
- } |
243 |
--- |
244 |
-2.6.2 |
245 |
- |
246 |
|
247 |
diff --git a/sys-apps/sandbox/files/sandbox-2.11-symlinkat-renameat.patch b/sys-apps/sandbox/files/sandbox-2.11-symlinkat-renameat.patch |
248 |
deleted file mode 100644 |
249 |
index e33011f7495..00000000000 |
250 |
--- a/sys-apps/sandbox/files/sandbox-2.11-symlinkat-renameat.patch |
251 |
+++ /dev/null |
252 |
@@ -1,124 +0,0 @@ |
253 |
-From 4c47cfa22802fd8201586bef233d8161df4ff61b Mon Sep 17 00:00:00 2001 |
254 |
-From: Mike Frysinger <vapier@g.o> |
255 |
-Date: Fri, 10 Mar 2017 10:15:50 -0800 |
256 |
-Subject: [PATCH] libsandbox: whitelist renameat/symlinkat as symlink funcs |
257 |
- |
258 |
-These funcs don't deref their path args, so flag them as such. |
259 |
- |
260 |
-URL: https://bugs.gentoo.org/612202 |
261 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
262 |
---- |
263 |
- libsandbox/libsandbox.c | 4 +++- |
264 |
- tests/renameat-2.sh | 12 ++++++++++++ |
265 |
- tests/renameat-3.sh | 11 +++++++++++ |
266 |
- tests/renameat.at | 2 ++ |
267 |
- tests/symlinkat-2.sh | 10 ++++++++++ |
268 |
- tests/symlinkat-3.sh | 9 +++++++++ |
269 |
- tests/symlinkat.at | 2 ++ |
270 |
- 7 files changed, 49 insertions(+), 1 deletion(-) |
271 |
- create mode 100755 tests/renameat-2.sh |
272 |
- create mode 100755 tests/renameat-3.sh |
273 |
- create mode 100755 tests/symlinkat-2.sh |
274 |
- create mode 100755 tests/symlinkat-3.sh |
275 |
- |
276 |
-diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c |
277 |
-index e809308d717d..de48bd79ba53 100644 |
278 |
---- a/libsandbox/libsandbox.c |
279 |
-+++ b/libsandbox/libsandbox.c |
280 |
-@@ -650,8 +650,10 @@ static bool symlink_func(int sb_nr, int flags, const char *abs_path) |
281 |
- sb_nr == SB_NR_LCHOWN || |
282 |
- sb_nr == SB_NR_REMOVE || |
283 |
- sb_nr == SB_NR_RENAME || |
284 |
-+ sb_nr == SB_NR_RENAMEAT || |
285 |
- sb_nr == SB_NR_RMDIR || |
286 |
-- sb_nr == SB_NR_SYMLINK)) |
287 |
-+ sb_nr == SB_NR_SYMLINK || |
288 |
-+ sb_nr == SB_NR_SYMLINKAT)) |
289 |
- { |
290 |
- /* These funcs sometimes operate on symlinks */ |
291 |
- if (!((sb_nr == SB_NR_FCHOWNAT || |
292 |
-diff --git a/tests/renameat-2.sh b/tests/renameat-2.sh |
293 |
-new file mode 100755 |
294 |
-index 000000000000..d0fbe8ae4574 |
295 |
---- /dev/null |
296 |
-+++ b/tests/renameat-2.sh |
297 |
-@@ -0,0 +1,12 @@ |
298 |
-+#!/bin/sh |
299 |
-+# make sure we can clobber symlinks #612202 |
300 |
-+ |
301 |
-+addwrite $PWD |
302 |
-+ |
303 |
-+ln -s /asdf sym || exit 1 |
304 |
-+touch file |
305 |
-+renameat-0 0 AT_FDCWD file AT_FDCWD sym || exit 1 |
306 |
-+[ ! -e file ] |
307 |
-+[ ! -L sym ] |
308 |
-+[ -e sym ] |
309 |
-+test ! -s "${SANDBOX_LOG}" |
310 |
-diff --git a/tests/renameat-3.sh b/tests/renameat-3.sh |
311 |
-new file mode 100755 |
312 |
-index 000000000000..9ae5c9a6511a |
313 |
---- /dev/null |
314 |
-+++ b/tests/renameat-3.sh |
315 |
-@@ -0,0 +1,11 @@ |
316 |
-+#!/bin/sh |
317 |
-+# make sure we reject bad renames #612202 |
318 |
-+ |
319 |
-+addwrite $PWD |
320 |
-+mkdir deny |
321 |
-+adddeny $PWD/deny |
322 |
-+ |
323 |
-+touch file |
324 |
-+renameat-0 -1,EACCES AT_FDCWD file AT_FDCWD deny/file || exit 1 |
325 |
-+[ -e file ] |
326 |
-+test -s "${SANDBOX_LOG}" |
327 |
-diff --git a/tests/renameat.at b/tests/renameat.at |
328 |
-index 081d7d20277e..eec4638deeaa 100644 |
329 |
---- a/tests/renameat.at |
330 |
-+++ b/tests/renameat.at |
331 |
-@@ -1 +1,3 @@ |
332 |
- SB_CHECK(1) |
333 |
-+SB_CHECK(2) |
334 |
-+SB_CHECK(3) |
335 |
-diff --git a/tests/symlinkat-2.sh b/tests/symlinkat-2.sh |
336 |
-new file mode 100755 |
337 |
-index 000000000000..168362e8806f |
338 |
---- /dev/null |
339 |
-+++ b/tests/symlinkat-2.sh |
340 |
-@@ -0,0 +1,10 @@ |
341 |
-+#!/bin/sh |
342 |
-+# make sure we can clobber symlinks #612202 |
343 |
-+ |
344 |
-+addwrite $PWD |
345 |
-+ |
346 |
-+symlinkat-0 0 /asdf AT_FDCWD ./sym || exit 1 |
347 |
-+[ -L sym ] |
348 |
-+symlinkat-0 -1,EEXIST /asdf AT_FDCWD ./sym || exit 1 |
349 |
-+[ -L sym ] |
350 |
-+test ! -s "${SANDBOX_LOG}" |
351 |
-diff --git a/tests/symlinkat-3.sh b/tests/symlinkat-3.sh |
352 |
-new file mode 100755 |
353 |
-index 000000000000..a01c750dd2b6 |
354 |
---- /dev/null |
355 |
-+++ b/tests/symlinkat-3.sh |
356 |
-@@ -0,0 +1,9 @@ |
357 |
-+#!/bin/sh |
358 |
-+# make sure we reject bad symlinks #612202 |
359 |
-+ |
360 |
-+addwrite $PWD |
361 |
-+mkdir deny |
362 |
-+adddeny $PWD/deny |
363 |
-+ |
364 |
-+symlinkat-0 -1,EACCES ./ AT_FDCWD deny/sym || exit 1 |
365 |
-+test -s "${SANDBOX_LOG}" |
366 |
-diff --git a/tests/symlinkat.at b/tests/symlinkat.at |
367 |
-index 081d7d20277e..eec4638deeaa 100644 |
368 |
---- a/tests/symlinkat.at |
369 |
-+++ b/tests/symlinkat.at |
370 |
-@@ -1 +1,3 @@ |
371 |
- SB_CHECK(1) |
372 |
-+SB_CHECK(2) |
373 |
-+SB_CHECK(3) |
374 |
--- |
375 |
-2.12.0 |
376 |
- |
377 |
|
378 |
diff --git a/sys-apps/sandbox/sandbox-2.10-r3.ebuild b/sys-apps/sandbox/sandbox-2.10-r3.ebuild |
379 |
deleted file mode 100644 |
380 |
index 49e172c3c52..00000000000 |
381 |
--- a/sys-apps/sandbox/sandbox-2.10-r3.ebuild |
382 |
+++ /dev/null |
383 |
@@ -1,84 +0,0 @@ |
384 |
-# Copyright 1999-2018 Gentoo Foundation |
385 |
-# Distributed under the terms of the GNU General Public License v2 |
386 |
- |
387 |
-# |
388 |
-# don't monkey with this ebuild unless contacting portage devs. |
389 |
-# period. |
390 |
-# |
391 |
- |
392 |
-EAPI="5" |
393 |
- |
394 |
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils |
395 |
- |
396 |
-DESCRIPTION="sandbox'd LD_PRELOAD hack" |
397 |
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" |
398 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
399 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
400 |
- |
401 |
-LICENSE="GPL-2" |
402 |
-SLOT="0" |
403 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
404 |
-IUSE="" |
405 |
- |
406 |
-DEPEND="app-arch/xz-utils |
407 |
- >=app-misc/pax-utils-0.1.19" #265376 |
408 |
-RDEPEND="" |
409 |
- |
410 |
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" |
411 |
- |
412 |
-sandbox_death_notice() { |
413 |
- ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" |
414 |
- ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" |
415 |
-} |
416 |
- |
417 |
-src_prepare() { |
418 |
- epatch "${FILESDIR}"/${P}-memory-corruption.patch #568714 |
419 |
- epatch "${FILESDIR}"/${P}-disable-same.patch |
420 |
- epatch "${FILESDIR}"/${P}-fix-opendir.patch #553092 |
421 |
- epatch_user |
422 |
-} |
423 |
- |
424 |
-multilib_src_configure() { |
425 |
- filter-lfs-flags #90228 |
426 |
- |
427 |
- local myconf=() |
428 |
- host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 |
429 |
- |
430 |
- ECONF_SOURCE="${S}" \ |
431 |
- econf "${myconf[@]}" |
432 |
-} |
433 |
- |
434 |
-multilib_src_test() { |
435 |
- # Default sandbox build will run with --jobs set to # cpus. |
436 |
- emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" |
437 |
-} |
438 |
- |
439 |
-multilib_src_install_all() { |
440 |
- doenvd "${FILESDIR}"/09sandbox |
441 |
- |
442 |
- keepdir /var/log/sandbox |
443 |
- fowners root:portage /var/log/sandbox |
444 |
- fperms 0770 /var/log/sandbox |
445 |
- |
446 |
- cd "${S}" |
447 |
- dodoc AUTHORS ChangeLog* NEWS README |
448 |
-} |
449 |
- |
450 |
-pkg_preinst() { |
451 |
- chown root:portage "${ED}"/var/log/sandbox |
452 |
- chmod 0770 "${ED}"/var/log/sandbox |
453 |
- |
454 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
455 |
- local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') |
456 |
- if [[ -n ${old} ]] ; then |
457 |
- elog "Removing old sandbox libraries for you:" |
458 |
- find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete |
459 |
- fi |
460 |
- fi |
461 |
-} |
462 |
- |
463 |
-pkg_postinst() { |
464 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
465 |
- chmod 0755 "${EROOT}"/etc/sandbox.d #265376 |
466 |
- fi |
467 |
-} |
468 |
|
469 |
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild |
470 |
deleted file mode 100644 |
471 |
index 29827378c0c..00000000000 |
472 |
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild |
473 |
+++ /dev/null |
474 |
@@ -1,85 +0,0 @@ |
475 |
-# Copyright 1999-2018 Gentoo Foundation |
476 |
-# Distributed under the terms of the GNU General Public License v2 |
477 |
- |
478 |
-# |
479 |
-# don't monkey with this ebuild unless contacting portage devs. |
480 |
-# period. |
481 |
-# |
482 |
- |
483 |
-EAPI="5" |
484 |
- |
485 |
-inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils |
486 |
- |
487 |
-DESCRIPTION="sandbox'd LD_PRELOAD hack" |
488 |
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/" |
489 |
-SRC_URI="mirror://gentoo/${P}.tar.xz |
490 |
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" |
491 |
- |
492 |
-LICENSE="GPL-2" |
493 |
-SLOT="0" |
494 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
495 |
-IUSE="" |
496 |
- |
497 |
-DEPEND="app-arch/xz-utils |
498 |
- >=app-misc/pax-utils-0.1.19" #265376 |
499 |
-RDEPEND="" |
500 |
- |
501 |
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" |
502 |
- |
503 |
-sandbox_death_notice() { |
504 |
- ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" |
505 |
- ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox" |
506 |
-} |
507 |
- |
508 |
-src_prepare() { |
509 |
- epatch "${FILESDIR}"/${P}-memory-corruption.patch #568714 |
510 |
- epatch "${FILESDIR}"/${P}-disable-same.patch |
511 |
- epatch "${FILESDIR}"/${P}-fix-opendir.patch #553092 |
512 |
- epatch "${FILESDIR}"/${PN}-2.11-symlinkat-renameat.patch #612202 |
513 |
- epatch_user |
514 |
-} |
515 |
- |
516 |
-multilib_src_configure() { |
517 |
- filter-lfs-flags #90228 |
518 |
- |
519 |
- local myconf=() |
520 |
- host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092 |
521 |
- |
522 |
- ECONF_SOURCE="${S}" \ |
523 |
- econf "${myconf[@]}" |
524 |
-} |
525 |
- |
526 |
-multilib_src_test() { |
527 |
- # Default sandbox build will run with --jobs set to # cpus. |
528 |
- emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" |
529 |
-} |
530 |
- |
531 |
-multilib_src_install_all() { |
532 |
- doenvd "${FILESDIR}"/09sandbox |
533 |
- |
534 |
- keepdir /var/log/sandbox |
535 |
- fowners root:portage /var/log/sandbox |
536 |
- fperms 0770 /var/log/sandbox |
537 |
- |
538 |
- cd "${S}" |
539 |
- dodoc AUTHORS ChangeLog* NEWS README |
540 |
-} |
541 |
- |
542 |
-pkg_preinst() { |
543 |
- chown root:portage "${ED}"/var/log/sandbox |
544 |
- chmod 0770 "${ED}"/var/log/sandbox |
545 |
- |
546 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
547 |
- local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') |
548 |
- if [[ -n ${old} ]] ; then |
549 |
- elog "Removing old sandbox libraries for you:" |
550 |
- find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete |
551 |
- fi |
552 |
- fi |
553 |
-} |
554 |
- |
555 |
-pkg_postinst() { |
556 |
- if [[ ${REPLACING_VERSIONS} == 1.* ]] ; then |
557 |
- chmod 0755 "${EROOT}"/etc/sandbox.d #265376 |
558 |
- fi |
559 |
-} |