Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 219 insertions, 16 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index b0c0553a2fc9..cfd2ec9e11c0 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.292 2014/01/18 04:48:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.293 2014/06/16 05:52:44 vapier Exp $
+
+*shadow-4.2.1 (16 Jun 2014)
+
+  16 Jun 2014; Mike Frysinger <vapier@gentoo.org> +shadow-4.2.1.ebuild:
+  Version bump.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild:
   Add arm64 love.
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 68daeb0d38b0..ef97152e1546 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -8,23 +8,25 @@ AUX pam.d-include/shadow 152 SHA256 7fc1ccca85d2b1ac4dad9909792453c8d26e9aeab48c
 AUX securetty 262 SHA256 9bc3c187d5535ebe83cf22129b7189a9d8e4c05520af187bff6cff4d8f083c67 SHA512 d841f00a4c83e9672ec3620cdff73f2cd02a1a9e883115b329720b5f6ffbf6faa0ff8ac975f1494f7ad07f0ffa91f6eb983a617e604af67dd46062069b09f7f2 WHIRLPOOL 4b7ee107532d1a2e528745c5e3dcb770fc54f7f2a7dcc0f706613e5623f9a5521ee808900a5ffeb68073d9787ebe08606e6eaf95cdb400c9490b0da3614deaa8
 AUX shadow-4.1.3-dots-in-usernames.patch 302 SHA256 2299ffaec204d20e00d791bf5b982571c9261a74c7a7b865a9f7cad1cdcb43ba SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d WHIRLPOOL f0258b24f7731ab7b15a1fca391593c8bbd6bdf2ddad57af1d7960d05af49bc5b706039caa576646cb3d817d2d4ad8e89526b12fe046301c63c1518d01dcf173
 DIST shadow-4.1.5.1.tar.bz2 2193325 SHA256 aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb SHA512 c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c WHIRLPOOL 08751597b5b57057f0a3141be97204df49fada25adf0a9f43106a4099ce1b06fec6e90592e43ff1d789bf0a7e16a40b45f29830879ea5c71e9f5a1a81e7a7357
+DIST shadow-4.2.1.tar.xz 1594536 SHA256 3b0893d1476766868cd88920f4f1231c4795652aa407569faff802bcda0f3d41 SHA512 7a14bf8e08126f0402e37b6e4c559615ced7cf829e39156d929ed05cd8813de48a77ff1f7f6fe707da04cf662a2e9e84c22d63d88dd1ed13f935fde594db95f0 WHIRLPOOL 032857f5fae8486cc3dd11303bfa7da55019000ce8ad7bac2f398f9f9764c8659e20a1547d05c5e4f366db749a52afb3083017faf14f6a72ee48345dcd1f86aa
 EBUILD shadow-4.1.5.1-r1.ebuild 5207 SHA256 2739bd1b1e66b820457db309569403700d093e5c9827ba4049d38b9a5727de15 SHA512 1e9bc3b4ac4841f7063482a9075e9be4c1fe5169cbe8f4b5a9ec80447202519d86b5d3048d9fed1176c79c986fdbaff35b82e326f81bd5ece1dc2232bc5b2c8b WHIRLPOOL 7cf7b7e46f523be1bf27b03d3bdc86ae517443ca0207d1da7a19242d60663a1ec6238b746efcc3cbdee7b8cc5f871e992b44b353be5448c905317eb68cb7aa8d
-MISC ChangeLog 49968 SHA256 a4f337564abe7d82ada5602da29c2bacb3ca12b27e53be22a4e64bf3668d38e7 SHA512 acc13cdbcdf8fceb4188293e73d6846329d25ce35d48d64a5e77007b8b9ae6886d84b766fa8e9f0c649fbbbf3208bc8ab9bd31e4ebf06d7b4add31d94ed6ac2f WHIRLPOOL bf5a26c7cac759588de738da08af9e705ccaed386f4e406d72d8cc53ade2e01c64fc503a515b85864442a73e3a7e1b9adf5b7b8701197f75cf83cb9a2931a14c
+EBUILD shadow-4.2.1.ebuild 5232 SHA256 edba09c4b6c21b5fa1881d3eaa5e49fd0f25f7cbe63eb7fd187b36b4a752f736 SHA512 f8fdb1cf5f5ce4143e211a942d5131e6ce13dc0b9a96378b463d1df83350c2f93fac359fa19a098605411a6ee5b9f18e378ffdac22e7b92ec230a6f6efe20de5 WHIRLPOOL d902b75dc93e9d7c6d5e98f16f499215838d3c6b5c0dcf9fcd4d5a8a593812f4671b0944767201bf217baeb796d71ea67ab81a1be2c145f68ff51c1f503c2157
+MISC ChangeLog 50086 SHA256 6b1916b776c9d139dd1eccef81b01851997588219fe2176d683e0692faa07451 SHA512 a357679705e2ead25236d1a65afd74b225939fc2524ba2100c0eaab37fb73a925fce7ff01c50678d05ae62a8d244c1e89fc68ece2d985dff8bfa944e457146a1 WHIRLPOOL c525f8ac68c073d158d1c544846012ecf118b5dc67fa2631e77bd5d09cc94d875c9b80a411b6215fd8986f406154e06691153608b8d83affeff15eede73ce69d
 MISC metadata.xml 374 SHA256 1675a5791603e79e431df63215162737553fa8018360b026739ac3284bca54b2 SHA512 0bb65b45fa94ddea89f7e0a879fd996b3f363b3e58eb6cbd71251fd79416667f103af4bac0c87f3ba240e0ce3f323c77ce7be9f6ea92c13d619ff8cef8797add WHIRLPOOL e7f4f5d975440fe71dbb35dee4394aa808fce7b5e58ac64d162418a47ed99cb002c7622563be4f6800967d6b8530d29dbd895e431c78f75a5cdf490b8c1afc45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2geZAAoJEPGu1DbS6WIAtZwP/1OPB3ldDGurvxfVY3OPdSaQ
-vMK8nwn2UUMTXmNOZByzs5hLrc59IALAJTm6Nan+fN9gpWRVbQhtKTPbyGsgITly
-tkNz4Hx/nJ5EILG1aKTCn0lL3Xtt/VGR72E/JEWjm4pC7Drt3rbJNCof4mXsGxFm
-pYYMOu+3wjNWyAi5gGHzKYRdPL5vkpTRb2BeW+KKuAGNBfiFHIHBZ+uw1TRCjl2D
-kI2aTcQFUY7DUA2eHquW4DXzxj5LA7thPSO8HTXN+XiIjdu1JaYf8qBAzjRU/Md1
-7I+jdI9dta07bu+y3hM1Cz8XJTL0JpXU70LFqDDRc2YtQScXUq6YiLiYnhIcnYa8
-4/pXzMa+vsNsUQn8tQW9oVfOCY4wZF7NruLaB9lVbNlDZWWUFagTrn2zHQwvryxb
-lS0ifiop9R6J3yReIQ+L3xh9TeUk9B7DBImlOvzepisweBC0vVfeqoXPtMeJWCHm
-9K8aDv07iiMZrgLvMORWNkbu8QZZK2eY8boEWfdpZwSdkhjyht4k5rYW7mnBx1vY
-/AdfN0Hphyl5dUsDWHsy6vcgl4naXGT/iFJOUlIIHdW+IQfycQpKUtPGe5TPeSoN
-Ki5tZetXrbs4qvthmmY18xHiXiY8p2wry5TYxNgKs5Ahvn4bKSKoFYR0U3u2+eA8
-OirqXzVPet88OQwCfPhI
-=rMXY
+iQIcBAEBCAAGBQJTnoY0AAoJEPGu1DbS6WIAmaQP/0ZSG0HPFQ2N5b5rXQQOoxtG
+/Cm1xH+OKGK2McOomp3N/fdiSmLBaxEB0awfVeStoHXcHW+g6XHEL+W47AhM/M5/
+Zk+e0Lmy+igq5jqsjUs8qOnJAIAuDsq78PGHbZIMjEFHJWcC3CL78p1WzEUhget8
+a+al4/z+vKC4f3XAG5eyjHkYgpaOVOnC1j3Ar2avXHxNZXKVaj1cpXX9OpaCdT1G
+vLeTPOW7ckZ3ymBOmWJoEahHx7tntpLnWYDuH5W3UvbcG2qoTn889LvUZpYZy80k
+CHZOkMqVhdDnfyy6hPS8Zdmk/jmD7Pv2MJHwks6wkCaxYRPl0XIryedDWoP5b25o
+RD1V+5tlzPit86xgA+jv4PNltopks8Oje/kdmgaUp2uNTVS6ChenbR6RNpjQY7rF
+vxCJ0trWJNn99KtsIihHIQYKuuSr5xWcj+5T7UnNADBX+WDjH0NRys5boh0jIne9
+yhzsAS4pb8B6dlWvJpERvnBNIewDQ0mmFVdnS02GaRJ59LlTurgg7JWDtXGFVXlC
+L81gCZWjrjOHKro/dgNAu/PZcYa46/RiX68sEtVObf8Ah6T1LWGNjz8zJ3yL0jhW
+c/Av6SBE56sPApy2gNJIdlg8ylZB0UfpEqJcCoInhtmcm6kv94B6Rq/kWALVicIq
+3rcfqzrz4yx+frH8YSsK
+=9IjT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/shadow-4.2.1.ebuild b/sys-apps/shadow/shadow-4.2.1.ebuild
new file mode 100644
index 000000000000..6d596ec0e63b
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.2.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.1 2014/06/16 05:52:43 vapier Exp $
+
+EAPI=4
+
+inherit eutils libtool toolchain-funcs pam multilib
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
+SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit cracklib nls pam selinux skey xattr"
+
+RDEPEND="acl? ( sys-apps/acl )
+	audit? ( sys-process/audit )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3 )
+	pam? ( virtual/pam )
+	skey? ( sys-auth/skey )
+	selinux? (
+		>=sys-libs/libselinux-1.28
+		sys-libs/libsemanage
+	)
+	nls? ( virtual/libintl )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20120417 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920
+	epatch_user
+	elibtoolize
+}
+
+src_configure() {
+	tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
+	econf \
+		--without-group-name-max-length \
+		--without-tcb \
+		--enable-shared=no \
+		--enable-static=yes \
+		$(use_with acl) \
+		$(use_with audit) \
+		$(use_with cracklib libcrack) \
+		$(use_with pam libpam) \
+		$(use_with skey) \
+		$(use_with selinux) \
+		$(use_enable nls) \
+		$(use_with elibc_glibc nscd) \
+		$(use_with xattr attr)
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	[[ -z ${val} ]] && comment="#"
+	sed -i -r \
+		-e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \
+		"${D}"/etc/login.defs
+	local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs)
+	einfo ${res:-Unable to find ${opt} in /etc/login.defs}
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# 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
+	fi
+	# Output arch-specific cruft
+	local devs
+	case $(tc-arch) in
+		ppc*)  devs="hvc0 hvsi0 ttyPSC0";;
+		hppa)  devs="ttyB0";;
+		arm)   devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttymxc2 ttymxc3 ttyO0 ttyO1 ttyO2";;
+		sh)    devs="ttySC0 ttySC1";;
+	esac
+	[[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty
+
+	# needed for 'useradd -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
+
+	cd "${S}"
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chpasswd chgpasswd newusers; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chage chsh chfn \
+				 user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# comment out login.defs options that pam hates
+		local opt
+		for opt in \
+			CHFN_AUTH \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+		done
+
+		sed -i -f "${FILESDIR}"/login_defs_pam.sed \
+			"${D}"/etc/login.defs
+
+		# 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 {} +
+
+		# Remove pam.d files provided by pambase.
+		rm "${D}"/etc/pam.d/{login,passwd,su} || die
+	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.
+	if [ ! -f "${ROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${ROOT}" 2>/dev/null ; then
+			grpconv -R "${ROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}