Bump to version 4.0.14 to get in line with shadow. Dropped a patch, dropped eautoconf, updated patches.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 246 insertions, 6 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index 9054e23b65e1..363a3813a4ed 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.61 2005/12/21 10:00:33 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.62 2006/01/04 21:35:12 flameeyes Exp $
+
+*pam-login-4.0.14 (04 Jan 2006)
+
+  04 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pam-login-4.0.14-dots-in-usernames.patch,
+  +files/pam-login-4.0.14-long-groupnames.patch, +pam-login-4.0.14.ebuild:
+  Bump to version 4.0.14 to get in line with shadow. Dropped a patch, dropped
+  eautoconf, updated patches.
 
   21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   files/pam-login-3.17-nonls.patch, pam-login-3.17.ebuild:
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index de8e9559d45c..b36d3d62d92e 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 90d5a98fc49c3bdf8e3013c9fe39adde ChangeLog 9379
+MD5 8a2afe670dbdaa13d17f8b8525b291f7 ChangeLog 9700
 MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
 MD5 e7f9dde204926c73a570b344556e4b1e files/digest-pam-login-3.17 67
 MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r2 69
 MD5 cec3e64e953a7f3f96a1e89d73b62899 files/digest-pam-login-4.0.12 67
+MD5 2b6cc6ba67673510780c1c4474587e62 files/digest-pam-login-4.0.14 67
 MD5 21df4caf263fa2ed75e574f9a067b72e files/login.defs 3229
 MD5 9470faa54b704ceebd949da53eed5ccc files/login.defs-4.0 6255
 MD5 2e7603feaff187884dd9b1e66601f02b files/login.pamd 382
@@ -21,6 +22,8 @@ MD5 450a2289f2a383296ad9af005e46da74 files/pam-login-4.0.11.1-ngettext.patch 103
 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 804242385ef14139f4b46167396f26f8 files/pam-login-4.0.12-long-groupnames.patch 923
+MD5 e95052f1288cd2003845b0382d723b60 files/pam-login-4.0.14-dots-in-usernames.patch 1745
+MD5 e75e9f48c14a1178ddd6076dfe7a4a7a files/pam-login-4.0.14-long-groupnames.patch 1275
 MD5 636f233fa173a998195016c3808173d4 files/pam-login-4.0.5-skey.patch 395
 MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
@@ -28,10 +31,11 @@ MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
 MD5 75061ebae5083e384feadfe3c4944d88 pam-login-3.17.ebuild 3065
 MD5 b14a60034b1653ab8897c834b7b2d26d pam-login-4.0.11.1-r2.ebuild 3988
 MD5 df176d893e727f84defe9cab73658e23 pam-login-4.0.12.ebuild 3995
+MD5 dbab109952bcca8ad31b6aaf08dc659e pam-login-4.0.14.ebuild 3831
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDqSfXAiZjviIA2XgRAvZJAKDQyPmpKU6gES2EuAZiu1PJLAzwfACcCPIW
-SYig3Zu5eZeRHAfuvP4xd2w=
-=Ut+S
+iD8DBQFDvD+hAiZjviIA2XgRApnyAJ4o1ESDFCWjmEeIweb3my0JHE6jsACePQtP
+QnY4Ijw//UfBCJIPx6jCE+A=
+=NbkH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pam-login/files/digest-pam-login-4.0.14 b/sys-apps/pam-login/files/digest-pam-login-4.0.14
new file mode 100644
index 000000000000..c8fe2c833299
--- /dev/null
+++ b/sys-apps/pam-login/files/digest-pam-login-4.0.14
@@ -0,0 +1 @@
+MD5 903f55cf05bbe082617d3337743792fb shadow-4.0.14.tar.bz2 1246902
diff --git a/sys-apps/pam-login/files/pam-login-4.0.14-dots-in-usernames.patch b/sys-apps/pam-login/files/pam-login-4.0.14-dots-in-usernames.patch
new file mode 100644
index 000000000000..88bd983e570f
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.14-dots-in-usernames.patch
@@ -0,0 +1,49 @@
+Index: shadow-4.0.14/libmisc/chkname.c
+===================================================================
+--- shadow-4.0.14.orig/libmisc/chkname.c
++++ shadow-4.0.14/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 @@ static int good_name (const char *name)
+ 		if (!((*name >= 'a' && *name <= 'z') ||
+ 		      (*name >= '0' && *name <= '9') ||
+ 		      *name == '_' || *name == '-' ||
++		      *name == '.' ||
+ 		      (*name == '$' && *(name + 1) == '\0')))
+ 			return 0;
+ 	}
+Index: shadow-4.0.14/man/useradd.8
+===================================================================
+--- shadow-4.0.14.orig/man/useradd.8
++++ shadow-4.0.14/man/useradd.8
+@@ -144,6 +144,23 @@ The name of the new user's login shell. 
+ 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.14-long-groupnames.patch b/sys-apps/pam-login/files/pam-login-4.0.14-long-groupnames.patch
new file mode 100644
index 000000000000..a927b13b832f
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-4.0.14-long-groupnames.patch
@@ -0,0 +1,43 @@
+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
+
+Index: shadow-4.0.14/libmisc/chkname.c
+===================================================================
+--- shadow-4.0.14.orig/libmisc/chkname.c
++++ shadow-4.0.14/libmisc/chkname.c
+@@ -59,8 +59,10 @@ int check_group_name (const char *name)
+ 	 * 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);
+ }
+Index: shadow-4.0.14/man/groupadd.8
+===================================================================
+--- shadow-4.0.14.orig/man/groupadd.8
++++ shadow-4.0.14/man/groupadd.8
+@@ -51,6 +51,18 @@ doesn't work yet.
+ .TP
+ \fB\-o\fR
+ This option permits to add group with 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.14.ebuild b/sys-apps/pam-login/pam-login-4.0.14.ebuild
new file mode 100644
index 000000000000..a7d4933cf5b1
--- /dev/null
+++ b/sys-apps/pam-login/pam-login-4.0.14.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 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.14.ebuild,v 1.1 2006/01/04 21:35:12 flameeyes Exp $
+
+inherit eutils libtool flag-o-matic autotools 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 skey"
+
+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}
+
+	# 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.14-dots-in-usernames.patch
+	epatch "${FILESDIR}"/${PN}-4.0.14-long-groupnames.patch
+
+	# Some UCLIBC patches
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-uclibc-missing-l64a.patch
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	[[ ${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
+}