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

[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: Sun, 12 Jan 2014 12:59:46 -0500
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.1.5.1-1ubuntu7
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-1ubuntu7) trusty; urgency=medium
 .
   * Don't ship subuid/subgid as conffiles as that'll just cause problems
     on upgrades. Instead simply touch them if they're not already present.
Checksums-Sha1: 
 628d37e20a12f492da18e87b5d083c46d0fd5394 2369 shadow_4.1.5.1-1ubuntu7.dsc
 6f372e12e88178009c345211035af5fd0b8276d0 111087 shadow_4.1.5.1-1ubuntu7.diff.gz
Checksums-Sha256: 
 32b8e631e14f8511b83dc6fb072f0bbef26911e967fb2e0b8c5a1c7e265be102 2369 shadow_4.1.5.1-1ubuntu7.dsc
 2d45408629983534a336ab27063713c6f20257d96766d5389b9e54cdd2fd5726 111087 shadow_4.1.5.1-1ubuntu7.diff.gz
Files: 
 6bbb416187ffd86c72bb4f5e9f823b3f 2369 admin required shadow_4.1.5.1-1ubuntu7.dsc
 4c27a60f10146ce0f2ba1a2c992e09de 111087 admin required shadow_4.1.5.1-1ubuntu7.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.5.1-1ubuntu6/debian/changelog 1:4.1.5.1-1ubuntu7/debian/changelog
--- 1:4.1.5.1-1ubuntu6/debian/changelog	2014-01-12 21:06:04.000000000 +0000
+++ 1:4.1.5.1-1ubuntu7/debian/changelog	2014-01-12 21:06:04.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.5.1-1ubuntu7) trusty; urgency=medium
+
+  * Don't ship subuid/subgid as conffiles as that'll just cause problems
+    on upgrades. Instead simply touch them if they're not already present.
+
+ -- Stéphane Graber <stgraber at ubuntu.com>  Sun, 12 Jan 2014 12:59:46 -0500
+
 shadow (1:4.1.5.1-1ubuntu6) saucy; urgency=low
 
   * debian/patches/496_su_kill_process_group: Kill the child process group,
diff -pruN 1:4.1.5.1-1ubuntu6/debian/login.postinst 1:4.1.5.1-1ubuntu7/debian/login.postinst
--- 1:4.1.5.1-1ubuntu6/debian/login.postinst	2014-01-12 21:06:04.000000000 +0000
+++ 1:4.1.5.1-1ubuntu7/debian/login.postinst	2014-01-12 21:06:04.000000000 +0000
@@ -22,6 +22,28 @@ then
 		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
+	fi
+	if [ -e /etc/subgid.pre-upgrade ]; then
+		mv /etc/subgid.pre-upgrade /etc/subgid
+	fi
+
+	# Create subuid/subgid if missing
+	if [ ! -e /etc/subuid ]; then
+		touch /etc/subuid
+		chown root:root /etc/subuid
+		chmod 644 /etc/subuid
+	fi
+
+	if [ ! -e /etc/subgid ]; then
+		touch /etc/subgid
+		chown root:root /etc/subgid
+		chmod 644 /etc/subgid
+	fi
 fi
 
 #DEBHELPER#
diff -pruN 1:4.1.5.1-1ubuntu6/debian/login.preinst 1:4.1.5.1-1ubuntu7/debian/login.preinst
--- 1:4.1.5.1-1ubuntu6/debian/login.preinst	2014-01-12 21:06:04.000000000 +0000
+++ 1:4.1.5.1-1ubuntu7/debian/login.preinst	2014-01-12 21:06:04.000000000 +0000
@@ -31,6 +31,16 @@ case "$1" in
 		fi
 	    fi
 	    
+
+        # FIXME: Transition code, can be dropped after Ubuntu 13.10 goes EOL
+        if dpkg --compare-versions $2 lt 1:4.1.5.1-1ubuntu7; then
+            if [ -e /etc/subuid ]; then
+                mv /etc/subuid /etc/subuid.pre-upgrade
+            fi
+            if [ -e /etc/subgid ]; then
+                mv /etc/subgid /etc/subgid.pre-upgrade
+            fi
+        fi
     ;;
 
     abort-upgrade)
diff -pruN 1:4.1.5.1-1ubuntu6/debian/rules 1:4.1.5.1-1ubuntu7/debian/rules
--- 1:4.1.5.1-1ubuntu6/debian/rules	2014-01-12 21:06:04.000000000 +0000
+++ 1:4.1.5.1-1ubuntu7/debian/rules	2014-01-12 21:06:04.000000000 +0000
@@ -42,8 +42,6 @@ binary-install/login::
 	install -c -m 444 debian/login.defs debian/login/etc/login.defs
 	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
 	install -d debian/login/usr/share/apport/package-hooks
-	install -c -m 644 debian/subuid debian/login/etc/subuid
-	install -c -m 644 debian/subuid debian/login/etc/subgid
 	install -c -m 644 debian/source_shadow.py debian/login/usr/share/apport/package-hooks/source_shadow.py
 	dh_lintian -p login
 
diff -pruN 1:4.1.5.1-1ubuntu6/debian/subuid 1:4.1.5.1-1ubuntu7/debian/subuid
--- 1:4.1.5.1-1ubuntu6/debian/subuid	2014-01-12 21:06:04.000000000 +0000
+++ 1:4.1.5.1-1ubuntu7/debian/subuid	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-# empty default subuid/subgid file