Add patch to avoid doublefree, thanks to TGL in bug #279538.

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

4 files changed, 79 insertions, 5 deletions

diff --git a/sys-auth/pam_ssh/ChangeLog b/sys-auth/pam_ssh/ChangeLog
index b1eed42a239e..642a71607ed0 100644
--- a/sys-auth/pam_ssh/ChangeLog
+++ b/sys-auth/pam_ssh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pam_ssh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v 1.29 2009/07/29 21:16:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_ssh/ChangeLog,v 1.30 2009/08/01 22:45:38 flameeyes Exp $
+
+*pam_ssh-1.97-r1 (01 Aug 2009)
+
+  01 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pam_ssh-1.97-r1.ebuild, +files/pam_ssh-1.97-doublefree.patch:
+  Add patch to avoid doublefree, thanks to TGL in bug #279538.
 
   29 Jul 2009; Markus Meier <maekke@gentoo.org> pam_ssh-1.97.ebuild:
   amd64/x86 stable, bug #263579
diff --git a/sys-auth/pam_ssh/Manifest b/sys-auth/pam_ssh/Manifest
index d8e189bf9ee0..2bdc072e0f62 100644
--- a/sys-auth/pam_ssh/Manifest
+++ b/sys-auth/pam_ssh/Manifest
@@ -4,17 +4,19 @@ Hash: SHA1
 AUX pam_ssh-1.91-debian.patch 13855 RMD160 35cea4b64425351e94f8e5ec4689f17cb97332e7 SHA1 28bbab2ba09356520b571990fc03b0c182bf135e SHA256 a64647467fb05b71a08fe718d371e62356ad8bbf7b7f5a7bc4827b08ca5c91cf
 AUX pam_ssh-1.91-openssl-0.9.8.patch 291 RMD160 f8cbc5831b4286f688f336ece32b7003a937cf4b SHA1 def422cb326165107ad9a4e347724284ae1abe30 SHA256 0e4b3bbd14b874bd9999f92cc2b4358f95e458654e0cc3bcc755790cbcdfea1d
 AUX pam_ssh-1.91-syslog.patch 308 RMD160 f06a704155b76052bdd536e8b27a579cf9d0a4bb SHA1 2f80221a9a804e8da777179dc0768dbc73a7fb65 SHA256 b581d3422f93a8de7cd8b7dbc23c58da133eb63127059e6ff0b1f3e93e63a802
+AUX pam_ssh-1.97-doublefree.patch 975 RMD160 45e10e818eea022e3990acaefd6f54aa2edf21f7 SHA1 193ccf9442506f2b98f07c794858c9aff85452df SHA256 035b20e4cfc0e723166c44414216ed4234d130877f9d717c905c5f1697421df0
 AUX system-auth.example 612 RMD160 ffbcbc7535cd654c5a9e8ce2d3584b841aea6e53 SHA1 f90c19c81821789fe16a200320792887b8680c44 SHA256 3699db4595de56f31448c85a83c34277d1bebb5c805871b1c449446a49fb1989
 DIST pam_ssh-1.92.tar.bz2 260444 RMD160 d7121ab89baaec82853758449f84429a387fee0e SHA1 33f537343fa4435717cbf83db52d19c6eed9a35e SHA256 d98f4698f692d46996b3845c2164528c8ad82f112df1c42abe7b8ebb2b133362
 DIST pam_ssh-1.97.tar.bz2 200184 RMD160 bc36f34fdf9ed545b8c52c7072e3f759a61527ce SHA1 ed5e529e94b754cb88dc64da4be397f046612fd0 SHA256 10233b0d3e480fdc977d4e3a1ea5a994cf1f257c3b948650a86e4d753796789d
 EBUILD pam_ssh-1.92.ebuild 1215 RMD160 1489eb768160f2036fcb8d834200449e4278924d SHA1 7b2835c4a1e9fffb79b313c18eab5f6ff7409c77 SHA256 fc366eb514c2acb3db0d753088274c2ea0a1e11973d62dfb9187f15700ba6f57
+EBUILD pam_ssh-1.97-r1.ebuild 1143 RMD160 fa149ecdc866a3e18ccd112197f9330af0b92139 SHA1 36cb66977a9f4d09dd972f5742dabed24a7749fa SHA256 d268a20b8727adcf6cdb4050e44ca2a4f5e559d36abc76e73c827b671d32682e
 EBUILD pam_ssh-1.97.ebuild 1090 RMD160 94403c76c8e0e3f575501dc8f7174fb135e24d0f SHA1 a28ba94075d59906d046d04d6effac0817e6b689 SHA256 6a760e0ac0d0f48b438fac657814c7ce2685df15cb9fd9301c3b8e720172e09d
-MISC ChangeLog 4964 RMD160 57dda279f034b6d7c084da8179cc195ee9838eca SHA1 b92f59875117730edbcf70f633c157dd4436207e SHA256 a733404d9e605067273638074cffee51b696873c825f423f7175e16099ea9f49
+MISC ChangeLog 5184 RMD160 068bf751d37a1dd34e096b5ae3ec252c4ee4d4eb SHA1 49989159d9cb910d2380733da7351e741de19bb8 SHA256 0a13f66b75f0c3d8397e581f594cd9c37393fce2e99cb5b05a4ccc80722e4715
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpwvEYACgkQkKaRLQcq0GIlVwCcCmsGeYwuNV30rMUL3ugz9dc7
-Mc8An1Waef4/XZ6wRoxqcXBXQh1zqMMF
-=l1ph
+iEYEARECAAYFAkp0xZgACgkQAiZjviIA2Xjb+QCgkz1F+aP9NVdysvoiABCZJ4jj
+CBoAoJdySHEeOo8BiMx9Z/mxjamGYLyc
+=QlC8
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_ssh/files/pam_ssh-1.97-doublefree.patch b/sys-auth/pam_ssh/files/pam_ssh-1.97-doublefree.patch
new file mode 100644
index 000000000000..2f63ff8bdcb0
--- /dev/null
+++ b/sys-auth/pam_ssh/files/pam_ssh-1.97-doublefree.patch
@@ -0,0 +1,20 @@
+--- pam_ssh-1.97/pam_ssh.c.orig	2009-08-01 20:11:00.000000000 +0200
++++ pam_ssh-1.97/pam_ssh.c	2009-08-01 20:11:16.000000000 +0200
+@@ -627,7 +627,7 @@
+              * than the file creation time */
+             if (retval = stat(per_agent, &stat_buf)) {
+                 pam_ssh_log(LOG_ERR, "stat() failed on %s", per_agent);
+-                free(per_agent);
++                pam_set_data(pamh, "ssh_agent_env_agent", NULL, NULL);
+                 fclose(env_read);
+                 return retval;
+             }
+@@ -646,7 +646,7 @@
+ 	if (start_agent) {
+                 if ((env_write = open(per_agent, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR)) < 0) {
+                         pam_ssh_log(LOG_ERR, "can't write to %s", per_agent);
+-                        free(per_agent);
++                        pam_set_data(pamh, "ssh_agent_env_agent", NULL, NULL);
+                         openpam_restore_cred(pamh);
+                         return PAM_SERVICE_ERR;
+                 }
diff --git a/sys-auth/pam_ssh/pam_ssh-1.97-r1.ebuild b/sys-auth/pam_ssh/pam_ssh-1.97-r1.ebuild
new file mode 100644
index 000000000000..cfedb31b0ccc
--- /dev/null
+++ b/sys-auth/pam_ssh/pam_ssh-1.97-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/08/01 22:45:38 flameeyes Exp $
+
+EAPI=2
+
+inherit pam autotools
+
+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"
+IUSE=""
+
+# Doesn't work on OpenPAM.
+DEPEND="sys-libs/pam
+	sys-devel/libtool"
+
+RDEPEND="sys-libs/pam
+	virtual/ssh"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-doublefree.patch"
+	eautoreconf
+}
+
+src_configure() {
+	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."
+}