Use the rlimit sandbox for x32 ABI until the seccomp one is fixed #553748 by Kyle Sanderson.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 24 insertions, 17 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/Manifest b/net-misc/openssh/Manifest
index aabe75eedf61..d173e89f817e 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -42,23 +42,23 @@ EBUILD openssh-6.7_p1-r4.ebuild 10138 SHA256 e4f6c4e80485352cc75e62c0212670a0d7f
 EBUILD openssh-6.7_p1.ebuild 10067 SHA256 970be3a06c0293262f6c59d068d290cc71935fe91f4295b1352b6c41c46c3bf7 SHA512 f2b689767c8da075f16e9e5d9fe258e22fb4019034539883d63632c1543d3141787883ec7013f87c23d709a554b4f994c4c2f41b1829e5301b55f7a5da3fbf46 WHIRLPOOL 8d70fd99a1f3307b801999a9c80be4bcc603cbc151170160d78a2fa8a50ceb701657cbb0b0eb9ccfe1287bff9299dcffb36f884b860a5ca88ac4a9936b21a574
 EBUILD openssh-6.8_p1-r5.ebuild 10577 SHA256 7ad36f2bb01a24c2421e76c240c151c4c3bbcb0e99b5780e3ee4a11a1d9b1b10 SHA512 f301ab241cf9fed3612d6281143376e118f0e75813cf8c4409af4f76eb2a259272f97c072d178c6ae10cca9545ea12d1fec31ac5c4959ddc7b75fcbcfb8dd850 WHIRLPOOL adee554a35cb545c192312f9731e71d23479d89d1b219b945e59b50b94f887e0371d8580688ea5406ed0085a65dd7696a9ebf0ce10423edbaac3466b5509306a
 EBUILD openssh-6.9_p1-r1.ebuild 10225 SHA256 6aa0410c26b7809b0ef86696408b0d90c970f06f53d3b0e821ad21d4c43e651c SHA512 a3c7a4be651cdf5d97d1cf1cbb72afeb8652b5c6c29af573d3c07bc0a20f3a0861ae62400c048a121b04396f0232af4c0664cbf232ecbab5377754bdfd62b870 WHIRLPOOL 3df2b62270a17e1f4393c90eb145a384ba8ff6a2b0c110f83ae44d6b6193b7803c9afc63ca7683f5614b7d157bfb541190719081b919306a3e3f1638e11130b6
-EBUILD openssh-6.9_p1-r2.ebuild 9818 SHA256 97486893bc4880a58b923226641b1cf464fbff8015e43d00e7b1832fedcae006 SHA512 b87ff9496cd9a110c5beb1199912d7b58d24947883cbbf1f40cff1f7290fc9b3d1b9db1a77fd8c0a64d73fcf6bcfd6c352705c1178e86467adf463cad238832f WHIRLPOOL d5998ba19186f20fbf938332fe5612c090db31ae125f2f59f2bf60289e6d654bdc496f0248c62351bcc60ad366ab02600bf9ca51a68e82c663e04f694203c036
-MISC ChangeLog 95609 SHA256 3c5d27d179ba20eb7a18b92a9aec36002cdd9851953449fe5e232600b52c354c SHA512 348169514abb0fbcebc504ba1f55c047b50118b3e77b12408a1d3ba8de63134d2e765490e38baca07da8dc715c6be9692ea087607b3a800cf3ca7b135f71d33d WHIRLPOOL acd174f7903c611ae857e51a7964ab53771c31975c0bc8ddd5848328a2ff816d1e461c0bba7fd599aedb1841438c88318f01b5bd8f2b02ff07ccd1e69f6ee2cf
+EBUILD openssh-6.9_p1-r2.ebuild 9974 SHA256 17285d693e20c5a3a4bc2f0793ef85c9e3591a1ea868aefd23ebd58ecacc5eac SHA512 8a9c3de0eaea733d7f52cc6b0afcab8906d4f1329dc8a467c1d86e80fcac6b0e444d42accfbcbbc524190064b5a34f1625d016e639ff09858ba79fe25b2d9ff1 WHIRLPOOL 1acdd2839b1ae147cc9523ff0e3e8ba26d4adf6111b73ea513ddae49140c345a642fcfdd5fc0688a39028dc328db891e7eafe6c5867f2060f6fc4e63e46d3d2d
+MISC ChangeLog 95783 SHA256 53b51ee42a1faf42d80733382986e4fd606366b7bb6350c76f44df851e071890 SHA512 95a4f4243cb8cd8901208adc3632e191ab27a5ea2ce947e832264833262d8bd1e74a7e4f3545d6f2da8d2b473a59cfc7014aa88d5b0ea30e348c4f5d9323c8e5 WHIRLPOOL 5b56a38ddcf0308b681fc1c1fe8107c37ea1385e30ebc435d22f73c38947f9afdbb37ffb1c22bc48c83117cb91b946831cd83bab2807c248292fd2822002f828
 MISC metadata.xml 2129 SHA256 f786d2849baa9c48bf58e1e5d71dec826998961dc96ae13937c2853900b4a289 SHA512 a8ce6d4781f98279cc7666a36f0e80229358d61a2ef9f7486d26233b523780963d43b2cca332301901a22a15ac2e79d2abce399028b47c95d65bccc49f609376 WHIRLPOOL c59d747bc802dd8e3c3bcc3d0e7168c1ad00ba48f74226e5da5dd1a1ea769882861c0bcd9bcb117fc92d8fca746f7d69a39b77a4dfcb5c0279f672bba2cb3eec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVttYAAAoJEPGu1DbS6WIAe5EP/1F0RyIOFajKN8n0Yrgm4wAD
-1YfX5WcJzIG5MBFnPlj2pIVgaMi693hsyZaKD3RSEXSwmAy9N0Bse1vSrk9jmxSm
-57xvM1WtOSWvEdP42aeGJ4Hkxp0h8XApQXqGIGa6L2UJcH8MRo+kQt/WE8ngmMU9
-zzAoOcV8W6vfs6giVR/mJvKXAgGjC4Qn/6k0XaR5ngmhn6GAZzLhc0jTnM/L/y9C
-wkjfcTM3ptXCb2qarow+/zehjgKDBiqXmViwm7Yx2MhcLIZaEyucQ4FOHeLgduwS
-Vx71pYjLTSZm+Kzg24BaIP+eFNPLeMfNL41Xp7nyIOfuq5bV0PNSrRdD6NT1W5L4
-IHFW4ZN1FeCFC4ahzjp+QDEch2EGOJTAkjxbKI8XUmeOKuVoiW82ouM5UvOKd2Xm
-XqgcMqBot5RGXTK8HqWehfschwP6jCdk008S5ctCQ5XqiWTACghv753k0WnP79+X
-fDPVXue058x1k8ixPyemk9VoF0xqFGSGkI+dWoZtx6l9LDAqOArConriVBgRe5k1
-m3ei0zDKlURjrkskJ6GPqdJKFXA7bdke3bYhtmV4ftkoh1b5HPuq1JmrKZ5uxp01
-ltVCp1dGMiP3ZIpwj7sl609xxvPcTkNgjs/ZTLtTP5XrlNOh4B+rafSVM80Mnqnt
-JkhPTHZBT1jSOhgRZ6+/
-=2iST
+iQIcBAEBCAAGBQJVwceHAAoJEPGu1DbS6WIAZLYP/AmMXLudDr5ZKOFVs2DH3jmQ
++D5eI3N1riUV/fAmjp4uSb/JUJXPJP4uBxih/v8Km0K04yhdqSgtNyP9XtJ5slLM
+sY9XLgpfRmNDo4Yc3+KvMUhic84dG8CUN+BycKtHH54hjpaLMKHBgrkiw46kU4ER
+Q9XIAqEmbYkwxQ7yygwtE0s3z4yBCknmxhLZ/U15jjXLGv0pnJ6FZXFuSguxhVOM
+/wa+v0f0Z25gdksrGvnBtc2CrV2kh+I8h3djfoBeFDuXO82NYX5xd6w50JJmB79Y
+wQgdqP8pzqzckTRILGbQMGWO0oEdLqrcR4cb0ODjto87KOBfvOMatK2kzPJ3cR/g
+b+SnJAyCSULWMrqNZUDWckkx6oUrX6uGO9zZu8Ey3TowEESRNI9/FPTcHt+6HOrb
+WcakdHkNHvCA8xz0f8HHAKsSLLbUjlNsmNDk3Xa5J2qsfV1VDgiwePx2yOrGVc48
+M9iLeYSir/+G2lvp5QWOPE/6lBZHfBd9Lj7zrhcYs4MORTC77ttXVPUjk7mUY9vE
+kUDh2pvfu/Wf+Jyel1hIF7KOXtyxXahprVfUr7YtieLTLgJR7ohQQdhaBZppfQuK
+Ombtn9WyWM7TIBMznqgoSTVF0863WaZp3z/2enb5yGgDAelxhbS4NdKMBtk9OAmr
+UAu5DDq4WZwcDaIyOqej
+=LDQb
 -----END PGP SIGNATURE-----
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 )