From 41cb3f1f016d8ecd023afbbcc229ceb7861d0d1a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 31 Jul 2012 20:57:57 +0200
Subject: [PATCH] shadow: set default group for useradd to users, login.defs
 tweaks.

---
 srcpkgs/shadow/files/login.defs | 37 +++++++++------------------------
 srcpkgs/shadow/template         |  4 +++-
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/shadow/files/login.defs b/srcpkgs/shadow/files/login.defs
index 8cf1ae5f147..d8d152f10cf 100644
--- a/srcpkgs/shadow/files/login.defs
+++ b/srcpkgs/shadow/files/login.defs
@@ -1,10 +1,8 @@
 # *REQUIRED*
 #   Directory where mailboxes reside, _or_ name of file, relative to the
 #   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
-#   QMAIL_DIR is for Qmail
 #
-#QMAIL_DIR	Maildir
-MAIL_DIR	/var/mail
+MAIL_DIR		/var/mail
 #MAIL_FILE	.mail
 
 # Password aging controls:
@@ -13,51 +11,36 @@ MAIL_DIR	/var/mail
 #	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
 #	PASS_MIN_LEN	Minimum acceptable password length.
 #	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
+PASS_MAX_DAYS		99999
+PASS_MIN_DAYS		0
+PASS_WARN_AGE		7
 
-#
 # Min/max values for automatic uid selection in useradd
-#
 UID_MIN			 1000
 UID_MAX			60000
 # System accounts
 SYS_UID_MIN		  100
 SYS_UID_MAX		  999
 
-#
 # Min/max values for automatic gid selection in groupadd
-#
 GID_MIN			 1000
 GID_MAX			60000
 # System accounts
 SYS_GID_MIN		  100
 SYS_GID_MAX		  999
 
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
 # If useradd should create home directories for users by default
 # On RH systems, we do. This option is overridden with the -m flag on
 # useradd command line.
-#
-CREATE_HOME	yes
+CREATE_HOME		yes
 
 # The permission mask is initialized to this value. If not specified, 
 # the permission mask will be initialized to 022.
-UMASK           077
+UMASK           	077
 
 # This enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
+USERGROUPS_ENAB		yes
 
-# Disable MD5 and use SHA512 by default.
-MD5_CRYPT_ENAB no
-ENCRYPT_METHOD SHA512
+# Use SHA512 encryption for passwords by default.
+ENCRYPT_METHOD		SHA512
+SHA_CRYPT_MIN_ROUNDS	66666
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 84e480af6d0..d95544bc596 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.5.1
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
 --libdir=/usr/lib --enable-shared --disable-static
@@ -59,6 +59,8 @@ post_install() {
 
 	# Disable creating mailbox files by default.
 	sed -i -e 's/yes/no/' $DESTDIR/etc/default/useradd
+	# Change default group to the users gid (100).
+	sed -i -e 's/^\(GROUP\)=\(.*\)$/\1=100/' ${DESTDIR}/etc/default/useradd
 
 	# Install the cron daily job.
 	install -D -m744 ${FILESDIR}/shadow.cron-daily \