[Pkg-shadow-devel] Ubuntu shadow 1:4.1.5.1-1ubuntu8

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Fri, 17 Jan 2014 16:15:13 -0500
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.1.5.1-1ubuntu8
Distribution: trusty
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Stéphane Graber <stgraber at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
 uidmap     - programs to help use subuids
Changes: 
 shadow (1:4.1.5.1-1ubuntu8) trusty; urgency=medium
 .
   * Fix postinst to create subuid and subgid when missing as those won't
     get created by usermod or any of the other tools.
Checksums-Sha1: 
 9567fb53b2b6b2bd18a12f3d6893b0a5d457740d 2369 shadow_4.1.5.1-1ubuntu8.dsc
 09103a7f22053c1a74bd3a6bf46946e9ead09047 111134 shadow_4.1.5.1-1ubuntu8.diff.gz
Checksums-Sha256: 
 2e94d52ad5a743ed4da618e0a04f3a17ff3984b1036de183ea319adbb3c6b699 2369 shadow_4.1.5.1-1ubuntu8.dsc
 4de7deca73ab1b1f345ebbb8f598a54a9e2bde6d847a0dde965cddb95a081542 111134 shadow_4.1.5.1-1ubuntu8.diff.gz
Files: 
 433bc1573a71b86d936c7f75ac15957c 2369 admin required shadow_4.1.5.1-1ubuntu8.dsc
 234d785fedc44f51ce09c5b624aab288 111134 admin required shadow_4.1.5.1-1ubuntu8.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.5.1-1ubuntu7/debian/changelog 1:4.1.5.1-1ubuntu8/debian/changelog
--- 1:4.1.5.1-1ubuntu7/debian/changelog	2014-01-18 00:06:21.000000000 +0000
+++ 1:4.1.5.1-1ubuntu8/debian/changelog	2014-01-18 00:06:20.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.5.1-1ubuntu8) trusty; urgency=medium
+
+  * Fix postinst to create subuid and subgid when missing as those won't
+    get created by usermod or any of the other tools.
+
+ -- Stéphane Graber <stgraber at ubuntu.com>  Fri, 17 Jan 2014 16:15:13 -0500
+
 shadow (1:4.1.5.1-1ubuntu7) trusty; urgency=medium
 
   * Don't ship subuid/subgid as conffiles as that'll just cause problems
diff -pruN 1:4.1.5.1-1ubuntu7/debian/login.postinst 1:4.1.5.1-1ubuntu8/debian/login.postinst
--- 1:4.1.5.1-1ubuntu7/debian/login.postinst	2014-01-18 00:06:21.000000000 +0000
+++ 1:4.1.5.1-1ubuntu8/debian/login.postinst	2014-01-18 00:06:20.000000000 +0000
@@ -14,16 +14,14 @@ then
 fi
 rm -f /etc/pam.d/login.pre-upgrade 2>/dev/null
 
-if [ "$1" = "configure" ] && [ "$2" = "" ]
-then
+if [ "$1" = "configure" ]; then
 	# Install faillog during initial installs only
-	if [ ! -f /var/log/faillog ] ; then
+	if [ "$2" = "" ] && [ ! -f /var/log/faillog ] ; then
 		touch /var/log/faillog
 		chown root:root /var/log/faillog
 		chmod 644 /var/log/faillog
 	fi
 
-elif [ "$1" = "configure" ]; then
 	# FIXME: Transition code, can be dropped after Ubuntu 13.10 goes EOL
 	if [ -e /etc/subuid.pre-upgrade ]; then
 		mv /etc/subuid.pre-upgrade /etc/subuid