1 |
commit: f1b84bb153039a5f6e6808ea841326d9d2a2a6cc |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 31 18:59:57 2013 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 31 18:59:57 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f1b84bb1 |
7 |
|
8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
9 |
|
10 |
Conflicts: |
11 |
cnf/make.globals |
12 |
|
13 |
|
14 |
bin/ebuild | 23 +++---- |
15 |
bin/ebuild-helpers/prepstrip | 3 +- |
16 |
bin/repoman | 2 +- |
17 |
cnf/make.globals | 5 +- |
18 |
man/ebuild.1 | 4 +- |
19 |
man/ebuild.5 | 5 ++ |
20 |
man/make.conf.5 | 11 +++- |
21 |
pym/_emerge/depgraph.py | 27 +++++-- |
22 |
.../package/ebuild/_config/special_env_vars.py | 3 +- |
23 |
pym/portage/package/ebuild/config.py | 14 ++-- |
24 |
pym/portage/repository/config.py | 8 ++ |
25 |
pym/portage/util/__init__.py | 65 ++++++++++++++++- |
26 |
pym/portage/util/movefile.py | 75 ++++++++++++++++++-- |
27 |
13 files changed, 200 insertions(+), 45 deletions(-) |
28 |
|
29 |
diff --cc cnf/make.globals |
30 |
index b66786b,f0597c1..9693348 |
31 |
--- a/cnf/make.globals |
32 |
+++ b/cnf/make.globals |
33 |
@@@ -149,20 -123,9 +149,23 @@@ PORTAGE_ELOG_MAILFROM="@portageuser@@lo |
34 |
# Signing command used by repoman |
35 |
PORTAGE_GPG_SIGNING_COMMAND="gpg --sign --digest-algo SHA256 --clearsign --yes --default-key \"\${PORTAGE_GPG_KEY}\" --homedir \"\${PORTAGE_GPG_DIR}\" \"\${FILE}\"" |
36 |
|
37 |
+ # Security labels are special, see bug #461868. |
38 |
+ PORTAGE_XATTR_EXCLUDE="security.*" |
39 |
+ |
40 |
+# Writeable paths for Mac OS X seatbelt sandbox |
41 |
+# |
42 |
+# If path ends in a slash (/), access will recursively be allowed to directory |
43 |
+# contents (using a regex), not the directory itself. Without a slash, access |
44 |
+# to the directory or file itself will be allowed (using a literal), so it can |
45 |
+# be created, removed and changed. If both is needed, the directory needs to be |
46 |
+# given twice, once with and once without the slash. Obviously this only makes |
47 |
+# sense for directories, not files. |
48 |
+# |
49 |
+# An empty value for either variable will disable all restrictions on the |
50 |
+# corresponding operation. |
51 |
+MACOSSANDBOX_PATHS="/dev/fd/ /private/tmp/ /private/var/tmp/ @@PORTAGE_BUILDDIR@@/ @@PORTAGE_ACTUAL_DISTDIR@@/" |
52 |
+MACOSSANDBOX_PATHS_CONTENT_ONLY="/dev/null /dev/dtracehelper /dev/tty /private/var/run/syslog" |
53 |
+ |
54 |
# ***************************** |
55 |
# ** DO NOT EDIT THIS FILE ** |
56 |
# *************************************************** |