From 747e077f380d671bb290bddc7c32f0bb52024481 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 25 Aug 2014 10:54:46 +0200
Subject: [PATCH] shadow: update to 4.2.1.

---
 srcpkgs/shadow/patches/cross-id32bit.patch | 28 ++++++++++++++++++++++
 srcpkgs/shadow/template                    | 20 +++++++---------
 2 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/shadow/patches/cross-id32bit.patch

diff --git a/srcpkgs/shadow/patches/cross-id32bit.patch b/srcpkgs/shadow/patches/cross-id32bit.patch
new file mode 100644
index 00000000000..aa58b85d371
--- /dev/null
+++ b/srcpkgs/shadow/patches/cross-id32bit.patch
@@ -0,0 +1,28 @@
+Added support to cache the value of the id32bit test, to allow cross compilation.
+
+	--xtraeme
+
+--- configure.in.orig	2014-05-09 13:53:10.000000000 +0200
++++ configure.in	2014-08-25 10:41:31.198567162 +0200
+@@ -335,6 +335,9 @@ if test "$enable_subids" != "no"; then
+ 	dnl
+ 	dnl FIXME: check if 32 bit UIDs/GIDs are supported by libc
+ 	dnl
++	AC_CACHE_CHECK(
++		[wheter subordinate IDs are supported],
++		[ac_cv_id32bit], [
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <sys/types.h>
+ int main(void) {
+@@ -342,9 +345,9 @@ int main(void) {
+ 	gid_t g;
+ 	return (sizeof u < 4) || (sizeof g < 4);
+ }
+-	])], [id32bit="yes"], [id32bit="no"])
++	])])], [ac_cv_id32bit="yes"], [ac_cv_id32bit="no"])
+ 
+-	if test "x$id32bit" = "xyes"; then
++	if test "x$ac_cv_id32bit" = "xyes"; then
+ 		AC_DEFINE(ENABLE_SUBIDS, 1, [Define to support the subordinate IDs.])
+ 		enable_subids="yes"
+ 	else
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index e7a63071b3e..130201ce881 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,12 +1,13 @@
 # Template file for 'shadow'
 pkgname=shadow
-version=4.1.5.1
-revision=17
+version=4.2.1
+revision=1
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --enable-shared --disable-static
  --with-libpam --without-selinux --with-acl --with-attr
- --disable-nls"
+ --enable-subordinate-ids ac_cv_id32bit=yes"
+hostmakedepends="automake libtool gettext-devel"
 makedepends="acl-devel pam-devel>=1.1.8_4"
 depends="pam"
 conf_files="
@@ -29,17 +30,12 @@ short_desc="Shadow password file utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 homepage="http://pkg-shadow.alioth.debian.org"
-distfiles="http://pkgs.fedoraproject.org/repo/pkgs/shadow-utils/${pkgname}-${version}.tar.bz2/a00449aa439c69287b6d472191dc2247/${pkgname}-${version}.tar.bz2"
-checksum=aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="automake libtool gettext-devel"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+distfiles="http://pkg-shadow.alioth.debian.org/releases/$pkgname-$version.tar.xz"
+checksum=3b0893d1476766868cd88920f4f1231c4795652aa407569faff802bcda0f3d41
 
 pre_configure() {
+	autoreconf -fi
+
 	case "$XBPS_TARGET_MACHINE" in
 		# Completely disable unportable ruserok().
 		*-musl) sed '/RUSEROK/d' -i configure;;