Update version.

(Portage version: 2.0.51.22-r2)

6 files changed, 256 insertions, 25 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 08770ade0176..1aa48c87805b 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2005/08/23 17:26:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.57 2005/08/24 09:44:28 azarah Exp $
+
+*pam-login-4.0.12 (24 Aug 2005)
+
+  24 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/pam-login-4.0.12-dots-in-usernames.patch,
+  +files/pam-login-4.0.12-long-groupnames.patch, +pam-login-4.0.12.ebuild:
+  Update version.
 
   23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   pam-login-4.0.11.1-r2.ebuild:
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index 196ee0cc53fd..f9134ab7c98a 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,32 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e05cdb6570d6e8b629bf861f347b6cc5 ChangeLog 8341
-MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
 MD5 b14a60034b1653ab8897c834b7b2d26d pam-login-4.0.11.1-r2.ebuild 3988
+MD5 e05cdb6570d6e8b629bf861f347b6cc5 ChangeLog 8341
+MD5 65bb95c03413c70d740d593044d8b59c pam-login-4.0.12.ebuild 3978
 MD5 591297b9a250280b3a6f640589f0450e pam-login-3.17.ebuild 2876
+MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
 MD5 1d05f0436f1c273d7862099f309afe4d metadata.xml 156
-MD5 c87c0968ace90b32753b91f93ad7bab1 files/pam-login-4.0.11.1-uclibc-missing-l64a.patch 1269
+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 44f064b586ea49c8e2dc1fca8b9e4599 files/pam-login-4.0.11.1-SUPATH.patch 1614
-MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
-MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r2 69
+MD5 c87c0968ace90b32753b91f93ad7bab1 files/pam-login-4.0.11.1-uclibc-missing-l64a.patch 1269
+MD5 b52179dd78e6b6d207600184022114db files/pam-login-4.0.12-dots-in-usernames.patch 1466
 MD5 9470faa54b704ceebd949da53eed5ccc files/login.defs-4.0 6255
+MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
+MD5 804242385ef14139f4b46167396f26f8 files/pam-login-4.0.12-long-groupnames.patch 923
 MD5 95f7b8980169e81352229bd548909ea7 files/pam-login-4.0.10-fix-configure.patch 579
-MD5 2e7603feaff187884dd9b1e66601f02b files/login.pamd 382
-MD5 e7f9dde204926c73a570b344556e4b1e files/digest-pam-login-3.17 67
-MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
-MD5 636f233fa173a998195016c3808173d4 files/pam-login-4.0.5-skey.patch 395
+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 2fdbabc344539e9dfd4955c061596a27 files/pam-login-3.17-query_user_context.patch 423
-MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
+MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-pam-login-4.0.12 67
 MD5 450a2289f2a383296ad9af005e46da74 files/pam-login-4.0.11.1-ngettext.patch 1038
-MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
-MD5 e01e197ed3b6d2ec6ae83d23b33088b8 files/login.pamd-4.0 1019
-MD5 21df4caf263fa2ed75e574f9a067b72e files/login.defs 3229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC1xhj5H05b2HAEkRAsvHAJ45SzIjDifaCiO2avkBFcEOnlc1RQCfSOai
-cx/D0O/nByZebm4RJl6y0Ok=
-=1WGD
------END PGP SIGNATURE-----
+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
diff --git a/sys-apps/pam-login/files/digest-pam-login-4.0.12 b/sys-apps/pam-login/files/digest-pam-login-4.0.12
new file mode 100644
index 000000000000..85c283816045
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-4.0.12
@@ -0,0 +1 @@
+MD5 609a417a45827c36ba6e33f9dc785371 shadow-4.0.12.tar.bz2 1082217
diff --git a/sys-apps/pam-login/files/pam-login-4.0.12-dots-in-usernames.patch b/sys-apps/pam-login/files/pam-login-4.0.12-dots-in-usernames.patch
new file mode 100644
index 000000000000..e0a5febe1ce2
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.12-dots-in-usernames.patch
@@ -0,0 +1,49 @@
+Allow people to add users with dots in their names.
+
+http://bugs.gentoo.org/22920
+
+--- libmisc/chkname.c
++++ libmisc/chkname.c
+@@ -18,7 +18,7 @@
+ static int good_name (const char *name)
+ {
+ 	/*
+-	 * User/group names must match [a-z_][a-z0-9_-]*
++	 * User/group names must match [a-z_][a-z0-9_-.$]*
+ 	 */
+ 	if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_'))
+ 		return 0;
+@@ -27,6 +27,7 @@
+ 		if (!((*name >= 'a' && *name <= 'z') ||
+ 		      (*name >= '0' && *name <= '9') ||
+ 		      *name == '_' || *name == '-' ||
++		      *name == '.' ||
+ 		      (*name == '$' && *(name + 1) == '\0')))
+ 			return 0;
+ 	}
+--- man/useradd.8
++++ man/useradd.8
+@@ -128,6 +128,23 @@
+ If no options are specified,
+ \fBuseradd\fR
+ displays the current default values.
++.SH RESTRICTS
++Currently,  the  shadow  suite  enforces  the following restrictions on 
++user names:
++
++.nf
++\- must begin with a lower case letter or underscore
++\- can only contain lower case letters, underscores, and dashes
++\- may end with a dollar sign
++\- regex for these requirements: [a\-z_][a\-z0-9_\-$]*
++.fi
++
++The length of usernames is restricted by glibc (via the UT_NAMESIZE define 
++in the utmp header file).  This may range from 8 characters on older 
++systems to 32 characters on newer systems.
++
++Note Gentoo adds a patch which allows people to create usernames with a 
++dot in them.
+ .SH "NOTES"
+ .PP
+ The system administrator is responsible for placing the default user files in the
diff --git a/sys-apps/pam-login/files/pam-login-4.0.12-long-groupnames.patch b/sys-apps/pam-login/files/pam-login-4.0.12-long-groupnames.patch
new file mode 100644
index 000000000000..6d08bc7e8e8b
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.12-long-groupnames.patch
@@ -0,0 +1,39 @@
+Remove arbitrary requirement on the length of groups.  Perhaps we 
+should turn this into a configure option and send upstream ?
+
+http://bugs.gentoo.org/3485
+
+--- libmisc/chkname.c
++++ libmisc/chkname.c
+@@ -59,8 +60,10 @@
+ 	 * Arbitrary limit for group names - max 16
+ 	 * characters (same as on HP-UX 10).
+ 	 */
++#if 0
+ 	if (strlen (name) > 16)
+ 		return 0;
++#endif
+ 
+ 	return good_name (name);
+ }
+--- man/groupadd.8
++++ man/groupadd.8
+@@ -46,6 +46,18 @@
+ .TP
+ \fB\-o\fR
+ Allow add group wit non\-unique GID.
++.SH RESTRICTIONS
++Currently, the shadow suite enforces the following restrictions on group 
++names:
++
++.nf
++\- must begin with a lower case letter or underscore
++\- can only contain lower case letters, underscores, and dashes
++\- regex for these requirements: [a\-z_][a\-z0\-9_\-]*
++.fi
++
++Normally shadow enforces a 16 character limit, but Gentoo adds patches to 
++remove it.
+ .SH "FILES"
+ .TP
+ \fI/etc/group\fR
diff --git a/sys-apps/pam-login/pam-login-4.0.12.ebuild b/sys-apps/pam-login/pam-login-4.0.12.ebuild
new file mode 100644
index 000000000000..8cbc308738ba
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-4.0.12.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.12.ebuild,v 1.1 2005/08/24 09:44:29 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
+
+	# Make user/group names more flexible #3485 / #22920
+	epatch "${FILESDIR}"/${PN}-4.0.12-dots-in-usernames.patch
+	epatch "${FILESDIR}"/${PN}-4.0.12-long-groupnames.patch
+
+	# Some UCLIBC patches
+	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 -pPR ${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
+}