Erase cleartext passwords from memory, fixes security bug 482588, CVE-2013-4285. Committing with stable keywords, thanks to Agostino Sarubbo for testing on amd64 and x86. Remove vulnerable versions.

(Portage version: 2.2.1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 13 insertions, 51 deletions

diff --git a/sys-auth/pam_skey/ChangeLog b/sys-auth/pam_skey/ChangeLog
index 8f6cf3ba0df4..4a8ce80ce6c8 100644
--- a/sys-auth/pam_skey/ChangeLog
+++ b/sys-auth/pam_skey/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pam_skey
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/ChangeLog,v 1.23 2013/08/26 16:32:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/ChangeLog,v 1.24 2013/08/28 06:00:25 ulm Exp $
+
+*pam_skey-1.1.5-r5 (28 Aug 2013)
+
+  28 Aug 2013; Ulrich Müller <ulm@gentoo.org> -pam_skey-1.1.5-r3.ebuild,
+  -pam_skey-1.1.5-r4.ebuild, +pam_skey-1.1.5-r5.ebuild:
+  Erase cleartext passwords from memory, fixes security bug 482588,
+  CVE-2013-4285. Committing with stable keywords, thanks to Agostino Sarubbo
+  for testing on amd64 and x86. Remove vulnerable versions.
 
 *pam_skey-1.1.5-r4 (26 Aug 2013)
 
@@ -90,6 +98,6 @@
   16 Jan 2008; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
   +pam_skey-1.1.4.ebuild:
   Import from Sunrise overlay. Original ebuild and patch contributed by
-  Dani Church <dani.church@gmail.com>, Jakub Moc <jakub@gentoo.org> and	me,
+  Dani Church <dani.church@gmail.com>, Jakub Moc <jakub@gentoo.org> and me,
   bug 55279.
 
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r3.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r3.ebuild
deleted file mode 100644
index 3b095a10d4c2..000000000000
--- a/sys-auth/pam_skey/pam_skey-1.1.5-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/pam_skey-1.1.5-r3.ebuild,v 1.3 2012/03/24 16:55:05 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils pam autotools multilib
-
-DESCRIPTION="PAM interface for the S/Key authentication system"
-HOMEPAGE="http://freshmeat.net/projects/pam_skey/"
-SRC_URI="http://dkorunic.net/tarballs/${P}.tar.gz
-	mirror://gentoo/${P}-patches-4.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/pam-0.78-r3
-	>=sys-auth/skey-1.1.5-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS="README INSTALL"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-
-	cd autoconf
-	eautoconf
-	eautoheader
-	mv configure defs.h.in .. || die "mv failed"
-}
-
-src_configure() {
-	econf --libdir="/$(get_libdir)" CFLAGS="${CFLAGS} -fPIC"
-}
-
-pkg_postinst() {
-	elog "To use this, you need to add a line like:"
-	elog
-	elog "auth       [success=done ignore=ignore auth_err=die default=bad] pam_skey.so"
-	elog
-	elog "to an appropriate place in /etc/pam.d/system-auth"
-	elog "Consult the documentation for instructions."
-}
diff --git a/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild b/sys-auth/pam_skey/pam_skey-1.1.5-r5.ebuild
index 69e5ceceedd1..5e4986c8f459 100644
--- a/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild
+++ b/sys-auth/pam_skey/pam_skey-1.1.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/pam_skey-1.1.5-r4.ebuild,v 1.1 2013/08/26 16:32:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_skey/pam_skey-1.1.5-r5.ebuild,v 1.1 2013/08/28 06:00:25 ulm Exp $
 
 EAPI=5
 
@@ -9,11 +9,11 @@ inherit eutils pam autotools multilib readme.gentoo
 DESCRIPTION="PAM interface for the S/Key authentication system"
 HOMEPAGE="http://freshmeat.net/projects/pam_skey/"
 SRC_URI="http://dkorunic.net/tarballs/${P}.tar.gz
-	mirror://gentoo/${P}-patches-5.tar.xz"
+	mirror://gentoo/${P}-patches-6.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/pam-0.78-r3
 	>=sys-auth/skey-1.1.5-r4"