Merge remote-tracking branch 'origin/3.6' into 3.7-alpha0

3 files changed, 58 insertions, 19 deletions

diff --git a/shadow/.footprint b/shadow/.footprint
index 307ca6a0..5d42d63d 100644
--- a/shadow/.footprint
+++ b/shadow/.footprint
@@ -30,6 +30,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwsr-xr-x	root/root	usr/bin/chsh
 -rwsr-xr-x	root/root	usr/bin/expiry
 -rwxr-xr-x	root/root	usr/bin/faillog
+-rwxr-xr-x	root/root	usr/bin/getsubids
 -rwxr-xr-x	root/root	usr/bin/groups
 -rwxr-xr-x	root/root	usr/bin/lastlog
 -rwsr-xr-x	root/root	usr/bin/newgidmap
@@ -54,6 +55,46 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/usermod
 lrwxrwxrwx	root/root	usr/sbin/vigr -> vipw
 -rwxr-xr-x	root/root	usr/sbin/vipw
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/chage.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/chfn.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/chsh.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/expiry.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/getsubids.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/groups.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/login.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/newgidmap.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/newgrp.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/newuidmap.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/passwd.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/sg.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/su.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/faillog.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/login.defs.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/passwd.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/shadow.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/suauth.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/subgid.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/subuid.5.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/chgpasswd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/faillog.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/groupadd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/groupdel.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/groupmems.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/groupmod.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/grpck.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/lastlog.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nologin.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/pwck.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/useradd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/userdel.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/usermod.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vigr.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/vipw.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 -rw-r--r--	root/root	var/log/faillog (EMPTY)
diff --git a/shadow/.signature b/shadow/.signature
index d11134fa..f767e540 100644
--- a/shadow/.signature
+++ b/shadow/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqr+dqmozf6U+Ye5hDKRssUBkks2GhjJLvLIqLLP422oC5pakao6/YL/X/W4G3HyyOzWm9PVlzQQqernd9o70wAU=
-SHA256 (Pkgfile) = 7c7de4a53457036f959b3ad197ab3da6d9c956bb6ac461bf74fba5956d68617a
-SHA256 (.footprint) = b79ff8d40e5ec27fb97328d3e5da447de2ca995e66305ebe2926b01292bfca2c
-SHA256 (shadow-4.9.tar.xz) = feec1f2ce9c1b62798afd35a7d1b04cefdfa3a0a30ff3e75d6965ba8978c9144
+RWRJc1FUaeVeqgN7VXhcnbbTbfPiEd60/iZQUV7kHbvQ+5eY5jjhA137t86o+oI7tarpldToO1yqleUS4oHRKzIx3s+gjpVBtwM=
+SHA256 (Pkgfile) = c49a4095f02a0cccda7a490a360f612a01c69f0f64f045127ae3832766bc8623
+SHA256 (.footprint) = 64614a7fcc7b8c2330824675ccbe9a7601cff4f12fe6d87ac9d9a10d11471d3e
+SHA256 (shadow-4.10.tar.xz) = bd6fbad04d96408b41c788fe8384ed37ba0b826348ff3651733c7e7ae00668fc
 SHA256 (pwck) = c62f1bf5785c2bb93bb269156bfa02b06728a01ff5d6c2e09cf6285701a1fda0
 SHA256 (login.defs) = def991c4bc012834d726a4010783634a930558b91650bc4cba5fe822064c3535
 SHA256 (chfn) = b31ef7a14f747e114c970027a57acb5dcefffee439ce0b4a7d55cc2f6b632fcf
@@ -17,5 +17,3 @@ SHA256 (su) = fd033d23c243c3ec7c0491f109365419bfa34c305fe6554f526b4df797486454
 SHA256 (useradd) = 2988d648da4c4c6924360aa3c648937e11ea8f5e98c856d293d071adf63a0ec9
 SHA256 (userdel) = 478cc2d620831ca266f953c0a743c19c1f007d567fb61a1757b631a80b328d41
 SHA256 (usermod) = 800ba6178170142c7202c7fdbdc30323bdbcf9b592c4f0328375b8830cf81d51
-SHA256 (libsubid-build-fix.patch) = b4abf2e588faca5d42a3dabcd8c844a14adecbda80576c2fd3d649016e8d5e6d
-SHA256 (430.patch) = 8f28000ca070d354490bb601e1092abd2724727d5db571e93159a57d41140bf8
diff --git a/shadow/Pkgfile b/shadow/Pkgfile
index b4b8c090..2fa2d8be 100644
--- a/shadow/Pkgfile
+++ b/shadow/Pkgfile
@@ -4,33 +4,29 @@
 # Depends on: acl linux-pam
 
 name=shadow
-version=4.9
+version=4.10
 release=1
-source=(https://github.com/shadow-maint/$name/releases/download/v$version/$name-$version.tar.xz
-	pwck login.defs chfn chsh login groupadd groupdel
-	groupmems groupmod passwd su useradd userdel usermod
-	libsubid-build-fix.patch 430.patch)
+source=(https://github.com/shadow-maint/$name/releases/download/v$version/$name-$version.tar.xz \
+	pwck login.defs chfn chsh login groupadd groupdel \
+	groupmems groupmod passwd su useradd userdel usermod)
 
 build() {
 	cd $name-$version
 
-	patch -Np1 -i $SRC/libsubid-build-fix.patch
-	patch -Np1 -i $SRC/430.patch
-	autoreconf -fvi
-
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
 		--sysconfdir=/etc \
-		--disable-shadowgrp \
 		--disable-shared \
-		--enable-static=yes \
+		--disable-shadowgrp \
 		--disable-nls \
 		--without-selinux \
 		--without-audit
 
 	make
 	make DESTDIR=$PKG install
+	make -C man DESTDIR=$PKG install
 
 	install -d $PKG/{bin,sbin}
 	mv $PKG/usr/bin/login $PKG/bin
@@ -45,7 +41,11 @@ build() {
 	rm -r $PKG/usr/bin/gpasswd \
 		$PKG/usr/sbin/{chpasswd,grpconv,grpunconv,logoutd} \
 		$PKG/usr/sbin/{newusers,pwconv,pwunconv} \
-		$PKG/etc/pam.d/*
+		$PKG/usr/share/man/man1/gpasswd.1 \
+		$PKG/usr/share/man/man8/{chpasswd.8,grpconv.8,grpunconv.8,logoutd.8} \
+		$PKG/usr/share/man/man8/{newusers.8,pwconv.8,pwunconv.8} \
+		$PKG/usr/share/man/man5/gshadow.5 \
+		$PKG/usr/share/man/man3
 
 	install -o root -g root -m 0644 \
 		$SRC/{ch{fn,sh},login,group{add,del,mems,mod},passwd,su,user{add,del,mod}} \