Finally fix bug #266603; thanks to Kevin Lyles for reporting, and the anonymous user for the patch.

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

4 files changed, 85 insertions, 2 deletions

diff --git a/sys-auth/pam_ssh/ChangeLog b/sys-auth/pam_ssh/ChangeLog
index f562fd889d70..f6c76be053e7 100644
--- a/sys-auth/pam_ssh/ChangeLog
+++ b/sys-auth/pam_ssh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam_ssh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v 1.43 2010/10/25 03:03:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v 1.44 2010/10/31 17:54:05 flameeyes Exp $
+
+*pam_ssh-1.97-r3 (31 Oct 2010)
+
+  31 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pam_ssh-1.97-r3.ebuild, +files/pam_ssh-1.97-EOF.patch:
+  Finally fix bug #266603; thanks to Kevin Lyles for reporting, and the
+  anonymous user for the patch.
 
   25 Oct 2010; Jeroen Roovers <jer@gentoo.org> pam_ssh-1.97-r2.ebuild:
   Stable for HPPA (bug #339176).
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index 293de6babaa0..77348918d6d1 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pam_ssh-1.97-EOF.patch 433 RMD160 e865de2c707d675a6ddb5dd740ea1a8b08095529 SHA1 42fc05b8d800caa674d1260ef0aef94a4b352cef SHA256 47315060f04fe991e443c9e9bfb8cc072c0d81d901ee6706cd29255ad08e44ac
 AUX pam_ssh-1.97-doublefree.patch 975 RMD160 45e10e818eea022e3990acaefd6f54aa2edf21f7 SHA1 193ccf9442506f2b98f07c794858c9aff85452df SHA256 035b20e4cfc0e723166c44414216ed4234d130877f9d717c905c5f1697421df0
 AUX pam_symbols.ver 35 RMD160 52c7d91bc13dc5ef75ddb26ee2d821743959d880 SHA1 d7a59e17da407b58e1f103e1c1008ee9a86422ee SHA256 3359a9186617879479a4e943a16bc8c69e4d0ab259e6b729f983ca9328616756
 DIST pam_ssh-1.97.tar.bz2 200184 RMD160 bc36f34fdf9ed545b8c52c7072e3f759a61527ce SHA1 ed5e529e94b754cb88dc64da4be397f046612fd0 SHA256 10233b0d3e480fdc977d4e3a1ea5a994cf1f257c3b948650a86e4d753796789d
 EBUILD pam_ssh-1.97-r1.ebuild 1162 RMD160 8d9aa02ec416d7ce8cc66135023e19961e98f09e SHA1 31cc7370e3da00fa36c8caaaad7933be2e870611 SHA256 ba2831a115847e58fdc2e495a6aa31c71f322b2171fe957fc403265ccdadacf6
 EBUILD pam_ssh-1.97-r2.ebuild 1484 RMD160 13019510b784b682efe47ea3e808ac364a119ba7 SHA1 48d3d29ce3b42302e2168856d1d59a1b6206081b SHA256 e611ebd0024f693b493b288812dec2024ade93efc35d64507b9939f9eb0647bb
-MISC ChangeLog 7001 RMD160 e8e64d6db56512f03791079d2427bfdbe3839051 SHA1 25efad950614cb9760d9f6634aedef1350fcd68a SHA256 b3b27ecf90b31efdf5a2ce4cf95a06d96ea874b2fc1b24bb3f2e3d80f844fb32
+EBUILD pam_ssh-1.97-r3.ebuild 1538 RMD160 895c06649188f8c25302bcb30247037b5044bf6b SHA1 9f9ac58693b24de43ae19683ada5dd187efb6ca0 SHA256 b1350e906f25464b7f61c68a10a39c9a7295c41355eecd5b60327853889bb5e8
+MISC ChangeLog 7258 RMD160 4890272783906804a5a988097308f900ffdc2f0b SHA1 cb9c662634d670fd921067f48bb76e1cd19604fe SHA256 402b361f616882948d7142a2026aed4f8a365d3296fe5dfaef6f82a225783b76
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzNrTwACgkQAiZjviIA2XhUKgCeK/5YS64+EWvJBoEc42DVDXZD
+ls8AoONmeuKMQwaDMQ7SDNLWQOlTXWvx
+=UFkg
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_ssh/files/pam_ssh-1.97-EOF.patch b/sys-auth/pam_ssh/files/pam_ssh-1.97-EOF.patch
new file mode 100644
index 000000000000..80214a1df70c
--- /dev/null
+++ b/sys-auth/pam_ssh/files/pam_ssh-1.97-EOF.patch
@@ -0,0 +1,11 @@
+--- pam_ssh-1.92.orig/pam_get_pass.c	2004-02-19 19:59:05.000000000 +0100
++++ pam_ssh-1.92/pam_get_pass.c	2009-04-18 13:51:10.000000000 +0200
+@@ -63,6 +63,8 @@
+ 	retval = conv->conv(1, msgs, &resp, conv->appdata_ptr);
+ 	if (retval != PAM_SUCCESS)
+ 		return retval;
++	if (resp[0].resp == NULL)
++		return PAM_AUTHTOK_RECOVERY_ERR;
+ 	retval = pam_set_item(pamh, PAM_AUTHTOK, resp[0].resp);
+ 	if (retval != PAM_SUCCESS)
+ 		return retval;
diff --git a/sys-auth/pam_ssh/pam_ssh-1.97-r3.ebuild b/sys-auth/pam_ssh/pam_ssh-1.97-r3.ebuild
new file mode 100644
index 000000000000..809c34776d7c
--- /dev/null
+++ b/sys-auth/pam_ssh/pam_ssh-1.97-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/pam_ssh-1.97-r3.ebuild,v 1.1 2010/10/31 17:54:05 flameeyes Exp $
+
+EAPI=2
+
+inherit pam autotools flag-o-matic
+
+DESCRIPTION="Uses ssh-agent to provide single sign-on"
+HOMEPAGE="http://pam-ssh.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.bz2"
+
+LICENSE="BSD as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+# Doesn't work on OpenPAM; looks for OpenSSH at build time (bug
+# #282993) and won't work with other implementations either
+RDEPEND="sys-libs/pam
+	net-misc/openssh"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-doublefree.patch"
+	epatch "${FILESDIR}/${P}-EOF.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# hide all the otherwise-exported symbols that may clash with
+	# other software loading the PAM modules (see bug #274924 as an
+	# example).
+	append-ldflags -Wl,--version-script="${FILESDIR}"/pam_symbols.ver
+
+	econf \
+		"--with-pam-dir=$(getpam_mod_dir)" \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+
+	find "${D}" -name '*.la' -delete || die "Unable to remove libtool archives."
+}
+
+pkg_postinst() {
+	elog "You can enable pam_ssh for system authentication by enabling"
+	elog "the ssh USE flag on sys-auth/pambase."
+}