commit:     2397b7b1beef5819a172c9d9d688f82de887858f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 19:42:25 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 25 19:42:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2397b7b1

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

 RELEASE-NOTES                                      | 15 +++++
 pym/_emerge/EbuildPhase.py                         | 30 ++++++++-
 pym/_emerge/MiscFunctionsProcess.py                |  6 +-
 pym/portage/package/ebuild/doebuild.py             | 49 ++++++++++----
 .../modules => tests/util/dyn_libs}/__init__.py    |  0
 .../tests/{bin => util/dyn_libs}/__test__.py       |  0
 .../tests/util/dyn_libs/test_soname_deps.py        | 34 ++++++++++
 .../util/futures/asyncio/test_wakeup_fd_sigchld.py | 76 ++++++++++++++++++++++
 pym/portage/util/_dyn_libs/soname_deps.py          | 42 ++++++++++--
 pym/portage/util/_eventloop/asyncio_event_loop.py  | 35 ++++++++--
 setup.py                                           |  2 +-
 11 files changed, 259 insertions(+), 30 deletions(-)

diff --cc pym/portage/package/ebuild/doebuild.py
index bdf1a2e9f,dc443df00..f8b784d6b
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@@ -1806,16 -1729,28 +1813,30 @@@ _post_phase_cmds = 
                "install_symlink_html_docs",
                "install_hooks"],
  
-       "preinst" : [
-               "preinst_aix",
-               "preinst_sfperms",
-               "preinst_selinux_labels",
-               "preinst_suid_scan",
-               "preinst_qa_check",
-               ],
- 
+       "preinst" : (
+               (
+                       # Since SELinux does not allow LD_PRELOAD across domain 
transitions,
+                       # disable the LD_PRELOAD sandbox for 
preinst_selinux_labels.
+                       {
+                               "ld_preload_sandbox": False,
+                               "selinux_only": True,
+                       },
+                       [
+                               "preinst_selinux_labels",
+                       ],
+               ),
+               (
+                       {},
+                       [
++                              "preinst_aix",
+                               "preinst_sfperms",
+                               "preinst_suid_scan",
+                               "preinst_qa_check",
+                       ],
+               ),
+       ),
        "postinst" : [
 +              "postinst_aix",
                "postinst_qa_check"],
  }
  

Reply via email to