Update version. Fix bugs #27706 and #28736.

5 files changed, 129 insertions, 4 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 97d625b7381e..a63f069961d5 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.23 2003/07/18 20:40:13 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.24 2003/09/25 03:59:08 azarah Exp $
+
+*pam-login-3.12 (25 Sep 2003)
+
+  25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.12.ebuild,
+  files/pam-login-3.11-lastlog-fix.patch:
+  Add version 3.12 to fix bug #27706 (fails to auth if credentials are
+  required). Add pam-login-3.11-lastlog-fix.patch to fix bug #28736, thanks to
+  bartron <bartron@gmx.net> (prints tty used wrong with lastlog).
 
   18 Jul 2003; Olivier Crete <tester@gentoo.org> pam-login-3.11-r1.ebuild,
   pam-login-3.11.ebuild:
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index 806410ed37c2..a663e96b2354 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,11 +1,10 @@
-MD5 036e04793e4d1bd1dee4f21403f14437 pam-login-3.12.ebuild 2584
+MD5 63e5d559306c9ac6565420ad3e67e0ef pam-login-3.12.ebuild 2598
 MD5 4e8328615b4be73c2edead03f8e03a9a pam-login-3.11.ebuild 2286
 MD5 13075ff52d9b0a7e91d424096286c570 pam-login-3.6-r1.ebuild 1833
-MD5 ac84e9097c680d83da7a9737a06371a8 ChangeLog 3157
+MD5 72cdc3efee7918e740beba1ef0dc6fa1 ChangeLog 3522
 MD5 ef65801f8ddff5ab3d3414df10191093 pam-login-3.7.ebuild 1983
 MD5 4277c8c7e9488f7d4b83945c2dc9f916 pam-login-3.6-r2.ebuild 1935
 MD5 ecd4297984744a8212898a88025c2945 pam-login-3.11-r1.ebuild 2530
-MD5 156d4d3e3d7dbb976e8ab92b41b3a124 .pam-login-3.12.ebuild.swp 12288
 MD5 363daa32525ee949f2294e752e55709c pam-login-3.10.ebuild 1988
 MD5 a5e9be8a38e1b8f784d3cf558cff7a6b files/digest-pam-login-3.10 67
 MD5 7febd6315d85fcd5196b602732789573 files/digest-pam-login-3.7 66
diff --git a/sys-apps/pam-login/files/digest-pam-login-3.12 b/sys-apps/pam-login/files/digest-pam-login-3.12
new file mode 100644
index 000000000000..1b6eb21d2573
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-3.12
@@ -0,0 +1 @@
+MD5 125b2dec1043a8e7f867514282ff2588 pam_login-3.12.tar.bz2 138742
diff --git a/sys-apps/pam-login/files/pam-login-3.11-lastlog-fix.patch b/sys-apps/pam-login/files/pam-login-3.11-lastlog-fix.patch
new file mode 100644
index 000000000000..7593984caf86
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-3.11-lastlog-fix.patch
@@ -0,0 +1,13 @@
+--- pam_login-3.11/src/login.c.orig	2003-05-12 15:44:45.000000000 +0200
++++ pam_login-3.11/src/login.c	2003-09-14 13:23:02.000000000 +0200
+@@ -662,8 +662,8 @@
+       opentty (ttyn);
+       tcsetattr (0, TCSAFLUSH, &tt);
+ 
+-      if ((tty = strrchr (ttyn, '/')))
+-	++tty;
++      if (!strncmp (ttyn, "/dev/", 5))
++	tty = ttyn + 5;
+       else
+ 	tty = ttyn;
+     }
diff --git a/sys-apps/pam-login/pam-login-3.12.ebuild b/sys-apps/pam-login/pam-login-3.12.ebuild
new file mode 100644
index 000000000000..c4887d096b58
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-3.12.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.12.ebuild,v 1.1 2003/09/25 03:59:08 azarah Exp $
+
+
+inherit gnuconfig
+
+IUSE="nls selinux"
+
+# Do we want to backup an old login.defs, and forcefully
+# install a new version?
+FORCE_LOGIN_DEFS="no"
+
+MY_PN="${PN/pam-/pam_}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+DESCRIPTION="Based on the sources from util-linux, with added pam and shadow features"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/pam/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+HOMEPAGE="http://www.thkukuk.de/pam/pam_login/"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	sys-libs/pam
+	>=sys-apps/shadow-4.0.2-r5
+	selinux? ( >=sys-apps/selinux-small-2003011510-r2 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	if use selinux
+	then
+		# Patches for selinux
+		epatch ${FILESDIR}/${PN}-3.11-selinux.diff
+
+		# Do not warn on inlining for gcc-3.3, bug #21213
+		epatch ${FILESDIR}/${PN}-3.11-selinux-gcc33.patch
+	else
+		# Do not warn on inlining for gcc-3.3, bug #21213
+		epatch ${FILESDIR}/${PN}-3.11-gcc33.patch
+	fi
+
+	epatch ${FILESDIR}/pam-login-3.11-lastlog-fix.patch
+}
+
+src_compile() {
+
+	# Fix configure scripts to recognize linux-mips
+	# (imports updated config.sub and config.guess)
+	gnuconfig_update
+
+	local myconf=
+	use nls ||myconf="--disable-nls"
+
+	econf ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	einstall rootexecbindir=${D}/bin || die
+
+	insinto /etc
+	insopts -m0644
+
+	doins ${FILESDIR}/login.defs
+	# Also install another one that we can use to check if
+	# we need to update it if FORCE_LOGIN_DEFS = "yes"
+	[ "${FORCE_LOGIN_DEFS}" = "yes" ] \
+		&& newins ${FILESDIR}/login.defs login.defs.new
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	rm -f ${ROOT}/etc/login.defs.new
+}
+
+pkg_postinst() {
+	[ "${FORCE_LOGIN_DEFS}" != "yes" ] && return 0
+
+	ewarn "Due to a compatibility issue, ${ROOT}etc/login.defs "
+	ewarn "is being updated automatically. Your old login.defs"
+	ewarn "will be backed up as:  ${ROOT}etc/login.defs.bak"
+	echo
+
+	local CHECK1="`md5sum ${ROOT}/etc/login.defs | cut -d ' ' -f 1`"
+	local CHECK2="`md5sum ${ROOT}/etc/login.defs.new | cut -d ' ' -f 1`"
+
+	if [ "${CHECK1}" != "${CHECK2}" ]
+	then
+		cp -a ${ROOT}/etc/login.defs ${ROOT}/etc/login.defs.bak
+		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
+	elif [ ! -f ${ROOT}/etc/login.defs ]
+	then
+		mv -f ${ROOT}/etc/login.defs.new ${ROOT}/etc/login.defs
+	else
+		rm -f ${ROOT}/etc/login.defs.new
+	fi
+}
+