diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-10-31 17:54:05 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-10-31 17:54:05 +0000 |
commit | 68482984d39e65efb43c7f1b37b6ead18447c313 (patch) | |
tree | 48116aebd1174e7f53e301060d111b6cba2b25ae /sys-auth/pam_ssh | |
parent | sparc stable wrt #341623 (diff) | |
download | gentoo-2-68482984d39e65efb43c7f1b37b6ead18447c313.tar.gz gentoo-2-68482984d39e65efb43c7f1b37b6ead18447c313.tar.bz2 gentoo-2-68482984d39e65efb43c7f1b37b6ead18447c313.zip |
Finally fix bug #266603; thanks to Kevin Lyles for reporting, and the anonymous user for the patch.
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth/pam_ssh')
-rw-r--r-- | sys-auth/pam_ssh/ChangeLog | 9 | ||||
-rw-r--r-- | sys-auth/pam_ssh/files/pam_ssh-1.97-EOF.patch | 11 | ||||
-rw-r--r-- | sys-auth/pam_ssh/pam_ssh-1.97-r3.ebuild | 53 |
3 files changed, 72 insertions, 1 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/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." +} |