Fix ssp detection on uClibc hosts.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.4 x86_64

5 files changed, 35 insertions, 9 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 5f2426469173..d7a3ae8e9d46 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.322 2008/11/03 08:47:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.323 2008/11/17 22:31:29 vapier Exp $
+
+  17 Nov 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-5.1_p1-better-ssp-check.patch, openssh-5.1_p1-r1.ebuild,
+  openssh-5.1_p1-r2.ebuild:
+  Fix ssp detection on uClibc hosts.
 
 *openssh-5.1_p1-r2 (03 Nov 2008)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 63e18c0380d2..c0da0ce0037b 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -20,6 +20,7 @@ AUX openssh-4.7_p1-packet-size.patch 1130 RMD160 b604b500747f5b53c9ddc3950adfaca
 AUX openssh-4.7_p1-x509-hpn-glue.patch 2734 RMD160 ff6961d2b5b018121c6c40af91b485d47eec1d29 SHA1 a081eaac28e6f761dbe2345263f8eaf810f0fa59 SHA256 6e27def1aaf61da6d4c8bb64d1068d255ffad86453cbc8ff6c42dd9e823bff9b
 AUX openssh-4.7p1-selinux.diff 541 RMD160 bcb8f1fef2ae8378e7000732223c6116e06e0d6f SHA1 395b4dcff3eb7b92582a4364e612fff87278e7bc SHA256 ef8d71c46059bdcc8487cad06914639a8237197561cc030d8eed3baf418cc810
 AUX openssh-4.9_p1-x509-hpn-glue.patch 2741 RMD160 54c645340e491dc915d5b8c7f02e089d2663e1ad SHA1 c3ba982038b2bf31e23c747afcbab540933caf0c SHA256 d0da5449d3226baf3bd25080a74550af75946d87c686a79841c41178aecb8c83
+AUX openssh-5.1_p1-better-ssp-check.patch 657 RMD160 44289e5f3988eda5a2ff5be28080516c1fc013e6 SHA1 52d35e1ff65cff58c8d95e57668deb52f13e5981 SHA256 966b63c469ae0bcc513fa35745017ec7693f773effdb6696f7e53502fb211b57
 AUX openssh-5.1_p1-escaped-banner.patch 554 RMD160 90ca69b68e774d9640fc3d9e5bac2bf1e94fd706 SHA1 fee652862c4050c3275d258791bdf9e2a12a6083 SHA256 31ca766d4bc7b5cb45546cc85ca088687b6436915d404ecc2d38bba511f4ab8d
 AUX openssh-5.1_p1-ldap-hpn-glue.patch 1666 RMD160 5fbcc5c60f9a8f44967c258749e2379295015ae2 SHA1 dfdf6fd489a1a2db4cc25d7fc49d31769d48c07d SHA256 f92037859510902f7bc7b97c92dc989614e0d2c07e5812b4d787b38892f3a6a3
 AUX openssh-5.1_p1-null-banner.patch 1411 RMD160 b3034cecc1d74973eed05c8f6ef580cab7ed1a7e SHA1 b5173ac7714c185abbc256b44a80e1dd21687f9b SHA256 7a682f19d1f60bf2c8cde330504fa22306c9ab2ed6d2b7fd455fb6d851a1f423
@@ -63,15 +64,15 @@ EBUILD openssh-4.7_p1-r20.ebuild 5364 RMD160 7e9a66b5d54b49f83ae8c85dc6cef9aa431
 EBUILD openssh-4.7_p1-r6.ebuild 5351 RMD160 a2e3b8435e17ec0697a49a2da195f95cdaeab947 SHA1 3b9a1137874658af134c462b3de434182d4c2330 SHA256 f21dd1253baa4de4994798afc25a1f2a656705787083d3f619856656b966f059
 EBUILD openssh-5.0_p1-r1.ebuild 5185 RMD160 7a6f156064ad1fe10b0147dd3d90727139b5c895 SHA1 520a472607295a03a60cb6a7f3ce46e155123f40 SHA256 87a98ecf1a680b78098bbd2cb11a231f986ec6d0ec7b467e1e5be88e1a67fc96
 EBUILD openssh-5.0_p1-r2.ebuild 5239 RMD160 6ccb10bacc5e8d21ab9f44d043f606dd50bea1dc SHA1 26ec517a579b65d9d916746bc1c0acc918c0edf1 SHA256 3763ef177f53a9bccbf449aa3bde6568a1dce1fb7429fd95721e0b45423ceb69
-EBUILD openssh-5.1_p1-r1.ebuild 5309 RMD160 4fe1fec31914d8f1f4f43b1842cf5512779647bf SHA1 f4fa1fe52ad5314a7035dd8e4149eb1252f44006 SHA256 681731bc24c63e9848df532e82d369956fc15806151c930e2b880e69bfb0c67b
-EBUILD openssh-5.1_p1-r2.ebuild 5419 RMD160 07cd8aeb18ab0a7a74fa79ba100e84fcca4d86ff SHA1 2c1aae0caa5347068c6038dd3b7a5d63c7da4f18 SHA256 af081cb94ecb5ec7096a65b89772bf93723b86484a8f4ac197d167745a4743bd
+EBUILD openssh-5.1_p1-r1.ebuild 5359 RMD160 885d53ea5eb105f4a881f25cc38680d3a2f805ef SHA1 c71739d0208380903e73fd4211d7ec32aafe19ca SHA256 a25ff4f18e711daa5ed2126b57572cd0abffc5a8e9a0ee31031ea12d50ac62f8
+EBUILD openssh-5.1_p1-r2.ebuild 5469 RMD160 1629ffccc1d8274a7ec40a4be1e54137f4273f23 SHA1 740eddf78b066e53445c766d2001b0762742175f SHA256 c055012fad22ca3c040302700ebf5835792ca59e74560d3ea8aa3a4e58aa0ddb
 EBUILD openssh-5.1_p1.ebuild 5249 RMD160 048d448fc272b34855af9cd89978f1d9557de082 SHA1 3d55a50404ee225fcdb7304ee7a5fc1c405f6db7 SHA256 6d8a9b1ef305ce1c6d9aa92baedf6300dedb2992806035b3776ff28cd5e3dddc
-MISC ChangeLog 50484 RMD160 a91c79acbee767f239b9447ec88d7de09adda565 SHA1 68c0be51b5310d4fcca47e494724cf8521903ab1 SHA256 340dd421c097874f1461530073c26a7794f82e8e92fc0f863d801c25d907bfc4
+MISC ChangeLog 50674 RMD160 7c2f401257a74a0afbc7a0d92f54ac666d9cc6a9 SHA1 d838fcbc8b6e8e6d1ad433f6f90c09f46b09aed9 SHA256 e38aa3801ce0a8175270ab360a3816a24981baaff8292d57b3cd19b380678516
 MISC metadata.xml 1520 RMD160 541d1e217f79ac6e3988deea05ea7b7e5d508c3d SHA1 b6809c92e434e61fda6eac4c43c4fe380d1591d3 SHA256 749cd9c2ef9a937c3a6a6c8bcf3fa81ca7d2f54f4f011d6f3ee3a5614993cded
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkOu/8ACgkQ67wieSYcaxe6sQCfd0XhXn0oMLgFb6+SoKBFAYJ6
-3BEAnRuTqxdO6CZrkv9N9CtJD5dV4xOP
-=nzIC
+iEYEARECAAYFAkkh8MgACgkQ67wieSYcaxeBLACfTCVojbU0RCNbNpdOJMokVN2C
+yl4AmwWBNxpssiRV5Js/jtcXbQBTq3tU
+=N2iU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch b/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch
new file mode 100644
index 000000000000..5f3578ec22b0
--- /dev/null
+++ b/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch
@@ -0,0 +1,18 @@
+a simple 'int main(){}' function won't generate references to SSP functions
+when using -fstack-protector which means systems that dont have SSP support
+wont get properly detected as lacking support.  instead, create a big buffer
+on the stack and use it as that seems to do the trick.
+
+--- openssh-5.1p1/configure.ac
++++ openssh-5.1p1/configure.ac
+@@ -145,8 +145,8 @@ int main(void){return 0;}
+ 		      AC_MSG_CHECKING(if $t works)
+ 		      AC_RUN_IFELSE(
+ 			[AC_LANG_SOURCE([
+-#include <stdlib.h>
+-int main(void){exit(0);}
++#include <stdio.h>
++int main(void){char foo[1024];return sprintf(foo, "moo cow");}
+ 			])],
+ 			[ AC_MSG_RESULT(yes)
+ 			  break ],
diff --git a/net-misc/openssh/openssh-5.1_p1-r1.ebuild b/net-misc/openssh/openssh-5.1_p1-r1.ebuild
index e000367e61a9..df4d37a1349e 100644
--- a/net-misc/openssh/openssh-5.1_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.1_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r1.ebuild,v 1.10 2008/11/03 08:46:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r1.ebuild,v 1.11 2008/11/17 22:31:29 vapier Exp $
 
 inherit eutils flag-o-matic ccc multilib autotools pam
 
@@ -89,6 +89,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	[[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
 	epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665
+	epatch "${FILESDIR}"/${P}-better-ssp-check.patch
 
 	sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
 
diff --git a/net-misc/openssh/openssh-5.1_p1-r2.ebuild b/net-misc/openssh/openssh-5.1_p1-r2.ebuild
index 037482bc7166..9367efd34339 100644
--- a/net-misc/openssh/openssh-5.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.1_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r2.ebuild,v 1.2 2008/11/03 08:53:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r2.ebuild,v 1.3 2008/11/17 22:31:29 vapier Exp $
 
 inherit eutils flag-o-matic ccc multilib autotools pam
 
@@ -94,6 +94,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-null-banner.patch #244222
 	epatch "${FILESDIR}"/${P}-escaped-banner.patch #244222
+	epatch "${FILESDIR}"/${P}-better-ssp-check.patch
 
 	eautoreconf
 }