Workaround autoconf-2.63 issues with empty else statements.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 35 insertions, 4 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 322310a9271c..dafb3700a628 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.352 2009/05/18 09:04:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.353 2009/06/23 18:20:35 vapier Exp $
+
+  23 Jun 2009; Mike Frysinger <vapier@gentoo.org> openssh-5.2_p1-r2.ebuild,
+  +files/openssh-5.2_p1-autoconf.patch:
+  Workaround autoconf-2.63 issues with empty else statements.
 
   18 May 2009; Robin H. Johnson <robbat2@gentoo.org>
   openssh-5.2_p1-r1.ebuild, openssh-5.2_p1-r2.ebuild,
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e780bfb71a9a..4f8a50ef6624 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.4_p1-ldap-hpn-glue.patch 1538 RMD160 eba0400a328f23b9329429d2da65b80ead546d4d SHA1 7190e861e8be4f03ae42ad43ba1770fdca95d46a SHA256 63e9f729fbb40babdf5cd2b4d87f4d1cb5a9aaed60bf7a8c072c22f9a6fb36ab
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
@@ -9,6 +12,7 @@ AUX openssh-5.1_p1-ldap-hpn-glue.patch 1666 RMD160 5fbcc5c60f9a8f44967c258749e23
 AUX openssh-5.1_p1-null-banner.patch 1411 RMD160 b3034cecc1d74973eed05c8f6ef580cab7ed1a7e SHA1 b5173ac7714c185abbc256b44a80e1dd21687f9b SHA256 7a682f19d1f60bf2c8cde330504fa22306c9ab2ed6d2b7fd455fb6d851a1f423
 AUX openssh-5.1_p1-x509-headers.patch 248 RMD160 e0085a315ac4a766527e4b44095f9520de79d7a5 SHA1 1d39aea309013ce81de4f03db569c838453176a3 SHA256 3d882e3c0701387c81b87aead5635d3d4c1962dbe78f3407cd6de73913c35824
 AUX openssh-5.1_p1-x509-hpn-glue.patch 3373 RMD160 024d7f17972907a591a067bfd0883ba0c0b297d0 SHA1 1b2ad74448c695bedee22a48d0bca879605c23d0 SHA256 0d9b10881a9207e5feec7429693b34fa56464e2c9e4fea1540d258ee2000e37a
+AUX openssh-5.2_p1-autoconf.patch 386 RMD160 8e57ae97df0b2483f826a7aba00bc0622b9a28f8 SHA1 22c4e40f54f97f866b460fe8987eb16363410caf SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb
 AUX openssh-5.2p1-ldap-stdargs.diff 252 RMD160 7bf89a0946446b43ce3026b7b01a9a4c637f388a SHA1 7b62038dc3060b1e77df213c85874ba80acd8f64 SHA256 97281375efa33e9ce70a55bfa95b6b426208175e7e3ff493012bc25d9b012f45
 AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0967944b6125be26ed4628f49abf586b2 SHA256 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41
 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f
@@ -31,6 +35,13 @@ EBUILD openssh-5.0_p1-r2.ebuild 5232 RMD160 3b0247e5b71cb12720f8746dfa9f7d50c0f5
 EBUILD openssh-5.1_p1-r2.ebuild 5465 RMD160 64e7b382e6a1c664b4e6ad6d93199dc8ed1985e6 SHA1 e42626794f7af0f265073d1b89a96852b5af8cbb SHA256 0cddb635f824087f3c6d39738a990b6cccc263d8ce33983f5f01b937250bbdcf
 EBUILD openssh-5.1_p1-r3.ebuild 5735 RMD160 4ce7ec18877d6bec6f5370a00ef82790ad87dbd9 SHA1 63e87f68db66e7b5dc39f08317d05284faeb9219 SHA256 acec83baf78e4ac4cb2fa3c2a5064ae00164581b0d8c1aba43e7dc5cec0cddde
 EBUILD openssh-5.2_p1-r1.ebuild 7046 RMD160 8116a694be2749acf19012071d92f43cff658b16 SHA1 15ce1638bba34e4afe76cc2ca2521e1e85a1c452 SHA256 24c99d66fe28e60f350864a91edef40f1c342b8330639197f6238e4cfe273ca9
-EBUILD openssh-5.2_p1-r2.ebuild 8215 RMD160 365822c26b90450a1525817019e7c4319040b575 SHA1 baa90a2dc9564d8f61e7d136455005ec2aaf6b29 SHA256 81a47a843703d495f3ca4b880903da0797e6e5780c39687997f7772d5e229434
-MISC ChangeLog 55145 RMD160 1de035ca7e74536e24e7872a9df1095cd674ac3c SHA1 4c3ec95443ad20665238bf8abbf310d673f8356e SHA256 87601888dadd18ca3066b7e99d2ee4e6ded1bc93df9944ad93fed3286c1e302b
+EBUILD openssh-5.2_p1-r2.ebuild 8256 RMD160 a089c5d1508c5a3207dd8d586748cad111d83f9e SHA1 9ca36968f2b0a7544a7ff33e30ff443b8c6d63e9 SHA256 73b0017da2fd3d026bfd5697190911aec8288c33c5b35606ce6eef4d2cc3e788
+MISC ChangeLog 55323 RMD160 1a32d65330df7edd4ec438bc01fa4a4bac5ff6f3 SHA1 627c1694049954b02fb51b56372717e27506279d SHA256 4cf5724f265870cb756e246b36cf81573a7d78465535cc95516e22e582c831c7
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpBHPkACgkQlPl3HsVfCDrGWgCcDmpRqon7/qen/e4msAV+pT6p
+UjoAmwbInVTQg+1vDETg3Nx6Uzpx69RG
+=L49z
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-5.2_p1-autoconf.patch b/net-misc/openssh/files/openssh-5.2_p1-autoconf.patch
new file mode 100644
index 000000000000..24ad7a9cf426
--- /dev/null
+++ b/net-misc/openssh/files/openssh-5.2_p1-autoconf.patch
@@ -0,0 +1,15 @@
+workaround problems with autoconf-2.63
+
+http://lists.gnu.org/archive/html/autoconf/2009-04/msg00007.html
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -3603,7 +3603,7 @@
+ #include <shadow.h>
+ 	struct spwd sp;
+ 	],[ sp.sp_expire = sp.sp_lstchg = sp.sp_inact = 0; ],
+-	[ sp_expire_available=yes ], []
++	[ sp_expire_available=yes ], [:]
+ 	)
+ 
+ 	if test "x$sp_expire_available" = "xyes" ; then
diff --git a/net-misc/openssh/openssh-5.2_p1-r2.ebuild b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
index 3a226891e8c9..9eb0f58a2076 100644
--- a/net-misc/openssh/openssh-5.2_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-5.2_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.10 2009/05/18 09:04:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.2_p1-r2.ebuild,v 1.11 2009/06/23 18:20:35 vapier Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -105,6 +105,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}-autoconf.patch
 
 	# in 5.2p1, the AES-CTR multithreaded variant is temporarily broken, and
 	# causes random hangs when combined with the -f switch of ssh.