diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-08-05 08:21:17 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-05 08:21:17 +0000 |
| commit | 76ed03edca1199417365a6639581a19873e0cd11 (patch) | |
| tree | 14c8cdc030607e462ac86fe4658149e1c3338f7d /net-misc | |
| parent | Include fix from git for test output #547586. (diff) | |
| download | gentoo-2-76ed03edca1199417365a6639581a19873e0cd11.tar.gz gentoo-2-76ed03edca1199417365a6639581a19873e0cd11.tar.bz2 gentoo-2-76ed03edca1199417365a6639581a19873e0cd11.zip | |
Use the rlimit sandbox for x32 ABI until the seccomp one is fixed #553748 by Kyle Sanderson.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-6.9_p1-r2.ebuild | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 87d9eec79246..a864535cf4b2 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.574 2015/07/28 01:08:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.575 2015/08/05 08:21:17 vapier Exp $ + + 05 Aug 2015; Mike Frysinger <vapier@gentoo.org> openssh-6.9_p1-r2.ebuild: + Use the rlimit sandbox for x32 ABI until the seccomp one is fixed #553748 by + Kyle Sanderson. 28 Jul 2015; Mike Frysinger <vapier@gentoo.org> openssh-6.9_p1-r2.ebuild: List USE=ssl as a requirement for USE=ldns and clean up the ldns deps a bit diff --git a/net-misc/openssh/openssh-6.9_p1-r2.ebuild b/net-misc/openssh/openssh-6.9_p1-r2.ebuild index 16318ea542fb..540904640ca1 100644 --- a/net-misc/openssh/openssh-6.9_p1-r2.ebuild +++ b/net-misc/openssh/openssh-6.9_p1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.9_p1-r2.ebuild,v 1.11 2015/07/28 01:08:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.9_p1-r2.ebuild,v 1.12 2015/08/05 08:21:17 vapier Exp $ EAPI="4" inherit eutils user flag-o-matic multilib autotools pam systemd versionator @@ -200,6 +200,9 @@ src_configure() { $(use_with ssl ssl-engine) ) + # The seccomp sandbox is broken on x32, so use the older method for now. #553748 + use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) + # Special settings for Gentoo/FreeBSD 9.0 or later (see bug #391011) if use elibc_FreeBSD && version_is_at_least 9.0 "$(uname -r|sed 's/\(.\..\).*/\1/')" ; then myconf+=( --disable-utmp --disable-wtmp --disable-wtmpx ) |