change package name so "shadow-utils" won't attempt to update

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>

.cvsignore

@@ -1,5 +0,0 @@
-shadow-4.0.16.tar.bz2
-shadow-4.0.16-nscd.c
-shadow-4.0.17.tar.bz2
-shadow-4.0.17-login.defs
-shadow-4.0.18.1.tar.bz2

.gitignore

@@ -0,0 +1,12 @@
+shadow-4.1.4.2.tar.bz2
+/shadow-4.1.4.3.tar.bz2
+/shadow-4.1.5.tar.bz2
+/shadow-4.1.5.1.tar.bz2
+/shadow-4.1.5.1.tar.bz2.sig
+/shadow-4.2.1.tar.xz
+/shadow-4.2.1.tar.xz.sig
+/shadow-4.3.1.tar.gz
+/shadow-4.5.tar.xz
+/shadow-4.5.tar.xz.asc
+/shadow-4.6.tar.xz
+/shadow-4.6.tar.xz.asc

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: shadow-utils
-# $Id: Makefile,v 1.3 2005/08/05 11:53:21 pvrabec Exp $
-NAME := shadow-utils
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

gpl-2.0.txt

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it 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.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

shadow-4.0.11.1-vipw.patch

@@ -1,133 +0,0 @@
---- shadow-4.0.11.1/src/groupadd.c.vipw	2005-07-19 11:50:45.000000000 +0000
-+++ shadow-4.0.11.1/src/groupadd.c	2005-08-04 15:14:58.000000000 +0000
-@@ -438,6 +451,7 @@
- 
- int main (int argc, char **argv)
- {
-+	struct stat s;
- #ifdef USE_PAM
- 	pam_handle_t *pamh = NULL;
- 	struct passwd *pampw;
-@@ -492,6 +506,11 @@
- 	OPENLOG ("groupadd");
- #endif				/* USE_PAM */
- 
-+	if (stat("/etc/gtmp", &s) == 0) {
-+        	fputs("vigr lockfile (/etc/gtmp) is present.\n", stderr);
-+	        fail_exit(1);
-+	}
-+
- #ifdef SHADOWGRP
- 	is_shadow_grp = sgr_file_present ();
- #endif
---- shadow-4.0.11.1/src/userdel.c.vipw	2005-08-04 15:16:06.000000000 +0000
-+++ shadow-4.0.11.1/src/userdel.c	2005-08-04 15:18:15.000000000 +0000
-@@ -577,6 +577,7 @@
- 	struct group *grp;
- 	int arg;
- 	int errors = 0;
-+	struct stat s;
- 
- #ifdef USE_PAM
- 	pam_handle_t *pamh = NULL;
-@@ -637,6 +638,11 @@
- 
- 	OPENLOG ("userdel");
- 
-+        if (stat("/etc/ptmp", &s) == 0) {
-+                fputs("vipw lockfile (/etc/ptmp) is present.\n", stderr);
-+                fail_exit(1);
-+        }
-+
- 	is_shadow_pwd = spw_file_present ();
- #ifdef SHADOWGRP
- 	is_shadow_grp = sgr_file_present ();
---- shadow-4.0.11.1/src/groupmod.c.vipw	2005-08-04 15:20:09.000000000 +0000
-+++ shadow-4.0.11.1/src/groupmod.c	2005-08-04 15:21:27.000000000 +0000
-@@ -407,6 +407,7 @@
- int main (int argc, char **argv)
- {
- 	struct group *grp;
-+	struct stat s;
- 
- #ifdef USE_PAM
- 	pam_handle_t *pamh = NULL;
-@@ -458,6 +459,11 @@
- 	}
- #endif				/* USE_PAM */
- 
-+        if (stat("/etc/gtmp", &s) == 0) {
-+	        fputs("vigr lockfile (/etc/gtmp) is present.\n", stderr);
-+	       	exit(1);
-+	}
-+
- 	OPENLOG ("groupmod");
- 
- #ifdef SHADOWGRP
---- shadow-4.0.11.1/src/groupdel.c.vipw	2005-08-04 15:22:00.000000000 +0000
-+++ shadow-4.0.11.1/src/groupdel.c	2005-08-04 15:23:10.000000000 +0000
-@@ -222,6 +222,7 @@
- int main (int argc, char **argv)
- {
- 	struct group *grp;
-+	struct stat s;
- 
- #ifdef USE_PAM
- 	pam_handle_t *pamh = NULL;
-@@ -276,6 +277,11 @@
- 	}
- #endif				/* USE_PAM */
- 
-+        if (stat("/etc/gtmp", &s) == 0) {
-+                fputs("vigr lockfile (/etc/gtmp) is present.\n", stderr);
-+                exit(1);
-+        }
-+
- 	OPENLOG ("groupdel");
- 
- #ifdef SHADOWGRP
---- shadow-4.0.11.1/src/usermod.c.vipw	2005-08-04 15:23:30.000000000 +0000
-+++ shadow-4.0.11.1/src/usermod.c	2005-08-04 15:25:31.000000000 +0000
-@@ -1224,6 +1224,7 @@
- int main (int argc, char **argv)
- {
- 	int grp_err = 0;
-+	struct stat s;
- 
- #ifdef USE_PAM
- 	pam_handle_t *pamh = NULL;
-@@ -1245,6 +1246,12 @@
- 	user_groups[0] = (char *) 0;
- 
- 	OPENLOG ("usermod");
-+	
-+        if (stat("/etc/ptmp", &s) == 0) {
-+	        fputs("vipw lockfile (/etc/ptmp) is present.\n", stderr);
-+                fail_exit(1);
-+        }
-+
- 
- 	is_shadow_pwd = spw_file_present ();
- #ifdef SHADOWGRP
---- shadow-4.0.11.1/src/useradd.c.vipw	2005-08-04 15:25:54.000000000 +0000
-+++ shadow-4.0.11.1/src/useradd.c	2005-08-04 15:28:42.000000000 +0000
-@@ -1651,6 +1651,7 @@
- 
- int main (int argc, char **argv)
- {
-+	struct stat s;
- #ifdef USE_PAM
- 	pam_handle_t *pamh = NULL;
- 	struct passwd *pampw;
-@@ -1669,6 +1670,11 @@
- 
- 	OPENLOG ("useradd");
- 
-+        if (stat("/etc/ptmp", &s) == 0) {
-+                fputs("vipw lockfile (/etc/ptmp) is present.\n", stderr);
-+                fail_exit(1);
-+        }
-+
- 	sys_ngroups = sysconf (_SC_NGROUPS_MAX);
- 	user_groups = malloc ((1 + sys_ngroups) * sizeof (char *));
- 

shadow-4.0.13-newgrpPwd.patch

@@ -1,92 +0,0 @@
---- shadow-4.0.13/src/newgrp.c.newgrpPwd	2005-09-15 18:44:12.000000000 +0200
-+++ shadow-4.0.13/src/newgrp.c	2005-10-21 16:02:16.000000000 +0200
-@@ -333,25 +333,37 @@ int main (int argc, char **argv)
- 	}
- #endif
- 
--	/*
--	 * see if she is a member of this group. If she isn't a member, she
--	 * needs to provide the group password. If there is no group
--	 * password, she will be denied access anyway.
--	 *
--	 */
--	if (!is_on_list (grp->gr_mem, name))
--		needspasswd = 1;
-+        /* Needn't password:
-+         *      - default user's GID = group ID
-+         *      - members of group
-+         *      - root
-+         * Need password:
-+         *      - all others users
-+         *
-+         * -- Karel Zak <kzak@redhat.com> 2004/03/29
-+         */
-+	if (getuid ()!=0)
-+        {
-+                if (grp->gr_gid==pwd->pw_gid)
-+                        needspasswd = 0;
-+                else if (is_on_list (grp->gr_mem, name))
-+                        needspasswd = 0;
-+                else
-+                        needspasswd = 1;
- 
- 	/*
- 	 * If she does not have either a shadowed password, or a regular
- 	 * password, and the group has a password, she needs to give the
- 	 * group password.
- 	 */
--	if ((spwd = getspnam (name)))
--		pwd->pw_passwd = spwd->sp_pwdp;
--
--	if (pwd->pw_passwd[0] == '\0' && grp->gr_passwd[0])
--		needspasswd = 1;
-+                if (!needspasswd)
-+                {
-+                        if ((spwd = getspnam (name)))
-+                                pwd->pw_passwd = spwd->sp_pwdp;
-+                        if (pwd->pw_passwd[0] == '\0' && grp->gr_passwd[0])
-+                                needspasswd = 1;
-+                }
-+        }
- 
- 	/*
- 	 * Now i see about letting her into the group she requested. If she
-@@ -362,7 +374,21 @@ int main (int argc, char **argv)
- 	 * Note that she now has to provide the password to her own group,
- 	 * unless she is listed as a member.  -- JWP
- 	 */
--	if (getuid () != 0 && needspasswd) {
-+        if (needspasswd) {
-+
-+                /* note: the original util-linux newgrp didn't ask for pasword if
-+                 * there is no password. It's better directly give up.
-+                 * -- kzak@redhat.com
-+                 */
-+		if (grp->gr_passwd==NULL || grp->gr_passwd[0] == '\0') {
-+                        /*
-+                         * there is no password, print out "Sorry" and give up
-+                         */
-+                        sleep (1);
-+                        fputs (_("Sorry.\n"), stderr);
-+			goto failure;
-+                }
-+
- 		/*
- 		 * get the password from her, and set the salt for
- 		 * the decryption from the group file.
-@@ -378,15 +404,6 @@ int main (int argc, char **argv)
- 		cpasswd = pw_encrypt (cp, grp->gr_passwd);
- 		strzero (cp);
- 
--		if (grp->gr_passwd[0] == '\0') {
--			/*
--			 * there is no password, print out "Sorry" and give up
--			 */
--			sleep (1);
--			fputs (_("Sorry.\n"), stderr);
--			goto failure;
--		}
--
- 		if (strcmp (cpasswd, grp->gr_passwd) != 0) {
- 			SYSLOG ((LOG_INFO,
- 				 "Invalid password for group `%s' from `%s'",

shadow-4.0.14-goodname.patch

@@ -1,96 +0,0 @@
---- shadow-4.0.18.1/libmisc/chkname.c.goodname	2005-08-31 19:24:57.000000000 +0200
-+++ shadow-4.0.18.1/libmisc/chkname.c	2007-06-26 16:20:40.000000000 +0200
-@@ -18,16 +18,24 @@
- static int good_name (const char *name)
- {
- 	/*
--	 * User/group names must match [a-z_][a-z0-9_-]*[$]
--	 */
--	if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_'))
-+         * User/group names must match gnu e-regex:
-+         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
-+         *
-+         * as a non-POSIX, extension, allow "$" as the last char for
-+         * sake of Samba 3.x "add machine script"
-+         */
-+	if (!*name || !((*name >= 'a' && *name <= 'z')
-+             || (*name >= 'A' && *name <= 'Z')
-+             || (*name >= '0' && *name <= '9')
-+             || *name == '_' || *name == '.'))
- 		return 0;
- 
- 	while (*++name) {
--		if (!((*name >= 'a' && *name <= 'z') ||
--		      (*name >= '0' && *name <= '9') ||
--		      *name == '_' || *name == '-' ||
--		      (*name == '$' && *(name + 1) == '\0')))
-+		if (!(  (*name >= 'a' && *name <= 'z')
-+		     || (*name >= 'A' && *name <= 'Z')
-+                     || (*name >= '0' && *name <= '9')
-+                     || *name == '_' || *name == '.' || *name == '-'
-+                     || (*name == '$' && *(name + 1) == '\0')))
- 			return 0;
- 	}
- 
-@@ -43,10 +51,9 @@
- #endif
- 
- 	/*
--	 * User names are limited by whatever utmp can
--	 * handle (usually max 8 characters).
-+	 * User names are limited by whatever utmp can handle.
- 	 */
--	if (strlen (name) > sizeof (ut.ut_user))
-+	if (strlen(name) + 1 > sizeof(ut.ut_user))
- 		return 0;
- 
- 	return good_name (name);
-@@ -54,11 +61,13 @@
- 
- int check_group_name (const char *name)
- {
--	/*
--	 * Arbitrary limit for group names - max 16
--	 * characters (same as on HP-UX 10).
--	 */
--	if (strlen (name) > 16)
-+#if HAVE_UTMPX_H
-+	struct utmpx ut;
-+#else
-+	struct utmp ut;
-+#endif
-+
-+	if (strlen(name) + 1 > sizeof(ut.ut_user))
- 		return 0;
- 
- 	return good_name (name);
---- shadow-4.0.18.1/man/groupadd.8.goodname	2007-06-26 16:20:40.000000000 +0200
-+++ shadow-4.0.18.1/man/groupadd.8	2007-06-26 16:22:05.000000000 +0200
-@@ -73,15 +73,11 @@
- Shadow password suite configuration.
- .SH "CAVEATS"
- .PP
--Groupnames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]
--.PP
--Groupnames may only be up to 16 characters long.
-+Groupnames may only be up to 32 characters long.
- .PP
- If the groupname already exists in an external group database such as NIS,
- \fBgroupadd\fR
- will deny the group creation request.
--.PP
--Groupnames may only be up to 16 characters long.
- .SH "EXIT VALUES"
- .PP
- The
---- shadow-4.0.18.1/man/useradd.8.goodname	2007-06-26 16:20:40.000000000 +0200
-+++ shadow-4.0.18.1/man/useradd.8	2007-06-26 16:20:40.000000000 +0200
-@@ -179,8 +179,6 @@
- Similarly, if the username already exists in an external user database such as NIS,
- \fBuseradd\fR
- will deny the user account creation request.
--.PP
--Usernames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$]
- .SH "FILES"
- .TP 3n
- \fI/etc/passwd\fR

shadow-4.0.16-lOption.patch

@@ -1,58 +0,0 @@
---- shadow-4.0.17/man/useradd.8.lOption	2006-11-02 18:23:50.000000000 +0100
-+++ shadow-4.0.17/man/useradd.8	2006-11-02 18:23:50.000000000 +0100
-@@ -96,6 +96,9 @@
- \fB\-m\fR
- option. The default is to not create the directory and to not copy any files.
- .TP 3n
-+\fB-l\fR
-+Do not add the user to the last login log file. This is an option added by Red Hat.
-+.TP 3n
- \fB-n\fR
- A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used.
- .TP 3n
---- shadow-4.0.17/src/useradd.c.lOption	2006-11-02 18:23:50.000000000 +0100
-+++ shadow-4.0.17/src/useradd.c	2006-11-02 18:26:46.000000000 +0100
-@@ -124,6 +124,7 @@
-     Gflg = 0,			/* secondary group set for new account */
-     kflg = 0,			/* specify a directory to fill new user directory */
-     mflg = 0,			/* create user's home directory if it doesn't exist */
-+    lflg = 0,      		/* do not add user to lastlog database file */
-     Mflg = 0,                   /* do NOT create user's home directory no matter what */
-     nflg = 0,                   /* do NOT create a group having the same name as the user */
-     oflg = 0,			/* permit non-unique user ID to be specified with -u */
-@@ -630,6 +631,7 @@
- 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
- 			   "  -m, --create-home		create home directory for the new user\n"
- 			   "				account\n"
-+			   "  -l,                       do not add user to lastlog database file\n"
- 			   "  -M,                       do not create user's home directory(overrides /etc/login.defs)\n"
- 			   "  -r,                       create system account\n"
- 			   "  -o, --non-unique		allow create user with duplicate\n"
-@@ -1041,7 +1043,7 @@
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:",
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1181,6 +1183,9 @@
- 			case 'm':
- 				mflg++;
- 				break;
-+			case 'l':
-+	                        lflg++;
-+                        	break;
- 			case 'o':
- 				oflg++;
- 				break;
-@@ -1549,7 +1554,7 @@
- 	 * no user with this UID exists yet (entries for shared UIDs
- 	 * are left unchanged).  --marekm
- 	 */
--	if (!getpwuid (user_id)) {
-+	if (!getpwuid (user_id) && !lflg) {
- 		faillog_reset (user_id);
- 		lastlog_reset (user_id);
- 	}

shadow-4.0.17-auditLogging.patch

@@ -1,15 +0,0 @@
-diff -Nurp shadow-4.0.17.orig/src/useradd.c shadow-4.0.17/src/useradd.c
---- shadow-4.0.17.orig/src/useradd.c	2006-10-02 18:25:30.000000000 +0100
-+++ shadow-4.0.17/src/useradd.c	2006-10-02 18:25:43.000000000 +0100
-@@ -1611,6 +1611,10 @@ static void create_home (void)
- 				 _
- 				 ("%s: cannot create directory %s\n"),
- 				 Prog, user_home);
-+#ifdef WITH_AUDIT
-+			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-+				      "adding home directory", user_name, user_id, 0);
-+#endif
- 			fail_exit (E_HOMEDIR);
- 		}
- 		chown (user_home, user_id, user_gid);
-

shadow-4.0.17-exitValues.patch

@@ -1,12 +0,0 @@
---- shadow-4.0.17/man/groupdel.8.exitValues	2006-10-04 22:40:59.000000000 +0200
-+++ shadow-4.0.17/man/groupdel.8	2006-10-04 22:43:51.000000000 +0200
-@@ -45,6 +45,9 @@
- \fI2\fR
- invalid command syntax
- .TP 3n
-+\fI6\fR
-+specified group doesn’t exist
-+.TP 3n
- \fI8\fR
- can't remove user's primary group
- .TP 3n

shadow-4.0.17-notInheritFd.patch

@@ -1,13 +0,0 @@
---- shadow-4.0.17/lib/commonio.c.fdInherit	2006-08-04 10:56:52.000000000 +0200
-+++ shadow-4.0.17/lib/commonio.c	2006-08-04 11:00:05.000000000 +0200
-@@ -457,6 +457,10 @@
- 		}
- 		return 0;
- 	}
-+
-+	/* not not inherit fd */
-+	fcntl(fileno(db->fp), F_SETFD, FD_CLOEXEC);
-+
- #ifdef WITH_SELINUX
- 	db->scontext = NULL;
- 	if ((is_selinux_enabled () > 0) && (!db->readonly)) {

shadow-4.0.17-redhat.patch

@@ -1,378 +0,0 @@
---- shadow-4.0.18.1/man/groupadd.8.redhat	2006-07-30 22:53:48.000000000 +0200
-+++ shadow-4.0.18.1/man/groupadd.8	2006-12-06 16:29:01.000000000 +0100
-@@ -14,7 +14,7 @@
- groupadd \- create a new group
- .SH "SYNOPSIS"
- .HP 9
--\fBgroupadd\fR [\-g\ \fIGID\fR\ [\-o]] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
-+\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-r] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
- .SH "DESCRIPTION"
- .PP
- The
-@@ -32,10 +32,13 @@
- \fB\-g\fR
- is turned off).
- .TP 3n
-+\fB-r\fR
-+This flag instructs \fBgroupadd\fR to add a system account.  The first available \fIgid\fR lower than 499 will be automatically selected unless the \fB-g\fR option is also given on the command line. This is an option added by Red Hat.
-+.TP 3n
- \fB\-g\fR \fIGID\fR
- The numerical value of the group's ID. This value must be unique, unless the
- \fB\-o\fR
--option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 999 and greater than every other group. Values between 0 and 999 are typically reserved for system accounts.
-+option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 500 and greater than every other group. Values between 0 and 499 are typically reserved for system accounts.
- .TP 3n
- \fB\-h\fR, \fB\-\-help\fR
- Display help message and exit.
---- shadow-4.0.18.1/man/useradd.8.redhat	2006-07-30 22:54:26.000000000 +0200
-+++ shadow-4.0.18.1/man/useradd.8	2006-12-06 16:29:01.000000000 +0100
-@@ -25,7 +25,7 @@
- \fB\-D\fR
- option, the
- \fBuseradd\fR
--command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files.
-+command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files. The version provided with Red Hat Linux will create a group for each user added to the system by default.
- .SH "OPTIONS"
- .PP
- The options which apply to the
-@@ -65,7 +65,7 @@
- The number of days after a password expires until the account is permanently disabled. A value of 0 disables the account as soon as the password has expired, and a value of \-1 disables the feature. The default value is \-1.
- .TP 3n
- \fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR
--The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group. The default group number is 1 or whatever is specified in
-+The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group.
- \fI/etc/default/useradd\fR.
- .TP 3n
- \fB\-G\fR, \fB\-\-groups\fR \fIGROUP1\fR[\fI,GROUP2,...\fR[\fI,GROUPN\fR]]]
-@@ -76,6 +76,9 @@
- \fB\-h\fR, \fB\-\-help\fR
- Display help message and exit.
- .TP 3n
-+\fB-M\fR
-+The user's home directory will not be created, even if the system wide settings from \fI/etc/login.defs\fR is to create home dirs.
-+.TP 3n
- \fB\-m\fR, \fB\-\-create\-home\fR
- The user's home directory will be created if it does not exist. The files contained in
- \fISKEL_DIR\fR
-@@ -93,6 +96,9 @@
- \fB\-m\fR
- option. The default is to not create the directory and to not copy any files.
- .TP 3n
-+\fB-n\fR
-+A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used.
-+.TP 3n
- \fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR
- Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and others).
- 
-@@ -118,6 +124,9 @@
- The encrypted password, as returned by
- \fBcrypt\fR(3). The default is to disable the account.
- .TP 3n
-+\fB-r\fR
-+This flag is used to create a system account. That is, a user with a UID lower than the value of UID_MIN defined in \fI/etc/login.defs\fR and whose password does not expire. Note that \fBuseradd\fR will not create a home directory for such an user, regardless of the default setting in \fI/etc/login.defs\fR. You have to specify \fB-m\fR option if you want a home directory for a system account to be created. This is an option added by Red Hat
-+.TP 3n
- \fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR
- The name of the user's login shell. The default is to leave this field blank, which causes the system to select the default login shell.
- .TP 3n
-@@ -161,6 +170,8 @@
- The system administrator is responsible for placing the default user files in the
- \fI/etc/skel/\fR
- directory.
-+.br
-+This version of useradd was modified by Red Hat to suit Red Hat user/group conventions.
- .SH "CAVEATS"
- .PP
- You may not add a user to a NIS group. This must be performed on the NIS server.
-@@ -181,6 +192,9 @@
- \fI/etc/group\fR
- Group account information.
- .TP 3n
-+\fI/etc/gshadow\fR
-+Secure group account information.
-+.TP 3n
- \fI/etc/default/useradd\fR
- Default values for account creation.
- .TP 3n
---- shadow-4.0.18.1/man/chpasswd.8.redhat	2006-07-30 22:53:40.000000000 +0200
-+++ shadow-4.0.18.1/man/chpasswd.8	2006-12-06 16:24:59.000000000 +0100
-@@ -24,7 +24,7 @@
- 
- \fIuser_name\fR:\fIpassword\fR
- .PP
--By default the supplied password must be in clear\-text. Default encryption algorithm is DES. Also the password age will be updated, if present.
-+By default the supplied password must be in clear\-text. Default encryption algorithm is DES, but this setting can be changed in \fI/etc/login.defs\fR. Red Hat uses MD5 to encrypt passwords by default. Also the password age will be updated, if present.
- .PP
- This command is intended to be used in a large system environment where many accounts are created at a single time.
- .SH "OPTIONS"
---- shadow-4.0.18.1/man/newusers.8.redhat	2006-07-30 22:54:08.000000000 +0200
-+++ shadow-4.0.18.1/man/newusers.8	2006-12-06 16:24:59.000000000 +0100
-@@ -35,6 +35,8 @@
- This field will be checked for existence as a directory and a new directory with the same name will be created if it does not already exist. The ownership of the directory will be set to be that of the user being created or updated.
- .PP
- This command is intended to be used in a large system environment where many accounts are updated at a single time.
-+.PP
-+Default encryption algorithm is DES, but this setting can be changed in \fI/etc/login.defs\fR. Red Hat uses MD5 to encrypt passwords by default.
- .SH "CAVEATS"
- .PP
- The input file must be protected since it contains unencrypted passwords.
---- shadow-4.0.18.1/src/useradd.c.redhat	2006-07-28 19:42:48.000000000 +0200
-+++ shadow-4.0.18.1/src/useradd.c	2006-12-06 16:29:01.000000000 +0100
-@@ -81,7 +81,7 @@
- static gid_t def_group = 100;
- static const char *def_gname = "other";
- static const char *def_home = "/home";
--static const char *def_shell = "";
-+static const char *def_shell = "/sbin/nologin";
- static const char *def_template = SKEL_DIR;
- static const char *def_create_mail_spool = "no";
- 
-@@ -93,7 +93,7 @@
- #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
- 
- static const char *user_name = "";
--static const char *user_pass = "!";
-+static const char *user_pass = "!!";
- static uid_t user_id;
- static gid_t user_gid;
- static const char *user_comment = "";
-@@ -124,8 +124,10 @@
-     Gflg = 0,			/* secondary group set for new account */
-     kflg = 0,			/* specify a directory to fill new user directory */
-     mflg = 0,			/* create user's home directory if it doesn't exist */
--    nflg = 0,			/* create a group having the same name as the user */
-+    Mflg = 0,                   /* do NOT create user's home directory no matter what */
-+    nflg = 0,                   /* do NOT create a group having the same name as the user */
-     oflg = 0,			/* permit non-unique user ID to be specified with -u */
-+    rflg = 0,                   /* create a system account */
-     sflg = 0,			/* shell program for new account */
-     uflg = 0;			/* specify user ID for new account */
- 
-@@ -633,6 +635,8 @@
- 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
- 			   "  -m, --create-home		create home directory for the new user\n"
- 			   "				account\n"
-+			   "  -M,                       do not create user's home directory(overrides /etc/login.defs)\n"
-+			   "  -r,                       create system account\n"
- 			   "  -o, --non-unique		allow create user with duplicate\n"
- 			   "				(non-unique) UID\n"
- 			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
-@@ -685,11 +689,20 @@
- 	spent->sp_namp = (char *) user_name;
- 	spent->sp_pwdp = (char *) user_pass;
- 	spent->sp_lstchg = time ((time_t *) 0) / SCALE;
--	spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
--	spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
--	spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
--	spent->sp_inact = scale_age (def_inactive);
--	spent->sp_expire = scale_age (user_expire);
-+	if (!rflg) {
-+		spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1));
-+		spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1));
-+		spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1));
-+		spent->sp_inact = scale_age (def_inactive);
-+		spent->sp_expire = scale_age (user_expire);
-+	}
-+	else {
-+		spent->sp_min = scale_age(-1);
-+                spent->sp_max = scale_age(-1);
-+                spent->sp_warn = scale_age(-1);
-+                spent->sp_inact = scale_age(-1);
-+        	spent->sp_expire = scale_age(-1);
-+	}
- 	spent->sp_flag = -1;
- }
- 
-@@ -837,8 +850,14 @@
- 	const struct passwd *pwd;
- 	uid_t uid_min, uid_max;
- 
--	uid_min = getdef_unum ("UID_MIN", 1000);
--	uid_max = getdef_unum ("UID_MAX", 60000);
-+        if (!rflg) {
-+                uid_min = getdef_unum ("UID_MIN", 500);
-+                uid_max = getdef_unum ("UID_MAX", 60000);
-+        }
-+        else {
-+                uid_min = 1;
-+                uid_max = getdef_unum ("UID_MIN", 500) - 1;
-+        }
- 
- 	/*
- 	 * Start with some UID value if the user didn't provide us with
-@@ -868,7 +887,7 @@
- #endif
- 			exit (E_NAME_IN_USE);
- 		}
--		if (uflg && user_id == pwd->pw_uid) {
-+		if (!oflg && uflg && user_id == pwd->pw_uid) {
- 			fprintf (stderr, _("%s: UID %u is not unique\n"),
- 				 Prog, (unsigned int) user_id);
- #ifdef WITH_AUDIT
-@@ -923,8 +942,13 @@
- 	const struct group *grp;
- 	gid_t gid_min, gid_max;
- 
--	gid_min = getdef_num ("GID_MIN", 500);
--	gid_max = getdef_num ("GID_MAX", 60000);
-+        if (!rflg) {
-+                gid_min = getdef_unum ("GID_MIN", 500);
-+                gid_max = getdef_unum ("GID_MAX", 60000);
-+        } else {
-+                gid_min = 1;
-+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
-+        }
- 
- 	/*
- 	 * Start with some GID value if the user didn't provide us with
-@@ -1022,7 +1046,7 @@
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:",
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1194,6 +1218,15 @@
- 				user_id = get_uid (optarg);
- 				uflg++;
- 				break;
-+                        case 'n':
-+                                nflg++;
-+                                break;
-+                        case 'r':
-+                                rflg++;
-+                                break;
-+                        case 'M':
-+                                Mflg++;
-+                                break;
- 			default:
- 				usage ();
- 			}
-@@ -1201,6 +1234,9 @@
- 		}
- 	}
- 
-+        if (mflg && Mflg) /* the admin is not decided .. create or not ? */
-+               usage();
-+
- 	/*
- 	 * Certain options are only valid in combination with others.
- 	 * Check it here so that they can be specified in any order.
-@@ -1706,6 +1742,14 @@
- 	}
- #endif				/* USE_PAM */
- 
-+        if (!rflg) /* for system accounts defaults are ignored and we
-+                    * do not create a home dir -- gafton */
-+        	if (getdef_bool("CREATE_HOME"))
-+               		mflg = 1;
-+
-+        if (Mflg) /* absolutely sure that we do not create home dirs */
-+        	mflg = 0;
-+
- 	/*
- 	 * See if we are messing with the defaults file, or creating
- 	 * a new user.
-@@ -1736,7 +1780,7 @@
- 	 * to that group, use useradd -g username username.
- 	 * --bero
- 	 */
--	if (!gflg) {
-+	if ( !(nflg || gflg) ) {
- 		if (getgrnam (user_name)) {
- 			fprintf (stderr,
- 				 _
-@@ -1787,25 +1831,18 @@
- 				 ("%s: warning: the home directory already exists.\n"
- 				  "Not copying any file from skel directory into it.\n"),
- 				 Prog);
--
--	} else if (getdef_str ("CREATE_HOME")) {
--		/*
--		 * RedHat added the CREATE_HOME option in login.defs in their
--		 * version of shadow-utils (which makes -m the default, with
--		 * new -M option to turn it off). Unfortunately, this
--		 * changes the way useradd works (it can be run by scripts
--		 * expecting some standard behaviour), compared to other
--		 * Unices and other Linux distributions, and also adds a lot
--		 * of confusion :-(.
--		 * So we now recognize CREATE_HOME and give a warning here
--		 * (better than "configuration error ... notify administrator"
--		 * errors in every program that reads /etc/login.defs). -MM
--		 */
--		fprintf (stderr,
--			 _
--			 ("%s: warning: CREATE_HOME not supported, please use -m instead.\n"),
--			 Prog);
- 	}
-+        /* Warning removed to protect the innocent. */
-+        /*
-+         * The whole idea about breaking some stupid scripts by creating a new
-+         * variable is crap - I could care less about the scripts. Historically
-+         * adduser type programs have always created the home directories and
-+         * I don't like the idea of providing a script when we can fix the
-+         * binary itself. And if the scripts are using the right options to the
-+         * useradd then they will not break. If not, they depend on unspecified
-+         * behavior and they will break, but they were broken anyway to begin
-+         * with --gafton
-+         */
- 
- 	create_mail ();
- 
---- shadow-4.0.18.1/src/groupadd.c.redhat	2006-07-28 19:38:52.000000000 +0200
-+++ shadow-4.0.18.1/src/groupadd.c	2006-12-06 16:29:01.000000000 +0100
-@@ -74,6 +74,7 @@
- static int oflg = 0;		/* permit non-unique group ID to be specified with -g */
- static int gflg = 0;		/* ID value for the new group */
- static int fflg = 0;		/* if group already exists, do nothing and exit(0) */
-+static int rflg = 0;            /* for adding system accounts (Red Hat) */
- 
- /* local function prototypes */
- static void usage (void);
-@@ -100,6 +101,7 @@
- 			   "Options:\n"
- 			   "  -f, --force			force exit with success status if the specified\n"
- 			   "				group already exists\n"
-+			   "  -r,                       create system account\n"
- 			   "  -g, --gid GID			use GID for the new group\n"
- 			   "  -h, --help			display this help message and exit\n"
- 			   "  -K, --key KEY=VALUE		overrides /etc/login.defs defaults\n"
-@@ -198,8 +200,13 @@
- 	const struct group *grp;
- 	gid_t gid_min, gid_max;
- 
--	gid_min = getdef_unum ("GID_MIN", 1000);
--	gid_max = getdef_unum ("GID_MAX", 60000);
-+	if (!rflg) {
-+		gid_min = getdef_unum ("GID_MIN", 500);
-+                gid_max = getdef_unum ("GID_MAX", 60000);
-+        } else {
-+                gid_min = 1;
-+                gid_max = getdef_unum ("GID_MIN", 500) - 1;
-+        }
- 
- 	/*
- 	 * Start with some GID value if the user didn't provide us with
-@@ -430,7 +437,7 @@
- 		};
- 
- 		while ((c =
--			getopt_long (argc, argv, "fg:hK:o", long_options,
-+			getopt_long (argc, argv, "frg:hK:o", long_options,
- 				     &option_index)) != -1) {
- 			switch (c) {
- 			case 'f':
-@@ -443,6 +450,12 @@
- 				 */
- 				fflg++;
- 				break;
-+	                case 'r':
-+	                        /*
-+	                         * create a system group
-+	                         */
-+	                        rflg++;
-+	                        break;
- 			case 'g':
- 				gflg++;
- 				group_id = get_gid (optarg);

shadow-4.0.17-useradd.patch

@@ -1,473 +0,0 @@
---- /dev/null	2007-01-16 10:10:52.644263000 +0100
-+++ shadow-4.0.17/libmisc/system.c	2007-01-16 18:24:34.000000000 +0100
-@@ -0,0 +1,37 @@
-+#include <config.h>
-+
-+#ident "$Id: shell.c,v 1.13 2006/01/18 19:38:27 kloczek Exp $"
-+
-+#include <stdio.h>
-+#include <sys/wait.h>
-+#include <fcntl.h>
-+#include "prototypes.h"
-+#include "defines.h"
-+
-+int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr)
-+{
-+	int status = -1;
-+	int fd;
-+	pid_t pid;
-+	
-+	pid = fork();
-+	if (pid < 0) 
-+		return -1;
-+
-+	if (pid) {       /* Parent */
-+		waitpid(pid, &status, 0);
-+		return status;
-+	}
-+
-+	fd = open("/dev/null", O_RDWR);
-+	/* Child */
-+	dup2(fd,0);	// Close Stdin
-+	if (ignore_stderr)
-+		dup2(fd,2);	// Close Stderr
-+	
-+	execve(command, (char *const *) argv, (char *const *) env);
-+	fprintf (stderr,
-+		 _("Failed to exec '%s'\n"), argv[0]);
-+	exit (-1);
-+}
-+
---- shadow-4.0.17/libmisc/Makefile.am.useradd	2005-09-05 18:21:37.000000000 +0200
-+++ shadow-4.0.17/libmisc/Makefile.am	2007-01-16 18:24:34.000000000 +0100
-@@ -41,6 +41,7 @@
- 	setugid.c \
- 	setupenv.c \
- 	shell.c \
-+	system.c \
- 	strtoday.c \
- 	sub.c \
- 	sulog.c \
---- shadow-4.0.17/libmisc/copydir.c.useradd	2006-07-10 06:35:56.000000000 +0200
-+++ shadow-4.0.17/libmisc/copydir.c	2007-01-16 18:24:34.000000000 +0100
-@@ -54,7 +54,7 @@
- static struct link_name *links;
- 
- #ifdef WITH_SELINUX
--static int selinux_file_context (const char *dst_name)
-+int selinux_file_context (const char *dst_name)
- {
- 	security_context_t scontext = NULL;
- 
---- shadow-4.0.17/man/usermod.8.xml.useradd	2006-06-16 18:11:04.000000000 +0200
-+++ shadow-4.0.17/man/usermod.8.xml	2007-01-16 18:24:34.000000000 +0100
-@@ -226,6 +226,19 @@
- 	  </para>
- 	</listitem>
-       </varlistentry>
-+       <varlistentry>
-+        <term>
-+         <option>-Z</option>, <option>--selinux-user</option>
-+         <replaceable>SEUSER</replaceable>
-+       </term>
-+       <listitem>
-+         <para>
-+           The SELinux user for the user's login. The default is to leave this
-+           field the blank, which causes the system to select the default
-+           SELinux user.
-+         </para>
-+       </listitem>
-+      </varlistentry>
-     </variablelist>
-   </refsect1>
- 
---- shadow-4.0.17/man/useradd.8.xml.useradd	2006-06-16 18:11:04.000000000 +0200
-+++ shadow-4.0.17/man/useradd.8.xml	2007-01-16 18:24:34.000000000 +0100
-@@ -251,6 +251,19 @@
- 	  </para>
- 	</listitem>
-       </varlistentry>
-+      <varlistentry>
-+	<term>
-+	  <option>-Z</option>, <option>--selinux-user</option>
-+	  <replaceable>SEUSER</replaceable>
-+	</term>
-+	<listitem>
-+	  <para>
-+	    The SELinux user for the user's login. The default is to leave this
-+	    field blank, which causes the system to select the default SELinux
-+            user.
-+	  </para>
-+	</listitem>
-+      </varlistentry>
-     </variablelist>
- 
-     <refsect2 id='changing_the_default_values'>
---- shadow-4.0.17/man/useradd.8.useradd	2007-01-16 18:24:34.000000000 +0100
-+++ shadow-4.0.17/man/useradd.8	2007-01-16 18:24:34.000000000 +0100
-@@ -137,6 +137,9 @@
- The numerical value of the user's ID. This value must be unique, unless the
- \fB\-o\fR
- option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 999 and greater than every other user. Values between 0 and 999 are typically reserved for system accounts.
-+.TP 3n
-+\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR
-+The SELinux user for the user's login. The default is to leave this field blank, which causes the system to select the default SELinux user.
- .SS "Changing the default values"
- .PP
- When invoked with the
---- shadow-4.0.17/man/usermod.8.useradd	2007-01-16 18:24:34.000000000 +0100
-+++ shadow-4.0.17/man/usermod.8	2007-01-16 18:24:34.000000000 +0100
-@@ -90,6 +90,10 @@
- \fB\-p\fR
- or
- \fB\-L\fR.
-+.TP 3n
-+\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR
-+The SELinux user for the user's login. The default is to leave this field blank, which causes the system to select the default SELinux user.
-+
- .SH "CAVEATS"
- .PP
- 
---- shadow-4.0.17/lib/prototypes.h.useradd	2006-02-07 17:36:30.000000000 +0100
-+++ shadow-4.0.17/lib/prototypes.h	2007-01-16 18:24:34.000000000 +0100
-@@ -52,6 +52,9 @@
- /* copydir.c */
- extern int copy_tree (const char *, const char *, uid_t, gid_t);
- extern int remove_tree (const char *);
-+#ifdef WITH_SELINUX
-+extern int selinux_file_context (const char *dst_name);
-+#endif
- 
- /* encrypt.c */
- extern char *pw_encrypt (const char *, const char *);
-@@ -147,6 +150,9 @@
- /* shell.c */
- extern int shell (const char *, const char *, char *const *);
- 
-+/* system.c */
-+extern int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr);
-+
- /* strtoday.c */
- extern long strtoday (const char *);
- 
---- shadow-4.0.17/lib/defines.h.useradd	2005-09-05 18:22:03.000000000 +0200
-+++ shadow-4.0.17/lib/defines.h	2007-01-16 18:24:34.000000000 +0100
-@@ -342,4 +342,7 @@
- #include <libaudit.h>
- #endif
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif
- #endif				/* _DEFINES_H_ */
---- shadow-4.0.17/src/useradd.c.useradd	2007-01-16 18:24:34.000000000 +0100
-+++ shadow-4.0.17/src/useradd.c	2007-01-16 18:24:34.000000000 +0100
-@@ -100,6 +100,7 @@
- static const char *user_home = "";
- static const char *user_shell = "";
- static const char *create_mail_spool = "";
-+static const char *user_selinux = "";
- 
- static long user_expire = -1;
- static int is_shadow_pwd;
-@@ -170,6 +171,7 @@
- static int get_groups (char *);
- static void usage (void);
- static void new_pwent (struct passwd *);
-+static void selinux_update_mapping (void);
- 
- static long scale_age (long);
- static void new_spent (struct spwd *);
-@@ -361,6 +363,7 @@
- 			def_create_mail_spool = xstrdup (cp);
- 		}
- 	}
-+	fclose(fp);
- }
- 
- /*
-@@ -648,7 +651,10 @@
- 			   "  -p, --password PASSWORD	use encrypted password for the new user\n"
- 			   "				account\n"
- 			   "  -s, --shell SHELL		the login shell for the new user account\n"
--			   "  -u, --uid UID			force use the UID for the new user account\n"
-+			   "  -u, --uid UID	       		force use the UID for the new user account\n"
-+#ifdef WITH_SELINUX
-+			   "  -Z, --selinux-user SEUSER	use a specific SEUSER for the SELinux user mapping\n"
-+#endif
- 			   "\n"));
- 	exit (E_USAGE);
- }
-@@ -1048,11 +1054,18 @@
- 			{"non-unique", no_argument, NULL, 'o'},
- 			{"password", required_argument, NULL, 'p'},
- 			{"shell", required_argument, NULL, 's'},
-+#ifdef WITH_SELINUX
-+			{"selinux-user", required_argument, NULL, 'Z'},
-+#endif
- 			{"uid", required_argument, NULL, 'u'},
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:",
-+#ifdef WITH_SELINUX
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:Z:",
-+#else
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:",
-+#endif
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'b':
-@@ -1236,6 +1249,17 @@
-                         case 'M':
-                                 Mflg++;
-                                 break;
-+#ifdef WITH_SELINUX
-+                        case 'Z':
-+				if (is_selinux_enabled() > 0)
-+					user_selinux = optarg;
-+				else {
-+					fprintf (stderr,_("%s: -Z requires SELinux enabled kernel\n"), Prog);
-+
-+					exit (E_BAD_ARG);
-+				}
-+                                break;
-+#endif
- 			default:
- 				usage ();
- 			}
-@@ -1603,6 +1627,33 @@
- 		grp_update ();
- }
- 
-+static void selinux_update_mapping () {
-+
-+#ifdef WITH_SELINUX
-+	if (is_selinux_enabled() <= 0) return;
-+
-+        if (*user_selinux) { /* must be done after passwd write() */
-+		const char *argv[7];
-+		argv[0] = "/usr/sbin/semanage";
-+		argv[1] = "login";
-+		argv[2] = "-a";
-+		argv[3] = "-s";
-+		argv[4] = user_selinux;
-+		argv[5] = user_name;
-+		argv[6] = NULL;
-+                if (safe_system(argv[0], argv, NULL, 0)) {
-+			fprintf (stderr,
-+				 _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
-+				 Prog, user_name, user_selinux);
-+#ifdef WITH_AUDIT
-+			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-+				      "adding SELinux user mapping", user_name, user_id, 0);
-+#endif        
-+		}
-+	}
-+#endif
-+
-+}
- /*
-  * create_home - create the user's home directory
-  *
-@@ -1612,7 +1663,11 @@
-  */
- static void create_home (void)
- {
-+
- 	if (access (user_home, F_OK)) {
-+#ifdef WITH_SELINUX
-+		selinux_file_context (user_home);
-+#endif
- 		/* XXX - create missing parent directories.  --marekm */
- 		if (mkdir (user_home, 0)) {
- 			fprintf (stderr,
-@@ -1840,6 +1895,15 @@
- 
- 	usr_update ();
- 
-+	create_mail ();
-+
-+	nscd_flush_cache ("passwd");
-+	nscd_flush_cache ("group");
-+
-+	close_files ();
-+
-+	selinux_update_mapping();
-+
- 	if (mflg) {
- 		create_home ();
- 		if (home_added)
-@@ -1863,13 +1927,6 @@
-          * with --gafton
-          */
- 
--	create_mail ();
--
--	nscd_flush_cache ("passwd");
--	nscd_flush_cache ("group");
--
--	close_files ();
--
- #ifdef USE_PAM
- 	if (retval == PAM_SUCCESS)
- 		pam_end (pamh, PAM_SUCCESS);
---- shadow-4.0.17/src/userdel.c.useradd	2007-01-16 18:24:34.000000000 +0100
-+++ shadow-4.0.17/src/userdel.c	2007-01-16 18:24:34.000000000 +0100
-@@ -792,6 +792,17 @@
- #endif
- 	}
- 
-+#ifdef WITH_SELINUX
-+	if (is_selinux_enabled() > 0) { 
-+		const char *argv[5];
-+		argv[0] = "/usr/sbin/semanage";
-+		argv[1] = "login";
-+		argv[2] = "-d";
-+		argv[3] = user_name;
-+		argv[4] = NULL;
-+                safe_system(argv[0], argv, NULL, 1);
-+        }
-+#endif        
- 	/*
- 	 * Cancel any crontabs or at jobs. Have to do this before we remove
- 	 * the entry from /etc/passwd.
---- shadow-4.0.17/src/usermod.c.useradd	2007-01-16 18:24:34.000000000 +0100
-+++ shadow-4.0.17/src/usermod.c	2007-01-16 18:29:45.000000000 +0100
-@@ -90,6 +90,7 @@
- static char *user_home;
- static char *user_newhome;
- static char *user_shell;
-+static const char *user_selinux = "";
- static long user_expire;
- static long user_inactive;
- static long sys_ngroups;
-@@ -132,6 +133,7 @@
- static int get_groups (char *);
- static void usage (void);
- static void new_pwent (struct passwd *);
-+static void selinux_update_mapping (void);
- 
- static void new_spent (struct spwd *);
- static void fail_exit (int);
-@@ -301,6 +303,9 @@
- 			   "  -s, --shell SHELL		new login shell for the user account\n"
- 			   "  -u, --uid UID			new UID for the user account\n"
- 			   "  -U, --unlock			unlock the user account\n"
-+#ifdef WITH_SELINUX
-+			   "  -Z, --selinux-user	new selinux user mapping for the user account\n"
-+#endif
- 			   "\n"));
- 	exit (E_USAGE);
- }
-@@ -925,13 +930,20 @@
- 			{"move-home", no_argument, NULL, 'm'},
- 			{"non-unique", no_argument, NULL, 'o'},
- 			{"password", required_argument, NULL, 'p'},
-+#ifdef WITH_SELINUX
-+			{"selinux-user", required_argument, NULL, 'Z'},
-+#endif
- 			{"shell", required_argument, NULL, 's'},
- 			{"uid", required_argument, NULL, 'u'},
- 			{"unlock", no_argument, NULL, 'U'},
- 			{NULL, 0, NULL, '\0'}
- 		};
- 		while ((c =
-+#ifdef WITH_SELINUX
-+			getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:UZ:",
-+#else
- 			getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:U",
-+#endif
- 				     long_options, NULL)) != -1) {
- 			switch (c) {
- 			case 'a':
-@@ -1080,6 +1092,16 @@
- 
- 				Uflg++;
- 				break;
-+#ifdef WITH_SELINUX
-+                        case 'Z':
-+				if (is_selinux_enabled() > 0)
-+					user_selinux = optarg;
-+				else {
-+					fprintf (stderr, _("%s: -Z requires SELinux enabled kernel\n"), Prog);
-+					exit (E_BAD_ARG);
-+				}
-+                                break;
-+#endif
- 			default:
- 				usage ();
- 			}
-@@ -1549,6 +1571,8 @@
- 	if (Gflg || lflg)
- 		grp_err = grp_update ();
- 
-+	selinux_update_mapping();
-+
- 	if (mflg)
- 		move_home ();
- 
-@@ -1580,3 +1604,62 @@
- 	exit (E_SUCCESS);
- 	/* NOT REACHED */
- }
-+
-+static void selinux_update_mapping () {
-+#ifdef WITH_SELINUX
-+	const char *argv[7];
-+
-+	if (is_selinux_enabled() <= 0) return;
-+
-+        if (*user_selinux) { 
-+		argv[0] = "/usr/sbin/semanage";
-+		argv[1] = "login";
-+		argv[2] = "-m";
-+		argv[3] = "-s";
-+		argv[4] = user_selinux;
-+		argv[5] = user_name;
-+		argv[6] = NULL;
-+                if (safe_system(argv[0], argv, NULL, 1)) {
-+			argv[2] = "-a";
-+			if (safe_system(argv[0], argv, NULL, 0)) {
-+				fprintf (stderr,
-+					 _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
-+					 Prog, user_name, user_selinux);
-+#ifdef WITH_AUDIT
-+				audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-+					      "modifying User mapping ", user_name, user_id, 0);
-+#endif        
-+			}
-+		}
-+        }
-+        
-+	if (dflg || *user_selinux) {
-+		argv[0] = "/usr/sbin/genhomedircon";
-+		argv[1] = NULL;
-+		if(safe_system(argv[0], argv, NULL,0)) {
-+			fprintf (stderr,
-+				 _("%s: warning: unable to relabel the homedir %s for %s.\n"),
-+				 Prog, user_home, user_name);
-+#ifdef WITH_AUDIT
-+			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-+			      "relabeling home directory", user_name, user_id, 0);
-+#endif
-+		}
-+
-+		argv[0] = "/sbin/restorecon";
-+		argv[1] = "-F";
-+		argv[2] = "-R";
-+		argv[3] = user_home;
-+		argv[4] = NULL;
-+                if (safe_system(argv[0], argv, NULL, 0)) {
-+			fprintf (stderr,
-+				 _("%s: warning: unable to relabel the homedir %s for %s.\n"),
-+				 Prog, user_home, user_name);
-+#ifdef WITH_AUDIT
-+			audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
-+				      "relabeling home directory", user_name, user_id, 0);
-+#endif        
-+		}
-+	}
-+#endif
-+}
-+

shadow-4.0.18.1-appendOption.patch

@@ -1,11 +0,0 @@
---- shadow-4.0.18.1/src/usermod.c.appendOption	2007-01-14 14:04:29.000000000 +0100
-+++ shadow-4.0.18.1/src/usermod.c	2007-01-14 14:05:04.000000000 +0100
-@@ -905,7 +905,7 @@
- 		 */
- 		int c;
- 		static struct option long_options[] = {
--			{"append", required_argument, NULL, 'a'},
-+			{"append", no_argument, NULL, 'a'},
- 			{"comment", required_argument, NULL, 'c'},
- 			{"home", required_argument, NULL, 'd'},
- 			{"expiredate", required_argument, NULL, 'e'},

shadow-4.0.18.1-findNewUidOnce.patch

@@ -1,113 +0,0 @@
---- shadow-4.0.18.1/src/useradd.c.findNewUidOnce	2007-05-16 13:16:51.000000000 +0200
-+++ shadow-4.0.18.1/src/useradd.c	2007-05-16 14:12:52.000000000 +0200
-@@ -847,8 +847,9 @@
-  * find_new_uid - find the next available UID
-  *
-  *	find_new_uid() locates the next highest unused UID in the password
-- *	file, or checks the given user ID against the existing ones for
-- *	uniqueness.
-+ *	file.
-+ *	It doesn't make sense to use find_new_uid(), if UID is specified 
-+ * 	via "-u" option.
-  */
- static void find_new_uid (void)
- {
-@@ -867,12 +868,7 @@
- 		memset (index, 0, sizeof (char) * uid_max + 1);
-         }
- 
--	/*
--	 * Start with some UID value if the user didn't provide us with
--	 * one already.
--	 */
--	if (!uflg)
--		user_id = uid_min;
-+	user_id = uid_min;
- 
- 	/*
- 	 * Search the entire password file, either looking for this
-@@ -886,42 +882,24 @@
- 	setpwent ();
- 	while ((pwd = getpwent ())) {
- #endif
--		if (strcmp (user_name, pwd->pw_name) == 0) {
--			fprintf (stderr, _("%s: name %s is not unique\n"),
--				 Prog, user_name);
--#ifdef WITH_AUDIT
--			audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user",
--				      user_name, user_id, 0);
--#endif
--			exit (E_NAME_IN_USE);
--		}
--		if (!oflg && uflg && user_id == pwd->pw_uid) {
--			fprintf (stderr, _("%s: UID %u is not unique\n"),
--				 Prog, (unsigned int) user_id);
--#ifdef WITH_AUDIT
--			audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user",
--				      user_name, user_id, 0);
--#endif
--			exit (E_UID_IN_USE);
--		}
--		if (!uflg && !rflg && pwd->pw_uid >= user_id) {
-+		if (!rflg && pwd->pw_uid >= user_id) {
- 			if (pwd->pw_uid > uid_max)
- 				continue;
- 			user_id = pwd->pw_uid + 1;
- 		}
- 		/* create index of occupied system accounts UIDs */
--		if (!uflg && rflg && (pwd->pw_uid <= uid_max)) 
-+		if (rflg && (pwd->pw_uid <= uid_max)) 
- 			index[pwd->pw_uid] = 1;
- 		
- 	}
- 
- 	/* find free system account */
--	if(!uflg && rflg) {
-+	if(rflg) {
- 		for( user_id = uid_max; (user_id >= uid_min) && index[user_id]; user_id--);
- 		if ( user_id < uid_min ) {
- 			fprintf (stderr, _("%s: can't get unique UID\n"), Prog);
- 			fail_exit (E_UID_IN_USE);
--		}		
-+		}	
- 	}
- 
- 	/*
-@@ -930,7 +908,7 @@
- 	 * free UID starting with UID_MIN (it's O(n*n) but can be avoided
- 	 * by not having users with UID equal to UID_MAX).  --marekm
- 	 */
--	if (!uflg && user_id == uid_max + 1) {
-+	if (user_id == uid_max + 1) {
- 		for (user_id = uid_min; user_id < uid_max; user_id++) {
- #ifdef NO_GETPWENT
- 			pw_rewind ();
-@@ -1590,9 +1568,6 @@
- 	struct passwd pwent;
- 	struct spwd spent;
- 
--	if (!oflg)
--		find_new_uid ();
--
- 	/*
- 	 * Fill in the password structure with any new fields, making
- 	 * copies of strings.
-@@ -1911,7 +1886,17 @@
- 		/* first, seek for a valid uid to use for this user.
- 		 * We do this because later we can use the uid we found as
- 		 * gid too ... --gafton */
--		find_new_uid ();
-+		if (!uflg)
-+			find_new_uid ();
-+		else {
-+			if (getpwuid (user_id)) {
-+	                        fprintf (stderr, _("%s: UID %u is not unique\n"), Prog, (unsigned int) user_id);
-+#ifdef WITH_AUDIT
-+        	                audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user", user_name, user_id, 0);
-+#endif
-+                        	exit (E_UID_IN_USE);
-+			}
-+		}
- 	}
- 
- 	/* do we have to add a group for that user? This is why we need to

shadow-4.0.18.1-gid.patch

@@ -1,32 +0,0 @@
---- shadow-4.0.18.1/src/useradd.c.gid	2006-11-04 14:09:53.000000000 +0100
-+++ shadow-4.0.18.1/src/useradd.c	2006-11-04 14:15:09.000000000 +0100
-@@ -207,11 +207,8 @@
- 	char *errptr;
- 
- 	gid = strtol (grname, &errptr, 10);
--	if (*errptr || errno == ERANGE || gid < 0) {
--		fprintf (stderr,
--			 _("%s: invalid numeric argument '%s'\n"), Prog, grname);
--		exit (E_BAD_ARG);
--	}
-+	if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && gid >= 0)
-+		return getgrgid (gid);
- 	return getgrnam (grname);
- }
- 
---- shadow-4.0.18.1/src/usermod.c.gid	2006-11-04 14:15:23.000000000 +0100
-+++ shadow-4.0.18.1/src/usermod.c	2006-11-04 14:16:42.000000000 +0100
-@@ -166,11 +166,8 @@
- 	char *errptr;
- 
- 	val = strtol (grname, &errptr, 10);
--	if (*errptr || errno == ERANGE || val < 0) {
--		fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
--			 grname);
--		exit (E_BAD_ARG);
--	}
-+	if (*grname != '\0' && *errptr == '\0' && errno != ERANGE && val >= 0)
-+		return getgrgid (val);
- 	return getgrnam (grname);
- }
- 

shadow-4.0.18.1-groupLoop.patch

@@ -1,178 +0,0 @@
---- shadow-4.0.18.1/src/usermod.c.groupLoop	2007-05-25 11:51:33.000000000 +0200
-+++ shadow-4.0.18.1/src/usermod.c	2007-05-25 11:51:33.000000000 +0200
-@@ -628,7 +628,7 @@
- 			continue;
- 
- 		changed = 0;
--		if (!gr_update (ngrp)) {
-+		if (!gr_update_entry (grp, ngrp)) {
- 			fprintf (stderr,
- 				 _("%s: error adding new group entry\n"), Prog);
- 			SYSLOG ((LOG_ERR, "error adding group entry"));
-@@ -770,7 +770,7 @@
- 		/* 
- 		 * Update the group entry to reflect the changes.
- 		 */
--		if (!sgr_update (nsgrp)) {
-+		if (!sgr_update_entry (sgrp, nsgrp)) {
- 			fprintf (stderr,
- 				 _("%s: error adding new group entry\n"), Prog);
- 			SYSLOG ((LOG_ERR, "error adding shadow group entry"));
---- shadow-4.0.18.1/src/userdel.c.groupLoop	2007-05-25 11:51:33.000000000 +0200
-+++ shadow-4.0.18.1/src/userdel.c	2007-05-25 11:51:33.000000000 +0200
-@@ -153,7 +153,7 @@
- 			exit (13);	/* XXX */
- 		}
- 		ngrp->gr_mem = del_list (ngrp->gr_mem, user_name);
--		if (!gr_update (ngrp))
-+		if (!gr_update_entry (grp, ngrp))
- 			fprintf (stderr,
- 				 _("%s: error updating group entry\n"), Prog);
- 
-@@ -252,7 +252,7 @@
- 		if (was_admin)
- 			nsgrp->sg_adm = del_list (nsgrp->sg_adm, user_name);
- 
--		if (!sgr_update (nsgrp))
-+		if (!sgr_update_entry (sgrp, nsgrp))
- 			fprintf (stderr,
- 				 _("%s: error updating group entry\n"), Prog);
- #ifdef WITH_AUDIT
---- shadow-4.0.18.1/src/useradd.c.groupLoop	2007-05-25 11:51:33.000000000 +0200
-+++ shadow-4.0.18.1/src/useradd.c	2007-05-25 11:54:28.000000000 +0200
-@@ -727,30 +727,6 @@
- 	struct sgrp *nsgrp;
- #endif
- 
--	/*
--	 * Test for unique entries of user_groups in /etc/group
--	 * pvrabec@redhat.com
--	 */
--	char **user_groups_tmp = user_groups;
--
--	while (*user_groups_tmp) {
--		int count = 0;
--
--		for (gr_rewind (), grp = gr_next (); grp && count < 2;
--		     grp = gr_next ()) {
--			if (strcmp (*user_groups_tmp, grp->gr_name) == 0) {
--				count++;
--			}
--		}
--		if (count > 1) {
--			fprintf (stderr,
--				 "%s: error not unique group names in group file\n",
--				 Prog);
--			fail_exit (E_GRP_UPDATE);
--		}
--		user_groups_tmp++;
--	}
--
- 	/* Locking and opening of the group files moved to open_files() --gafton */
- 
- 	/*
-@@ -780,7 +756,7 @@
- 		 * update the group entry to reflect the change.
- 		 */
- 		ngrp->gr_mem = add_list (ngrp->gr_mem, user_name);
--		if (!gr_update (ngrp)) {
-+		if (!gr_update_entry (grp, ngrp)) {
- 			fprintf (stderr,
- 				 _("%s: error adding new group entry\n"), Prog);
- 			fail_exit (E_GRP_UPDATE);
-@@ -828,7 +804,7 @@
- 		 * update the group entry to reflect the change.
- 		 */
- 		nsgrp->sg_mem = add_list (nsgrp->sg_mem, user_name);
--		if (!sgr_update (nsgrp)) {
-+		if (!sgr_update_entry (sgrp, nsgrp)) {
- 			fprintf (stderr,
- 				 _("%s: error adding new group entry\n"), Prog);
- 			fail_exit (E_GRP_UPDATE);
---- shadow-4.0.18.1/lib/sgroupio.c.groupLoop	2005-08-31 19:24:56.000000000 +0200
-+++ shadow-4.0.18.1/lib/sgroupio.c	2007-05-25 11:51:33.000000000 +0200
-@@ -146,6 +146,13 @@
- 	return commonio_update (&gshadow_db, (const void *) sg);
- }
- 
-+int sgr_update_entry(const struct sgrp *oldgr, const struct sgrp *newgr)
-+{
-+	return commonio_update_entry(&gshadow_db, (const void *) oldgr,
-+				     (const void *) newgr);
-+}
-+
-+
- int sgr_remove (const char *name)
- {
- 	return commonio_remove (&gshadow_db, name);
---- shadow-4.0.18.1/lib/groupio.c.groupLoop	2005-08-31 19:24:56.000000000 +0200
-+++ shadow-4.0.18.1/lib/groupio.c	2007-05-25 11:51:33.000000000 +0200
-@@ -128,6 +128,12 @@
- 	return commonio_remove (&group_db, name);
- }
- 
-+int gr_update_entry(const struct group *oldgr, const struct group *newgr)
-+{
-+	return commonio_update_entry(&group_db, (const void *) oldgr,
-+				     (const void *) newgr);
-+}
-+
- int gr_rewind (void)
- {
- 	return commonio_rewind (&group_db);
---- shadow-4.0.18.1/lib/sgroupio.h.groupLoop	2005-03-31 07:14:49.000000000 +0200
-+++ shadow-4.0.18.1/lib/sgroupio.h	2007-05-25 11:51:33.000000000 +0200
-@@ -11,4 +11,5 @@
- extern int sgr_rewind (void);
- extern int sgr_unlock (void);
- extern int sgr_update (const struct sgrp *);
-+extern int sgr_update_entry(const struct sgrp *oldgr, const struct sgrp *newgr);
- extern int sgr_sort (void);
---- shadow-4.0.18.1/lib/commonio.c.groupLoop	2007-05-25 11:51:33.000000000 +0200
-+++ shadow-4.0.18.1/lib/commonio.c	2007-05-25 11:51:33.000000000 +0200
-@@ -826,6 +826,36 @@
- 	return 1;
- }
- 
-+int commonio_update_entry(struct commonio_db *db, const void *oldgr,
-+		      const void *newgr)
-+{
-+	struct commonio_entry *tmp;
-+	
-+	if (!db->isopen || db->readonly) {
-+		errno = EINVAL;
-+		return 0;
-+	}
-+
-+	tmp = db->head;
-+	while (tmp != NULL) {
-+		if (oldgr == tmp->eptr)
-+			break;
-+		tmp = tmp->next;
-+	}
-+	
-+	/* Didn't find this in the database; hop out */
-+	if (tmp == NULL)
-+		return 0;
-+
-+	tmp->eptr = db->ops->dup(newgr);
-+	if (tmp->eptr == NULL)
-+		return 1;
-+	tmp->changed = 1;
-+
-+	db->changed = 1;
-+
-+	return 1;
-+}
- 
- void commonio_del_entry (struct commonio_db *db, const struct commonio_entry *p)
- {
---- shadow-4.0.18.1/lib/groupio.h.groupLoop	2005-03-31 07:14:49.000000000 +0200
-+++ shadow-4.0.18.1/lib/groupio.h	2007-05-25 11:51:33.000000000 +0200
-@@ -10,4 +10,6 @@
- extern int gr_rewind (void);
- extern int gr_unlock (void);
- extern int gr_update (const struct group *);
-+extern int gr_update_entry(const struct group *oldgr, const struct group *newgr);
- extern int gr_sort (void);
-+

shadow-4.0.18.1-mtime.patch

@@ -1,117 +0,0 @@
-diff -up shadow-4.0.18.1/libmisc/copydir.c.utime shadow-4.0.18.1/libmisc/copydir.c
---- shadow-4.0.18.1/libmisc/copydir.c.utime	2007-10-16 11:36:54.000000000 +0200
-+++ shadow-4.0.18.1/libmisc/copydir.c	2007-10-18 11:59:22.000000000 +0200
-@@ -33,6 +33,7 @@
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <fcntl.h>
- #include <stdio.h>
- #include "prototypes.h"
-@@ -154,6 +155,7 @@ int copy_tree (const char *src_root, con
- 	struct DIRECT *ent;
- 	struct stat sb;
- 	struct link_name *lp;
-+	struct timeval mt[2];
- 	DIR *dir;
- 
- 	/*
-@@ -215,6 +217,18 @@ int copy_tree (const char *src_root, con
- 		if (LSTAT (src_name, &sb) == -1)
- 			continue;
- 
-+#if  defined(_BSD_SOURCE) || defined(_SVID_SOURCE)
-+		mt[0].tv_sec  = sb.st_atim.tv_sec;
-+		mt[0].tv_usec = sb.st_atim.tv_nsec / 1000;
-+		mt[1].tv_sec  = sb.st_mtim.tv_sec;
-+		mt[1].tv_usec = sb.st_mtim.tv_nsec / 1000;
-+#else
-+                mt[0].tv_sec  = sb.st_atime;
-+                mt[0].tv_usec = sb.st_atimensec / 1000;
-+                mt[1].tv_sec  = sb.st_mtime;
-+                mt[1].tv_usec = sb.st_mtimensec / 1000;
-+#endif
-+		
- 		if (S_ISDIR (sb.st_mode)) {
- 
- 			/*
-@@ -230,10 +244,12 @@ int copy_tree (const char *src_root, con
- 				      uid == (uid_t) - 1 ? sb.st_uid : uid,
- 				      gid == (gid_t) - 1 ? sb.st_gid : gid)
- 			    || chmod (dst_name, sb.st_mode)
--			    || copy_tree (src_name, dst_name, uid, gid)) {
-+			    || copy_tree (src_name, dst_name, uid, gid)
-+			    || utimes (dst_name, mt)) {
- 				err++;
- 				break;
- 			}
-+
- 			continue;
- 		}
- #ifdef	S_IFLNK
-@@ -270,13 +286,21 @@ int copy_tree (const char *src_root, con
- #ifdef WITH_SELINUX
- 			selinux_file_context (dst_name);
- #endif
--			if (symlink (oldlink, dst_name) ||
--			    lchown (dst_name,
-+			if (symlink (oldlink, dst_name)
-+			    || lchown (dst_name,
- 				    uid == (uid_t) - 1 ? sb.st_uid : uid,
- 				    gid == (gid_t) - 1 ? sb.st_gid : gid)) {
- 				err++;
- 				break;
- 			}
-+
-+			/* 2007-10-18: We don't care about 
-+			 *  exit status of lutimes because
-+			 *  it returns ENOSYS on many system
-+			 *  - not implemented
-+			 */
-+			lutimes (dst_name, mt);
-+
- 			continue;
- 		}
- #endif
-@@ -314,10 +338,12 @@ int copy_tree (const char *src_root, con
- 			    || chown (dst_name,
- 				      uid == (uid_t) - 1 ? sb.st_uid : uid,
- 				      gid == (gid_t) - 1 ? sb.st_gid : gid)
--			    || chmod (dst_name, sb.st_mode & 07777)) {
-+			    || chmod (dst_name, sb.st_mode & 07777)
-+			    || utimes (dst_name, mt)) {
- 				err++;
- 				break;
- 			}
-+			
- 			continue;
- 		}
- 
-@@ -343,14 +369,25 @@ int copy_tree (const char *src_root, con
- 			err++;
- 			break;
- 		}
-+
- 		while ((cnt = read (ifd, buf, sizeof buf)) > 0) {
- 			if (write (ofd, buf, cnt) != cnt) {
- 				cnt = -1;
- 				break;
- 			}
- 		}
-+
- 		close (ifd);
--		close (ofd);
-+		
-+		if (futimes (ofd, mt) != 0) {
-+		  err++;
-+		  break;
-+		}
-+		
-+		if (close (ofd) != 0) {
-+		  err++;
-+		  break;
-+		}
- 
- 		if (cnt == -1) {
- 			err++;

shadow-4.0.18.1-overflow.patch

@@ -1,36 +0,0 @@
---- shadow-4.0.17/src/chpasswd.c.overflow	2006-11-08 11:09:32.000000000 +0100
-+++ shadow-4.0.17/src/chpasswd.c	2006-11-08 13:13:15.000000000 +0100
-@@ -239,9 +239,13 @@
- 		newpwd = cp;
- 		if (!eflg) {
- 			if (md5flg) {
--				char salt[12] = "$1$";
-+				char tmp[12];
-+				char salt[15] = "\0";
- 
--				strcat (salt, crypt_make_salt ());
-+				strcpy( tmp, crypt_make_salt ());
-+				if( !strncmp( tmp, "$1$", 3) )
-+					strcat( salt, "$1$");
-+				strcat( salt, tmp);
- 				cp = pw_encrypt (newpwd, salt);
- 			} else
- 				cp = pw_encrypt (newpwd, crypt_make_salt ());
---- shadow-4.0.17/src/chgpasswd.c.overflow	2006-11-08 13:13:40.000000000 +0100
-+++ shadow-4.0.17/src/chgpasswd.c	2006-11-08 13:17:24.000000000 +0100
-@@ -243,9 +243,13 @@
- 		newpwd = cp;
- 		if (!eflg) {
- 			if (md5flg) {
--				char salt[12] = "$1$";
-+				char tmp[12];
-+				char salt[15] = "\0";
- 
--				strcat (salt, crypt_make_salt ());
-+				strcpy( tmp, crypt_make_salt ());
-+				if( !strncmp( tmp, "$1$", 3) )
-+					strcat( salt, "$1$");
-+				strcat( salt, tmp);
- 				cp = pw_encrypt (newpwd, salt);
- 			} else
- 				cp = pw_encrypt (newpwd, crypt_make_salt ());

shadow-4.0.18.1-sysAccount.patch

@@ -1,149 +0,0 @@
---- shadow-4.0.18.1/src/useradd.c.sysAccount	2007-03-12 10:49:14.000000000 +0100
-+++ shadow-4.0.18.1/src/useradd.c	2007-03-12 12:15:57.000000000 +0100
-@@ -854,6 +854,7 @@
- {
- 	const struct passwd *pwd;
- 	uid_t uid_min, uid_max;
-+	char * index;
- 
-         if (!rflg) {
-                 uid_min = getdef_unum ("UID_MIN", 500);
-@@ -862,6 +863,8 @@
-         else {
-                 uid_min = 1;
-                 uid_max = getdef_unum ("UID_MIN", 500) - 1;
-+		index = alloca (sizeof (char) * uid_max +1);
-+		memset (index, 0, sizeof (char) * uid_max + 1);
-         }
- 
- 	/*
-@@ -901,11 +904,24 @@
- #endif
- 			exit (E_UID_IN_USE);
- 		}
--		if (!uflg && pwd->pw_uid >= user_id) {
-+		if (!uflg && !rflg && pwd->pw_uid >= user_id) {
- 			if (pwd->pw_uid > uid_max)
- 				continue;
- 			user_id = pwd->pw_uid + 1;
- 		}
-+		/* create index of occupied system accounts UIDs */
-+		if (!uflg && rflg && (pwd->pw_uid <= uid_max)) 
-+			index[pwd->pw_uid] = 1;
-+		
-+	}
-+
-+	/* find free system account */
-+	if(!uflg && rflg) {
-+		for( user_id = uid_max; (user_id >= uid_min) && index[user_id]; user_id--);
-+		if ( user_id < uid_min ) {
-+			fprintf (stderr, _("%s: can't get unique UID\n"), Prog);
-+			fail_exit (E_UID_IN_USE);
-+		}		
- 	}
- 
- 	/*
-@@ -946,6 +962,7 @@
- {
- 	const struct group *grp;
- 	gid_t gid_min, gid_max;
-+	char * index;
- 
-         if (!rflg) {
-                 gid_min = getdef_unum ("GID_MIN", 500);
-@@ -953,7 +970,9 @@
-         } else {
-                 gid_min = 1;
-                 gid_max = getdef_unum ("GID_MIN", 500) - 1;
--        }
-+       		index = alloca (sizeof (char) * gid_max +1);
-+		memset (index, 0, sizeof (char) * gid_max + 1);
-+	}
- 
- 	/*
- 	 * Start with some GID value if the user didn't provide us with
-@@ -978,12 +997,16 @@
- 			user_gid = grp->gr_gid;
- 			return;
- 		}
--		if (grp->gr_gid >= user_gid) {
-+		if (!rflg && grp->gr_gid >= user_gid) {
- 			if (grp->gr_gid > gid_max)
- 				continue;
- 			user_gid = grp->gr_gid + 1;
- 		}
-+		/* create index of occupied system accounts GIDs */
-+		if (rflg && (grp->gr_gid <= gid_max)) 
-+			index[grp->gr_gid] = 1;
- 	}
-+
- #ifndef NO_GETGRENT		/* glibc does have this, so ... */
- 	/* A quick test gets here: if the UID is available
- 	 * as a GID, go ahead and use it */
-@@ -992,6 +1015,18 @@
- 		return;
- 	}
- #endif
-+
-+	/* find free system account */
-+	if(rflg) {
-+		for( user_gid = gid_max; (user_gid >= gid_min) && index[user_gid]; user_gid--);
-+		if ( user_gid < gid_min ) {
-+			fprintf (stderr,
-+				 "%s: can't get unique gid (run out of GIDs)\n",
-+				 Prog);
-+			fail_exit (4);
-+		}
-+	}
-+
- 	if (user_gid == gid_max + 1) {
- 		for (user_gid = gid_min; user_gid < gid_max; user_gid++) {
- #ifdef NO_GETGRENT
---- shadow-4.0.18.1/src/groupadd.c.sysAccount	2007-03-12 10:49:14.000000000 +0100
-+++ shadow-4.0.18.1/src/groupadd.c	2007-03-12 10:49:14.000000000 +0100
-@@ -199,6 +199,7 @@
- {
- 	const struct group *grp;
- 	gid_t gid_min, gid_max;
-+	char * index;
- 
- 	if (!rflg) {
- 		gid_min = getdef_unum ("GID_MIN", 500);
-@@ -206,7 +207,9 @@
-         } else {
-                 gid_min = 1;
-                 gid_max = getdef_unum ("GID_MIN", 500) - 1;
--        }
-+        	index = alloca (sizeof (char) * gid_max +1);
-+		memset (index, 0, sizeof (char) * gid_max + 1);
-+	}
- 
- 	/*
- 	 * Start with some GID value if the user didn't provide us with
-@@ -251,12 +254,25 @@
- 				 Prog, (unsigned int) group_id);
- 			fail_exit (E_GID_IN_USE);
- 		}
--		if (!gflg && grp->gr_gid >= group_id) {
-+		if (!gflg && !rflg && grp->gr_gid >= group_id) {
- 			if (grp->gr_gid > gid_max)
- 				continue;
- 			group_id = grp->gr_gid + 1;
- 		}
-+		/* create index of occupied system accounts UIDs */
-+		if (!gflg && rflg && (grp->gr_gid <= gid_max)) 
-+			index[grp->gr_gid] = 1;
-+	}
-+
-+	/* find free system account */
-+	if(!gflg && rflg) {
-+		for( group_id = gid_max; (group_id >= gid_min) && index[group_id]; group_id--);
-+		if ( group_id < gid_min ) {
-+			fprintf (stderr, _("%s: can't get unique GID\n"), Prog);
-+			fail_exit (E_GID_IN_USE);
-+		}	
- 	}
-+
- 	if (!gflg && group_id == gid_max + 1) {
- 		for (group_id = gid_min; group_id < gid_max; group_id++) {
- #ifdef NO_GETGRENT

shadow-4.0.3-noinst.patch

@@ -1,11 +0,0 @@
---- shadow-4.0.7/lib/Makefile.am.noinst	2005-01-18 01:08:48.000000000 +0100
-+++ shadow-4.0.7/lib/Makefile.am	2005-03-01 16:38:38.018234957 +0100
-@@ -3,7 +3,7 @@
- 
- DEFS = 
- 
--lib_LTLIBRARIES = libshadow.la
-+noinst_LTLIBRARIES = libshadow.la
- 
- libshadow_la_LDFLAGS = -version-info 0:0:0
- libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) $(LIBSELINUX)

shadow-4.1.5.1-default-range.patch

@@ -0,0 +1,36 @@
+Index: shadow-4.5/lib/semanage.c
+===================================================================
+--- shadow-4.5.orig/lib/semanage.c
++++ shadow-4.5/lib/semanage.c
+@@ -143,6 +143,7 @@ static int semanage_user_mod (semanage_h
+ 		goto done;
+ 	}
+ 
++#if 0
+ 	ret = semanage_seuser_set_mlsrange (handle, seuser, DEFAULT_SERANGE);
+ 	if (ret != 0) {
+ 		fprintf (stderr,
+@@ -150,6 +151,7 @@ static int semanage_user_mod (semanage_h
+ 		ret = 1;
+ 		goto done;
+ 	}
++#endif
+ 
+ 	ret = semanage_seuser_set_sename (handle, seuser, seuser_name);
+ 	if (ret != 0) {
+@@ -200,6 +202,7 @@ static int semanage_user_add (semanage_h
+ 		goto done;
+ 	}
+ 
++#if 0
+ 	ret = semanage_seuser_set_mlsrange (handle, seuser, DEFAULT_SERANGE);
+ 	if (ret != 0) {
+ 		fprintf (stderr,
+@@ -208,6 +211,7 @@ static int semanage_user_add (semanage_h
+ 		ret = 1;
+ 		goto done;
+ 	}
++#endif
+ 
+ 	ret = semanage_seuser_set_sename (handle, seuser, seuser_name);
+ 	if (ret != 0) {

shadow-4.1.5.1-info-parent-dir.patch

@@ -0,0 +1,21 @@
+Index: shadow-4.5/man/newusers.8.xml
+===================================================================
+--- shadow-4.5.orig/man/newusers.8.xml
++++ shadow-4.5/man/newusers.8.xml
+@@ -218,7 +218,15 @@
+ 	  <para>
+ 	    If this field does not specify an existing directory, the
+ 	    specified directory is created, with ownership set to the
+-	    user being created or updated and its primary group.
++	    user being created or updated and its primary group. Note 
++            that newusers does not create parent directories of the new 
++            user's home directory. The newusers command will fail to 
++            create the home directory if the parent directories do not 
++            exist, and will send a message to stderr informing the user 
++            of the failure. The newusers command will not halt or return 
++            a failure to the calling shell if it fails to create the home 
++            directory, it will continue to process the batch of new users 
++            specified.
+ 	  </para>
+ 	  <para>
+ 	    If the home directory of an existing user is changed,

shadow-4.1.5.1-logmsg.patch

@@ -0,0 +1,13 @@
+Index: shadow-4.5/src/useradd.c
+===================================================================
+--- shadow-4.5.orig/src/useradd.c
++++ shadow-4.5/src/useradd.c
+@@ -323,7 +323,7 @@ static void fail_exit (int code)
+ 	              user_name, AUDIT_NO_ID,
+ 	              SHADOW_AUDIT_FAILURE);
+ #endif
+-	SYSLOG ((LOG_INFO, "failed adding user '%s', data deleted", user_name));
++	SYSLOG ((LOG_INFO, "failed adding user '%s', exit code: %d", user_name, code));
+ 	exit (code);
+ }
+ 

shadow-4.1.5.1-userdel-helpfix.patch

@@ -0,0 +1,16 @@
+Index: shadow-4.5/src/userdel.c
+===================================================================
+--- shadow-4.5.orig/src/userdel.c
++++ shadow-4.5/src/userdel.c
+@@ -143,8 +143,9 @@ static void usage (int status)
+ 	                  "\n"
+ 	                  "Options:\n"),
+ 	                Prog);
+-	(void) fputs (_("  -f, --force                   force removal of files,\n"
+-	                "                                even if not owned by user\n"),
++	(void) fputs (_("  -f, --force                   force some actions that would fail otherwise\n"
++			"                                e.g. removal of user still logged in\n"
++			"                                or files, even if not owned by the user\n"),
+ 	              usageout);
+ 	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
+ 	(void) fputs (_("  -r, --remove                  remove home directory and mail spool\n"), usageout);

shadow-4.2.1-date-parsing.patch

@@ -0,0 +1,69 @@
+Index: shadow-4.5/libmisc/getdate.y
+===================================================================
+--- shadow-4.5.orig/libmisc/getdate.y
++++ shadow-4.5/libmisc/getdate.y
+@@ -152,6 +152,7 @@ static int	yyHaveDay;
+ static int	yyHaveRel;
+ static int	yyHaveTime;
+ static int	yyHaveZone;
++static int      yyHaveYear;
+ static int	yyTimezone;
+ static int	yyDay;
+ static int	yyHour;
+@@ -293,18 +294,21 @@ date	: tUNUMBER '/' tUNUMBER {
+ 	      yyDay = $3;
+ 	      yyYear = $5;
+ 	    }
++	    yyHaveYear++;
+ 	}
+ 	| tUNUMBER tSNUMBER tSNUMBER {
+ 	    /* ISO 8601 format.  yyyy-mm-dd.  */
+ 	    yyYear = $1;
+ 	    yyMonth = -$2;
+ 	    yyDay = -$3;
++	    yyHaveYear++;
+ 	}
+ 	| tUNUMBER tMONTH tSNUMBER {
+ 	    /* e.g. 17-JUN-1992.  */
+ 	    yyDay = $1;
+ 	    yyMonth = $2;
+ 	    yyYear = -$3;
++	    yyHaveYear++;
+ 	}
+ 	| tMONTH tUNUMBER {
+ 	    yyMonth = $1;
+@@ -314,6 +318,7 @@ date	: tUNUMBER '/' tUNUMBER {
+ 	    yyMonth = $1;
+ 	    yyDay = $2;
+ 	    yyYear = $4;
++	    yyHaveYear++;
+ 	}
+ 	| tUNUMBER tMONTH {
+ 	    yyMonth = $2;
+@@ -323,6 +328,7 @@ date	: tUNUMBER '/' tUNUMBER {
+ 	    yyMonth = $2;
+ 	    yyDay = $1;
+ 	    yyYear = $3;
++	    yyHaveYear++;
+ 	}
+ 	;
+ 
+@@ -395,7 +401,8 @@ relunit	: tUNUMBER tYEAR_UNIT {
+ 
+ number	: tUNUMBER
+           {
+-	    if ((yyHaveTime != 0) && (yyHaveDate != 0) && (yyHaveRel == 0))
++	    if ((yyHaveTime != 0 || $1 >= 100) && !yyHaveYear
++		&& (yyHaveDate != 0) && (yyHaveRel == 0))
+ 	      yyYear = $1;
+ 	    else
+ 	      {
+@@ -802,7 +809,7 @@ yylex (void)
+ 	  return LookupWord (buff);
+ 	}
+       if (c != '(')
+-	return *yyInput++;
++	return (unsigned char)*yyInput++;
+       Count = 0;
+       do
+ 	{

shadow-4.2.1-no-lock-dos.patch

@@ -0,0 +1,16 @@
+Index: shadow-4.5/lib/commonio.c
+===================================================================
+--- shadow-4.5.orig/lib/commonio.c
++++ shadow-4.5/lib/commonio.c
+@@ -140,7 +140,10 @@ static int do_lock_file (const char *fil
+ 	int retval;
+ 	char buf[32];
+ 
+-	fd = open (file, O_CREAT | O_EXCL | O_WRONLY, 0600);
++	/* We depend here on the fact, that the file name is pid-specific.
++	 * So no O_EXCL here and no DoS.
++	 */
++	fd = open (file, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+ 	if (-1 == fd) {
+ 		if (log) {
+ 			(void) fprintf (stderr,

shadow-4.2.1-null-tm.patch

@@ -0,0 +1,91 @@
+Index: shadow-4.5/src/faillog.c
+===================================================================
+--- shadow-4.5.orig/src/faillog.c
++++ shadow-4.5/src/faillog.c
+@@ -163,10 +163,14 @@ static void print_one (/*@null@*/const s
+ 	}
+ 
+ 	tm = localtime (&fl.fail_time);
++	if (tm == NULL) {
++		cp = "(unknown)";
++	} else {
+ #ifdef HAVE_STRFTIME
+-	strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm);
+-	cp = ptime;
++		strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm);
++		cp = ptime;
+ #endif
++	}
+ 	printf ("%-9s   %5d    %5d   ",
+ 	        pw->pw_name, fl.fail_cnt, fl.fail_max);
+ 	/* FIXME: cp is not defined ifndef HAVE_STRFTIME */
+Index: shadow-4.5/src/chage.c
+===================================================================
+--- shadow-4.5.orig/src/chage.c
++++ shadow-4.5/src/chage.c
+@@ -168,6 +168,10 @@ static void date_to_str (char *buf, size
+ 	struct tm *tp;
+ 
+ 	tp = gmtime (&date);
++	if (tp == NULL) {
++		(void) snprintf (buf, maxsize, "(unknown)");
++		return;
++	}
+ #ifdef HAVE_STRFTIME
+ 	(void) strftime (buf, maxsize, "%Y-%m-%d", tp);
+ #else
+Index: shadow-4.5/src/lastlog.c
+===================================================================
+--- shadow-4.5.orig/src/lastlog.c
++++ shadow-4.5/src/lastlog.c
+@@ -158,13 +158,17 @@ static void print_one (/*@null@*/const s
+ 
+ 	ll_time = ll.ll_time;
+ 	tm = localtime (&ll_time);
++	if (tm == NULL) {
++		cp = "(unknown)";
++	} else {
+ #ifdef HAVE_STRFTIME
+-	strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm);
+-	cp = ptime;
++		strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm);
++		cp = ptime;
+ #else
+-	cp = asctime (tm);
+-	cp[24] = '\0';
++		cp = asctime (tm);
++		cp[24] = '\0';
+ #endif
++	}
+ 
+ 	if (ll.ll_time == (time_t) 0) {
+ 		cp = _("**Never logged in**\0");
+Index: shadow-4.5/src/passwd.c
+===================================================================
+--- shadow-4.5.orig/src/passwd.c
++++ shadow-4.5/src/passwd.c
+@@ -455,6 +455,9 @@ static /*@observer@*/const char *date_to
+ 	struct tm *tm;
+ 
+ 	tm = gmtime (&t);
++	if (tm == NULL) {
++		return "(unknown)";
++	}
+ #ifdef HAVE_STRFTIME
+ 	(void) strftime (buf, sizeof buf, "%m/%d/%Y", tm);
+ #else				/* !HAVE_STRFTIME */
+Index: shadow-4.5/src/usermod.c
+===================================================================
+--- shadow-4.5.orig/src/usermod.c
++++ shadow-4.5/src/usermod.c
+@@ -210,6 +210,10 @@ static void date_to_str (/*@unique@*//*@
+ 	} else {
+ 		time_t t = (time_t) date;
+ 		tp = gmtime (&t);
++		if (tp == NULL) {
++			strncpy (buf, "unknown", maxsize);
++			return;
++		}
+ #ifdef HAVE_STRFTIME
+ 		strftime (buf, maxsize, "%Y-%m-%d", tp);
+ #else

shadow-4.3.1-manfix.patch

@@ -0,0 +1,266 @@
+Index: shadow-4.5/man/groupmems.8.xml
+===================================================================
+--- shadow-4.5.orig/man/groupmems.8.xml
++++ shadow-4.5/man/groupmems.8.xml
+@@ -179,20 +179,10 @@
+   <refsect1 id='setup'>
+     <title>SETUP</title>
+     <para>
+-      The <command>groupmems</command> executable should be in mode
+-      <literal>2770</literal> as user <emphasis>root</emphasis> and in group
+-      <emphasis>groups</emphasis>. The system administrator can add users to
+-      group <emphasis>groups</emphasis> to allow or disallow them using the
+-      <command>groupmems</command> utility to manage their own group
+-      membership list.
++      In this operating system the <command>groupmems</command> executable
++      is not setuid and regular users cannot use it to manipulate
++      the membership of their own group.
+     </para>
+-
+-    <programlisting>
+-	$ groupadd -r groups
+-	$ chmod 2770 groupmems
+-	$ chown root.groups groupmems
+-	$ groupmems -g groups -a gk4
+-    </programlisting>
+   </refsect1>
+ 
+   <refsect1 id='configuration'>
+Index: shadow-4.5/man/chage.1.xml
+===================================================================
+--- shadow-4.5.orig/man/chage.1.xml
++++ shadow-4.5/man/chage.1.xml
+@@ -102,6 +102,9 @@
+ 	    Set the number of days since January 1st, 1970 when the password
+ 	    was last changed. The date may also be expressed in the format
+ 	    YYYY-MM-DD (or the format more commonly used in your area).
++	    If the <replaceable>LAST_DAY</replaceable> is set to
++	    <emphasis>0</emphasis> the user is forced to change his password
++	    on the next log on.
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+@@ -119,6 +122,13 @@
+ 	    system again.
+ 	  </para>
+ 	  <para>
++	    For example the following can be used to set an account to expire
++	    in 180 days:
++	  </para>
++	  <programlisting>
++	    chage -E $(date -d +180days +%Y-%m-%d)
++	  </programlisting>
++	  <para>
+ 	    Passing the number <emphasis remap='I'>-1</emphasis> as the
+ 	    <replaceable>EXPIRE_DATE</replaceable> will remove an account
+ 	    expiration date.
+Index: shadow-4.5/man/ja/man5/login.defs.5
+===================================================================
+--- shadow-4.5.orig/man/ja/man5/login.defs.5
++++ shadow-4.5/man/ja/man5/login.defs.5
+@@ -147,10 +147,6 @@ PASS_MAX_DAYS, PASS_MIN_DAYS, PASS_WARN_
+ shadow パスワード機能のどのプログラムが
+ どのパラメータを使用するかを示したものである。
+ .na
+-.IP chfn 12
+-CHFN_AUTH CHFN_RESTRICT
+-.IP chsh 12
+-CHFN_AUTH
+ .IP groupadd 12
+ GID_MAX GID_MIN
+ .IP newusers 12
+Index: shadow-4.5/man/login.defs.5.xml
+===================================================================
+--- shadow-4.5.orig/man/login.defs.5.xml
++++ shadow-4.5/man/login.defs.5.xml
+@@ -162,6 +162,17 @@
+       long numeric parameters is machine-dependent.
+     </para>
+ 
++    <para>
++      Please note that the parameters in this configuration file control the
++      behavior of the tools from the shadow-utils component. None of these
++      tools uses the PAM mechanism, and the utilities that use PAM (such as the
++      passwd command) should be configured elsewhere. The only values that
++      affect PAM modules are <emphasis>ENCRYPT_METHOD</emphasis> and <emphasis>SHA_CRYPT_MAX_ROUNDS</emphasis>
++      for pam_unix module, <emphasis>FAIL_DELAY</emphasis> for pam_faildelay module,
++      and <emphasis>UMASK</emphasis> for pam_umask module. Refer to
++      pam(8) for more information.
++    </para>
++
+     <para>The following configuration items are provided:</para>
+ 
+     <variablelist remap='IP'>
+@@ -252,16 +263,6 @@
+ 	</listitem>
+       </varlistentry>
+       <varlistentry>
+-	<term>chfn</term>
+-	<listitem>
+-	  <para>
+-	    <phrase condition="no_pam">CHFN_AUTH</phrase>
+-	    CHFN_RESTRICT
+-	    <phrase condition="no_pam">LOGIN_STRING</phrase>
+-	  </para>
+-	</listitem>
+-      </varlistentry>
+-      <varlistentry>
+ 	<term>chgpasswd</term>
+ 	<listitem>
+ 	  <para>
+@@ -282,14 +283,6 @@
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+-      <varlistentry condition="no_pam">
+-	<term>chsh</term>
+-	<listitem>
+-	  <para>
+-	    CHSH_AUTH LOGIN_STRING
+-	  </para>
+-	</listitem>
+-      </varlistentry>
+       <!-- expiry: no variables (CONSOLE_GROUPS linked, but not used) -->
+       <!-- faillog: no variables -->
+       <varlistentry>
+@@ -350,34 +343,6 @@
+       </varlistentry>
+       <!-- id: no variables -->
+       <!-- lastlog: no variables -->
+-      <varlistentry>
+-	<term>login</term>
+-	<listitem>
+-	  <para>
+-	    <phrase condition="no_pam">CONSOLE</phrase>
+-	    CONSOLE_GROUPS DEFAULT_HOME
+-	    <phrase condition="no_pam">ENV_HZ ENV_PATH ENV_SUPATH
+-	    ENV_TZ ENVIRON_FILE</phrase>
+-	    ERASECHAR FAIL_DELAY
+-	    <phrase condition="no_pam">FAILLOG_ENAB</phrase>
+-	    FAKE_SHELL
+-	    <phrase condition="no_pam">FTMP_FILE</phrase>
+-	    HUSHLOGIN_FILE
+-	    <phrase condition="no_pam">ISSUE_FILE</phrase>
+-	    KILLCHAR
+-	    <phrase condition="no_pam">LASTLOG_ENAB</phrase>
+-	    LOGIN_RETRIES
+-	    <phrase condition="no_pam">LOGIN_STRING</phrase>
+-	    LOGIN_TIMEOUT LOG_OK_LOGINS LOG_UNKFAIL_ENAB
+-	    <phrase condition="no_pam">MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE
+-	    MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB
+-	    QUOTAS_ENAB</phrase>
+-	    TTYGROUP TTYPERM TTYTYPE_FILE
+-	    <phrase condition="no_pam">ULIMIT UMASK</phrase>
+-	    USERGROUPS_ENAB
+-	  </para>
+-	</listitem>
+-      </varlistentry>
+       <!-- logoutd: no variables -->
+       <varlistentry>
+ 	<term>newgrp / sg</term>
+@@ -405,17 +370,6 @@
+ 	</listitem>
+       </varlistentry>
+       <!-- nologin: no variables -->
+-      <varlistentry condition="no_pam">
+-	<term>passwd</term>
+-	<listitem>
+-	  <para>
+-	    ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB
+-	    PASS_ALWAYS_WARN PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN
+-	    <phrase condition="sha_crypt">SHA_CRYPT_MAX_ROUNDS
+-	    SHA_CRYPT_MIN_ROUNDS</phrase>
+-	  </para>
+-	</listitem>
+-      </varlistentry>
+       <varlistentry>
+ 	<term>pwck</term>
+ 	<listitem>
+@@ -442,32 +396,6 @@
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+-      <varlistentry>
+-	<term>su</term>
+-	<listitem>
+-	  <para>
+-	    <phrase condition="no_pam">CONSOLE</phrase>
+-	    CONSOLE_GROUPS DEFAULT_HOME
+-	    <phrase condition="no_pam">ENV_HZ ENVIRON_FILE</phrase>
+-	    ENV_PATH ENV_SUPATH
+-	    <phrase condition="no_pam">ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB
+-	    MAIL_DIR MAIL_FILE QUOTAS_ENAB</phrase>
+-	    SULOG_FILE SU_NAME
+-	    <phrase condition="no_pam">SU_WHEEL_ONLY</phrase>
+-	    SYSLOG_SU_ENAB
+-	    <phrase condition="no_pam">USERGROUPS_ENAB</phrase>
+-	  </para>
+-	</listitem>
+-      </varlistentry>
+-      <varlistentry>
+-	<term>sulogin</term>
+-	<listitem>
+-	  <para>
+-	    ENV_HZ
+-	    <phrase condition="no_pam">ENV_TZ</phrase>
+-	  </para>
+-	</listitem>
+-      </varlistentry>
+       <varlistentry>
+ 	<term>useradd</term>
+ 	<listitem>
+Index: shadow-4.5/man/shadow.5.xml
+===================================================================
+--- shadow-4.5.orig/man/shadow.5.xml
++++ shadow-4.5/man/shadow.5.xml
+@@ -208,8 +208,8 @@
+ 	  </para>
+ 	  <para>
+ 	    After expiration of the password and this expiration period is
+-	    elapsed, no login is possible using the current user's
+-	    password.  The user should contact her administrator.
++	    elapsed, no login is possible for the user.
++	    The user should contact her administrator.
+ 	  </para>
+ 	  <para>
+ 	    An empty field means that there are no enforcement of an
+Index: shadow-4.5/man/useradd.8.xml
+===================================================================
+--- shadow-4.5.orig/man/useradd.8.xml
++++ shadow-4.5/man/useradd.8.xml
+@@ -347,6 +347,11 @@
+ 	    <option>CREATE_HOME</option> is not enabled, no home
+ 	    directories are created.
+ 	  </para>
++	  <para>
++	    The directory where the user's home directory is created must
++	    exist and have proper SELinux context and permissions. Otherwise
++	    the user's home directory cannot be created or accessed.
++	  </para>
+ 	</listitem>
+       </varlistentry>
+       <varlistentry>
+Index: shadow-4.5/man/usermod.8.xml
+===================================================================
+--- shadow-4.5.orig/man/usermod.8.xml
++++ shadow-4.5/man/usermod.8.xml
+@@ -132,7 +132,8 @@
+ 	    If the <option>-m</option>
+ 	    option is given, the contents of the current home directory will
+ 	    be moved to the new home directory, which is created if it does
+-	    not already exist.
++	    not already exist. If the current home directory does not exist
++	    the new home directory will not be created.
+ 	  </para>
+ 	</listitem>
+       </varlistentry>
+@@ -256,7 +257,8 @@
+ 	<listitem>
+ 	  <para>
+ 	    Move the content of the user's home directory to the new
+-	    location.
++	    location. If the current home directory does not exist
++	    the new home directory will not be created.
+ 	  </para>
+ 	  <para>
+ 	    This option is only valid in combination with the

shadow-4.3.1-selinux-perms.patch

@@ -0,0 +1,277 @@
+Index: shadow-4.5/src/chgpasswd.c
+===================================================================
+--- shadow-4.5.orig/src/chgpasswd.c
++++ shadow-4.5/src/chgpasswd.c
+@@ -39,6 +39,13 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#include <selinux/avc.h>
++#endif
++#ifdef WITH_LIBAUDIT
++#include <libaudit.h>
++#endif
+ #ifdef ACCT_TOOLS_SETUID
+ #ifdef USE_PAM
+ #include "pam_defs.h"
+@@ -76,6 +83,9 @@ static bool sgr_locked = false;
+ #endif
+ static bool gr_locked = false;
+ 
++/* The name of the caller */
++static char *myname = NULL;
++
+ /* local function prototypes */
+ static void fail_exit (int code);
+ static /*@noreturn@*/void usage (int status);
+@@ -300,6 +310,63 @@ static void check_perms (void)
+ #endif				/* ACCT_TOOLS_SETUID */
+ }
+ 
++#ifdef WITH_SELINUX
++static int
++log_callback (int type, const char *fmt, ...)
++{
++    int audit_fd;
++    va_list ap;
++
++    va_start(ap, fmt);
++#ifdef WITH_AUDIT
++    audit_fd = audit_open();
++
++    if (audit_fd >= 0) {
++	char *buf;
++
++	if (vasprintf (&buf, fmt, ap) < 0)
++		goto ret;
++	audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL,
++				   NULL, 0);
++	audit_close(audit_fd);
++	free(buf);
++	goto ret;
++    }
++
++#endif
++    vsyslog (LOG_USER | LOG_INFO, fmt, ap);
++ret:
++    va_end(ap);
++    return 0;
++}
++
++static void
++selinux_check_root (void)
++{
++    int status = -1;
++    security_context_t user_context;
++    union selinux_callback old_callback;
++
++    if (is_selinux_enabled() < 1)
++	return;
++
++    old_callback = selinux_get_callback(SELINUX_CB_LOG);
++    /* setup callbacks */
++    selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) &log_callback);
++    if ((status = getprevcon(&user_context)) < 0) {
++	selinux_set_callback(SELINUX_CB_LOG, old_callback);
++	exit(1);
++    }
++
++    status = selinux_check_access(user_context, user_context, "passwd", "passwd", NULL);
++
++    selinux_set_callback(SELINUX_CB_LOG, old_callback);
++    freecon(user_context);
++    if (status != 0 && security_getenforce() != 0)
++	exit(1);
++}
++#endif
++
+ /*
+  * open_files - lock and open the group databases
+  */
+@@ -393,6 +460,7 @@ int main (int argc, char **argv)
+ 
+ 	const struct group *gr;
+ 	struct group newgr;
++	struct passwd *pw = NULL;
+ 	int errors = 0;
+ 	int line = 0;
+ 
+@@ -408,8 +476,33 @@ int main (int argc, char **argv)
+ 
+ 	OPENLOG ("chgpasswd");
+ 
++#ifdef WITH_AUDIT
++	audit_help_open ();
++#endif
++
++	/*
++	 * Determine the name of the user that invoked this command. This
++	 * is really hit or miss because there are so many ways that command
++	 * can be executed and so many ways to trip up the routines that
++	 * report the user name.
++	 */
++	pw = get_my_pwent ();
++	if (NULL == pw) {
++		fprintf (stderr, _("%s: Cannot determine your user name.\n"),
++		         Prog);
++		SYSLOG ((LOG_WARN,
++		         "Cannot determine the user name of the caller (UID %lu)",
++		         (unsigned long) getuid ()));
++		exit (E_NOPERM);
++	}
++	myname = xstrdup (pw->pw_name);
++
+ 	check_perms ();
+ 
++#ifdef WITH_SELINUX
++	selinux_check_root ();
++#endif
++
+ #ifdef SHADOWGRP
+ 	is_shadow_grp = sgr_file_present ();
+ #endif
+@@ -536,6 +629,15 @@ int main (int argc, char **argv)
+ 			newgr.gr_passwd = cp;
+ 		}
+ 
++#ifdef WITH_AUDIT
++		{
++
++			audit_logger_with_group (AUDIT_GRP_CHAUTHTOK, Prog,
++		              "change-password",
++		              myname, AUDIT_NO_ID, gr->gr_name,
++		              SHADOW_AUDIT_SUCCESS);
++		}
++#endif
+ 		/* 
+ 		 * The updated group file entry is then put back and will
+ 		 * be written to the group file later, after all the
+Index: shadow-4.5/src/chpasswd.c
+===================================================================
+--- shadow-4.5.orig/src/chpasswd.c
++++ shadow-4.5/src/chpasswd.c
+@@ -39,6 +39,13 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#include <selinux/avc.h>
++#endif
++#ifdef WITH_LIBAUDIT
++#include <libaudit.h>
++#endif
+ #ifdef USE_PAM
+ #include "pam_defs.h"
+ #endif				/* USE_PAM */
+@@ -297,6 +304,63 @@ static void check_perms (void)
+ #endif				/* USE_PAM */
+ }
+ 
++#ifdef WITH_SELINUX
++static int
++log_callback (int type, const char *fmt, ...)
++{
++    int audit_fd;
++    va_list ap;
++
++    va_start(ap, fmt);
++#ifdef WITH_AUDIT
++    audit_fd = audit_open();
++
++    if (audit_fd >= 0) {
++	char *buf;
++
++	if (vasprintf (&buf, fmt, ap) < 0)
++		goto ret;
++	audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL,
++				   NULL, 0);
++	audit_close(audit_fd);
++	free(buf);
++	goto ret;
++    }
++
++#endif
++    vsyslog (LOG_USER | LOG_INFO, fmt, ap);
++ret:
++    va_end(ap);
++    return 0;
++}
++
++static void
++selinux_check_root (void)
++{
++    int status = -1;
++    security_context_t user_context;
++    union selinux_callback old_callback;
++
++    if (is_selinux_enabled() < 1)
++	return;
++
++    old_callback = selinux_get_callback(SELINUX_CB_LOG);
++    /* setup callbacks */
++    selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback) &log_callback);
++    if ((status = getprevcon(&user_context)) < 0) {
++	selinux_set_callback(SELINUX_CB_LOG, old_callback);
++	exit(1);
++    }
++
++    status = selinux_check_access(user_context, user_context, "passwd", "passwd", NULL);
++
++    selinux_set_callback(SELINUX_CB_LOG, old_callback);
++    freecon(user_context);
++    if (status != 0 && security_getenforce() != 0)
++	exit(1);
++}
++#endif
++
+ /*
+  * open_files - lock and open the password databases
+  */
+@@ -405,8 +469,16 @@ int main (int argc, char **argv)
+ 
+ 	OPENLOG ("chpasswd");
+ 
++#ifdef WITH_AUDIT
++	audit_help_open ();
++#endif
++
+ 	check_perms ();
+ 
++#ifdef WITH_SELINUX
++	selinux_check_root ();
++#endif
++
+ #ifdef USE_PAM
+ 	if (!use_pam)
+ #endif				/* USE_PAM */
+@@ -566,6 +638,11 @@ int main (int argc, char **argv)
+ 			newpw.pw_passwd = cp;
+ 		}
+ 
++#ifdef WITH_AUDIT
++		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
++		              "updating-password",
++		              pw->pw_name, (unsigned int) pw->pw_uid, 1);
++#endif
+ 		/* 
+ 		 * The updated password file entry is then put back and will
+ 		 * be written to the password file later, after all the
+Index: shadow-4.5/src/Makefile.am
+===================================================================
+--- shadow-4.5.orig/src/Makefile.am
++++ shadow-4.5/src/Makefile.am
+@@ -87,9 +87,9 @@ chage_LDADD    = $(LDADD) $(LIBPAM_SUID)
+ newuidmap_LDADD    = $(LDADD) $(LIBSELINUX)
+ newgidmap_LDADD    = $(LDADD) $(LIBSELINUX)
+ chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
+-chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBCRYPT)
++chgpasswd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBSELINUX) $(LIBAUDIT) $(LIBCRYPT)
+ chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD)
+-chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
++chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBAUDIT) $(LIBCRYPT)
+ gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
+ groupadd_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)
+ groupdel_LDADD = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX)

shadow-4.5-crypt_h.patch

@@ -0,0 +1,41 @@
+Index: shadow-4.5/configure.ac
+===================================================================
+--- shadow-4.5.orig/configure.ac
++++ shadow-4.5/configure.ac
+@@ -32,9 +32,9 @@ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_STDBOOL
+ 
+-AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \
+-	utmpx.h termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \
+-	utime.h ulimit.h sys/resource.h gshadow.h lastlog.h \
++AC_CHECK_HEADERS(crypt.h errno.h fcntl.h limits.h unistd.h sys/time.h \
++	utmp.h utmpx.h termios.h termio.h sgtty.h sys/ioctl.h syslog.h \
++	paths.h utime.h ulimit.h sys/resource.h gshadow.h lastlog.h \
+ 	locale.h rpc/key_prot.h netdb.h acl/libacl.h attr/libattr.h \
+ 	attr/error_context.h)
+ 
+Index: shadow-4.5/lib/defines.h
+===================================================================
+--- shadow-4.5.orig/lib/defines.h
++++ shadow-4.5/lib/defines.h
+@@ -4,6 +4,8 @@
+ #ifndef _DEFINES_H_
+ #define _DEFINES_H_
+ 
++#include "config.h"
++
+ #if HAVE_STDBOOL_H
+ # include <stdbool.h>
+ #else
+@@ -94,6 +96,10 @@ char *strchr (), *strrchr (), *strtok ()
+ # include <unistd.h>
+ #endif
+ 
++#if HAVE_CRYPT_H
++# include <crypt.h>		/* crypt(3) may be defined in here */
++#endif
++
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>

shadow-4.5-goodname.patch

@@ -0,0 +1,96 @@
+Index: shadow-4.5/libmisc/chkname.c
+===================================================================
+--- shadow-4.5.orig/libmisc/chkname.c
++++ shadow-4.5/libmisc/chkname.c
+@@ -47,27 +47,46 @@
+ #include "chkname.h"
+ 
+ static bool is_valid_name (const char *name)
+-{
++{      
+ 	/*
+-	 * User/group names must match [a-z_][a-z0-9_-]*[$]
+-	 */
+-	if (('\0' == *name) ||
+-	    !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
++         * User/group names must match gnu e-regex:
++         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
++         *
++         * as a non-POSIX, extension, allow "$" as the last char for
++         * sake of Samba 3.x "add machine script"
++         *
++         * Also do not allow fully numeric names or just "." or "..".
++         */
++	int numeric;
++
++	if ('\0' == *name ||
++	    ('.' == *name && (('.' == name[1] && '\0' == name[2]) ||
++			      '\0' == name[1])) ||
++	    !((*name >= 'a' && *name <= 'z') ||
++	      (*name >= 'A' && *name <= 'Z') ||
++	      (*name >= '0' && *name <= '9') ||
++	      *name == '_' ||
++	      *name == '.')) {
+ 		return false;
+ 	}
+ 
++	numeric = isdigit(*name);
++
+ 	while ('\0' != *++name) {
+-		if (!(( ('a' <= *name) && ('z' >= *name) ) ||
+-		      ( ('0' <= *name) && ('9' >= *name) ) ||
+-		      ('_' == *name) ||
+-		      ('-' == *name) ||
+-		      ( ('$' == *name) && ('\0' == *(name + 1)) )
++		if (!((*name >= 'a' && *name <= 'z') ||
++		      (*name >= 'A' && *name <= 'Z') ||
++		      (*name >= '0' && *name <= '9') ||
++		      *name == '_' ||
++		      *name == '.' ||
++		      *name == '-' ||
++		      (*name == '$' && name[1] == '\0')
+ 		     )) {
+ 			return false;
+ 		}
++		numeric &= isdigit(*name);
+ 	}
+ 
+-	return true;
++	return !numeric;
+ }
+ 
+ bool is_valid_user_name (const char *name)
+Index: shadow-4.5/man/groupadd.8.xml
+===================================================================
+--- shadow-4.5.orig/man/groupadd.8.xml
++++ shadow-4.5/man/groupadd.8.xml
+@@ -256,12 +256,6 @@
+    <refsect1 id='caveats'>
+      <title>CAVEATS</title>
+      <para>
+-       Groupnames must start with a lower case letter or an underscore,
+-       followed by lower case letters, digits, underscores, or dashes.
+-       They can end with a dollar sign.
+-       In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+-     </para>
+-     <para>
+        Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
+      </para>
+      <para>
+Index: shadow-4.5/man/useradd.8.xml
+===================================================================
+--- shadow-4.5.orig/man/useradd.8.xml
++++ shadow-4.5/man/useradd.8.xml
+@@ -633,12 +633,6 @@
+     </para>
+ 
+     <para>
+-      Usernames must start with a lower case letter or an underscore,
+-      followed by lower case letters, digits, underscores, or dashes.
+-      They can end with a dollar sign.
+-      In regular expression terms: [a-z_][a-z0-9_-]*[$]?
+-    </para>
+-    <para>
+       Usernames may only be up to 32 characters long.
+     </para>
+   </refsect1>

shadow-4.5-long-entry.patch

@@ -0,0 +1,84 @@
+diff -up shadow-4.5/lib/defines.h.long-entry shadow-4.5/lib/defines.h
+--- shadow-4.5/lib/defines.h.long-entry	2014-09-01 16:36:40.000000000 +0200
++++ shadow-4.5/lib/defines.h	2018-04-20 11:53:07.419308212 +0200
+@@ -382,4 +382,7 @@ extern char *strerror ();
+ # endif
+ #endif
+ 
++/* Maximum length of passwd entry */
++#define PASSWD_ENTRY_MAX_LENGTH 32768
++
+ #endif				/* _DEFINES_H_ */
+diff -up shadow-4.5/lib/pwio.c.long-entry shadow-4.5/lib/pwio.c
+--- shadow-4.5/lib/pwio.c.long-entry	2015-11-17 17:45:15.000000000 +0100
++++ shadow-4.5/lib/pwio.c	2018-04-20 12:10:24.400837235 +0200
+@@ -79,7 +79,10 @@ static int passwd_put (const void *ent,
+ 	    || (pw->pw_gid == (gid_t)-1)
+ 	    || (valid_field (pw->pw_gecos, ":\n") == -1)
+ 	    || (valid_field (pw->pw_dir, ":\n") == -1)
+-	    || (valid_field (pw->pw_shell, ":\n") == -1)) {
++	    || (valid_field (pw->pw_shell, ":\n") == -1)
++	    || (strlen (pw->pw_name) + strlen (pw->pw_passwd) +
++	        strlen (pw->pw_gecos) + strlen (pw->pw_dir) +
++	        strlen (pw->pw_shell) + 100 > PASSWD_ENTRY_MAX_LENGTH)) {
+ 		return -1;
+ 	}
+ 
+diff -up shadow-4.5/lib/sgetpwent.c.long-entry shadow-4.5/lib/sgetpwent.c
+--- shadow-4.5/lib/sgetpwent.c.long-entry	2014-09-01 16:36:40.000000000 +0200
++++ shadow-4.5/lib/sgetpwent.c	2018-04-20 12:16:31.911513808 +0200
+@@ -57,7 +57,7 @@
+ struct passwd *sgetpwent (const char *buf)
+ {
+ 	static struct passwd pwent;
+-	static char pwdbuf[1024];
++	static char pwdbuf[PASSWD_ENTRY_MAX_LENGTH];
+ 	register int i;
+ 	register char *cp;
+ 	char *fields[NFIELDS];
+@@ -67,8 +67,10 @@ struct passwd *sgetpwent (const char *bu
+ 	 * the password structure remain valid.
+ 	 */
+ 
+-	if (strlen (buf) >= sizeof pwdbuf)
++	if (strlen (buf) >= sizeof pwdbuf) {
++		fprintf (stderr, "Too long passwd entry encountered, file corruption?\n");
+ 		return 0;	/* fail if too long */
++	}
+ 	strcpy (pwdbuf, buf);
+ 
+ 	/*
+diff -up shadow-4.5/lib/sgetspent.c.long-entry shadow-4.5/lib/sgetspent.c
+--- shadow-4.5/lib/sgetspent.c.long-entry	2014-09-01 16:36:40.000000000 +0200
++++ shadow-4.5/lib/sgetspent.c	2018-04-20 12:16:54.505056257 +0200
+@@ -48,7 +48,7 @@
+  */
+ struct spwd *sgetspent (const char *string)
+ {
+-	static char spwbuf[1024];
++	static char spwbuf[PASSWD_ENTRY_MAX_LENGTH];
+ 	static struct spwd spwd;
+ 	char *fields[FIELDS];
+ 	char *cp;
+@@ -61,6 +61,7 @@ struct spwd *sgetspent (const char *stri
+ 	 */
+ 
+ 	if (strlen (string) >= sizeof spwbuf) {
++		fprintf (stderr, "Too long shadow entry encountered, file corruption?\n");
+ 		return 0;	/* fail if too long */
+ 	}
+ 	strcpy (spwbuf, string);
+diff -up shadow-4.5/lib/shadowio.c.long-entry shadow-4.5/lib/shadowio.c
+--- shadow-4.5/lib/shadowio.c.long-entry	2016-12-07 06:30:41.000000001 +0100
++++ shadow-4.5/lib/shadowio.c	2018-04-20 12:12:03.292171667 +0200
+@@ -79,7 +79,9 @@ static int shadow_put (const void *ent,
+ 
+ 	if (   (NULL == sp)
+ 	    || (valid_field (sp->sp_namp, ":\n") == -1)
+-	    || (valid_field (sp->sp_pwdp, ":\n") == -1)) {
++	    || (valid_field (sp->sp_pwdp, ":\n") == -1)
++	    || (strlen (sp->sp_namp) + strlen (sp->sp_pwdp) +
++	        1000 > PASSWD_ENTRY_MAX_LENGTH)) {
+ 		return -1;
+ 	}
+ 

shadow-4.5-usermod-unlock.patch

@@ -0,0 +1,64 @@
+Index: shadow-4.5/src/usermod.c
+===================================================================
+--- shadow-4.5.orig/src/usermod.c
++++ shadow-4.5/src/usermod.c
+@@ -455,14 +455,17 @@ static char *new_pw_passwd (char *pw_pas
+ 		strcat (buf, pw_pass);
+ 		pw_pass = buf;
+ 	} else if (Uflg && pw_pass[0] == '!') {
+-		char *s;
++		char *s = pw_pass;
+ 
+-		if (pw_pass[1] == '\0') {
++		while ('!' == *s)
++			++s;
++
++		if (*s == '\0') {
+ 			fprintf (stderr,
+ 			         _("%s: unlocking the user's password would result in a passwordless account.\n"
+ 			           "You should set a password with usermod -p to unlock this user's password.\n"),
+ 			         Prog);
+-			return pw_pass;
++			return NULL;
+ 		}
+ 
+ #ifdef WITH_AUDIT
+@@ -471,12 +474,15 @@ static char *new_pw_passwd (char *pw_pas
+ 		              user_newname, (unsigned int) user_newid, 1);
+ #endif
+ 		SYSLOG ((LOG_INFO, "unlock user '%s' password", user_newname));
+-		s = pw_pass;
+-		while ('\0' != *s) {
+-			*s = *(s + 1);
+-			s++;
+-		}
++		memmove (pw_pass, s, strlen (s) + 1);
+ 	} else if (pflg) {
++		if (strchr (user_pass, ':') != NULL) {
++			fprintf (stderr,
++			         _("%s: The password field cannot contain a colon character.\n"),
++			         Prog);
++			return NULL;
++
++		}
+ #ifdef WITH_AUDIT
+ 		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+ 		              "updating-password",
+@@ -525,6 +531,8 @@ static void new_pwent (struct passwd *pw
+ 	if (   (!is_shadow_pwd)
+ 	    || (strcmp (pwent->pw_passwd, SHADOW_PASSWD_STRING) != 0)) {
+ 		pwent->pw_passwd = new_pw_passwd (pwent->pw_passwd);
++		if (pwent->pw_passwd == NULL)
++			fail_exit (E_PW_UPDATE);
+ 	}
+ 
+ 	if (uflg) {
+@@ -639,6 +647,8 @@ static void new_spent (struct spwd *spen
+ 	 *  + aging has been requested
+ 	 */
+ 	spent->sp_pwdp = new_pw_passwd (spent->sp_pwdp);
++	if (spent->sp_pwdp == NULL)
++		fail_exit(E_PW_UPDATE);
+ 
+ 	if (pflg) {
+ 		spent->sp_lstchg = (long) gettime () / SCALE;

shadow-4.6-getenforce.patch

@@ -0,0 +1,21 @@
+diff -up shadow-4.6/lib/selinux.c.getenforce shadow-4.6/lib/selinux.c
+--- shadow-4.6/lib/selinux.c.getenforce	2018-05-28 15:10:15.870315221 +0200
++++ shadow-4.6/lib/selinux.c	2018-05-28 15:10:15.894315731 +0200
+@@ -75,7 +75,7 @@ int set_selinux_file_context (const char
+ 	}
+ 	return 0;
+     error:
+-	if (security_getenforce () != 0) {
++	if (security_getenforce () > 0) {
+ 		return 1;
+ 	}
+ 	return 0;
+@@ -95,7 +95,7 @@ int reset_selinux_file_context (void)
+ 		selinux_checked = true;
+ 	}
+ 	if (selinux_enabled) {
+-		if (setfscreatecon (NULL) != 0) {
++		if (setfscreatecon (NULL) != 0 && security_getenforce () > 0) {
+ 			return 1;
+ 		}
+ 	}

shadow-4.6-move-home.patch

@@ -0,0 +1,15 @@
+diff -up shadow-4.6/src/usermod.c.move-home shadow-4.6/src/usermod.c
+--- shadow-4.6/src/usermod.c.move-home	2018-05-28 14:59:05.594076665 +0200
++++ shadow-4.6/src/usermod.c	2018-05-28 15:00:28.479837392 +0200
+@@ -1845,6 +1845,11 @@ static void move_home (void)
+ 			         Prog, prefix_user_home, prefix_user_newhome);
+ 			fail_exit (E_HOMEDIR);
+ 		}
++	} else {
++		fprintf (stderr,
++		         _("%s: The previous home directory (%s) does "
++		           "not exist or is inaccessible. Move cannot be completed.\n"),
++		         Prog, prefix_user_home);
+ 	}
+ }
+ 

shadow-4.6-orig-context.patch

@@ -0,0 +1,128 @@
+diff -up shadow-4.6/lib/commonio.c.orig-context shadow-4.6/lib/commonio.c
+--- shadow-4.6/lib/commonio.c.orig-context	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/lib/commonio.c	2018-05-28 14:56:37.287929667 +0200
+@@ -961,7 +961,7 @@ int commonio_close (struct commonio_db *
+ 		snprintf (buf, sizeof buf, "%s-", db->filename);
+ 
+ #ifdef WITH_SELINUX
+-		if (set_selinux_file_context (buf) != 0) {
++		if (set_selinux_file_context (buf, db->filename) != 0) {
+ 			errors++;
+ 		}
+ #endif
+@@ -994,7 +994,7 @@ int commonio_close (struct commonio_db *
+ 	snprintf (buf, sizeof buf, "%s+", db->filename);
+ 
+ #ifdef WITH_SELINUX
+-	if (set_selinux_file_context (buf) != 0) {
++	if (set_selinux_file_context (buf, db->filename) != 0) {
+ 		errors++;
+ 	}
+ #endif
+diff -up shadow-4.6/libmisc/copydir.c.orig-context shadow-4.6/libmisc/copydir.c
+--- shadow-4.6/libmisc/copydir.c.orig-context	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/libmisc/copydir.c	2018-05-28 14:56:37.287929667 +0200
+@@ -484,7 +484,7 @@ static int copy_dir (const char *src, co
+ 	 */
+ 
+ #ifdef WITH_SELINUX
+-	if (set_selinux_file_context (dst) != 0) {
++	if (set_selinux_file_context (dst, NULL) != 0) {
+ 		return -1;
+ 	}
+ #endif				/* WITH_SELINUX */
+@@ -605,7 +605,7 @@ static int copy_symlink (const char *src
+ 	}
+ 
+ #ifdef WITH_SELINUX
+-	if (set_selinux_file_context (dst) != 0) {
++	if (set_selinux_file_context (dst, NULL) != 0) {
+ 		free (oldlink);
+ 		return -1;
+ 	}
+@@ -684,7 +684,7 @@ static int copy_special (const char *src
+ 	int err = 0;
+ 
+ #ifdef WITH_SELINUX
+-	if (set_selinux_file_context (dst) != 0) {
++	if (set_selinux_file_context (dst, NULL) != 0) {
+ 		return -1;
+ 	}
+ #endif				/* WITH_SELINUX */
+@@ -744,7 +744,7 @@ static int copy_file (const char *src, c
+ 		return -1;
+ 	}
+ #ifdef WITH_SELINUX
+-	if (set_selinux_file_context (dst) != 0) {
++	if (set_selinux_file_context (dst, NULL) != 0) {
+ 		return -1;
+ 	}
+ #endif				/* WITH_SELINUX */
+diff -up shadow-4.6/lib/prototypes.h.orig-context shadow-4.6/lib/prototypes.h
+--- shadow-4.6/lib/prototypes.h.orig-context	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/lib/prototypes.h	2018-05-28 14:56:37.287929667 +0200
+@@ -326,7 +326,7 @@ extern /*@observer@*/const char *crypt_m
+ 
+ /* selinux.c */
+ #ifdef WITH_SELINUX
+-extern int set_selinux_file_context (const char *dst_name);
++extern int set_selinux_file_context (const char *dst_name, const char *orig_name);
+ extern int reset_selinux_file_context (void);
+ #endif
+ 
+diff -up shadow-4.6/lib/selinux.c.orig-context shadow-4.6/lib/selinux.c
+--- shadow-4.6/lib/selinux.c.orig-context	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/lib/selinux.c	2018-05-28 14:56:37.287929667 +0200
+@@ -50,7 +50,7 @@ static bool selinux_enabled;
+  *	Callers may have to Reset SELinux to create files with default
+  *	contexts with reset_selinux_file_context
+  */
+-int set_selinux_file_context (const char *dst_name)
++int set_selinux_file_context (const char *dst_name, const char *orig_name)
+ {
+ 	/*@null@*/security_context_t scontext = NULL;
+ 
+@@ -62,19 +62,23 @@ int set_selinux_file_context (const char
+ 	if (selinux_enabled) {
+ 		/* Get the default security context for this file */
+ 		if (matchpathcon (dst_name, 0, &scontext) < 0) {
+-			if (security_getenforce () != 0) {
+-				return 1;
+-			}
++			/* We could not get the default, copy the original */
++			if (orig_name == NULL)
++				goto error;
++			if (getfilecon (orig_name, &scontext) < 0)
++				goto error;
+ 		}
+ 		/* Set the security context for the next created file */
+-		if (setfscreatecon (scontext) < 0) {
+-			if (security_getenforce () != 0) {
+-				return 1;
+-			}
+-		}
++		if (setfscreatecon (scontext) < 0)
++			goto error;
+ 		freecon (scontext);
+ 	}
+ 	return 0;
++    error:
++	if (security_getenforce () != 0) {
++		return 1;
++	}
++	return 0;
+ }
+ 
+ /*
+diff -up shadow-4.6/src/useradd.c.orig-context shadow-4.6/src/useradd.c
+--- shadow-4.6/src/useradd.c.orig-context	2018-05-28 14:56:37.288929688 +0200
++++ shadow-4.6/src/useradd.c	2018-05-28 14:58:02.242730903 +0200
+@@ -2020,7 +2020,7 @@ static void create_home (void)
+ {
+ 	if (access (prefix_user_home, F_OK) != 0) {
+ #ifdef WITH_SELINUX
+-		if (set_selinux_file_context (prefix_user_home) != 0) {
++		if (set_selinux_file_context (prefix_user_home, NULL) != 0) {
+ 			fprintf (stderr,
+ 			         _("%s: cannot set SELinux context for home directory %s\n"),
+ 			         Prog, user_home);

shadow-4.6-redhat.patch

@@ -0,0 +1,41 @@
+diff -up shadow-4.6/src/useradd.c.redhat shadow-4.6/src/useradd.c
+--- shadow-4.6/src/useradd.c.redhat	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/src/useradd.c	2018-05-28 13:37:16.695651258 +0200
+@@ -98,7 +98,7 @@ const char *Prog;
+ static gid_t def_group = 100;
+ static const char *def_gname = "other";
+ static const char *def_home = "/home";
+-static const char *def_shell = "";
++static const char *def_shell = "/sbin/nologin";
+ static const char *def_template = SKEL_DIR;
+ static const char *def_create_mail_spool = "no";
+ 
+@@ -108,7 +108,7 @@ static const char *def_expire = "";
+ #define	VALID(s)	(strcspn (s, ":\n") == strlen (s))
+ 
+ static const char *user_name = "";
+-static const char *user_pass = "!";
++static const char *user_pass = "!!";
+ static uid_t user_id;
+ static gid_t user_gid;
+ static const char *user_comment = "";
+@@ -1114,9 +1114,9 @@ static void process_flags (int argc, cha
+ 		};
+ 		while ((c = getopt_long (argc, argv,
+ #ifdef WITH_SELINUX
+-		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:UZ:",
++		                         "b:c:d:De:f:g:G:hk:K:lmMnNop:rR:P:s:u:UZ:",
+ #else				/* !WITH_SELINUX */
+-		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rR:P:s:u:U",
++		                         "b:c:d:De:f:g:G:hk:K:lmMnNop:rR:P:s:u:U",
+ #endif				/* !WITH_SELINUX */
+ 		                         long_options, NULL)) != -1) {
+ 			switch (c) {
+@@ -1267,6 +1267,7 @@ static void process_flags (int argc, cha
+ 			case 'M':
+ 				Mflg = true;
+ 				break;
++			case 'n':
+ 			case 'N':
+ 				Nflg = true;
+ 				break;

shadow-4.6-selinux.patch

@@ -0,0 +1,115 @@
+diff -up shadow-4.6/lib/semanage.c.selinux shadow-4.6/lib/semanage.c
+--- shadow-4.6/lib/semanage.c.selinux	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/lib/semanage.c	2018-05-28 13:38:20.551008911 +0200
+@@ -294,6 +294,9 @@ int set_seuser (const char *login_name,
+ 
+ 	ret = 0;
+ 
++        /* drop obsolete matchpathcon cache */
++        matchpathcon_fini();
++
+ done:
+ 	semanage_seuser_key_free (key);
+ 	semanage_handle_destroy (handle);
+@@ -369,6 +372,10 @@ int del_seuser (const char *login_name)
+ 	}
+ 
+ 	ret = 0;
++
++        /* drop obsolete matchpathcon cache */
++        matchpathcon_fini();
++
+ done:
+ 	semanage_handle_destroy (handle);
+ 	return ret;
+diff -up shadow-4.6/src/useradd.c.selinux shadow-4.6/src/useradd.c
+--- shadow-4.6/src/useradd.c.selinux	2018-05-28 13:43:30.996748997 +0200
++++ shadow-4.6/src/useradd.c	2018-05-28 13:44:04.645486199 +0200
+@@ -2120,6 +2120,7 @@ static void create_mail (void)
+  */
+ int main (int argc, char **argv)
+ {
++	int rv = E_SUCCESS;
+ #ifdef ACCT_TOOLS_SETUID
+ #ifdef USE_PAM
+ 	pam_handle_t *pamh = NULL;
+@@ -2342,27 +2343,11 @@ int main (int argc, char **argv)
+ 
+ 	usr_update ();
+ 
+-	if (mflg) {
+-		create_home ();
+-		if (home_added) {
+-			copy_tree (def_template, prefix_user_home, false, false,
+-			           (uid_t)-1, user_id, (gid_t)-1, user_gid);
+-		} else {
+-			fprintf (stderr,
+-			         _("%s: warning: the home directory already exists.\n"
+-			           "Not copying any file from skel directory into it.\n"),
+-			         Prog);
+-		}
+-
+-	}
+-
+-	/* Do not create mail directory for system accounts */
+-	if (!rflg) {
+-		create_mail ();
+-	}
+-
+ 	close_files ();
+ 
++	nscd_flush_cache ("passwd");
++	nscd_flush_cache ("group");
++
+ 	/*
+ 	 * tallylog_reset needs to be able to lookup
+ 	 * a valid existing user name,
+@@ -2373,8 +2358,9 @@ int main (int argc, char **argv)
+ 	}
+ 
+ #ifdef WITH_SELINUX
+-	if (Zflg) {
+-		if (set_seuser (user_name, user_selinux) != 0) {
++	if (Zflg && *user_selinux) {
++		if (is_selinux_enabled () > 0) {
++		    if (set_seuser (user_name, user_selinux) != 0) {
+ 			fprintf (stderr,
+ 			         _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
+ 			         Prog, user_name, user_selinux);
+@@ -2383,14 +2369,31 @@ int main (int argc, char **argv)
+ 			              "adding SELinux user mapping",
+ 			              user_name, (unsigned int) user_id, 0);
+ #endif				/* WITH_AUDIT */
+-			fail_exit (E_SE_UPDATE);
++			rv = E_SE_UPDATE;
++		    }
+ 		}
+ 	}
+-#endif				/* WITH_SELINUX */
++#endif
+ 
+-	nscd_flush_cache ("passwd");
+-	nscd_flush_cache ("group");
++	if (mflg) {
++		create_home ();
++		if (home_added) {
++			copy_tree (def_template, prefix_user_home, false, true,
++			           (uid_t)-1, user_id, (gid_t)-1, user_gid);
++		} else {
++			fprintf (stderr,
++			         _("%s: warning: the home directory already exists.\n"
++			           "Not copying any file from skel directory into it.\n"),
++			         Prog);
++		}
++
++	}
++
++	/* Do not create mail directory for system accounts */
++	if (!rflg) {
++		create_mail ();
++	}
+ 
+-	return E_SUCCESS;
++	return rv;
+ }
+ 

shadow-4.6-usermod-crash.patch

@@ -0,0 +1,42 @@
+diff -up shadow-4.6/libmisc/prefix_flag.c.usermod-crash shadow-4.6/libmisc/prefix_flag.c
+--- shadow-4.6/libmisc/prefix_flag.c.usermod-crash	2018-04-29 18:42:37.000000000 +0200
++++ shadow-4.6/libmisc/prefix_flag.c	2018-05-28 15:14:10.642302440 +0200
+@@ -319,6 +319,7 @@ extern struct group *prefix_getgr_nam_gi
+ {
+ 	long long int gid;
+ 	char *endptr;
++	struct group *g;
+ 
+ 	if (NULL == grname) {
+ 		return NULL;
+@@ -333,7 +334,8 @@ extern struct group *prefix_getgr_nam_gi
+ 	    	&& (gid == (gid_t)gid)) {
+ 			return prefix_getgrgid ((gid_t) gid);
+ 		}
+-		return prefix_getgrnam (grname);
++		g = prefix_getgrnam (grname);
++		return g ? __gr_dup(g) : NULL;
+ 	}
+ 	else
+ 		return getgr_nam_gid(grname);
+diff -up shadow-4.6/src/usermod.c.usermod-crash shadow-4.6/src/usermod.c
+--- shadow-4.6/src/usermod.c.usermod-crash	2018-05-28 15:12:37.920332763 +0200
++++ shadow-4.6/src/usermod.c	2018-05-28 15:15:50.337422470 +0200
+@@ -1276,11 +1276,13 @@ static void process_flags (int argc, cha
+ 		prefix_user_home = xmalloc(len);
+ 		wlen = snprintf(prefix_user_home, len, "%s/%s", prefix, user_home);
+ 		assert (wlen == (int) len -1);
++		if (user_newhome) {
++			len = strlen(prefix) + strlen(user_newhome) + 2;
++			prefix_user_newhome = xmalloc(len);
++			wlen = snprintf(prefix_user_newhome, len, "%s/%s", prefix, user_newhome);
++			assert (wlen == (int) len -1);
++		}
+ 
+-		len = strlen(prefix) + strlen(user_newhome) + 2;
+-		prefix_user_newhome = xmalloc(len);
+-		wlen = snprintf(prefix_user_newhome, len, "%s/%s", prefix, user_newhome);
+-		assert (wlen == (int) len -1);
+ 	}
+ 	else {
+ 		prefix_user_home = user_home;

shadow-bsd.txt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1990 - 1994, Julianne Frances Haugh
+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz
+ * Copyright (c) 2000 - 2006, Tomasz Kłoczko
+ * Copyright (c) 2007 - 2011, Nicolas François
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the copyright holders or contributors may not be used to
+ *    endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+

shadow-utils.login.defs

@@ -1,3 +1,11 @@
+#
+# Please note that the parameters in this configuration file control the
+# behavior of the tools from the shadow-utils component. None of these
+# tools uses the PAM mechanism, and the utilities that use PAM (such as the
+# passwd command) should therefore be configured elsewhere. Refer to
+# /etc/pam.d/system-auth for more information.
+#
+
 # *REQUIRED*
 #   Directory where mailboxes reside, _or_ name of file, relative to the
 #   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
@@ -22,14 +30,20 @@ PASS_WARN_AGE	7
 #
 # Min/max values for automatic uid selection in useradd
 #
-UID_MIN			  500
-UID_MAX			60000
+UID_MIN                  1000
+UID_MAX                 60000
+# System accounts
+SYS_UID_MIN               201
+SYS_UID_MAX               999
 
 #
 # Min/max values for automatic gid selection in groupadd
 #
-GID_MIN			  500
-GID_MAX			60000
+GID_MIN                  1000
+GID_MAX                 60000
+# System accounts
+SYS_GID_MIN               201
+SYS_GID_MAX               999
 
 #
 # If defined, this command is run when removing a user.
@@ -53,6 +67,6 @@ UMASK           077
 #
 USERGROUPS_ENAB yes
 
-# Use MD5 or DES to encrypt password? Red Hat use MD5 by default.
-MD5_CRYPT_ENAB yes
+# Use SHA512 to encrypt password.
+ENCRYPT_METHOD SHA512 
 

shadow-utils.spec

@@ -1,115 +1,141 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
+# they warn against doing this ...
+%define _disable_source_fetch 0
+%define srcname shadow-utils
 
 Summary: Utilities for managing accounts and shadow password files
-Name: shadow-utils
-Version: 4.0.18.1
-Release: 19%{?dist}
+Name: %{srcname}46
+Version: 4.6
+Release: 2%{?dist}
 Epoch: 2
-URL: http://shadow.pld.org.pl/
-Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
-Source1: shadow-4.0.17-login.defs
-Source2: shadow-4.0.18.1-useradd
-Source3: shadow-4.0.16-nscd.c
-Patch0: shadow-4.0.17-redhat.patch
-Patch1: shadow-4.0.3-noinst.patch
-Patch2: shadow-4.0.11.1-vipw.patch
-Patch3: shadow-4.0.14-goodname.patch
-Patch4: shadow-4.0.13-newgrpPwd.patch
-Patch5: shadow-4.0.16-lOption.patch
-Patch6: shadow-4.0.17-notInheritFd.patch
-Patch7: shadow-4.0.17-exitValues.patch
-Patch8: shadow-4.0.17-auditLogging.patch
-Patch9: shadow-4.0.18.1-gid.patch
-Patch10: shadow-4.0.18.1-overflow.patch
-Patch11: shadow-4.0.17-useradd.patch
-Patch12: shadow-4.0.18.1-appendOption.patch
-Patch13: shadow-4.0.18.1-sysAccount.patch
-Patch14: shadow-4.0.18.1-findNewUidOnce.patch
-Patch15: shadow-4.0.18.1-groupLoop.patch
-Patch16: shadow-4.0.18.1-mtime.patch
+URL: http://pkg-shadow.alioth.debian.org/
+Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz
+Source1: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc
+Source2: shadow-utils.useradd
+Source3: shadow-utils.login.defs
+Source4: shadow-bsd.txt
+Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+Patch0: shadow-4.6-redhat.patch
+Patch1: shadow-4.5-goodname.patch
+Patch2: shadow-4.1.5.1-info-parent-dir.patch
+Patch6: shadow-4.6-selinux.patch
+Patch10: shadow-4.6-orig-context.patch
+Patch11: shadow-4.1.5.1-logmsg.patch
+Patch14: shadow-4.1.5.1-default-range.patch
+Patch15: shadow-4.3.1-manfix.patch
+Patch17: shadow-4.1.5.1-userdel-helpfix.patch
+Patch19: shadow-4.2.1-date-parsing.patch
+Patch21: shadow-4.6-move-home.patch
+Patch22: shadow-4.6-audit-update.patch
+Patch23: shadow-4.5-usermod-unlock.patch
+Patch24: shadow-4.2.1-no-lock-dos.patch
+Patch28: shadow-4.3.1-selinux-perms.patch
+Patch29: shadow-4.2.1-null-tm.patch
+Patch31: shadow-4.6-getenforce.patch
+Patch32: shadow-4.5-crypt_h.patch
+Patch33: shadow-4.5-long-entry.patch
+Patch34: shadow-4.6-usermod-crash.patch
 
-License: BSD
+License: BSD and GPLv2+
 Group: System Environment/Base
-BuildRequires: autoconf, automake, libtool, gettext-devel
+BuildRequires: gcc
 BuildRequires: libselinux-devel >= 1.25.2-1
-BuildRequires: audit-libs-devel >= 1.0.10
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: audit-libs-devel >= 1.6.5
+BuildRequires: libsemanage-devel
+BuildRequires: libacl-devel, libattr-devel
+BuildRequires: bison, flex, gnome-doc-utils, docbook-style-xsl, docbook-dtds
+BuildRequires: autoconf, automake, libtool, gettext-devel
 Requires: libselinux >= 1.25.2-1
-Requires: audit-libs >= 1.0.10
+Requires: audit-libs >= 1.6.5
+Requires: setup
+Requires(pre): coreutils
+Requires(post): coreutils
+Requires: %{name}-newxidmap = %{version}-%{release}
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The shadow-utils package includes the necessary programs for
 converting UNIX password files to the shadow password format, plus
 programs for managing user and group accounts. The pwconv command
 converts passwords to the shadow password format. The pwunconv command
-unconverts shadow passwords and generates an npasswd file (a standard
+unconverts shadow passwords and generates a passwd file (a standard
 UNIX password file). The pwck command checks the integrity of password
 and shadow files. The lastlog command prints out the last login times
 for all users. The useradd, userdel, and usermod commands are used for
 managing user accounts. The groupadd, groupdel, and groupmod commands
 are used for managing group accounts.
 
+%package newxidmap
+Summary: only the newuidmapp and newgidmap from shadow-utils
+%description newxidmap
+%{summary}.
+
 %prep
 %setup -q -n shadow-%{version}
 %patch0 -p1 -b .redhat
-%patch1 -p1 -b .noinst
-%patch2 -p1 -b .vipw
-%patch3 -p1 -b .goodname
-%patch4 -p1 -b .newgrpPwd
-%patch5 -p1 -b .lOption
+%patch1 -p1 -b .goodname
+%patch2 -p1 -b .info-parent-dir
+%patch6 -p1 -b .selinux
+%patch10 -p1 -b .orig-context
+%patch11 -p1 -b .logmsg
+%patch14 -p1 -b .default-range
+%patch15 -p1 -b .manfix
+%patch17 -p1 -b .userdel
+%patch19 -p1 -b .date-parsing
+%patch21 -p1 -b .move-home
+%patch22 -p1 -b .audit-update
+%patch23 -p1 -b .unlock
+%patch24 -p1 -b .no-lock-dos
+%patch28 -p1 -b .selinux-perms
+%patch29 -p1 -b .null-tm
+%patch31 -p1 -b .getenforce
+%patch32 -p1 -b .crypt_h
+%patch33 -p1 -b .long-entry
+%patch34 -p1 -b .usermod-crash
 
-#replace whole file
-cp %{SOURCE3} lib/nscd.c
-%patch6 -p1 -b .notInheritFd
+iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
+cp -f doc/HOWTO.utf8 doc/HOWTO
 
-%patch7 -p1 -b .exitValues
-%patch8 -p1 -b .auditLogging
-%patch9 -p1 -b .gid
-%patch10 -p1 -b .overflow
-%patch11 -p1 -b .useradd
-%patch12 -p1 -b .appendOption
-%patch13 -p1 -b .sysAccount
-%patch14 -p1 -b .findNewUidOnce
-%patch15 -p1 -b .groupLoop
-%patch16 -p1 -b .mtime
-
-rm po/*.gmo
-rm po/stamp-po
-
-aclocal
-libtoolize --force
-automake -a
-autoconf
+cp -a %{SOURCE4} %{SOURCE5} .
 
 %build
-%configure \
-	--disable-desrpc \
-	--enable-shadowgrp \
-	--without-libcrack \
-	--with-libcrypt \
-%if %{WITH_SELINUX}
-	--with-selinux \
+%ifarch sparc64
+#sparc64 need big PIE
+export CFLAGS="$RPM_OPT_FLAGS -fPIE"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%else
+export CFLAGS="$RPM_OPT_FLAGS -fpie"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 %endif
-	--without-libpam \
-	--disable-shared \
-	--with-libaudit
-make 
+
+rm aclocal.m4
+aclocal
+libtoolize --force
+
+autoreconf
+%configure \
+        --enable-shadowgrp \
+        --enable-man \
+        --with-audit \
+        --with-sha-crypt \
+        --with-selinux \
+        --without-libcrack \
+        --without-libpam \
+        --disable-shared \
+        --with-group-name-max-length=32
+%make_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
+%make_install gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
 install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/default
-install -p -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/login.defs
+install -p -c -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/login.defs
 install -p -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/default/useradd
 
 
 ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser
-#ln -s %{_mandir}/man8/useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8
 ln -s useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8
 for subdir in $RPM_BUILD_ROOT/%{_mandir}/{??,??_??,??_??.*}/man* ; do
-	test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8
+        test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8
 done
 
 # Remove binaries we don't use.
@@ -120,13 +146,11 @@ rm $RPM_BUILD_ROOT/%{_bindir}/groups
 rm $RPM_BUILD_ROOT/%{_bindir}/login
 rm $RPM_BUILD_ROOT/%{_bindir}/passwd
 rm $RPM_BUILD_ROOT/%{_bindir}/su
+rm $RPM_BUILD_ROOT/%{_bindir}/faillog
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/login.access
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/limits
 rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd
-rm $RPM_BUILD_ROOT/%{_sbindir}/vipw
-rm $RPM_BUILD_ROOT/%{_sbindir}/vigr
 rm $RPM_BUILD_ROOT/%{_sbindir}/nologin
-rm $RPM_BUILD_ROOT/%{_sbindir}/chgpasswd
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man1/chsh.*
@@ -153,68 +177,457 @@ rm $RPM_BUILD_ROOT/%{_mandir}/man5/suauth.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/vipw.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vipw.*
 rm $RPM_BUILD_ROOT/%{_mandir}/man8/nologin.*
 rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/nologin.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vigr.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/chgpasswd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/chgpasswd.*
+rm $RPM_BUILD_ROOT/%{_mandir}/man3/getspnam.*
+rm $RPM_BUILD_ROOT/%{_mandir}/*/man3/getspnam.*
+rm $RPM_BUILD_ROOT/%{_mandir}/man5/faillog.*
+rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/faillog.*
+rm $RPM_BUILD_ROOT/%{_mandir}/man8/faillog.*
+rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/faillog.*
 
-%find_lang shadow
 find $RPM_BUILD_ROOT%{_mandir} -depth -type d -empty -delete
+%find_lang shadow
 for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
     dir=$(echo $dir | sed -e "s|^$RPM_BUILD_ROOT||")
     lang=$(basename $dir)
+#   echo "%%lang($lang) $dir" >> shadow.lang
+#   echo "%%lang($lang) $dir/man*" >> shadow.lang
     echo "%%lang($lang) $dir/man*/*" >> shadow.lang
 done
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f shadow.lang
-%defattr(-,root,root)
 %doc NEWS doc/HOWTO README
-%dir %{_sysconfdir}/default
-%attr(0644,root,root)	%config(noreplace) %{_sysconfdir}/login.defs
-%attr(0600,root,root)	%config(noreplace) %{_sysconfdir}/default/useradd
+%{!?_licensedir:%global license %%doc}
+%license gpl-2.0.txt shadow-bsd.txt
+%attr(0644,root,root)   %config(noreplace) %{_sysconfdir}/login.defs
+%attr(0644,root,root)   %config(noreplace) %{_sysconfdir}/default/useradd
 %{_bindir}/sg
-%{_bindir}/chage
-%{_bindir}/faillog
-%{_bindir}/gpasswd
+%attr(4755,root,root) %{_bindir}/chage
+%attr(4755,root,root) %{_bindir}/gpasswd
 %{_bindir}/lastlog
-%{_bindir}/newgrp
+%attr(4755,root,root) %{_bindir}/newgrp
 %{_sbindir}/adduser
-%attr(0750,root,root)	%{_sbindir}/user*
-%attr(0750,root,root)	%{_sbindir}/group*
+%attr(0755,root,root)   %{_sbindir}/user*
+%attr(0755,root,root)   %{_sbindir}/group*
 %{_sbindir}/grpck
 %{_sbindir}/pwck
 %{_sbindir}/*conv
 %{_sbindir}/chpasswd
+%{_sbindir}/chgpasswd
 %{_sbindir}/newusers
+%{_sbindir}/vipw
+%{_sbindir}/vigr
 %{_mandir}/man1/chage.1*
 %{_mandir}/man1/gpasswd.1*
 %{_mandir}/man1/sg.1*
 %{_mandir}/man1/newgrp.1*
 %{_mandir}/man3/shadow.3*
-%{_mandir}/man3/getspnam.3*
 %{_mandir}/man5/shadow.5*
 %{_mandir}/man5/login.defs.5*
 %{_mandir}/man5/gshadow.5*
-%{_mandir}/man5/faillog.5*
+%{_mandir}/man5/subuid.5*
+%{_mandir}/man5/subgid.5*
 %{_mandir}/man8/adduser.8*
 %{_mandir}/man8/group*.8*
 %{_mandir}/man8/user*.8*
 %{_mandir}/man8/pwck.8*
 %{_mandir}/man8/grpck.8*
 %{_mandir}/man8/chpasswd.8*
+%{_mandir}/man8/chgpasswd.8*
 %{_mandir}/man8/newusers.8*
 %{_mandir}/man8/*conv.8*
 %{_mandir}/man8/lastlog.8*
-%{_mandir}/man8/faillog.8*
+%{_mandir}/man8/vipw.8*
+%{_mandir}/man8/vigr.8*
+
+%files newxidmap
+%attr(4755,root,root) %{_bindir}/newgidmap
+%attr(4755,root,root) %{_bindir}/newuidmap
+%{_mandir}/man1/newgidmap.1*
+%{_mandir}/man1/newuidmap.1*
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:4.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon May 28 2018 Tomáš Mráz <tmraz@redhat.com> - 2:4.6-1
+- update to current upstream release 4.6
+
+* Fri Apr 20 2018 Tomáš Mráz <tmraz@redhat.com> - 2:4.5-10
+- Raise limit for passwd and shadow entry length but also prevent
+  writing longer entries (#1422497)
+
+* Tue Feb 06 2018 Björn Esser <besser82@fedoraproject.org> - 2:4.5-9
+- Add patch to include crypt.h, if present
+- Use %%make_{build,install} macros
+- Refresh other patches for proper alignment
+
+* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 2:4.5-8
+- Rebuilt for switch to libxcrypt
+
+* Mon Nov  6 2017 Tomáš Mráz <tmraz@redhat.com> - 2:4.5-7
+- fix regression caused by the userdel-chroot patch (#1509978)
+
+* Thu Nov  2 2017 Tomáš Mráz <tmraz@redhat.com> - 2:4.5-6
+- fix userdel in chroot (#1316168)
+- add useful chage -E example to chage manpage
+
+* Fri Sep 15 2017 Tomáš Mráz <tmraz@redhat.com> - 2:4.5-5
+- do not allow "." and ".." user names
+
+* Mon Aug 14 2017 Tomáš Mráz <tmraz@redhat.com> - 2:4.5-4
+- allow switching to secondary group without checking the membership
+  explicitly (patch from upstream)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:4.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Tomáš Mráz <tmraz@redhat.com> - 2:4.5-1
+- update to current upstream release 4.5
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:4.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Aug 25 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.3.1-2
+- fix regression in useradd - not processing defaults properly (#1369979)
+
+* Tue Aug 23 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.3.1-1
+- new upstream release fixing low impact security issue
+
+* Tue Jun 14 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-11
+- guard for localtime() and gmtime() failure
+
+* Mon May 30 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-10
+- chpasswd, chgpasswd: open audit when starting
+
+* Thu May 26 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-9
+- chgpasswd: do not remove it
+- chpasswd, chgpasswd: add selinux_check_access call (#1336902)
+
+* Thu Mar 17 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-8
+- userdel: fix userdel -f with /etc/subuid present (#1316168)
+
+* Tue Feb  9 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-7
+- usermod: properly return error during password manipulation
+
+* Wed Feb  3 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-6
+- add possibility to clear or set lastlog record for user via lastlog
+
+* Fri Jan  8 2016 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-5
+- do not use obscure permissions for binaries
+- remove unused commands from login.defs(5) cross-reference
+
+* Fri Nov  6 2015 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-4
+- document that groupmems is not setuid root
+- document that expiration of the password after inactivity period
+  locks the user account completely
+
+* Thu Aug 27 2015 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-3
+- unlock also passwords locked with passwd -l
+- prevent breaking user entry by entering a password containing colon
+- fix possible DoS when locking the database files for update
+- properly use login.defs from the chroot in useradd
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:4.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Nov 26 2014 Tomáš Mráz <tmraz@redhat.com> - 2:4.2.1-1
+- new upstream release with support for subordinate uids and gids
+
+* Tue Nov 25 2014 Tomáš Mráz <tmraz@redhat.com> - 2:4.1.5.1-22
+- small adjustments to the audit patch
+
+* Fri Oct 17 2014 Tomáš Mráz <tmraz@redhat.com> - 2:4.1.5.1-21
+- update auditing to cover more events and fix some incorrect audit
+  records - patch by Steve Grubb (#1151580)
+- apply the same new allocation algorithm to uids as for gids
+
+* Wed Sep 10 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-20
+- discard obsolete matchpathcon cache after semanage_commit()
+
+* Tue Sep  9 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-19
+- disallow all-numeric user and group names (#1139318)
+
+* Fri Aug 29 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-18
+- label the newly created home dir correctly (#1077809)
+- mention that chage -d 0 forces password change (#1135010)
+- improve date parsing and error detecting in chage
+- avoid full group database scanning in newgrp in most common case
+- report error if usermod asked for moving homedir and it does not exist
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:4.1.5.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Aug  5 2014 Tom Callaway <spot@fedoraproject.org> - 2:4.1.5.1-16
+- fix license handling
+
+* Mon Jul 14 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-15
+- revert the last change as it is not really needed
+
+* Thu Jul 10 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-14
+- put system users and groups into /usr/lib/{passwd,group} if
+  the files exist and SHADOW_USE_USRLIB environment variable is set
+  Patch by Colin Walters
+
+* Mon Jun 30 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-13
+- ignore getgrgid() errors for now
+
+* Mon Jun 30 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-12
+- improve group allocation algorithm - patch by Stephen Gallager (#1089738)
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:4.1.5.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Feb 12 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-10
+- clean up login.defs manpage
+- properly document userdel -f behavior
+
+* Fri Oct 18 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-9
+- document that the directory where user's home is created must exist
+
+* Thu Jul 25 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-8
+- slightly more meaningful error messages if crypt() returns NULL (#988184)
+- explicit suid permissions
+
+* Fri Jul 19 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-7
+- fix useradd man page bugs
+
+* Fri Jun 14 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-6
+- report error to stdout when SELinux context for home directory
+  cannot be determined (#973647)
+- audit the changing home directory owner (#885797)
+- do not set the default SELinux MLS range (#852676)
+
+* Tue Mar 19 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-5
+- improve the failure syslog message in useradd (#830617)
+
+* Wed Feb 20 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-4
+- keep the original context if matchpathcon() fails (#912399)
+
+* Tue Jan 29 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-3
+- fix bugs in merge_group_entries()
+
+* Fri Jan 11 2013 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-2
+- /etc/default is owned by glibc-common now (#894194)
+
+* Wed Sep 19 2012 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-1
+- new upstream version
+- use the original file permissions when creating backup (#853102)
+
+* Wed Jul 25 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.5-5
+- make /etc/default/useradd world-readable (#835137)
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:4.1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jun 18 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.5-3
+- pwconv/grpconv skipped 2nd of consecutive failures (#832995)
+
+* Thu Mar 22 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.5-2
+- fix selinux context handling
+- reset selinux context on files copied from skel
+
+* Mon Mar 19 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.5-1
+- upgrade
+
+* Tue Feb 07 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-14
+- compile with PIE and RELRO flags (#784349)
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:4.1.4.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 20 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-12
+- fix leaks in .IDs patch (#734340)
+
+* Wed Nov 16 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-11
+- free memory associated with SELinux security contexts
+
+* Wed Nov 09 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-10
+- replace semanage call by library call
+- useradd man page (#739147)
+
+* Tue Aug 02 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-9
+- man page adjustment (userdel -Z)
+
+* Tue Aug 02 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-8
+- fixing semanage issue (#701355)
+
+* Fri Jul 22 2011 Miloslav Trmač <mitr@redhat.com> - 2:4.1.4.3-7
+- Make sure /etc/login.defs is not changed on upgrades from Fedora 1[345].
+
+* Wed Jun 29 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-6
+- man page fixes (#696213 #674878)
+
+* Tue Jun 28 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-5
+- userdel option to remove Linux login <-> SELinux login mapping (#639900)
+- useradd special exit value if SELinux user mapping is invalid (#639975)
+- usermod special exit value if SELinux user mapping is invalid (#639976)
+
+* Mon Jun 27 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-4
+- refer to PAM in /etc/login.defs (#629277)
+
+* Mon Jun 06 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-3
+- fix shadow-4.1.4.2-underflow.patch
+
+* Tue May 31 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-2
+- fix integer underflow in laslog (#706321)
+
+* Fri May 20 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.3-1
+- upgrade
+- change UID/GID_MIN to #1000
+- fix find_new_uid/gid for big UID/GID_MAX
+
+* Wed Feb 09 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-11
+- useradd man page (-m option)
+- create home directory on fs with noacl
+- remove faillog app (pam_tally.so is no longer shipped)
+  Resolves: #523265, #622320
+
+* Tue Feb 01 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-10
+- do not use  gshadow functions from glibc, there is a bug
+  in glibc sgetsgent(#674361)
+  Resolves: #674234
+
+* Wed Jan 05 2011 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-9
+- fix gshadow functions from shadow utils
+- make shadow utils use gshadow functions from glibc
+  Resolves: #665780
+
+* Tue Jul 20 2010 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-8
+- fix pwck/grpck hang
+  Resolves: #586322
+
+* Mon Jun 14 2010 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-7
+- fix integer underflow in faillog (#603683)
+- use preferred GID for reserved static IDs
+
+* Thu Apr 29 2010 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-6
+- preserve ACL's on files in /etc/skel
+  Resolves: #513055
+
+* Wed Apr 28 2010 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-5
+- newusers man page more informative
+- userdel should not need to run semanage
+  Resolves: #586330 #586408
+
+* Thu Apr 01 2010 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-4
+- fix man directories ownership (#569418)
+
+* Fri Mar 26 2010 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-3
+- max group name length set to 32 characters
+
+* Wed Nov 18 2009 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-2
+- apply patches{1,2,3}
+- enable SHA512 in /etc/login.defs
+
+* Mon Sep 07 2009 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.4.2-1
+- upgrade
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2:4.1.4.1-7
+- rebuilt with new audit
+
+* Wed Aug 05 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-6
+- increase threshold for uid/gid reservations to 200 (#515667)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:4.1.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-4
+- fix a list of owned directories (#510366)
+
+* Thu Jul 16 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-3
+- reduce the reuse of system IDs
+
+* Wed Jul 15 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-2
+- speed up sys users look up on LDAP boxes (#511813)
+
+* Tue Jun 16 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-1
+- upgrade
+
+* Fri May 15 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4-1
+- upgrade
+
+* Wed Apr 22 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.3.1-2
+- lastlog fix
+
+* Fri Apr 17 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.3.1-1
+- upgrade
+
+* Tue Apr 14 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.3-2
+- get "-n" option back
+- fix selinux issues
+
+* Tue Apr 14 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.3-1
+- upgrade
+
+* Tue Mar 24 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-12
+- don not allow UID/GID = 4294967295 (#484040)
+
+* Mon Jan 19 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-11
+- fix license tag (#226416)
+- get rid of tabs in spec file (#226416)
+- convert HOWTO to UTF8 (#226416)
+
+* Mon Jan 05 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-10
+- Add policycoreutils as Requires, because of restorecon (#478494)
+
+* Sun Dec 21 2008 Jesse Keating <jkeating@redhat.com> - 2:4.1.2-9
+- Add setup as a Requires. Perhaps this should be a files requires. (#477529)
+
+* Wed Sep 24 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-8
+- groupmems: check username for valid character (#455603)
+- groupmems: don't segfault on nonexistent group (#456088)
+
+* Thu Sep 11 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-7
+- fix usermod SELinux user mappings change (#458766)
+
+* Tue Sep 02 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-6
+- audit improvements, thnx. to sgrubb@redhat.com
+
+* Tue Sep 02 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-5
+- fix groupmems issues (#459825)
+
+* Mon Jul 28 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-4
+- fix configure options (#456748)
+
+* Thu Jul 24 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-3
+- recreate selinux patch
+
+* Tue Jul 22 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-2
+- provide getspnam by man-pages
+
+* Mon May 26 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.2-1
+- upgrade
+
+* Tue May 20 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.1-2
+- fix salt size problem (#447136)
+
+* Mon Apr 07 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.1-1
+- upgrade
+
+* Fri Mar 07 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.0-5
+- improve newgrp audit patch
+
+* Mon Mar 03 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.0-4
+- fix selinux labeling  (#433757)
+
+* Tue Feb 19 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.0-3
+- fix groupmems segmentation fault (#430813)
+
+* Wed Feb 13 2008 Peter Vrabec <pvrabec@redhat.com> 2:4.1.0-2
+- fix newgrp audit event
+
+* Wed Dec 12 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.1.0-1
+- new upgrade release from new upstream
+- provide vipw and vigr
+
+* Thu Nov 29 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-20
+- do not create mail spool entries for system accounts (#402351)
+
 * Thu Oct 18 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-19
 - fix timestamps when moving home dirs to another file system (#278571)
 
@@ -227,11 +640,11 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jun 26 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-16
 - fix "CAVEATS" section of groupadd man page (#245590)
 
-* Tue Jun 06 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-15
+* Wed Jun 06 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-15
 - fix infinitive loop if there are duplicate entries
   in /etc/group (#240915)
 
-* Tue Jun 06 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-14
+* Wed Jun 06 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-14
 - do not run find_new_uid() twice and use getpwuid() to check
   UID uniqueness (#236871)
 
@@ -246,7 +659,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Feb 28 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-10
 - spec file fixes to meet fedora standarts.
-- fix useless call of restorecon(). (#222159) 
+- fix useless call of restorecon(). (#222159)
 
 * Sun Jan 14 2007 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-9
 - fix append option in usermod (#222540).
@@ -273,7 +686,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Nov 03 2006 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-2
 - improve audit logging (#211659)
 - improve "-l" option. Do not reset faillog if it's used (#213450).
- 
+
 * Wed Nov 01 2006 Peter Vrabec <pvrabec@redhat.com> 2:4.0.18.1-1
 - upgrade
 
@@ -281,7 +694,7 @@ rm -rf $RPM_BUILD_ROOT
 - add dist-tag
 
 * Wed Oct 04 2006 Peter Vrabec <pvrabec@redhat.com> 2:4.0.17-6
-- fix regression. Permissions on user* group* binaries 
+- fix regression. Permissions on user* group* binaries
   should be 0750, because of CAPP/LSPP certification
 - fix groupdel man page
 
@@ -366,7 +779,7 @@ rm -rf $RPM_BUILD_ROOT
 - audit support
 
 * Sat Aug 27 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.12-1
-- upgrade 
+- upgrade
 
 * Sat Aug 13 2005 Dan Walsh <dwalsh@redhat.com> 2:4.0.11.1-5
 - Change to use new selinux api for selinux_check_passwd_access
@@ -380,11 +793,11 @@ rm -rf $RPM_BUILD_ROOT
 - fix useradd man page(#97131)
 
 * Mon Aug 08 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.11.1-2
-- do not copy files from skel directory if home directory 
+- do not copy files from skel directory if home directory
   already exist (#89591,#80242)
 
 * Fri Aug 05 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.11.1-1
-- upgrade 
+- upgrade
 
 * Mon May 23 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.7-9
 - remove vigr binary
@@ -399,13 +812,13 @@ rm -rf $RPM_BUILD_ROOT
 - fix chage -l option (#109499, #137498)
 
 * Mon Apr 04 2005 Peter Vrabec <pvrabec@redhat.com> 2:4.0.7-5
-- fix memory leak, and CPU spinning when grp_update() and 
+- fix memory leak, and CPU spinning when grp_update() and
   duplicate group entries in /etc/group (#151484)
 
-* Mon Mar 29 2005 Peter Vrabec <pvrabec@redhat.com>  2:4.0.7-4
+* Tue Mar 29 2005 Peter Vrabec <pvrabec@redhat.com>  2:4.0.7-4
 - use newgrp binary
 - newgrp don't ask for password if user's default GID = group ID,
-  ask for password if there is some in /etc/gshadow 
+  ask for password if there is some in /etc/gshadow
   and in /etc/group is 'x' (#149997)
 
 * Mon Mar 14 2005 Peter Vrabec <pvrabec@redhat.com>
@@ -512,7 +925,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Sep 4 2003 Dan Walsh <dwalsh@redhat.com> 4.0.3-11.sel
 - build with SELinux support
 
-* Fri Jul 28 2003 Dan Walsh <dwalsh@redhat.com> 4.0.3-10
+* Mon Jul 28 2003 Dan Walsh <dwalsh@redhat.com> 4.0.3-10
 - Add SELinux support
 
 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
@@ -695,7 +1108,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 23 1999 Preston Brown <pbrown@redhat.com>
 - edit out unused CHFN fields from login.defs.
 
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
 - auto rebuild in the new build environment (release 7)
 
 * Wed Jan 13 1999 Bill Nottingham <notting@redhat.com>
@@ -736,7 +1149,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Nov 06 1997 Cristian Gafton <gafton@redhat.com>
 - added forgot lastlog command to the spec file
 
-* Mon Oct 26 1997 Cristian Gafton <gafton@redhat.com>
+* Mon Oct 27 1997 Cristian Gafton <gafton@redhat.com>
 - obsoletes adduser
 
 * Thu Oct 23 1997 Cristian Gafton <gafton@redhat.com>

sources

@@ -1,3 +0,0 @@
-7ebc6a5cd0207246a6b2c9ebf9b30391  shadow-4.0.16-nscd.c
-e7751d46ecf219c07ae0b028ab3335c6  shadow-4.0.18.1.tar.bz2
-e91727c55dbafc9915250e31535f13bb  shadow-4.0.17-login.defs

sources.bak

@@ -0,0 +1,2 @@
+SHA512 (shadow-4.6.tar.xz) = e8eee52c649d9973f724bc2d5aeee71fa2e6a2e41ec3487cd6cf6d47af70c32e0cdf304df29b32eae2b6eb6f9066866b5f2c891add0ec87ba583bea3207b3631
+SHA512 (shadow-4.6.tar.xz.asc) = 8728bff5544db6ea123f758cce5bd5c2d346489570c33092e4e97db35c274d7aba01580018f120e4ad80b8f79cfe296a33bccbe9bf68df51bf9b2004c6bfffed

tests/sanity/Makefile

@@ -0,0 +1,77 @@
+# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material 
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Author: Jakub Hrozek
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+# Example Makefile for RHTS                                          #
+# This example is geared towards a test for a specific package       #
+# It does most of the work for you, but may require further coding   #
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
+
+# The toplevel namespace within which the test lives.
+TOPLEVEL_NAMESPACE=CoreOS
+
+# The name of the package under test:
+PACKAGE_NAME=shadow-utils
+
+# The path of the test below the package:
+RELATIVE_PATH=sanity
+
+# Version of the Test. Used with make tag.
+export TESTVERSION=1.1
+
+# The combined namespace of the test.
+export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
+
+# A phony target is one that is not really the name of a file.
+# It is just a name for some commands to be executed when you
+# make an explicit request. There are two reasons to use a
+# phony target: to avoid a conflict with a file of the same
+# name, and to improve performance.
+.PHONY: all install download clean
+
+# Executables to be built should be added here, they will be generated on the system under test.
+BUILT_FILES= 
+
+# Data files, .c files, scripts anything needed to either compile the test and/or run it.
+FILES=$(METADATA) Makefile PURPOSE sanity_test.py runtest.sh
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x ./sanity_test.py
+	chmod a+x ./runtest.sh
+
+clean:
+	rm -f *~ *.rpm $(BUILT_FILES)
+
+# Include Common Makefile
+include /usr/share/rhts/lib/rhts-make.include
+
+# Generate the testinfo.desc here:
+$(METADATA): Makefile
+	@touch $(METADATA)
+	@echo "Owner:        Jakub Hrozek <jhrozek@redhat.com>" > $(METADATA)
+	@echo "Name:         $(TEST)" >> $(METADATA)
+	@echo "Path:         $(TEST_DIR)" >> $(METADATA)
+	@echo "TestVersion:  $(TESTVERSION)" >> $(METADATA)
+	@echo "License:      GNU GPL" >> $(METADATA)
+	@echo "Description:  Basic sanity test for shadow-utils" >> $(METADATA)
+	@echo "TestTime:     5m" >> $(METADATA)
+	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
+	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)
+	@echo "Requires:     python" >> $(METADATA)
+	rhts-lint $(METADATA)
+

tests/sanity/PURPOSE

@@ -0,0 +1,10 @@
+This is a basic sanity test for the shadow-utils package. It is implemented
+in python on top of the unittesting.py module.
+
+Its purpose is to ensure that the binaries in the shadow-utils package behave
+as expected and its switches/options work correctly.
+
+For the most part, every binary in the shadow-utils package is represented by
+a single class named Test<BinaryName>, i.e. TestUsermod etc. There are some 
+exceptions, like TestUseraddWeirdNameTest though.
+

tests/sanity/runtest.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+. /usr/bin/rhts-environment.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+rlJournalStart
+rlFileBackup --clean /etc/default/useradd- /etc/default/useradd
+setenforce 0
+python sanity_test.py -v
+setenforce 1
+rlFileRestore
+
+EXIT=$?
+if [[ $EXIT -eq 0 ]]; then
+    RESULT="PASS"
+else
+    RESULT="FAIL"
+fi
+
+
+rlJournalEnd
+
+echo "Result: $RESULT"
+echo "Exit: $EXIT"
+report_result $TEST $RESULT $EXIT

tests/tests.yml

@@ -0,0 +1,13 @@
+---
+# This first play always runs on the local staging system
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - atomic
+    tests:
+    - sanity
+    required_packages:
+    - shadow-utils     # sanity test needs shadow-utils
+    - python           # sanity test needs python