shadow: Updated (4.1.5.1 -> 4.2.1)

base/musl/pkg/shadow/shadow-disable-rlogin.patch

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../musl/pkg/shadow/shadow-disable-rlogin.patch
-# Copyright (C) 2014 The OpenSDE Project
+# Copyright (C) 2014 - 2016 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -35,15 +35,15 @@ diff --git a/configure.in b/configure.in
 index da04a81..4203d1f 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -194,7 +194,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd",
- 
+@@ -196,7 +196,7 @@
  dnl XXX - quick hack, should disappear before anyone notices :).
  AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
--AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
-+AC_DEFINE(RLOGIN, 0, [Define if login should support the -r flag for rlogind.])
- AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
+ if test "$ac_cv_func_ruserok" = "yes"; then
+-	AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
++	AC_DEFINE(RLOGIN, 0, [Define if login should support the -r flag for rlogind.])
+ 	AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
+ fi
  
- AC_ARG_ENABLE(shadowgrp,
 diff --git a/lib/prototypes.h b/lib/prototypes.h
 index 00d9e0b..a1696fe 100644
 --- a/lib/prototypes.h
@@ -75,16 +75,16 @@ diff --git a/libmisc/Makefile.in b/libmisc/Makefile.in
 index 4891360..86dcbd5 100644
 --- a/libmisc/Makefile.in
 +++ b/libmisc/Makefile.in
-@@ -79,7 +79,7 @@ am_libmisc_a_OBJECTS = addgrps.$(OBJEXT) age.$(OBJEXT) \
- 	motd.$(OBJEXT) myname.$(OBJEXT) obscure.$(OBJEXT) \
- 	pam_pass.$(OBJEXT) pam_pass_non_interractive.$(OBJEXT) \
- 	pwd2spwd.$(OBJEXT) pwdcheck.$(OBJEXT) pwd_init.$(OBJEXT) \
--	remove_tree.$(OBJEXT) rlogin.$(OBJEXT) root_flag.$(OBJEXT) \
-+	remove_tree.$(OBJEXT) root_flag.$(OBJEXT) \
- 	salt.$(OBJEXT) setugid.$(OBJEXT) setupenv.$(OBJEXT) \
- 	shell.$(OBJEXT) strtoday.$(OBJEXT) sub.$(OBJEXT) \
- 	sulog.$(OBJEXT) ttytype.$(OBJEXT) tz.$(OBJEXT) \
-@@ -306,7 +306,6 @@ libmisc_a_SOURCES = \
+@@ -113,7 +113,7 @@
+ 	obscure.$(OBJEXT) pam_pass.$(OBJEXT) \
+ 	pam_pass_non_interractive.$(OBJEXT) pwd2spwd.$(OBJEXT) \
+ 	pwdcheck.$(OBJEXT) pwd_init.$(OBJEXT) remove_tree.$(OBJEXT) \
+-	rlogin.$(OBJEXT) root_flag.$(OBJEXT) salt.$(OBJEXT) \
++	root_flag.$(OBJEXT) salt.$(OBJEXT) \
+ 	setugid.$(OBJEXT) setupenv.$(OBJEXT) shell.$(OBJEXT) \
+ 	strtoday.$(OBJEXT) sub.$(OBJEXT) sulog.$(OBJEXT) \
+ 	ttytype.$(OBJEXT) tz.$(OBJEXT) ulimit.$(OBJEXT) \
+@@ -393,7 +393,6 @@
  	pwdcheck.c \
  	pwd_init.c \
  	remove_tree.c \
@@ -92,7 +92,7 @@ index 4891360..86dcbd5 100644
  	root_flag.c \
  	salt.c \
  	setugid.c \
-@@ -413,7 +412,6 @@ distclean-compile:
+@@ -504,7 +503,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwd_init.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwdcheck.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remove_tree.Po@am__quote@

base/shadow/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch

@@ -0,0 +1,57 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../shadow/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
+# Copyright (C) 2016 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+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.
+
+Upstream-Status: Accepted
+[https://github.com/shadow-maint/shadow/commit/2cb54158b80cdbd97ca3b36df83f9255e923ae3f]
+
+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

base/shadow/shadow.conf

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../shadow/shadow.conf
-# Copyright (C) 2006 - 2012 The OpenSDE Project
+# Copyright (C) 2006 - 2016 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -25,8 +25,17 @@ fi
 disable_groups() {
 	echo_status "Disabling groups command..."
 	echo_status "Using groups command provided by coreutils..."
-	sed 's/groups$(EXEEXT) //' -i.orig src/Makefile.in
-	find man -name Makefile.in -exec sed 's/groups\.1 / /' -i.orig '{}' \;
+	sed -i -e 's/groups$(EXEEXT) //' \
+	src/Makefile.in
+
+	sed -i -e 's|man1/groups\.1||' \
+		-e 's|man8/nologin\.8||' \
+	man/Makefile.in	
+
+	if ! atstage native; then
+		echo_status "Fixing cross compilation..."
+		echo "#define ENABLE_SUBIDS 1" >> config.h
+	fi
 }
 hook_add premake 3 "disable_groups"
 
@@ -55,10 +64,14 @@ pm_shadow() {
 
 hook_add postmake 5 "pm_shadow"
 
-confopt="$confopt --enable-shared --disable-desrpc"
+confopt="$confopt --enable-shared --disable-nls --enable-subordinate-ids=yes"
 
 if ! atstage native; then
 	libdir="/${libdir##*/}"
+	var_append configcache ' ' 'ac_cv_id32bit=yes'
+	var_remove confopt ' ' '--enable-subordinate-ids=yes'
+	var_append confopt ' ' '--enable-subordinate-ids=no'
+	hook_add premake 9 "sed -i -e 's/\(^suidu*bins = \).*/\1/' src/Makefile.in"
 else
 	libdir="$root/${libdir##*/}"
 fi

base/shadow/shadow.desc

@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../shadow/shadow.desc
-[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2016 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -32,7 +32,7 @@
 
 [L] BSD
 [S] Stable
-[V] 4.1.5.1
+[V] 4.2.1
 [P] X -1-3-5---9 179.100
 
-[D] 451543640 shadow-4.1.5.1.tar.bz2 http://pkg-shadow.alioth.debian.org/releases/
+[D] 2235802114 shadow-4.2.1.tar.xz http://pkg-shadow.alioth.debian.org/releases/