add ENV_SUPATH support

5 files changed, 109 insertions, 1 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 881ebbc504b4..6465fd083aa0 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.2 2002/05/26 10:34:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.3 2002/06/17 19:34:19 azarah Exp $
+
+*pam-login-3.6-r2 (17 Jun 2002)
+
+  17 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Add ENV_SUPATH support.  Should close bugs #3147, #3643.
 
 *pam-login-3.6 (26 May 2002)
 
diff --git a/sys-apps/pam-login/files/digest-pam-login-3.6-r2 b/sys-apps/pam-login/files/digest-pam-login-3.6-r2
new file mode 100644
index 000000000000..c1e818eeeceb
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-3.6-r2
@@ -0,0 +1 @@
+MD5 80e7f5d92f24b77007dc87104c118ff3 pam_login-3.6.tar.bz2 149061
diff --git a/sys-apps/pam-login/files/login.defs b/sys-apps/pam-login/files/login.defs
index 9e42cfbf1079..c8e087703884 100644
--- a/sys-apps/pam-login/files/login.defs
+++ b/sys-apps/pam-login/files/login.defs
@@ -66,6 +66,11 @@ ENV_PATH                /usr/local/bin:/usr/bin:/bin
 ENV_ROOTPATH            /sbin:/bin:/usr/sbin:/usr/bin
 
 #
+# The default PATH settings when su'ing to root:
+#
+ENV_SUPATH              /sbin:/bin:/usr/sbin:/usr/bin
+
+#
 # Terminal permissions
 #
 #	TTYGROUP	Login tty will be assigned this group ownership.
diff --git a/sys-apps/pam-login/files/pam-login-3.6-SUPATH.patch b/sys-apps/pam-login/files/pam-login-3.6-SUPATH.patch
new file mode 100644
index 000000000000..78d7cf037c67
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-3.6-SUPATH.patch
@@ -0,0 +1,10 @@
+--- pam_login-3.6/src/getdef.c.orig	Mon Jun 17 21:19:47 2002
++++ pam_login-3.6/src/getdef.c	Mon Jun 17 21:21:49 2002
+@@ -56,6 +56,7 @@
+   { "DEFAULT_HOME",		"yes" },
+   { "ENV_PATH",			_PATH_DEFPATH },
+   { "ENV_ROOTPATH",             "/sbin:/bin:/usr/sbin:/usr/bin" },
++  { "ENV_SUPATH",		"/sbin:/bin:/usr/sbin:/usr/bin" },
+   { "FAILLOG_ENAB",		"yes" },
+   { "FAIL_DELAY",               NULL },
+   { "FTMP_FILE",                NULL },
diff --git a/sys-apps/pam-login/pam-login-3.6-r2.ebuild b/sys-apps/pam-login/pam-login-3.6-r2.ebuild
new file mode 100644
index 000000000000..5ae19988b6a0
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-3.6-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.6-r2.ebuild,v 1.1 2002/06/17 19:34:19 azarah Exp $
+
+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/"
+
+DEPEND="virtual/glibc
+	sys-libs/pam
+	>=sys-apps/shadow-4.0.2-r5"
+	
+SLOT="0"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	patch -p1 <${FILESDIR}/${P}-SUPATH.patch || die
+}
+
+src_compile() {
+        
+	local myconf=""
+	use nls || {
+		myconf="--disable-nls"
+		touch ${S}/intl/libintl.h
+	}
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		${myconf} || die
+			
+	emake || die
+}
+
+src_install() {
+	
+	make prefix=${D}/usr \
+		rootexecbindir=${D}/bin \
+		mandir=${D}/usr/share/man \
+		sysconfdir=${D}/etc \
+		install || die
+
+	insinto /etc
+	insopts -m0644
+	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() {
+
+	echo
+	echo "************************************************************"
+	echo "   Due to a compatibility issue, ${ROOT}etc/login.defs "
+	echo "   is being updated automatically. Your old login.defs"
+	echo "   will be backed up as:  ${ROOT}etc/login.defs.bak"
+	echo "************************************************************"
+	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
+}
+