[Pkg-shadow-devel] Ubuntu shadow 1:4.1.1-6ubuntu5

[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.7
Date: Fri, 03 Apr 2009 14:33:43 -0700
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.1-6ubuntu5
Distribution: jaunty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Kees Cook <kees at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Launchpad-Bugs-Fixed: 316756
Changes: 
 shadow (1:4.1.1-6ubuntu5) jaunty; urgency=low
 .
   * debian/login.preinst: add special-case handling to restore the
     original white-space in /etc/login.defs that is changed by
     system-tools-backends (LP: #316756).
Files: 
 5e42d841431016925d4303df9459f3c6 1692 admin required shadow_4.1.1-6ubuntu5.dsc
 2b2198a454069267cade35a831e1f9b0 95720 admin required shadow_4.1.1-6ubuntu5.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.1-6ubuntu4/debian/changelog 1:4.1.1-6ubuntu5/debian/changelog
--- 1:4.1.1-6ubuntu4/debian/changelog	2009-04-04 01:32:19.000000000 +0100
+++ 1:4.1.1-6ubuntu5/debian/changelog	2009-04-04 01:32:19.000000000 +0100
@@ -1,3 +1,11 @@
+shadow (1:4.1.1-6ubuntu5) jaunty; urgency=low
+
+  * debian/login.preinst: add special-case handling to restore the
+    original white-space in /etc/login.defs that is changed by
+    system-tools-backends (LP: #316756).
+
+ -- Kees Cook <kees at ubuntu.com>  Fri, 03 Apr 2009 14:33:43 -0700
+
 shadow (1:4.1.1-6ubuntu4) jaunty; urgency=low
 
   * debian/patches/593_omit_lastchange_field_if_clock_is_misset (LP: #349504)
diff -pruN 1:4.1.1-6ubuntu4/debian/login.preinst 1:4.1.1-6ubuntu5/debian/login.preinst
--- 1:4.1.1-6ubuntu4/debian/login.preinst	2009-04-04 01:32:19.000000000 +0100
+++ 1:4.1.1-6ubuntu5/debian/login.preinst	2009-04-04 01:32:19.000000000 +0100
@@ -29,6 +29,16 @@ case "$1" in
 	    if dpkg --compare-versions $2 lt 1:4.0.3 ; then
 		remove_md5 /etc/pam.d/login 5e61c3334e25625fe1fa4d79cf9123ff
 		fi
+        # Work around a misbehavior of gnome-system-tools that rewrites login.defs
+        # https://bugs.launchpad.net/bugs/316756
+        if [ -w /etc/login.defs ]; then
+            if grep -q /etc/login.defs '^UID_MIN 1000$'; then
+                sed -i -e 's/^UID_MIN 1000$/UID_MIN			 1000/' /etc/login.defs
+            fi
+            if grep -q /etc/login.defs '^UID_MAX 60000$'; then
+                sed -i -e 's/^UID_MAX 60000$/UID_MAX			60000/' /etc/login.defs
+            fi
+        fi
 	    fi
 	    
     ;;