Fix warning with USE="X509 ldap" #310287 by Nico Baggus.

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

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 8440e20d194c5482011ddbc4325a3e6b7c64850b..f9eee28f22f36d80500134fcbbe05b2d4c04884d 100644 (file)
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.376 2010/03/19 19:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.377 2010/03/20 00:17:55 vapier Exp $
+
+  20 Mar 2010; Mike Frysinger <vapier@gentoo.org> openssh-5.3_p1-r1.ebuild,
+  openssh-5.4_p1.ebuild:
+  Fix warning with USE="X509 ldap" #310287 by Nico Baggus.
 
   19 Mar 2010; Raúl Porcel <armin76@gentoo.org> openssh-5.3_p1-r1.ebuild:
   sparc stable wrt #308555

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b99a291a8636dfc447864a701cd05607214300c0..78e871e742fefe20a9480008560eef0c65276567 100644 (file)
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
 AUX openssh-4.7p1-selinux.diff 541 RMD160 bcb8f1fef2ae8378e7000732223c6116e06e0d6f SHA1 395b4dcff3eb7b92582a4364e612fff87278e7bc SHA256 ef8d71c46059bdcc8487cad06914639a8237197561cc030d8eed3baf418cc810
@@ -36,7 +39,14 @@ DIST openssh-lpk-5.2p1-0.3.11.patch.gz 18116 RMD160 2ff9bdff19e0854a96063be1e058
 DIST openssh-lpk-5.3p1-0.3.11.patch.gz 18137 RMD160 3e316722d521e163a82d661465abef7f128d736b SHA1 870a703e2cafa744681733766e48faf3229e3b7e SHA256 34d8dbccde3b1fedb6b75d7a725ade8b37389c46f5b13a2e5a80d8cd8e6ffaaa
 EBUILD openssh-5.1_p1-r2.ebuild 5462 RMD160 f36841058b21ed27a1852a5b1570939c2ad709c9 SHA1 fd8625bcc5c76842aea3c3ed5b7f93846be7567c SHA256 2a50479c1d0c4f60a67a2ca74ae658228d3297b528772b43951bac2ea3291c02
 EBUILD openssh-5.2_p1-r3.ebuild 8150 RMD160 b9049bb12151086a4261cfc70aad4ba0def0d4a7 SHA1 a9f0ec39435444e2ca4ca2e0ca99d3a10ded6bd8 SHA256 ba524fd8817de5ece224ba2fca841964020069bd580ae644c99ad9ff3587af1d
-EBUILD openssh-5.3_p1-r1.ebuild 8305 RMD160 dd1b3a0bcb76286c07e737db5f1149391b714f4a SHA1 30c364963b873c943adf06a6ef0d02d74e122608 SHA256 0f87fbca3e95ac1853e2fc305fb5a3d8d5e855755052f7d86c71f2a717080fdc
-EBUILD openssh-5.4_p1.ebuild 6638 RMD160 5025c29df3fcd9494fc083642cdb3a8fbb2ebaf0 SHA1 10b5f330cae049460542f6ea115d5f2756fa8f33 SHA256 563c7401d005168f1e8b1344960c857d0f7b1b9076333f52dce2e7f6c0d55dc8
-MISC ChangeLog 58721 RMD160 4001b6c02f67147d2b531a44cfcfc752ac8e0e27 SHA1 ba48c1ad6866193a213d2bdc9d32d60925434acd SHA256 8e78afc3f1801c031d16a42ccd18579785e855919ed12335deb275a4a700e9a7
+EBUILD openssh-5.3_p1-r1.ebuild 8321 RMD160 c632f38bae4c60e4836c96ca7e35dd103b598159 SHA1 1a7f59e8144586def7d83b6c6721d6da5c9e8d40 SHA256 1fa0285b909c4bd834bf495d3140aa8c7e6586ca1f85ec0c46aa0e0b4ee8df5d
+EBUILD openssh-5.4_p1.ebuild 6654 RMD160 fcdc656a6235e2cac6acec9de1a19411168cb136 SHA1 05337c3b3bf9f6f149960e950a2c8a9656923dc1 SHA256 3312d3f11221a69f517c33170a08d8133d47efb25ba0dc31f81a36548f083f3b
+MISC ChangeLog 58881 RMD160 dff1d8dd63eaa113359f3b021948487d2e3b5ea1 SHA1 375b08cf0528db5f219eec9b03b723f2533c5000 SHA256 b70612e9ed56a7459b2d6105966d1676e512afb3ea87752e21328f399d05254d
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkukFDYACgkQTwhj9JtAlp7V4gEAxR7MFxkUCeMXvKXkqMIi5QnT
+Z3raPPev6w+wjvTr3UsBALGCfgZxM0wvLFB5d9pydP0f1H1yf5ibabYeRbhuILcz
+=wYIJ
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openssh/openssh-5.3_p1-r1.ebuild b/net-misc/openssh/openssh-5.3_p1-r1.ebuild
index 7774f800cf4551745fc68dbf2cc16024ba14fc38..ec59ec872de96f738b5de0db7be65478b5821465 100644 (file)
--- a/net-misc/openssh/openssh-5.3_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.3_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.3_p1-r1.ebuild,v 1.9 2010/03/19 19:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.3_p1-r1.ebuild,v 1.10 2010/03/20 00:17:55 vapier Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -160,7 +160,7 @@ src_compile() {
                --with-ssl-engine \
                $(static_use_with pam) \
                $(static_use_with kerberos kerberos5 /usr) \
-               ${LDAP_PATCH:+$(use ldap && use_with ldap)} \
+               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
                $(use_with libedit) \
                ${PKCS11_PATCH:+$(use pkcs11 && static_use_with pkcs11)} \
                $(use_with selinux) \

diff --git a/net-misc/openssh/openssh-5.4_p1.ebuild b/net-misc/openssh/openssh-5.4_p1.ebuild
index 198967fd51f08b49295b7a1e5c9032cf46bcbbcf..615851451ebb5d905e2698d4c5bd9c12010a1406 100644 (file)
--- a/net-misc/openssh/openssh-5.4_p1.ebuild
+++ b/net-misc/openssh/openssh-5.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.2 2010/03/13 01:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.3 2010/03/20 00:17:55 vapier Exp $
 
 inherit eutils flag-o-matic multilib autotools pam
 
@@ -131,7 +131,7 @@ src_compile() {
                --with-ssl-engine \
                $(static_use_with pam) \
                $(static_use_with kerberos kerberos5 /usr) \
-               ${LDAP_PATCH:+$(use ldap && use_with ldap)} \
+               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
                $(use_with libedit) \
                $(use_with selinux) \
                $(use_with skey) \