mbox

shadow: update to 4.2.1 v2

Message ID 1458371425-28675-1-git-send-email-marcel.lorenz@ipfire.org
State Accepted
Commit 4787315b6e67b486e813292d45402ee3890a3e7b
Headers

Message

Marcel Lorenz March 19, 2016, 6:10 p.m. UTC 
  This is version 2 of the patch. The first is deprecated.
I forgot to add the last rootfile change to my first patch.
The build of the iso fails with the first. (/bin/groups not found) 
The "groups" from the coreutils package is used (/usr/bin/groups)

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>

---
 config/rootfiles/common/shadow                     |  98 ++---
 lfs/shadow                                         |  23 +-
 .../shadow-4.2.1-SHA512_password_hashing.patch     |  38 ++
 ...dow-4.2.1-suppress_installation_of_groups.patch | 446 +++++++++++++++++++++
 4 files changed, 546 insertions(+), 59 deletions(-)
 create mode 100644 src/patches/shadow-4.2.1-SHA512_password_hashing.patch
 create mode 100644 src/patches/shadow-4.2.1-suppress_installation_of_groups.patch

Comments

Michael Tremer June 17, 2016, 10:26 p.m. UTC | #1 
Merged.

On Sat, 2016-03-19 at 08:10 +0100, Marcel Lorenz wrote:
> This is version 2 of the patch. The first is deprecated.
> I forgot to add the last rootfile change to my first patch.
> The build of the iso fails with the first. (/bin/groups not found) 
> The "groups" from the coreutils package is used (/usr/bin/groups)
> 
> Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
> 
> ---
>  config/rootfiles/common/shadow                     |  98 ++---
>  lfs/shadow                                         |  23 +-
>  .../shadow-4.2.1-SHA512_password_hashing.patch     |  38 ++
>  ...dow-4.2.1-suppress_installation_of_groups.patch | 446
> +++++++++++++++++++++
>  4 files changed, 546 insertions(+), 59 deletions(-)
>  create mode 100644 src/patches/shadow-4.2.1-SHA512_password_hashing.patch
>  create mode 100644 src/patches/shadow-4.2.1-
> suppress_installation_of_groups.patch
> 
> diff --git a/config/rootfiles/common/shadow b/config/rootfiles/common/shadow
> index ec9054e..0b0c83f 100644
> --- a/config/rootfiles/common/shadow
> +++ b/config/rootfiles/common/shadow
> @@ -1,17 +1,16 @@
> -bin/groups
>  bin/login
>  bin/passwd
>  bin/su
>  #etc/.pwd.lock
>  #etc/default
> +#etc/default/useradd
>  etc/limits
>  etc/login.access
>  etc/login.defs
>  #etc/passwd-
>  etc/shadow
>  #etc/shadow-
> -lib/libshadow.so.0
> -lib/libshadow.so.0.0.0
> +sbin/nologin
>  #usr/bin/chage
>  #usr/bin/chfn
>  #usr/bin/chsh
> @@ -19,64 +18,22 @@ lib/libshadow.so.0.0.0
>  #usr/bin/faillog
>  #usr/bin/gpasswd
>  #usr/bin/lastlog
> +#usr/bin/newgidmap
>  #usr/bin/newgrp
> +#usr/bin/newuidmap
>  #usr/bin/sg
> -#usr/lib/libshadow.a
> -#usr/lib/libshadow.la
>  #usr/lib/libshadow.so
> -#usr/man/man1/chage.1
> -#usr/man/man1/chfn.1
> -#usr/man/man1/chsh.1
> -#usr/man/man1/expiry.1
> -#usr/man/man1/gpasswd.1
> -#usr/man/man1/login.1
> -#usr/man/man1/newgrp.1
> -#usr/man/man1/passwd.1
> -#usr/man/man1/sg.1
> -#usr/man/man1/su.1
> -#usr/man/man3/getspnam.3
> -#usr/man/man3/shadow.3
> -#usr/man/man5/faillog.5
> -#usr/man/man5/gshadow.5
> -#usr/man/man5/limits.5
> -#usr/man/man5/login.access.5
> -#usr/man/man5/login.defs.5
> -#usr/man/man5/passwd.5
> -#usr/man/man5/porttime.5
> -#usr/man/man5/shadow.5
> -#usr/man/man5/suauth.5
> -#usr/man/man8
> -#usr/man/man8/chpasswd.8
> -#usr/man/man8/faillog.8
> -#usr/man/man8/groupadd.8
> -#usr/man/man8/groupdel.8
> -#usr/man/man8/groupmod.8
> -#usr/man/man8/grpck.8
> -#usr/man/man8/grpconv.8
> -#usr/man/man8/grpunconv.8
> -#usr/man/man8/lastlog.8
> -#usr/man/man8/logoutd.8
> -#usr/man/man8/newusers.8
> -#usr/man/man8/nologin.8
> -#usr/man/man8/pwck.8
> -#usr/man/man8/pwconv.8
> -#usr/man/man8/pwunconv.8
> -#usr/man/man8/useradd.8
> -#usr/man/man8/userdel.8
> -#usr/man/man8/usermod.8
> -#usr/man/man8/vigr.8
> -#usr/man/man8/vipw.8
>  #usr/sbin/chgpasswd
>  usr/sbin/chpasswd
>  usr/sbin/groupadd
>  usr/sbin/groupdel
> +usr/sbin/groupmems
>  usr/sbin/groupmod
>  #usr/sbin/grpck
>  usr/sbin/grpconv
>  #usr/sbin/grpunconv
>  #usr/sbin/logoutd
>  #usr/sbin/newusers
> -#usr/sbin/nologin
>  #usr/sbin/pwck
>  usr/sbin/pwconv
>  #usr/sbin/pwunconv
> @@ -85,3 +42,48 @@ usr/sbin/userdel
>  usr/sbin/usermod
>  #usr/sbin/vigr
>  #usr/sbin/vipw
> +#usr/share/man/man1/chage.1
> +#usr/share/man/man1/chfn.1
> +#usr/share/man/man1/chsh.1
> +#usr/share/man/man1/expiry.1
> +#usr/share/man/man1/gpasswd.1
> +#usr/share/man/man1/login.1
> +#usr/share/man/man1/newgidmap.1
> +#usr/share/man/man1/newgrp.1
> +#usr/share/man/man1/newuidmap.1
> +#usr/share/man/man1/passwd.1
> +#usr/share/man/man1/sg.1
> +#usr/share/man/man1/su.1
> +#usr/share/man/man3/shadow.3
> +#usr/share/man/man5/faillog.5
> +#usr/share/man/man5/gshadow.5
> +#usr/share/man/man5/limits.5
> +#usr/share/man/man5/login.access.5
> +#usr/share/man/man5/login.defs.5
> +#usr/share/man/man5/porttime.5
> +#usr/share/man/man5/shadow.5
> +#usr/share/man/man5/suauth.5
> +#usr/share/man/man5/subgid.5
> +#usr/share/man/man5/subuid.5
> +#usr/share/man/man8/chgpasswd.8
> +#usr/share/man/man8/chpasswd.8
> +#usr/share/man/man8/faillog.8
> +#usr/share/man/man8/groupadd.8
> +#usr/share/man/man8/groupdel.8
> +#usr/share/man/man8/groupmems.8
> +#usr/share/man/man8/groupmod.8
> +#usr/share/man/man8/grpck.8
> +#usr/share/man/man8/grpconv.8
> +#usr/share/man/man8/grpunconv.8
> +#usr/share/man/man8/lastlog.8
> +#usr/share/man/man8/logoutd.8
> +#usr/share/man/man8/newusers.8
> +#usr/share/man/man8/nologin.8
> +#usr/share/man/man8/pwck.8
> +#usr/share/man/man8/pwconv.8
> +#usr/share/man/man8/pwunconv.8
> +#usr/share/man/man8/useradd.8
> +#usr/share/man/man8/userdel.8
> +#usr/share/man/man8/usermod.8
> +#usr/share/man/man8/vigr.8
> +#usr/share/man/man8/vipw.8
> diff --git a/lfs/shadow b/lfs/shadow
> index f281431..b4777b9 100644
> --- a/lfs/shadow
> +++ b/lfs/shadow
> @@ -24,10 +24,10 @@
>  
>  include Config
>  
> -VER        = 4.0.15
> +VER        = 4.2.1
>  
>  THISAPP    = shadow-$(VER)
> -DL_FILE    = $(THISAPP).tar.bz2
> +DL_FILE    = $(THISAPP).tar.xz
>  DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e
> +$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8
>  
>  install : $(TARGET)
>  
> @@ -69,11 +69,15 @@ $(subst %,%_MD5,$(objects)) :
>  
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
> -	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && ./configure --libdir=/lib --enable-shared --without-
> selinux --disable-nls
> -	cd $(DIR_APP) && sed -i 's/groups$(EXEEXT) //' src/Makefile
> -	cd $(DIR_APP) && find man -name Makefile -exec sed -i '/groups/d' {}
> \;
> -	cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//'
> man/Makefile
> +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-
> suppress_installation_of_groups.patch
> +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-
> SHA512_password_hashing.patch
> +	cd $(DIR_APP) && ./configure --libdir=/lib	\
> +				--sysconfdir=/etc	\
> +				--enable-shared		\
> +				--without-selinux	\
> +				--disable-nls		\
> +				--with-group-name-max-length=32
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make install
>  	cd $(DIR_APP) && cp -v etc/{limits,login.access} /etc
> @@ -81,10 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  				-e 's@/var/spool/mail@/var/mail@' \
>  				etc/login.defs > /etc/login.defs
>  	mv -v /usr/bin/passwd /bin
> -	mv -v /lib/libshadow.*a /usr/lib
> -	rm -v /lib/libshadow.so
>  	ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
> -	mkdir -v /etc/default
>  	touch /etc/shadow
>  	chmod 600 /etc/shadow
>  	pwconv
> diff --git a/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
> b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
> new file mode 100644
> index 0000000..7fc5bc9
> --- /dev/null
> +++ b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
> @@ -0,0 +1,38 @@
> +diff -crB shadow-4.2.1-a/etc/login.defs shadow-4.2.1-b/etc/login.defs
> +*** shadow-4.2.1-a/etc/login.defs	2014-05-09 10:20:28.000000000 +0000
> +--- shadow-4.2.1-b/etc/login.defs	2016-03-13 10:51:09.680171239 +0000
> +***************
> +*** 118,124 ****
> +  #   Directory where mailboxes reside, _or_ name of file, relative to the
> +  #   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
> +  #
> +! MAIL_DIR	/var/spool/mail
> +  #MAIL_FILE	.mail
> +  
> +  #
> +--- 118,124 ----
> +  #   Directory where mailboxes reside, _or_ name of file, relative to the
> +  #   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
> +  #
> +! MAIL_DIR	/var/mail
> +  #MAIL_FILE	.mail
> +  
> +  #
> +***************
> +*** 317,323 ****
> +  # Note: If you use PAM, it is recommended to use a value consistent with
> +  # the PAM modules configuration.
> +  #
> +! #ENCRYPT_METHOD DES
> +  
> +  #
> +  # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
> +--- 317,323 ----
> +  # Note: If you use PAM, it is recommended to use a value consistent with
> +  # the PAM modules configuration.
> +  #
> +! ENCRYPT_METHOD SHA512
> +  
> +  #
> +  # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
> +Only in shadow-4.2.1-b: SHA512_password_hashing.patch
> diff --git a/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
> b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
> new file mode 100644
> index 0000000..f9f09c4
> --- /dev/null
> +++ b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
> @@ -0,0 +1,446 @@
> +diff -crB shadow-4.2.1-a/man/cs/Makefile.in shadow-4.2.1-b/man/cs/Makefile.in
> +*** shadow-4.2.1-a/man/cs/Makefile.in	2014-05-09 16:49:46.000000000
> +0000
> +--- shadow-4.2.1-b/man/cs/Makefile.in	2016-03-13 10:47:55.924166976
> +0000
> +***************
> +*** 300,311 ****
> +  	man8/groupadd.8 \
> +  	man8/groupdel.8 \
> +  	man8/groupmod.8 \
> +! 	man1/groups.1 \
> +  	man8/grpck.8 \
> +  	man5/gshadow.5 \
> +  	man8/lastlog.8 \
> +  	man8/nologin.8 \
> +! 	man5/passwd.5 \
> +  	man5/shadow.5 \
> +  	man1/su.1 \
> +  	man8/vipw.8
> +--- 300,311 ----
> +  	man8/groupadd.8 \
> +  	man8/groupdel.8 \
> +  	man8/groupmod.8 \
> +! 	man1/ \
> +  	man8/grpck.8 \
> +  	man5/gshadow.5 \
> +  	man8/lastlog.8 \
> +  	man8/nologin.8 \
> +! 	man5/ \
> +  	man5/shadow.5 \
> +  	man1/su.1 \
> +  	man8/vipw.8
> +diff -crB shadow-4.2.1-a/man/da/Makefile.in shadow-4.2.1-b/man/da/Makefile.in
> +*** shadow-4.2.1-a/man/da/Makefile.in	2014-05-09 16:49:46.000000000
> +0000
> +--- shadow-4.2.1-b/man/da/Makefile.in	2016-03-13 10:47:55.928166977
> +0000
> +***************
> +*** 298,304 ****
> +  top_srcdir = @top_srcdir@
> +  
> +  # 2012.01.28 - activate manpages with more than 50% translated messages
> +! man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
> +  	man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
> +  	man8/vigr.8 man8/vipw.8 $(am__append_1)
> +  man_nopam = 
> +--- 298,304 ----
> +  top_srcdir = @top_srcdir@
> +  
> +  # 2012.01.28 - activate manpages with more than 50% translated messages
> +! man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \
> +  	man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
> +  	man8/vigr.8 man8/vipw.8 $(am__append_1)
> +  man_nopam = 
> +diff -crB shadow-4.2.1-a/man/de/Makefile.in shadow-4.2.1-b/man/de/Makefile.in
> +*** shadow-4.2.1-a/man/de/Makefile.in	2014-05-09 16:49:46.000000000
> +0000
> +--- shadow-4.2.1-b/man/de/Makefile.in	2016-03-13 10:47:55.916166976
> +0000
> +***************
> +*** 299,309 ****
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +--- 299,309 ----
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +diff -crB shadow-4.2.1-a/man/es/Makefile.in shadow-4.2.1-b/man/es/Makefile.in
> +*** shadow-4.2.1-a/man/es/Makefile.in	2014-05-09 16:49:46.000000000
> +0000
> +--- shadow-4.2.1-b/man/es/Makefile.in	2016-03-13 10:47:55.872166975
> +0000
> +***************
> +*** 266,272 ****
> +  #	man1/login.1 \
> +  #	man1/newgrp.1 \
> +  #	man1/passwd.1 \
> +! #	man5/passwd.5 \
> +  #	man1/su.1 \
> +  #	man8/vigr.8 \
> +  #	man8/vipw.8
> +--- 266,272 ----
> +  #	man1/login.1 \
> +  #	man1/newgrp.1 \
> +  #	man1/passwd.1 \
> +! #	man5/ \
> +  #	man1/su.1 \
> +  #	man8/vigr.8 \
> +  #	man8/vipw.8
> +diff -crB shadow-4.2.1-a/man/fr/Makefile.in shadow-4.2.1-b/man/fr/Makefile.in
> +*** shadow-4.2.1-a/man/fr/Makefile.in	2014-05-09 16:49:46.000000000
> +0000
> +--- shadow-4.2.1-b/man/fr/Makefile.in	2016-03-13 10:47:55.984166978
> +0000
> +***************
> +*** 301,311 ****
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +--- 301,311 ----
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +diff -crB shadow-4.2.1-a/man/hu/Makefile.in shadow-4.2.1-b/man/hu/Makefile.in
> +*** shadow-4.2.1-a/man/hu/Makefile.in	2014-05-09 16:49:46.000000000
> +0000
> +--- shadow-4.2.1-b/man/hu/Makefile.in	2016-03-13 10:47:55.972166978
> +0000
> +***************
> +*** 295,306 ****
> +  man_MANS = \
> +  	man1/chsh.1 \
> +  	man1/gpasswd.1 \
> +! 	man1/groups.1 \
> +  	man8/lastlog.8 \
> +  	man1/login.1 \
> +  	man1/newgrp.1 \
> +  	man1/passwd.1 \
> +! 	man5/passwd.5 \
> +  	man1/sg.1 \
> +  	man1/su.1
> +  
> +--- 295,306 ----
> +  man_MANS = \
> +  	man1/chsh.1 \
> +  	man1/gpasswd.1 \
> +! 	man1/ \
> +  	man8/lastlog.8 \
> +  	man1/login.1 \
> +  	man1/newgrp.1 \
> +  	man1/passwd.1 \
> +! 	man5/ \
> +  	man1/sg.1 \
> +  	man1/su.1
> +  
> +diff -crB shadow-4.2.1-a/man/it/Makefile.in shadow-4.2.1-b/man/it/Makefile.in
> +*** shadow-4.2.1-a/man/it/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/it/Makefile.in	2016-03-13 10:47:55.896166976
> +0000
> +***************
> +*** 299,309 ****
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +--- 299,309 ----
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +diff -crB shadow-4.2.1-a/man/ja/Makefile.in shadow-4.2.1-b/man/ja/Makefile.in
> +*** shadow-4.2.1-a/man/ja/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/ja/Makefile.in	2016-03-13 10:47:55.932166977
> +0000
> +***************
> +*** 296,305 ****
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
> +  	man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
> +! 	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
> +  	man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
> +  	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
> +  	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
> +  	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
> +--- 296,305 ----
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
> +  	man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
> +! 	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \
> +  	man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \
> +  	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
> +  	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
> +  	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
> +diff -crB shadow-4.2.1-a/man/ko/Makefile.in shadow-4.2.1-b/man/ko/Makefile.in
> +*** shadow-4.2.1-a/man/ko/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/ko/Makefile.in	2016-03-13 10:47:55.940166977
> +0000
> +***************
> +*** 295,303 ****
> +  man_MANS = \
> +  	man1/chfn.1 \
> +  	man1/chsh.1 \
> +! 	man1/groups.1 \
> +  	man1/login.1 \
> +! 	man5/passwd.5 \
> +  	man1/su.1 \
> +  	man8/vigr.8 \
> +  	man8/vipw.8
> +--- 295,303 ----
> +  man_MANS = \
> +  	man1/chfn.1 \
> +  	man1/chsh.1 \
> +! 	man1/ \
> +  	man1/login.1 \
> +! 	man5/ \
> +  	man1/su.1 \
> +  	man8/vigr.8 \
> +  	man8/vipw.8
> +diff -crB shadow-4.2.1-a/man/Makefile.in shadow-4.2.1-b/man/Makefile.in
> +*** shadow-4.2.1-a/man/Makefile.in	2014-05-09 16:49:46.000000000 +0000
> +--- shadow-4.2.1-b/man/Makefile.in	2016-03-13 10:47:55.880166976 +0000
> +***************
> +*** 365,375 ****
> +  @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv
> tr zh_CN zh_TW
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +--- 365,375 ----
> +  @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv
> tr zh_CN zh_TW
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +diff -crB shadow-4.2.1-a/man/pl/Makefile.in shadow-4.2.1-b/man/pl/Makefile.in
> +*** shadow-4.2.1-a/man/pl/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/pl/Makefile.in	2016-03-13 10:47:55.912166976
> +0000
> +***************
> +*** 300,307 ****
> +  
> +  # 2012.01.28 - activate manpages with more than 50% translated messages
> +  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
> +! 	man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
> +  	man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +  	man8/vipw.8 $(am__append_1)
> +--- 300,307 ----
> +  
> +  # 2012.01.28 - activate manpages with more than 50% translated messages
> +  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
> +! 	man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
> +  	man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +  	man8/vipw.8 $(am__append_1)
> +diff -crB shadow-4.2.1-a/man/pt_BR/Makefile.in shadow-4.2.1-
> b/man/pt_BR/Makefile.in
> +*** shadow-4.2.1-a/man/pt_BR/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/pt_BR/Makefile.in	2016-03-13 10:47:55.904166976
> +0000
> +***************
> +*** 297,303 ****
> +  	man8/groupadd.8 \
> +  	man8/groupdel.8 \
> +  	man8/groupmod.8 \
> +! 	man5/passwd.5 \
> +  	man5/shadow.5
> +  
> +  EXTRA_DIST = $(man_MANS)
> +--- 297,303 ----
> +  	man8/groupadd.8 \
> +  	man8/groupdel.8 \
> +  	man8/groupmod.8 \
> +! 	man5/ \
> +  	man5/shadow.5
> +  
> +  EXTRA_DIST = $(man_MANS)
> +diff -crB shadow-4.2.1-a/man/ru/Makefile.in shadow-4.2.1-b/man/ru/Makefile.in
> +*** shadow-4.2.1-a/man/ru/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/ru/Makefile.in	2016-03-13 10:47:55.944166977
> +0000
> +***************
> +*** 299,309 ****
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +--- 299,309 ----
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +diff -crB shadow-4.2.1-a/man/sv/Makefile.in shadow-4.2.1-b/man/sv/Makefile.in
> +*** shadow-4.2.1-a/man/sv/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/sv/Makefile.in	2016-03-13 10:47:55.988166978
> +0000
> +***************
> +*** 300,309 ****
> +  
> +  # 2012.01.28 - activate manpages with more than 50% translated messages
> +  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
> +! 	man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
> +  	man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
> +  	man8/vigr.8 man8/vipw.8 $(am__append_1)
> +  man_nopam = \
> +--- 300,309 ----
> +  
> +  # 2012.01.28 - activate manpages with more than 50% translated messages
> +  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
> +! 	man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \
> +  	man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
> +  	man8/vigr.8 man8/vipw.8 $(am__append_1)
> +  man_nopam = \
> +diff -crB shadow-4.2.1-a/man/tr/Makefile.in shadow-4.2.1-b/man/tr/Makefile.in
> +*** shadow-4.2.1-a/man/tr/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/tr/Makefile.in	2016-03-13 10:47:55.964166977
> +0000
> +***************
> +*** 300,306 ****
> +  	man8/groupmod.8 \
> +  	man1/login.1 \
> +  	man1/passwd.1 \
> +! 	man5/passwd.5 \
> +  	man5/shadow.5 \
> +  	man1/su.1 \
> +  	man8/useradd.8 \
> +--- 300,306 ----
> +  	man8/groupmod.8 \
> +  	man1/login.1 \
> +  	man1/passwd.1 \
> +! 	man5/ \
> +  	man5/shadow.5 \
> +  	man1/su.1 \
> +  	man8/useradd.8 \
> +diff -crB shadow-4.2.1-a/man/zh_CN/Makefile.in shadow-4.2.1-
> b/man/zh_CN/Makefile.in
> +*** shadow-4.2.1-a/man/zh_CN/Makefile.in	2014-05-09 16:49:47.000000000
> +0000
> +--- shadow-4.2.1-b/man/zh_CN/Makefile.in	2016-03-13 10:47:55.952166977
> +0000
> +***************
> +*** 299,309 ****
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +--- 299,309 ----
> +  top_srcdir = @top_srcdir@
> +  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
> +  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
> +! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
> +! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
> +  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
> +  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
> +! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
> +  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
> +  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
> +  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
> +diff -crB shadow-4.2.1-a/man/zh_TW/Makefile.in shadow-4.2.1-
> b/man/zh_TW/Makefile.in
> +*** shadow-4.2.1-a/man/zh_TW/Makefile.in	2014-05-09 16:49:48.000000000
> +0000
> +--- shadow-4.2.1-b/man/zh_TW/Makefile.in	2016-03-13 10:47:55.956166977
> +0000
> +***************
> +*** 302,308 ****
> +  	man8/groupadd.8 \
> +  	man8/groupdel.8 \
> +  	man8/groupmod.8 \
> +! 	man5/passwd.5 \
> +  	man1/su.1 \
> +  	man8/useradd.8 \
> +  	man8/userdel.8 \
> +--- 302,308 ----
> +  	man8/groupadd.8 \
> +  	man8/groupdel.8 \
> +  	man8/groupmod.8 \
> +! 	man5/ \
> +  	man1/su.1 \
> +  	man8/useradd.8 \
> +  	man8/userdel.8 \
> +diff -crB shadow-4.2.1-a/src/Makefile.in shadow-4.2.1-b/src/Makefile.in
> +*** shadow-4.2.1-a/src/Makefile.in	2014-05-09 16:49:48.000000000 +0000
> +--- shadow-4.2.1-b/src/Makefile.in	2016-03-13 10:47:38.824166600 +0000
> +***************
> +*** 78,84 ****
> +  POST_UNINSTALL = :
> +  build_triplet = @build@
> +  host_triplet = @host@
> +! bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT)
> +  sbin_PROGRAMS = nologin$(EXEEXT)
> +  ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
> +  	chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
> +--- 78,84 ----
> +  POST_UNINSTALL = :
> +  build_triplet = @build@
> +  host_triplet = @host@
> +! bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT)
> +  sbin_PROGRAMS = nologin$(EXEEXT)
> +  ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
> +  	chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \