Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047).

Fix building on UCLIBC.

Package-Manager: portage-2.0.51.22-r2

9 files changed, 317 insertions, 13 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 62cfc1e350ab..fa215dc4cb41 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.53 2005/08/01 13:40:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.54 2005/08/03 18:57:22 azarah Exp $
+
+*pam-login-4.0.11.1-r2 (03 Aug 2005)
+
+  03 Aug 2005; Martin Schlemmer <azarah@gentoo.org> files/login.defs-4.0,
+  +files/pam-login-4.0.5-skey.patch, +files/pam-login-4.0.11.1-SUPATH.patch,
+  +files/pam-login-4.0.11.1-ngettext.patch,
+  +files/pam-login-4.0.11.1-uclibc-missing-l64a.patch,
+  +pam-login-4.0.11.1-r2.ebuild:
+  Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047).
+  Fix building on UCLIBC.
 
 *pam-login-4.0.11.1-r1 (01 Aug 2005)
 
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index bf53c712eee7..0f001874f8dd 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,28 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dcdb08f3063aa2ddfdaa38fe69bf20a9 pam-login-4.0.11.1-r1.ebuild 3553
+MD5 54c5710b5ff87e75989f22a5d41245be pam-login-4.0.11.1-r2.ebuild 3940
 MD5 c1a4d7808f13b9eb272ef64bb9266e29 ChangeLog 7716
 MD5 2595d9d5d585309a961d44bb056d46fe pam-login-3.17.ebuild 2876
 MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
 MD5 1d05f0436f1c273d7862099f309afe4d metadata.xml 156
+MD5 e62336f0f353f9235606a9dcbe9b7e34 .pam-login-4.0.11.1-r2.ebuild.swp 20480
 MD5 21df4caf263fa2ed75e574f9a067b72e files/login.defs 3229
 MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
 MD5 128c7d12948df01d7348a7edede0c2fb files/pam-login-3.14-query_user_context.diff 635
-MD5 68c71aba21339235407b7b913885d667 files/login.defs-4.0 6041
+MD5 c87c0968ace90b32753b91f93ad7bab1 files/pam-login-4.0.11.1-uclibc-missing-l64a.patch 1269
+MD5 e69667a1d5dae1183fc9edd70f6f1a98 files/login.defs-4.0 6255
 MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
 MD5 95f7b8980169e81352229bd548909ea7 files/pam-login-4.0.10-fix-configure.patch 579
 MD5 e01e197ed3b6d2ec6ae83d23b33088b8 files/login.pamd-4.0 1019
+MD5 44f064b586ea49c8e2dc1fca8b9e4599 files/pam-login-4.0.11.1-SUPATH.patch 1614
 MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
 MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r1 69
 MD5 2fdbabc344539e9dfd4955c061596a27 files/pam-login-3.17-query_user_context.patch 423
+MD5 450a2289f2a383296ad9af005e46da74 files/pam-login-4.0.11.1-ngettext.patch 1038
 MD5 2e7603feaff187884dd9b1e66601f02b files/login.pamd 382
+MD5 636f233fa173a998195016c3808173d4 files/pam-login-4.0.5-skey.patch 395
+MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r2 69
 MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
 MD5 e7f9dde204926c73a570b344556e4b1e files/digest-pam-login-3.17 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7ieG1ZcsMnZjRyIRArjIAJ0RfV2BzI6ZGobWoU0Sr4cJjzKxqQCfeIGE
-Hfc0bFx3MJ+Vk9YKSPatwt4=
-=E9Zc
------END PGP SIGNATURE-----
diff --git a/sys-apps/pam-login/files/digest-pam-login-4.0.11.1-r2 b/sys-apps/pam-login/files/digest-pam-login-4.0.11.1-r2
new file mode 100644
index 000000000000..797d6633880d
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-4.0.11.1-r2
@@ -0,0 +1 @@
+MD5 e60b7b16128b9e00576073389a0ff1e6 shadow-4.0.11.1.tar.bz2 1056103
diff --git a/sys-apps/pam-login/files/login.defs-4.0 b/sys-apps/pam-login/files/login.defs-4.0
index a59ba6834b26..c173b2ff1fe4 100644
--- a/sys-apps/pam-login/files/login.defs-4.0
+++ b/sys-apps/pam-login/files/login.defs-4.0
@@ -1,7 +1,7 @@
 #
 # /etc/login.defs - Configuration control definitions for the login package.
 #
-#	$Id: login.defs-4.0,v 1.1 2005/08/01 11:48:13 azarah Exp $
+#	$Id: login.defs-4.0,v 1.2 2005/08/03 18:57:22 azarah Exp $
 #
 # Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
 # If unspecified, some arbitrary (and possibly incorrect) value will
@@ -78,6 +78,13 @@ HUSHLOGIN_FILE	.hushlogin
 #HUSHLOGIN_FILE	/etc/hushlogins
 
 #
+# *REQUIRED*  The default PATH settings, for superuser and normal users.
+#
+# (they are minimal, add the rest in the shell startup files)
+ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ENV_PATH	PATH=/bin:/usr/bin
+
+#
 # Terminal permissions
 #
 #	TTYGROUP	Login tty will be assigned this group ownership.
diff --git a/sys-apps/pam-login/files/pam-login-4.0.11.1-SUPATH.patch b/sys-apps/pam-login/files/pam-login-4.0.11.1-SUPATH.patch
new file mode 100644
index 000000000000..7cbb8b73f8c2
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.11.1-SUPATH.patch
@@ -0,0 +1,45 @@
+diff -urp shadow-4.0.11.1/lib/getdef.c shadow-4.0.11.1.az/lib/getdef.c
+--- shadow-4.0.11.1/lib/getdef.c	2005-07-12 20:54:39.000000000 +0200
++++ shadow-4.0.11.1.az/lib/getdef.c	2005-08-03 20:35:10.000000000 +0200
+@@ -61,9 +61,7 @@ static struct itemdef def_table[] = {
+ 	{"CHSH_AUTH", NULL},
+ 	{"CRACKLIB_DICTPATH", NULL},
+ 	{"ENV_HZ", NULL},
+-	{"ENV_PATH", NULL},
+ 	{"ENV_ROOTPATH", NULL},	/* SuSE compatibility? */
+-	{"ENV_SUPATH", NULL},
+ 	{"ENV_TZ", NULL},
+ 	{"ENVIRON_FILE", NULL},
+ 	{"FAILLOG_ENAB", NULL},
+@@ -87,6 +85,8 @@ static struct itemdef def_table[] = {
+ 	{"QUOTAS_ENAB", NULL},
+ 	{"ULIMIT", NULL},
+ #endif
++	{"ENV_PATH", NULL},
++	{"ENV_SUPATH", NULL},
+ 	{"CONSOLE_GROUPS", NULL},
+ 	{"CONSOLE", NULL},
+ 	{"CREATE_HOME", NULL},
+diff -urp shadow-4.0.11.1/src/su.c shadow-4.0.11.1.az/src/su.c
+--- shadow-4.0.11.1/src/su.c	2005-07-18 12:14:39.000000000 +0200
++++ shadow-4.0.11.1.az/src/su.c	2005-08-03 20:34:02.000000000 +0200
+@@ -584,10 +584,8 @@ int main (int argc, char **argv)
+ #endif				/* !USE_PAM */
+ 
+ 	signal (SIGINT, SIG_DFL);
+-#ifndef USE_PAM
+-	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+ 
+-	/* XXX very similar code duplicated in libmisc/setupenv.c */
++	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+ 	if (!cp) {
+ 		addenv ("PATH=/bin:/usr/bin", NULL);
+ 	} else if (strchr (cp, '=')) {
+@@ -597,7 +595,6 @@ int main (int argc, char **argv)
+ 	}
+ 
+ 	environ = newenvp;	/* make new environment active */
+-#endif				/* !USE_PAM */
+ 
+ 	if (getenv ("IFS"))	/* don't export user IFS ... */
+ 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
diff --git a/sys-apps/pam-login/files/pam-login-4.0.11.1-ngettext.patch b/sys-apps/pam-login/files/pam-login-4.0.11.1-ngettext.patch
new file mode 100644
index 000000000000..9eba2c07220a
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.11.1-ngettext.patch
@@ -0,0 +1,28 @@
+New ngettext stuff borks on UCLIBC, as ngettext do not have a !ENABLE_NLS
+define.  Add a check for ngettext and add the ngettext define.  Both was
+inspired by coreutils.
+
+diff -urp shadow-4.0.11.1/configure.in shadow-4.0.11.1.az/configure.in
+--- shadow-4.0.11.1/configure.in	2005-08-03 00:59:56.000000000 +0200
++++ shadow-4.0.11.1.az/configure.in	2005-08-03 12:04:55.000000000 +0200
+@@ -280,6 +280,6 @@ if test "$with_libskey" = "yes"; then
+ fi
+ 
+ AM_GNU_GETTEXT_VERSION(0.12.1)
+-AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT([external], [need-ngettext])
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+diff -urp shadow-4.0.11.1/lib/defines.h shadow-4.0.11.1.az/lib/defines.h
+--- shadow-4.0.11.1/lib/defines.h	2005-06-14 22:27:48.000000000 +0200
++++ shadow-4.0.11.1.az/lib/defines.h	2005-08-03 12:06:42.000000000 +0200
+@@ -24,6 +24,8 @@
+ # undef textdomain
+ # define textdomain(Domain)	/* empty */
+ # define _(Text) Text
++# define ngettext(Msgid1, Msgid2, N) \
++    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+ #endif
+ 
+ #if STDC_HEADERS
diff --git a/sys-apps/pam-login/files/pam-login-4.0.11.1-uclibc-missing-l64a.patch b/sys-apps/pam-login/files/pam-login-4.0.11.1-uclibc-missing-l64a.patch
new file mode 100644
index 000000000000..8b6b87d8385f
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.11.1-uclibc-missing-l64a.patch
@@ -0,0 +1,64 @@
+UCLIBC have the prototypes in stdlib.h, but not the actual functions (yes, you
+guys sucks once again.  The better way might be rather to add lib/rad64.c back,
+but its higher maintainence our side at least.
+
+--- shadow-4.0.11.1/libmisc/salt.c	2005-08-03 12:50:45.000000000 +0200
++++ shadow-4.0.11.1.az/libmisc/salt.c	2005-08-03 13:07:03.000000000 +0200
+@@ -14,6 +14,57 @@
+ #include "prototypes.h"
+ #include "defines.h"
+ #include "getdef.h"
++
++#ifndef HAVE_A64L
++
++/*
++ * i64c - convert an integer to a radix 64 character
++ */
++
++int
++i64c(int i)
++{
++	if (i <= 0)
++		return ('.');
++
++	if (i == 1)
++		return ('/');
++
++	if (i >= 2 && i < 12)
++		return ('0' - 2 + i);
++
++	if (i >= 12 && i < 38)
++		return ('A' - 12 + i);
++
++	if (i >= 38 && i < 63)
++		return ('a' - 38 + i);
++
++	return ('z');
++}
++
++/*
++ * l64a - convert a long to a string of radix 64 characters
++ */
++
++char *
++l64a(long l)
++{
++	static	char	buf[8];
++	int	i = 0;
++
++	if (l < 0L)
++		return ((char *) 0);
++
++	do {
++		buf[i++] = i64c ((int) (l % 64));
++		buf[i] = '\0';
++	} while (l /= 64L, l > 0 && i < 6);
++
++	return (buf);
++}
++
++#endif /* !HAVE_A64L */
++
+ /*
+  * Generate 8 base64 ASCII characters of random salt.  If MD5_CRYPT_ENAB
+  * in /etc/login.defs is "yes", the salt string will be prefixed by "$1$"
diff --git a/sys-apps/pam-login/files/pam-login-4.0.5-skey.patch b/sys-apps/pam-login/files/pam-login-4.0.5-skey.patch
new file mode 100644
index 000000000000..14626b0a2330
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.5-skey.patch
@@ -0,0 +1,11 @@
+--- shadow-4.0.5.orig/lib/pwauth.c	2004-11-01 12:14:40.254524181 -0800
++++ shadow-4.0.5/lib/pwauth.c	2004-11-01 12:15:13.426532987 -0800
+@@ -152,7 +152,7 @@
+ 	 * If there is no SKEY information we default to not using SKEY.
+ 	 */
+ 
+-	if (skeychallenge (&skey, user, challenge_info) == 0)
++	if (skeychallenge (&skey, user, challenge_info, sizeof(challenge_info)) == 0)
+ 		use_skey = 1;
+ #endif
+ 
diff --git a/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild b/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
new file mode 100644
index 000000000000..8a12f243d7d3
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-4.0.11.1-r2.ebuild,v 1.1 2005/08/03 18:57:22 azarah Exp $
+
+inherit eutils libtool flag-o-matic pam
+
+# Do we want to backup an old login.defs, and forcefully
+# install a new version?
+FORCE_LOGIN_DEFS="no"
+
+MY_PN="shadow"
+S="${WORKDIR}/${MY_PN}-${PV}"
+DESCRIPTION="Login, lastlog and faillog for PAM based systems"
+HOMEPAGE="http://shadow.pld.org.pl/"
+SRC_URI="ftp://ftp.pld.org.pl/software/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="livecd nls selinux"
+
+DEPEND="virtual/libc
+	sys-libs/pam
+	>=sys-apps/shadow-4.0.11.1-r1
+	skey? ( app-admin/skey )
+	selinux? ( sys-libs/libselinux )"
+# We need sys-apps/shadow-4.0.7-r1, as that no longer installs login.pamd
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# The new configure changes do not detect utmp/logdir properly
+	epatch "${FILESDIR}"/${PN}-4.0.10-fix-configure.patch
+
+	# skeychallenge call needs updating #69741
+	epatch "${FILESDIR}"/${PN}-4.0.5-skey.patch
+
+	# Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047)
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-SUPATH.patch
+
+	# Some UCLIBC patches
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-ngettext.patch
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-uclibc-missing-l64a.patch
+
+	elibtoolize
+	epunt_cxx
+
+	# Needed by the UCLIBC patches
+	autoconf
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] \
+		&& export ac_cv_func_setpgrp_void=yes
+	econf \
+		--disable-desrpc \
+		--with-libcrypt \
+		--with-libcrack \
+		--enable-shared=no \
+		--enable-static=yes \
+		--with-libpam \
+		$(use_with skey libskey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		|| die "bad configure"
+
+	cd ${S}/man
+	emake SUBDIRS="" \
+	      man_XMANS="faillog.5.xml faillog.8.xml lastlog.8.xml \
+	                 login.1.xml login.access.5.xml login.defs.5.xml" \
+	      man_MANS="faillog.5 faillog.8 lastlog.8 \
+	                login.1 login.access.5 login.defs.5" \
+		|| die "emake man failed"
+	cd ${S}/libmisc
+	emake || die "emake libmisc failed"
+	cd ${S}/lib
+	emake || die "emake lib failed"
+	cd ${S}/src
+	emake faillog lastlog login || die "emake faillog lastlog login failed"
+}
+
+src_install() {
+	cd ${S}/man
+	make SUBDIRS="" \
+	     man_XMANS="faillog.5.xml faillog.8.xml lastlog.8.xml \
+	                login.1.xml login.defs.5.xml" \
+	     man_MANS="faillog.5 faillog.8 lastlog.8 \
+	               login.1 login.defs.5" \
+	     DESTDIR=${D} install || die "emake man failed"
+	cd ${S}/src
+
+	into /
+	dobin ${S}/src/login
+	into /usr
+	dobin ${S}/src/{last,fail}log
+
+	newpamd "${FILESDIR}/login.pamd-4.0" login
+	use selinux || dosed -e '/@selinux@/d' /etc/pam.d/login
+	use selinux && dosed -e 's:@selinux@::g' /etc/pam.d/login
+
+	insinto /etc
+	insopts -m0644
+	newins "${FILESDIR}/login.defs-4.0" 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 ChangeLog NEWS README TODO
+}
+
+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
+}