Fix building with --as-needed #148538 by Mart Raudsepp.

Package-Manager: portage-2.1.2_pre1

4 files changed, 36 insertions, 13 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 462bab146575..b3f6ab4fa396 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.192 2006/09/23 02:27:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.193 2006/09/23 04:57:43 vapier Exp $
+
+  23 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-4.3_p2-opensc-libs.patch, openssh-4.3_p2-r4.ebuild:
+  Fix building with --as-needed #148538 by Mart Raudsepp.
 
   23 Sep 2006; Mike Frysinger <vapier@gentoo.org>
   +files/openssh-4.3_p2-ldap-updates.patch, openssh-4.3_p2-r4.ebuild:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 8db0dd7fd69d..b3603d5ccae2 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -97,6 +97,10 @@ AUX openssh-4.3_p2-ldap-updates.patch 250 RMD160 d6a47a8b903b9f0d253e36d973ca321
 MD5 b4d2402771889dac23aeffa9552fc0de files/openssh-4.3_p2-ldap-updates.patch 250
 RMD160 d6a47a8b903b9f0d253e36d973ca3213a5055144 files/openssh-4.3_p2-ldap-updates.patch 250
 SHA256 c6488e24af00fc0baf43ab1f8b25ebb3b8cb9bc946d7f219b92b1686b08566d8 files/openssh-4.3_p2-ldap-updates.patch 250
+AUX openssh-4.3_p2-opensc-libs.patch 431 RMD160 98cfb8260471e15a33ef028d751cc04240887f4d SHA1 f80822ce21ad9503b7936141bf8ead52258b895b SHA256 7c65f09ca072f4240a7bf9b3f83d2d25adc0ea14658830dca88b4543631ddf65
+MD5 27d18938f3137f9fcfb814e5c0028a6c files/openssh-4.3_p2-opensc-libs.patch 431
+RMD160 98cfb8260471e15a33ef028d751cc04240887f4d files/openssh-4.3_p2-opensc-libs.patch 431
+SHA256 7c65f09ca072f4240a7bf9b3f83d2d25adc0ea14658830dca88b4543631ddf65 files/openssh-4.3_p2-opensc-libs.patch 431
 AUX openssh-4.3_p2-securid-hpn-glue.patch 1731 RMD160 47eb05afaf9e0f27d4d838dd32ad36ca13ae494f SHA1 9bb463592299564c8bf6064acb15693cb6486cbf SHA256 7cafbe9c840878561e5692a810a9f503a3f5a02f39f674801c8d7858166fdc4d
 MD5 aa56fc6ed586b9c51b652e39dc034986 files/openssh-4.3_p2-securid-hpn-glue.patch 1731
 RMD160 47eb05afaf9e0f27d4d838dd32ad36ca13ae494f files/openssh-4.3_p2-securid-hpn-glue.patch 1731
@@ -196,14 +200,14 @@ EBUILD openssh-4.3_p2-r3.ebuild 5744 RMD160 f6e4806a26fc0510f7c45284ada5dce74644
 MD5 94e3cad88d80a60890dfdcbff1eec01d openssh-4.3_p2-r3.ebuild 5744
 RMD160 f6e4806a26fc0510f7c45284ada5dce746441633 openssh-4.3_p2-r3.ebuild 5744
 SHA256 18f263b594dfc74d2760fde44f7f994323450a85fd95bcb61fb0631778b7d517 openssh-4.3_p2-r3.ebuild 5744
-EBUILD openssh-4.3_p2-r4.ebuild 5871 RMD160 ccafc1b3ff6f94a80135512322c7c8d101a2dad9 SHA1 ac45e697dad6e35d18acd08c29619ec4b347adcc SHA256 3fa96e4cb774826e3fb1de7e24d1bad357754ecbb66764fe7f3d34eff798f499
-MD5 436d140968302fb3d09bd072abde074f openssh-4.3_p2-r4.ebuild 5871
-RMD160 ccafc1b3ff6f94a80135512322c7c8d101a2dad9 openssh-4.3_p2-r4.ebuild 5871
-SHA256 3fa96e4cb774826e3fb1de7e24d1bad357754ecbb66764fe7f3d34eff798f499 openssh-4.3_p2-r4.ebuild 5871
-MISC ChangeLog 31279 RMD160 add53b947d71ae6374f574b6653132a3e965fcf7 SHA1 44eaf7c7abf98f657cd3252c47da77e28ad0c5ec SHA256 79d3ac88cc7bd27d95a0a5208654739d6c5e7685282fb54f384b6fb6eb434145
-MD5 aa80337bb6fd67a4f0b03796a4e2a352 ChangeLog 31279
-RMD160 add53b947d71ae6374f574b6653132a3e965fcf7 ChangeLog 31279
-SHA256 79d3ac88cc7bd27d95a0a5208654739d6c5e7685282fb54f384b6fb6eb434145 ChangeLog 31279
+EBUILD openssh-4.3_p2-r4.ebuild 5934 RMD160 e44e2561272b200819d361f0c6493f84c6a3c44d SHA1 e3f6d80dd255c91d155ed5cc528c9fd10d0a61d2 SHA256 5e987d9eb067aeafdfe11d5ec5b62c0f8e0240a777e07d113da971e9da21fe4d
+MD5 ddd4e3242333ceb0f8f44ba5daa690a2 openssh-4.3_p2-r4.ebuild 5934
+RMD160 e44e2561272b200819d361f0c6493f84c6a3c44d openssh-4.3_p2-r4.ebuild 5934
+SHA256 5e987d9eb067aeafdfe11d5ec5b62c0f8e0240a777e07d113da971e9da21fe4d openssh-4.3_p2-r4.ebuild 5934
+MISC ChangeLog 31457 RMD160 3ab86099c6fbb821e58f35bc4f9bf054e8db60ea SHA1 eb24e1fd29efbcf5993ffa1f978a90677b84db80 SHA256 3738aedba6804fcdb3093c3b99d80a20fd00689813b01475a714a1350680fbe6
+MD5 7a724c17cb0b478069de01d0f8b33c13 ChangeLog 31457
+RMD160 3ab86099c6fbb821e58f35bc4f9bf054e8db60ea ChangeLog 31457
+SHA256 3738aedba6804fcdb3093c3b99d80a20fd00689813b01475a714a1350680fbe6 ChangeLog 31457
 MISC metadata.xml 1287 RMD160 9be6778c10712b2613792647256f309898f52828 SHA1 38d05973334ed37cb9ee3778df3cf3b1369b6b81 SHA256 fbd731005f40dec6baf09aae0ba15a994e1ae448f4aa70ecd078db4b1a2feda3
 MD5 d536c311ded25994241e9708f293c9f7 metadata.xml 1287
 RMD160 9be6778c10712b2613792647256f309898f52828 metadata.xml 1287
@@ -238,7 +242,7 @@ SHA256 a02a26ccb3fdf24c5b0a7196af3bb5273e61193f91fa383d479dc9e0e959630c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFFJutamhnQswr0vIRAr54AJ0cXh2a5ptnvSCJA90qbzT0hqQvVQCdFBrU
-2GBaEULZW8XLpekEkw9y5CA=
-=LdlA
+iD8DBQFFFL7YamhnQswr0vIRAqomAJ9XA9Xi/q3+PmiQJbePmgVqb3GlDACfRv0Z
+DmcYgwMe/3fDeS1QrmCwXC8=
+=RQ/3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch b/net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch
new file mode 100644
index 000000000000..8eb8ff823069
--- /dev/null
+++ b/net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/148538
+http://bugzilla.mindrot.org/show_bug.cgi?id=1234
+
+--- openssh/configure
++++ openssh/configure
+@@ -3086,7 +3086,7 @@ AC_ARG_WITH(opensc,
+ 			LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
+ 			LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`
+ 			CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS"
+-			LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS"
++			LIBS="$LIBS $LIBOPENSC_LIBS"
+ 			cat >>confdefs.h <<\_ACEOF
+ #define SMARTCARD 1
+ _ACEOF
diff --git a/net-misc/openssh/openssh-4.3_p2-r4.ebuild b/net-misc/openssh/openssh-4.3_p2-r4.ebuild
index b10a21ceb72e..fc632bd2ede4 100644
--- a/net-misc/openssh/openssh-4.3_p2-r4.ebuild
+++ b/net-misc/openssh/openssh-4.3_p2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r4.ebuild,v 1.2 2006/09/23 02:27:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r4.ebuild,v 1.3 2006/09/23 04:57:43 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/openssh-4.3_p2-identical-simple-dos.patch #148228
 	epatch "${FILESDIR}"/openssh-4.3_p2-configure.patch #137921
 	epatch "${FILESDIR}"/openssh-4.3_p1-krb5-typos.patch #124494
+	epatch "${FILESDIR}"/openssh-4.3_p2-opensc-libs.patch #148538
 	use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch
 	use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2
 	use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch