Fixed building with --as-needed, thanks to marienz for the help (bug #363151)

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 42 insertions, 9 deletions

diff --git a/sys-auth/pam_ssh_agent_auth/ChangeLog b/sys-auth/pam_ssh_agent_auth/ChangeLog
index 33e515e642c2..a5ecc58bd6a6 100644
--- a/sys-auth/pam_ssh_agent_auth/ChangeLog
+++ b/sys-auth/pam_ssh_agent_auth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/pam_ssh_agent_auth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh_agent_auth/ChangeLog,v 1.1 2011/02/05 22:35:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh_agent_auth/ChangeLog,v 1.2 2011/04/12 07:23:32 angelos Exp $
+
+  12 Apr 2011; Christoph Mende <angelos@gentoo.org>
+  pam_ssh_agent_auth-0.9.2.ebuild, +files/pam_ssh_agent_auth-0.9.2-libs.patch:
+  Fixed building with --as-needed, thanks to marienz for the help (bug #363151)
 
 *pam_ssh_agent_auth-0.9.2 (05 Feb 2011)
 
diff --git a/sys-auth/pam_ssh_agent_auth/Manifest b/sys-auth/pam_ssh_agent_auth/Manifest
index 4f1eef523810..e41f4c7399ef 100644
--- a/sys-auth/pam_ssh_agent_auth/Manifest
+++ b/sys-auth/pam_ssh_agent_auth/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX pam_ssh_agent_auth-0.9.2-libs.patch 1314 RMD160 6d346036612abfff5303ea60673974290ab71c96 SHA1 a04917421a731e7e9eee46415337b4d5a65ae91b SHA256 cf0df8ce67d80a7ca569e1066c9a30aeff733a651386ab46f8d5fcfef4e5ec86
 DIST pam_ssh_agent_auth-0.9.2.tar.bz2 237156 RMD160 2ef2a4dbb1f3115751f596629c0518e65500cdf4 SHA1 0f3d9455a8f983907cfad293105cfb16c4a08a0a SHA256 76c80b6482ea5d03e1f33514f30ac77cd56e2fc8cb233a470562686df7426f4b
-EBUILD pam_ssh_agent_auth-0.9.2.ebuild 926 RMD160 cbf9b4acba5461a5261134f29217a90e4d13ae53 SHA1 933f01fc968fdc45efe017d593c15ddf4c6b1fb3 SHA256 549ee69fe4b6e4e7666bcb2937ef616cebc044b932ddf73fb2013432529a9086
-MISC ChangeLog 463 RMD160 a0d810f8f03d29a05b28cfa0b7d63c83fafd5d9d SHA1 1646e03f454c819b5bbb10f814587c8d850193c8 SHA256 3ef8bdb537a6e7a1157119fdc31577dd37d5ef22c2c17ff310c396e5efb57cee
+EBUILD pam_ssh_agent_auth-0.9.2.ebuild 988 RMD160 0960765edb199348fef931fc435e0afddc5e4c81 SHA1 8e10b6219b633eb0134414a6771b3518548bb834 SHA256 35652c82ddb39c1de2962b681635204923f2715682c27c93f93019bc4715e5fc
+MISC ChangeLog 673 RMD160 2540602fb608ac1801197cad9ce4c51453d2d48c SHA1 ae3626315893e58e04bf2dcbca1be3bf8121bb5a SHA256 adb739b3c73cf77c7239e5946d46dd1ca48d44853c0dcb00f10881e87c66ab76
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1N0KgACgkQAiZjviIA2XhmiQCeJd/p3eNoX5ReUAxhwfwjY9BS
-rmwAoNAFm4xa/d7d05cFkG2xK5c4ljxb
-=nRz1
+iF4EAREIAAYFAk2j/egACgkQmWq1bYTyC0PvpwEAgI6PxOPAslnxISkJeZKHzase
+L6TQVU9pzyOFMdrEaFQA/3VpNzE6XprqZvIDHgRUc+HoSAvl+4QbcUl6ny2gYDHL
+=9DHU
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch
new file mode 100644
index 000000000000..3e259761a2e2
--- /dev/null
+++ b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile.in b/Makefile.in
+index 3428c51..4b5ea8a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -48,7 +48,7 @@ PAM_MODULES=pam_ssh_agent_auth.so
+ 
+ SSHOBJS=xmalloc.o atomicio.o authfd.o bufaux.o bufbn.o buffer.o cleanup.o entropy.o fatal.o key.o log.o misc.o secure_filename.o ssh-dss.o ssh-rsa.o uuencode.o compat.o
+ 
+-PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o
++PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o pam_ssh_agent_auth.o
+ 
+ 
+ MANPAGES_IN	= pam_ssh_agent_auth.pod
+@@ -72,8 +72,8 @@ $(LIBCOMPAT): always
+ 	(cd openbsd-compat && $(MAKE))
+ always:
+ 
+-pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)  pam_ssh_agent_auth.o
+-	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam pam_ssh_agent_auth.o
++pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)
++	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam
+ 
+ $(MANPAGES): $(MANPAGES_IN)
+ 	pod2man --section=8 --release=v0.8 --name=pam_ssh_agent_auth --official --center "PAM" pam_ssh_agent_auth.pod > pam_ssh_agent_auth.8
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
index 4083023e9ad6..a9d65da3d137 100644
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
+++ b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild,v 1.1 2011/02/05 22:35:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild,v 1.2 2011/04/12 07:23:32 angelos Exp $
 
 EAPI=4
 
-inherit pam
+inherit eutils pam
 
 DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
 HOMEPAGE="http://pamsshagentauth.sourceforge.net"
@@ -25,6 +25,10 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	dev-lang/perl"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libs.patch
+}
+
 src_configure() {
 	pammod_hide_symbols