Fix from upstream for cross-compile noticed in Chromium OS.

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

4 files changed, 69 insertions, 19 deletions

diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index 97fb9283ddc7..b7455ccd2392 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/shadow
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.297 2015/02/14 05:40:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.298 2015/04/30 06:48:16 vapier Exp $
+
+  30 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/shadow-4.2.1-cross-size-checks.patch, shadow-4.2.1-r1.ebuild:
+  Fix from upstream for cross-compile noticed in Chromium OS.
 
 *shadow-4.2.1-r1 (14 Feb 2015)
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 98020ea8ff75..eca94207fc8d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,27 +7,28 @@ AUX pam.d-include/passwd 144 SHA256 8c54d2e3aab50b2a8d3d36aa37f7d7bb32c15d9a3af9
 AUX pam.d-include/shadow 152 SHA256 7fc1ccca85d2b1ac4dad9909792453c8d26e9aeab48c620d861a92b9355ac69f SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3 WHIRLPOOL 2b5282f983b5bf52c0311c2153dba2d12f6c07ae803d1723010bf4bbf4962d120aea026d32b1f3b062778da5222e7cb16dc39660e53b72173fba723a57b616de
 AUX securetty 280 SHA256 8696cb3bf227aff9ffd7e0b08534854fe446135c04d4d117a6da95f771e8eec7 SHA512 45cef97f97fa8450e19d047c4dc3e84c023caa9d0778a0d229c30e51abff0a900a02d220618079dff9f097ff0b8d29cafd9f67bbf695699928eb31dd09e86df3 WHIRLPOOL 0d1edf1aaccd61eb6a0ebd0f5d5b0445bce35d93f5db7811d49a7f334bc91c115da22a031e40ee5c4789be22f10a716649184a95167e3a0f37b97a7446bedc5f
 AUX shadow-4.1.3-dots-in-usernames.patch 302 SHA256 2299ffaec204d20e00d791bf5b982571c9261a74c7a7b865a9f7cad1cdcb43ba SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d WHIRLPOOL f0258b24f7731ab7b15a1fca391593c8bbd6bdf2ddad57af1d7960d05af49bc5b706039caa576646cb3d817d2d4ad8e89526b12fe046301c63c1518d01dcf173
+AUX shadow-4.2.1-cross-size-checks.patch 1248 SHA256 2729c215d0147c961163c29d5f456b2280767c113239daa79ab3b5ddf00876cf SHA512 dde27090645e757e53eaba69180a50fbbdfd04f3fd485fafa7d6dc20736ef2fee112350886236328424cbf3c2dfbe57f5fcf45f72a0b69634d7ce9cc368924d8 WHIRLPOOL 792550a615099f493bb8d22af100a9c9dc75f1560aee71128c7d7e4300ae41644b81d7107d929157afee184798d0d327944bd4df33e823072463e5e3f9678442
 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
-EBUILD shadow-4.2.1-r1.ebuild 5459 SHA256 327712cc8a98b3c10e597d484a73738522a51bbd28ceff70d380e0720e405be4 SHA512 8172fb75706231d9c61680a4e0e344b84014ff7b265532386a37b22887d46cd37b2695f5a722de2f3014e8a6524ef55649cdec3668142dfe8d5213ec6954f757 WHIRLPOOL de6fe90d9b842270a72266ff1db1cee3d23c8b185f8647f75eb4c748c93157522af60fba34d4d7a964f470c629219f535374563edead8f0aeb3e4bc819731e91
+EBUILD shadow-4.2.1-r1.ebuild 5612 SHA256 d2c2df5f20775b7f092481bcfab7f446895ef8b5ecfc4bd459a41e257d48971b SHA512 651a3c2a2b06c3ac6a188b55290c35cce1f4cff6062ab23af7df0b5ff3d80a5b124d8a2697b6fe67d9719b4abdcc68c133b09d29d570884c1133fa495e6efbbb WHIRLPOOL bac74232f95c8f9b011d94f70d64ead797cca81f7a8db303de784d16abfd0987299c7445cb930b3169b52002a121faa3bede495f81aba4585847a9d6da7cdada
 EBUILD shadow-4.2.1.ebuild 5242 SHA256 88510edfbc2b8e66a6af3248fad77e305987784c240a320c9ec0d5d10a3dfc04 SHA512 faa2727df657cefd764f3d4f7dabf5ad3ae72696681c74ddcbd9bf2104431f14298b09025be581fc557c37aa62269e405b034daeaa31f454ebcd20bc1b8796fc WHIRLPOOL 92a1cc8a6e0f53ffd7cc059ac03c80e67591d2f5e3ffd3367f4b46faa768e1a4b18af74d6534e71150e1607ae61944f1fe3e24d386bcfc1e1021c326ca6e2d6c
-MISC ChangeLog 50905 SHA256 ccc936bd65237de11aea3863cb259c7b97722e5563b9bc4dceeda6eb1dbe768d SHA512 dec81cea61c8a6584729c6958cba1567fb0f4322d9432c3aa16077902f7a733cb1ddba88634c76ecace7acbe969c14772b9500f0f0dd9248699135be0eeee406 WHIRLPOOL 8446a0ca9b5e99018f3f6051a224759db42ff36b6db6e589b1458da0d0c8f8c5e1d4abb1140813252a81b1d6c4725fc3b1b16d9be3b8470e925bac9f524bff0a
+MISC ChangeLog 51089 SHA256 bbd5750c5403da96d5875738418b68a3884025a85391885fced1d202f97187ee SHA512 8741d75131d25e4524c7a243338e26e614ce81411c0c58725028717c16ace08ec3aa665b8af3eaa4a6f94a23debfed07524bda6d2e2652a05bc290c30322b9ab WHIRLPOOL eb08c4506cbab719018752c00167a531cc6ca5075965921466906cfc3db75dd69276e06115a5893cb7a22f099a563a86b295ccac7e410af037c968ea53c1620a
 MISC metadata.xml 374 SHA256 1675a5791603e79e431df63215162737553fa8018360b026739ac3284bca54b2 SHA512 0bb65b45fa94ddea89f7e0a879fd996b3f363b3e58eb6cbd71251fd79416667f103af4bac0c87f3ba240e0ce3f323c77ce7be9f6ea92c13d619ff8cef8797add WHIRLPOOL e7f4f5d975440fe71dbb35dee4394aa808fce7b5e58ac64d162418a47ed99cb002c7622563be4f6800967d6b8530d29dbd895e431c78f75a5cdf490b8c1afc45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU3t/eAAoJEPGu1DbS6WIA604QAIp8oZ3ywuhGpkDonMdY+xcg
-4NMnCNdqUQn4oSdNvOWqCugIqXhRKAyzVYLZYbkEeeCxQ+/hD4MeU6CImfDTgL30
-6J8iNsXqFKPMRTPMa+kpWk0qcpqV1va5bx07/FeiV9l7+x/FnDnrcHJVz9MyxPuU
-srmGwdER1xFpXbXtsHhsrVF9DVOi32Uvqo++R4+DdavrSMMHOuU+H2mU5xVQ3TNi
-223ZH57HMeqAp45rcC9AMJwLcoMG7k7w4jSAldzFCzsDIPI8N+mxhfQ5Ih5JS4rY
-dmjgvsnKrW5R1Jrm3VWqCAXj8434cmK0xQ1NEb9/z6DjwF1yS66OU3PyHCGM2SQ9
-FfMAKpUNDras86TNlu91ZmyMjq6sNpflyISUslxAkLMugH5xbrUtTURuGO05MXri
-vsej8ORn3WRdCy+EU+abgKCJV1bcaKZQ9DEG6YzLQr58jHum5iQZF2OSI+h4qgaJ
-j2JuTJEF1vJGX1gBMqn4YiUqSSo9Xag+GJeJkkRKED8gbrEg87fUh6vVqezTB8xM
-Ebe8fpDpXUn/2BnPCH3/vlHuucrxytJ/xZyNPeUp3RkZAguH3GtHY5vZhNpLFqJX
-J5vmTBncajheqtbrTyfJ7Z2TwtQjmsysBDCC8X96IbGpP30CyozU7rAia+kc0UTm
-p0U1p7JuR74a8zVTsTV+
-=8Fq/
+iQIcBAEBCAAGBQJVQdAxAAoJEPGu1DbS6WIAsdMQAJq42MA9EBzxbGb2nT2QgGry
+lTG+zNAZIwX51raeCuLkWPP7fH2iNXg8PtliioIG7c9x3dHW8wk8MwjnTfPwkV1h
+YzlK26cBn4ktwFHhflDWdpMGVFwlRETj2gCz0v/d2zbFJ0zA8YQFXlLUY7/8/iB2
+A0W2ET5fLgMvB86hRnTa/+Cddi/JrapBza8tMxJkcc016A/Msk/PBj5v1mrw/4ax
+bxOSWTZa28R+EN9EKv89CCVgLKRbozmwDJDh54Eyay5Y5k/HpN4cq5PcTFsJVTHl
+/Z1iqPNUzbORceuJEbuZ2QmExNRsI98PdS/zrG83CypYcP1bP7eqktoamuJaMT9l
+s2fp9zkZNvdkUGg45vpsgkvR1kNr/X+gx0rynDEkUZuw2/rm34YRp1saB3DdaDUh
+A43ttGrgxp/dTHxzMh6NZQYjOoFsgsH50+0vM9dneLIdE+qpDR9xniAXi99av1WU
+FzqyP/jCJNf54iE70jeYZvIqtWlF7MOGtADH8bsk+K+6lxAV2Lyce9pwUNHNrXLr
+ajnBUrorzI2DCHpoSSxBaoQvBJI0fX2n8BHFrP/I8nPxepyu88WHAVk7Bp7TgGRJ
+xn0toFgWejRdgd+Qi1MNnCQzgE/PHzyzFs+x6RjFPNvQQJ5bf0SdtoJMiesogrAO
+i332Admkc66zvvb6dYFl
+=1/TQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/shadow/files/shadow-4.2.1-cross-size-checks.patch b/sys-apps/shadow/files/shadow-4.2.1-cross-size-checks.patch
new file mode 100644
index 000000000000..f067caab204d
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.2.1-cross-size-checks.patch
@@ -0,0 +1,41 @@
+From 2cb54158b80cdbd97ca3b36df83f9255e923ae3f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Sat, 23 Aug 2014 09:46:39 +0100
+Subject: [PATCH] Check size of uid_t and gid_t using AC_CHECK_SIZEOF
+
+This built-in check is simpler than the previous method and, most
+importantly, works when cross-compiling.
+
+Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+---
+ configure.in | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 1a3f841..4a4d6d0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -335,16 +335,10 @@ if test "$enable_subids" != "no"; then
+ 	dnl
+ 	dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc
+ 	dnl
+-	AC_RUN_IFELSE([AC_LANG_SOURCE([
+-#include <sys/types.h>
+-int main(void) {
+-	uid_t u;
+-	gid_t g;
+-	return (sizeof u < 4) || (sizeof g < 4);
+-}
+-	])], [id32bit="yes"], [id32bit="no"])
+-
+-	if test "x$id32bit" = "xyes"; then
++	AC_CHECK_SIZEOF([uid_t],, [#include "sys/types.h"])
++	AC_CHECK_SIZEOF([gid_t],, [#include "sys/types.h"])
++
++	if test "$ac_cv_sizeof_uid_t" -ge 4 && test "$ac_cv_sizeof_gid_t" -ge 4; then
+ 		AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.])
+ 		enable_subids="yes"
+ 	else
+-- 
+2.3.6
+
diff --git a/sys-apps/shadow/shadow-4.2.1-r1.ebuild b/sys-apps/shadow/shadow-4.2.1-r1.ebuild
index afa836dd5c6a..6ee7fe697a7e 100644
--- a/sys-apps/shadow/shadow-4.2.1-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.2.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 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-r1.ebuild,v 1.1 2015/02/14 05:40:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1-r1.ebuild,v 1.2 2015/04/30 06:48:16 vapier Exp $
 
 EAPI=4
 
-inherit eutils libtool toolchain-funcs pam multilib
+inherit eutils libtool toolchain-funcs pam multilib autotools
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
@@ -37,8 +37,12 @@ RDEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920
+	epatch "${FILESDIR}"/${P}-cross-size-checks.patch
 	epatch_user
-	elibtoolize
+	# https://github.com/shadow-maint/shadow/pull/5
+	mv configure.{in,ac} || die
+	eautoreconf
+	#elibtoolize
 }
 
 src_configure() {