Add fix for POSIX test compat #391011.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

4 files changed, 49 insertions, 4 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 518bc3eb6592..9f0905c2f9ce 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.444 2012/05/08 15:39:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.445 2012/05/17 04:29:44 vapier Exp $
+
+  17 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-6.0_p1-test.patch, openssh-6.0_p1.ebuild:
+  Add fix for POSIX test compat #391011.
 
   08 May 2012; Brent Baude <ranger@gentoo.org> openssh-5.9_p1-r4.ebuild:
   Marking openssh-5.9_p1-r4 ppc64 for bug 396075
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 31aeec53c751..f9c0de27f52b 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
 AUX openssh-5.2_p1-autoconf.patch 386 RMD160 8e57ae97df0b2483f826a7aba00bc0622b9a28f8 SHA1 22c4e40f54f97f866b460fe8987eb16363410caf SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb
 AUX openssh-5.2_p1-gsskex-fix.patch 408 RMD160 6a6296cd1c8acc52af4e0d8b6238b326d5d41e77 SHA1 b31e5294c68e6af9a75987a1c3ece5e52f56e9a5 SHA256 8190db31ed2e8dc6ce79030e5c648d04610b06dd8366df5948ef6e990314ee96
@@ -13,6 +16,7 @@ AUX openssh-5.9_p1-drop-openssl-check.patch 848 RMD160 91bf95bcd7ea9f4b669e713bb
 AUX openssh-5.9_p1-sshd-gssapi-multihomed.patch 6622 RMD160 abde3019aab3c94995ffe5574dc27d250b22af82 SHA1 0c825c0ea5f37836bd6206f59953dab751f3371b SHA256 f5ae8419023d9e5f64c4273e43d60664d0079b5888ed999496038f295852e0ae
 AUX openssh-5.9_p1-x509-glue.patch 569 RMD160 d23083a8e9c83587adbf22f82bedfc2714232039 SHA1 9b80ade665db278459b063097593999f518606e0 SHA256 579ef6409878cea36828057a82a37232ba230af0acb58438f020c284f06a6510
 AUX openssh-6.0_p1-hpn-progressmeter.patch 379 RMD160 5e77c4031326013543e8278efc696f24a1cf7203 SHA1 63a3dd4ce10970c27c0227d03f3c12e2dad4cd5f SHA256 fb38d9d16132fcc16fb2648bce21e2260fb5cadf0ae2e2a7849638aeb79d3dc7
+AUX openssh-6.0_p1-test.patch 780 RMD160 495ce89ea55a2a5cd4cb033f5aa4b9c4cdb20feb SHA1 47b01f709c150aac59c5e14ebe4b7ac13e2bb428 SHA256 c5893911cec3eecf84dc13bddbefbe1e1053db11e65a909b5f28eacbdd88a29c
 AUX openssh-6.0_p1-x509-glue.patch 569 RMD160 4ed2f74ed9e158fc9d9529abe1dc6b68981a1f1e SHA1 196bda7bd786a3d9f06bc332d14122e0b8322299 SHA256 8c9048a33036a93f56e254cfd53b18313682d466deadfdcd8937a46793617900
 AUX openssh-6.0_p1-x509-hpn-glue.patch 1774 RMD160 20cb84d6ef0f342ff8d7ab7df56a7d61f0906d83 SHA1 ca9ca97ab247081a8b80a09e085db75ff36be02e SHA256 b2dcff21652eea92d2ff2640a568070a944e7bfb2bd3217c433e6383a64b0970
 AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0967944b6125be26ed4628f49abf586b2 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41
@@ -60,6 +64,23 @@ EBUILD openssh-5.8_p2-r1.ebuild 8462 RMD160 07f1612009f0177a38128a68fa70ceb69a55
 EBUILD openssh-5.8_p2.ebuild 8459 RMD160 6df01d2b21cff13e64c18a8db428098b29d5799c SHA1 8bb5d78727b519e2cba5d5b51afdae7207d6dafd SHA256 a51825842d8d5b223f017d513a705c5125ab6f990d9620e3196eec7dfc45befb
 EBUILD openssh-5.9_p1-r3.ebuild 9131 RMD160 5efd12002b2ac0ad866bb3492c19279c432f4425 SHA1 42bc8e2f1390ff8beb62db33bf3751f54f2b99f8 SHA256 28e75f996fc487b112800e1148ace5a67a6168901db73cfb4b1fc9882bd5c97c
 EBUILD openssh-5.9_p1-r4.ebuild 9185 RMD160 f42ab81d9f03247ed309c17dd5ca7611df735faa SHA1 b3532813f58922147c0e7504486d1ceadfeba7fb SHA256 7ee510747c89c5ae0017bcd190c92bc233621e5e8bb8e7fae357d9c147c9aa32
-EBUILD openssh-6.0_p1.ebuild 9315 RMD160 4d91c99731742d956dd84daf88740622549f54f8 SHA1 7bbd36097beead4725aba9b055137e9b14d1a302 SHA256 7eb8d7ed773a1e0441209ca454ed4cb08643579fe99de57e21afb9b0605826a1
-MISC ChangeLog 70702 RMD160 4b7aa341b81a23cff7e4f1631e9ea1ecd5c3a4bb SHA1 ffa45d80b9c04c359aed61ba6e59a79958433536 SHA256 40fb5e3fa1cacc02719a83015958c7db21380c82f9a586c03f0ba5e364e8b7ba
+EBUILD openssh-6.0_p1.ebuild 9369 RMD160 270f96c87d34c7ccf77760fe381dabc7091a4ae4 SHA1 db08bf90766242dc3658ff4da171da8de4962066 SHA256 e495462a4aea4fb9c6e0b1b0010527533d7332a02ede874e677c4193cd288916
+MISC ChangeLog 70853 RMD160 a344b4f233ed8a13e9f0878c4577b836b0541fa5 SHA1 c216f04b18a56fddf42ba7b6cdcd2b368f999d4f SHA256 c7a6634488de335f767e08756202df0499e038390e2302cd2e5180707ab52ceb
 MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPtH7XAAoJELEHsLL7fEFWiisP/AhXkzyb85rPuty5iqTEKyEC
+GN5Af5mrouD4VBniUymJfSEfmMgEU7gQXuWjOf9rp2a80jQdgs5WEGKJPs/3UURQ
+8WQBnS0og1sikfVDYmdkgHU7Re55g4c4BpGEKpfqfYqa/Ryu9qgQCLQ+uXiy71I1
+rnVOtrEk0ckXKgdzo7q+fsMJtOUv/DF49zc9MHR7U1kF4AFDFymIZoo8nlOcE15H
+sUM5uLxRBZP7hfKA/oD2jPOhEYx1t8xYC1YDxVLiLrG6JqmWaZn2MUAT1iz98SMA
+EAuuGjqTMyDgmprgjteL4bzswYxfGNd6PqCezpNwzfgE9JPTWaMjtA7NgFI5gNgk
+L6UsLLCtHgTGkHtMHuNEtMqexop/3d1cyIzMdcnQj6HrFq7wJHTVZs+T5XMiigFu
+oUY0CpQndqmNEIh09Z1Sb5VxifUgx/N7Bt6PTO3y5n+CZmKUz5AtbaL/Ppk+YrhX
+2oqyCS4nP1wLJ2+T2qH4KSpzVNHQpsVc5Aj7XESBx6y5w4D9CjLOXABHDYRrFjIO
+J620+ZhAHAChpQeb8gKyvIN7agTCdfHkgHsxIZETYkdjSOafLXNG/DRvrRZITYek
+9eeHINNJByym8WTD9nUoD5oWYTs8g4zlxtrkeuJQTdI3FT5lVWzlJzM9OWQ5TpDn
+DEevCq3cTIicFEkNq4hF
+=r8zT
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-6.0_p1-test.patch b/net-misc/openssh/files/openssh-6.0_p1-test.patch
new file mode 100644
index 000000000000..8b988aed9b5e
--- /dev/null
+++ b/net-misc/openssh/files/openssh-6.0_p1-test.patch
@@ -0,0 +1,19 @@
+changeset:   10701:b159befd3104
+tag:         tip
+user:        Mike Frysinger <vapier@gentoo.org>
+date:        Sun Apr 29 00:26:33 2012 -0400
+summary:     use = with `test`, not ==
+
+diff -r d8a3ea854288 -r b159befd3104 configure.ac
+--- a/configure.ac	Fri Apr 27 00:55:42 2012 +0000
++++ b/configure.ac	Sun Apr 29 00:26:33 2012 -0400
+@@ -2591,7 +2591,7 @@
+ 	AC_DEFINE([SANDBOX_DARWIN], [1], [Sandbox using Darwin sandbox_init(3)])
+ elif test "x$sandbox_arg" = "xseccomp_filter" || \
+      ( test -z "$sandbox_arg" && \
+-       test "x$have_seccomp_filter" == "x1" && \
++       test "x$have_seccomp_filter" = "x1" && \
+        test "x$ac_cv_header_linux_audit_h" = "xyes" && \
+        test "x$have_seccomp_audit_arch" = "x1" && \
+        test "x$have_linux_no_new_privs" = "x1" && \
+
diff --git a/net-misc/openssh/openssh-6.0_p1.ebuild b/net-misc/openssh/openssh-6.0_p1.ebuild
index 78ac2cbf1374..09f9ce1b92bf 100644
--- a/net-misc/openssh/openssh-6.0_p1.ebuild
+++ b/net-misc/openssh/openssh-6.0_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1.ebuild,v 1.3 2012/05/05 03:20:40 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.0_p1.ebuild,v 1.4 2012/05/17 04:29:44 vapier Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib autotools pam systemd
@@ -99,6 +99,7 @@ src_prepare() {
 	else
 		use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP"
 	fi
+	epatch "${FILESDIR}"/${PN}-6.0_p1-test.patch #391011
 	epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	if [[ -n ${HPN_PATCH} ]] && use hpn; then
 		epatch "${WORKDIR}"/${HPN_PATCH%.*}