Version bump.

Package-Manager: portage-2.1.1_pre4

5 files changed, 278 insertions, 8 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 683098d1382b..c3f46392a8d8 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.158 2006/07/18 08:25:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.159 2006/08/04 13:14:04 vapier Exp $
+
+*shadow-4.0.18.1 (04 Aug 2006)
+
+  04 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.0.18.1-useradd-usermod.patch, +shadow-4.0.18.1.ebuild:
+  Version bump.
 
   18 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +files/login_defs.awk,
   shadow-4.0.17-r1.ebuild:
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index ecab5fc8e83a..023621aa92ea 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -145,9 +145,14 @@ AUX shadow-4.0.17-no-local-getpass.patch 785 RMD160 e70027b07b4300c5a53a78f022f0
 MD5 391c3e007af4fe7929bb36bff5af8e8d files/shadow-4.0.17-no-local-getpass.patch 785
 RMD160 e70027b07b4300c5a53a78f022f055f0e95891da files/shadow-4.0.17-no-local-getpass.patch 785
 SHA256 694c3d2bdb101f2dde963525c6a46a36b87e3f85e1051753a3676b63b054c04c files/shadow-4.0.17-no-local-getpass.patch 785
+AUX shadow-4.0.18.1-useradd-usermod.patch 1081 RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 SHA1 c13cf8b5c566e129d4fc62ad3ac08b6c856c992e SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb
+MD5 aa1259020b925cd3088cb7a36fbe7753 files/shadow-4.0.18.1-useradd-usermod.patch 1081
+RMD160 65bb85eba9f2e08f4febeea97d522d515f7d9fb7 files/shadow-4.0.18.1-useradd-usermod.patch 1081
+SHA256 ca34bc36424585c9f1d64c6b4201ce62c964773c7c6c16faecdd2610ad655cfb files/shadow-4.0.18.1-useradd-usermod.patch 1081
 DIST shadow-4.0.15.tar.bz2 1294860 RMD160 b7b9ee9469561205037a1eacaa8791f069ba124c SHA1 0f7cd3366a032091fdffd2f8edf65056bd576cae SHA256 e486bdb083df453c2d15ac58887ef45a3006182c0cdb1c6092058ea588be538d
 DIST shadow-4.0.16.tar.bz2 1438030 RMD160 9ac436d89913441b448da90ece25b77e818f3bd4 SHA1 c8e739d935cb46d9cbc0654f373c2bff18110a55 SHA256 2cbd0af0b4682d91282d2d0ad3110e6dfcad4e365d25a3b6beaf7048dd477bdd
 DIST shadow-4.0.17.tar.bz2 1496220 RMD160 590fbe5d0363da44370b026282c8226ee64f4603 SHA1 326b3de0a81c1e1f9bfc75e67d45678c14fe282d SHA256 6e85b7a01d311fdb181d909b00c6e42bf08816c13e7f54d6dcc1d7a342ef98cd
+DIST shadow-4.0.18.1.tar.bz2 1516296 RMD160 05a1f609370371de3112479cb6a98d966c45fa6c SHA1 1a30458e9db05560bfc82529048bd5d60b45cf9b SHA256 3da368d87a94270c3db4bae6ff634b8db5dcbc8822d554dbfea955a676c1ab12
 EBUILD shadow-4.0.15-r2.ebuild 7775 RMD160 bdeaea056dc667a540b1d6e6e0ffd1038c92f35b SHA1 01dae360d311fe428673c9f2f993e62d517a1564 SHA256 1c21c849a63972b49c52b67fcece8cc3bf99846feb3ee6ec182418c0369d1957
 MD5 b06cd7373f15f55767eaddeebc92db4e shadow-4.0.15-r2.ebuild 7775
 RMD160 bdeaea056dc667a540b1d6e6e0ffd1038c92f35b shadow-4.0.15-r2.ebuild 7775
@@ -164,10 +169,14 @@ EBUILD shadow-4.0.17.ebuild 7991 RMD160 872d95027f123f4e274517037f4757be40a7d802
 MD5 48530d568db8d0b0d288c0af284aff0a shadow-4.0.17.ebuild 7991
 RMD160 872d95027f123f4e274517037f4757be40a7d802 shadow-4.0.17.ebuild 7991
 SHA256 60ac1066685a4e332456e8e8d0b413f315f0b9fad30d6c1d5070c11e053fe5c4 shadow-4.0.17.ebuild 7991
-MISC ChangeLog 29011 RMD160 49e85ed1d14bcc56aa45356bbaaf1079470e57fa SHA1 dccead776bdaad5d15d03d1865f5201faf1ddc03 SHA256 2a8fdf6a81a5e0b49bce64015f62bf4b399e7e7ce3ed656a0b86cd2f85c6df0b
-MD5 7612f78cdd21da381451c2c9c4279c4e ChangeLog 29011
-RMD160 49e85ed1d14bcc56aa45356bbaaf1079470e57fa ChangeLog 29011
-SHA256 2a8fdf6a81a5e0b49bce64015f62bf4b399e7e7ce3ed656a0b86cd2f85c6df0b ChangeLog 29011
+EBUILD shadow-4.0.18.1.ebuild 5796 RMD160 45f12d993539bf21a3a929ab27dc0e672a2e1846 SHA1 5fc59c420f9743e88003cd55c955438191688290 SHA256 ebd912dafc0f8c6cbe091e49a48b1f212e2337785bb0eb7e05686278cb6501a5
+MD5 2db264d4c2de6e3bc9f634e5eccc0173 shadow-4.0.18.1.ebuild 5796
+RMD160 45f12d993539bf21a3a929ab27dc0e672a2e1846 shadow-4.0.18.1.ebuild 5796
+SHA256 ebd912dafc0f8c6cbe091e49a48b1f212e2337785bb0eb7e05686278cb6501a5 shadow-4.0.18.1.ebuild 5796
+MISC ChangeLog 29183 RMD160 0dee5ace3d625b6ebba3671c7b2544baab0c3132 SHA1 ae0995f622549ba7c9cdba1fcfbb4c261506e70e SHA256 4571491fc688659450daedb53de7532709fab93851078fba117046c8ae18bf64
+MD5 d07025e03d76c808b05a76dbbf88a66e ChangeLog 29183
+RMD160 0dee5ace3d625b6ebba3671c7b2544baab0c3132 ChangeLog 29183
+SHA256 4571491fc688659450daedb53de7532709fab93851078fba117046c8ae18bf64 ChangeLog 29183
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -184,10 +193,13 @@ SHA256 83147ff4ad684b84d8dfb31024d51f598d7796ace7110722d4b90a91d765b046 files/di
 MD5 0d5e88a5cf5d51d74de79faa25e883cf files/digest-shadow-4.0.17-r1 247
 RMD160 1a0703c1b522ea5eb648ee638e3872b566faa2e1 files/digest-shadow-4.0.17-r1 247
 SHA256 83147ff4ad684b84d8dfb31024d51f598d7796ace7110722d4b90a91d765b046 files/digest-shadow-4.0.17-r1 247
+MD5 6be0a013e7aee78ebb6228308ca16fee files/digest-shadow-4.0.18.1 253
+RMD160 31ec617739d2935bd1b4dfc1d676399d5c5f50bc files/digest-shadow-4.0.18.1 253
+SHA256 6683d8ca173c809dedf056bf6e658284264bb277cab8c43e03b811ed4308d109 files/digest-shadow-4.0.18.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEvl5uamhnQswr0vIRAvUBAJ4paiAY1aaxnHF2Gk54iT3tbHyv/QCeNV6u
-klRF5XzxCKSn0hh34DBr1jU=
-=GS9w
+iD8DBQFE00gramhnQswr0vIRAhYWAKCJpoP1EkRk7d6dbo4mI+E8qyeE/gCdHX2L
+vkbSK8wDzGXJx8SPIRwXSIk=
+=bi5Y
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/digest-shadow-4.0.18.1 b/sys-apps/shadow/files/digest-shadow-4.0.18.1
new file mode 100644
index 000000000000..801875319890
--- /dev/null
+++ b/sys-apps/shadow/files/digest-shadow-4.0.18.1
@@ -0,0 +1,3 @@
+MD5 e7751d46ecf219c07ae0b028ab3335c6 shadow-4.0.18.1.tar.bz2 1516296
+RMD160 05a1f609370371de3112479cb6a98d966c45fa6c shadow-4.0.18.1.tar.bz2 1516296
+SHA256 3da368d87a94270c3db4bae6ff634b8db5dcbc8822d554dbfea955a676c1ab12 shadow-4.0.18.1.tar.bz2 1516296
diff --git a/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch b/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch
new file mode 100644
index 000000000000..8fe14329f1c1
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.18.1-useradd-usermod.patch
@@ -0,0 +1,42 @@
+--- shadow-4.0.18.1.orig/src/useradd.c	2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/useradd.c	2006-08-04 09:24:34.000000000 +0200
+@@ -203,13 +203,17 @@
+ 	long gid;
+ 	char *errptr;
+ 
++	struct group* grp = getgrnam (grname);
++	if (grp)
++		return grp;
++
+ 	gid = strtol (grname, &errptr, 10);
+ 	if (*errptr || errno == ERANGE || gid < 0) {
+ 		fprintf (stderr,
+ 			 _("%s: invalid numeric argument '%s'\n"), Prog, grname);
+ 		exit (E_BAD_ARG);
+ 	}
+-	return getgrnam (grname);
++	return getgrgid (gid);
+ }
+ 
+ static long get_number (const char *numstr)
+--- shadow-4.0.18.1.orig/src/usermod.c	2006-07-28 19:42:48.000000000 +0200
++++ shadow-4.0.18.1/src/usermod.c	2006-08-04 09:24:21.000000000 +0200
+@@ -165,13 +165,17 @@
+ 	long val;
+ 	char *errptr;
+ 
++	struct group* grp = getgrnam (grname);
++	if (grp)
++		return grp;
++
+ 	val = strtol (grname, &errptr, 10);
+ 	if (*errptr || errno == ERANGE || val < 0) {
+ 		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
+ 			 grname);
+ 		exit (E_BAD_ARG);
+ 	}
+-	return getgrnam (grname);
++	return getgrgid (val);
+ }
+ 
+ /*
diff --git a/sys-apps/shadow/shadow-4.0.18.1.ebuild b/sys-apps/shadow/shadow-4.0.18.1.ebuild
new file mode 100644
index 000000000000..93bc2ec7977f
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.0.18.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.18.1.ebuild,v 1.1 2006/08/04 13:14:04 vapier Exp $
+
+inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/"
+SRC_URI="ftp://ftp.pld.org.pl/software/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls pam selinux skey nousuid"
+
+RDEPEND=">=sys-libs/cracklib-2.7-r3
+	pam? ( virtual/pam )
+	!sys-apps/pam-login
+	skey? ( app-admin/skey )
+	selinux? ( >=sys-libs/libselinux-1.28 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51-r2
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# uclibc support, corrects NIS usage
+	epatch "${FILESDIR}"/${PN}-4.0.13-nonis.patch
+
+	# If su should not simulate a login shell, use '/bin/sh' as shell to enable
+	# running of commands as user with /bin/false as shell, closing bug #15015.
+	# *** This one could be a security hole; disable for now ***
+	#epatch "${FILESDIR}"/${P}-nologin-run-sh.patch
+
+	# tweak the default login.defs
+	epatch "${FILESDIR}"/${PN}-4.0.17-login.defs.patch
+
+	# Make user/group names more flexible #3485 / #22920
+	epatch "${FILESDIR}"/${PN}-4.0.13-dots-in-usernames.patch
+	epatch "${FILESDIR}"/${PN}-4.0.13-long-groupnames.patch
+
+	# Fix compiling with gcc-2.95.x
+	epatch "${FILESDIR}"/${PN}-4.0.12-gcc2.patch
+
+	# lock down setuid perms #47208
+	epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
+
+	epatch "${FILESDIR}"/${PN}-4.0.15-uclibc-missing-l64a.patch
+
+	epatch "${FILESDIR}"/${PN}-4.0.16-fix-useradd-usergroups.patch #128715
+
+	epatch "${FILESDIR}"/${PN}-4.0.18.1-useradd-usermod.patch
+
+	# Needed by the UCLIBC patches
+	eautoconf || die
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
+	econf \
+		--disable-desrpc \
+		--with-libcrypt \
+		--with-libcrack \
+		--enable-shared=no \
+		--enable-static=yes \
+		$(use_with pam libpam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		|| die "bad configure"
+	emake || die "compile problem"
+}
+
+src_install() {
+	local perms=4711
+	use nousuid && perms=711
+	make DESTDIR="${D}" suiduperms=${perms} install || die "install problem"
+	dosym useradd /usr/sbin/adduser
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	# Using a securetty with devfs device names added
+	# (compat names kept for non-devfs compatibility)
+	insopts -m0600 ; doins "${FILESDIR}"/securetty
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	else
+		newpamd "${FILESDIR}/login.pamd" login
+		use selinux || sed -i -e '/@selinux@/d' "${D}"/etc/pam.d/login
+		use selinux && sed -i -e 's:@selinux@::g' "${D}"/etc/pam.d/login
+	fi
+	# Output arch-specific cruft
+	case $(tc-arch) in
+		ppc*)  echo "hvc0" >> "${D}"/etc/securetty
+		       echo "hvsi0" >> "${D}"/etc/securetty;;
+		hppa)  echo "ttyB0" >> "${D}"/etc/securetty;;
+		arm)   echo "ttyFB0" >> "${D}"/etc/securetty;;
+	esac
+
+	# needed for 'adduser -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	# move passwd to / to help recover broke systems #64441
+	mv "${D}"/usr/bin/passwd "${D}"/bin/
+	dosym /bin/passwd /usr/bin/passwd
+
+	if use pam ; then
+		local INSTALL_SYSTEM_PAMD="yes"
+
+		# Do not install below pam.d files if we have pam-0.78 or later
+		has_version '>=sys-libs/pam-0.78' && \
+			INSTALL_SYSTEM_PAMD="no"
+
+		for x in "${FILESDIR}"/pam.d-include/*; do
+			case "${x##*/}" in
+				"login")
+					# We do no longer install this one, as its from
+					# pam-login now.
+					;;
+				"system-auth"|"system-auth-1.1"|"other")
+					# These we only install if we do not have pam-0.78
+					# or later.
+					[ "${INSTALL_SYSTEM_PAMD}" = "yes" ] && [ -f ${x} ] && \
+						dopamd ${x}
+					;;
+				"su")
+					# Disable support for pam_env and pam_wheel on openpam
+					has_version sys-libs/pam && dopamd ${x}
+					;;
+				"su-openpam")
+					has_version sys-libs/openpam && newpamd ${x} su
+					;;
+				*)
+					[ -f ${x} ] && dopamd ${x}
+					;;
+			esac
+		done
+		for x in chage chsh chfn chpasswd newusers \
+		         user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+
+		find "${D}"/usr/share/man \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-exec rm {} \;
+	fi
+
+	cd "${S}"
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	# comment out options that pam hates
+	if use pam ; then
+		awk -f "${FILESDIR}"/login_defs.awk \
+			lib/getdef.c etc/login.defs \
+			> "${D}"/etc/login.defs
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${D}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-exec rm {} \;
+
+	cd "${S}"
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}"/etc/pam.d/system-auth.new \
+		"${ROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups (we need ROOT=/ here, as grpconv only
+	# operate on / ...).
+	if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then
+		if grpck -r &>/dev/null; then
+			grpconv
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+}