From 1b02721b38c22f541fe12a0cfd5a64802331fab7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 13 Jan 2009 02:38:46 +0000
Subject: Fixup ssp detection patch #254365 by Felix Riemann. Package-Manager:
 portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

---
 net-misc/openssh/ChangeLog                                   |  6 +++++-
 net-misc/openssh/Manifest                                    | 10 +++++-----
 net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index e28ce71f4bfe..96ecb92e77bd 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.324 2009/01/09 02:37:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.325 2009/01/13 02:38:45 vapier Exp $
+
+  13 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  files/openssh-5.1_p1-better-ssp-check.patch:
+  Fixup ssp detection patch #254365 by Felix Riemann.
 
 *openssh-5.1_p1-r3 (09 Jan 2009)
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index ec9e7820a1ee..007ea808bcb9 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -20,7 +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 741 RMD160 a3e163049c7939a3b20f1a0ee475987a785f988a SHA1 9e09c3eaa993ea38621044dca31a6569a8c3dece SHA256 6bf5d3d22882ec6ceff49d500cf890db568849f427ed260e690f7c7c18454f4d
+AUX openssh-5.1_p1-better-ssp-check.patch 746 RMD160 b7facd50af120db7da8af5bfdc4826e3aa164bf5 SHA1 5853549f875f2a660a084c578b5e00fffd3d1d9d SHA256 2bfd132a0b2ee952629e9b2d17b5b84785736c6c6e8444f0bb71d7c394ab11a5
 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
@@ -68,12 +68,12 @@ EBUILD openssh-5.1_p1-r1.ebuild 5359 RMD160 885d53ea5eb105f4a881f25cc38680d3a2f8
 EBUILD openssh-5.1_p1-r2.ebuild 5469 RMD160 1629ffccc1d8274a7ec40a4be1e54137f4273f23 SHA1 740eddf78b066e53445c766d2001b0762742175f SHA256 c055012fad22ca3c040302700ebf5835792ca59e74560d3ea8aa3a4e58aa0ddb
 EBUILD openssh-5.1_p1-r3.ebuild 5619 RMD160 f82f374bf5ce94b9e16234db1f5795a8a606aac1 SHA1 5768cba1109d15bbdb65f04a01ce1514f13d46e0 SHA256 a513cb85c709de30b5729b954b68f40063c1c8acd6cd92395ea8a2d740110a6c
 EBUILD openssh-5.1_p1.ebuild 5249 RMD160 048d448fc272b34855af9cd89978f1d9557de082 SHA1 3d55a50404ee225fcdb7304ee7a5fc1c405f6db7 SHA256 6d8a9b1ef305ce1c6d9aa92baedf6300dedb2992806035b3776ff28cd5e3dddc
-MISC ChangeLog 50860 RMD160 5523151745701d42492b813061bf20e560eaf6b2 SHA1 8d1d588a5e65870db349b3ca7205ee10ba01202f SHA256 ac46b37219b95f493aa5ed5921460a85b7415394a94f841765d70d90f4330e36
+MISC ChangeLog 51009 RMD160 ac3242fcf3752241c400162274a52742a57dc73f SHA1 530b33ed3e3a16ff97c57df526f7a9fd80d9a451 SHA256 9e196699f3ece5e2133fea251cc4773a313ed23a61ff832288c4c0414ea387e0
 MISC metadata.xml 1520 RMD160 541d1e217f79ac6e3988deea05ea7b7e5d508c3d SHA1 b6809c92e434e61fda6eac4c43c4fe380d1591d3 SHA256 749cd9c2ef9a937c3a6a6c8bcf3fa81ca7d2f54f4f011d6f3ee3a5614993cded
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklmuNQACgkQAiZjviIA2Xi0SQCfYxRj0zireXll831btowjcbLD
-4qoAoK9PrLcX/EPyXG6P4NeSWuDyKkSU
-=HzBN
+iEYEARECAAYFAklr/rsACgkQn/5bYzqsSmE1hACgjm7PnNmAQ+nLAtPfuAf3Ss8v
+X+sAnA/TXKoxO5R6oZbckns8pM2XP0XM
+=mmT4
 -----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
index 017ad498fd7c..cc986fcce776 100644
--- 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
@@ -15,7 +15,7 @@ https://bugs.gentoo.org/244776
 -#include <stdlib.h>
 -int main(void){exit(0);}
 +#include <stdio.h>
-+int main(void){char foo[[1024]];return sprintf(foo, "moo cow");}
++int main(void){char foo[[1024]];return sprintf(foo, "moo cow") == 7;}
  			])],
  			[ AC_MSG_RESULT(yes)
  			  break ],
-- 
cgit v1.2.3-65-gdbad