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

[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 22:12:07 -0700
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.1-6ubuntu6
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: 354887
Changes: 
 shadow (1:4.1.1-6ubuntu6) jaunty; urgency=low
 .
   * debian/login.preinst: fix typo in grep (LP: #354887).
Files: 
 d877d5df93e237ff7e10236ca023d786 1692 admin required shadow_4.1.1-6ubuntu6.dsc
 54a18c2b115d90d62fb95d64f803cc92 95750 admin required shadow_4.1.1-6ubuntu6.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.1-6ubuntu5/debian/changelog 1:4.1.1-6ubuntu6/debian/changelog
--- 1:4.1.1-6ubuntu5/debian/changelog	2009-04-04 09:21:41.000000000 +0100
+++ 1:4.1.1-6ubuntu6/debian/changelog	2009-04-04 09:21:40.000000000 +0100
@@ -1,3 +1,9 @@
+shadow (1:4.1.1-6ubuntu6) jaunty; urgency=low
+
+  * debian/login.preinst: fix typo in grep (LP: #354887).
+
+ -- Kees Cook <kees at ubuntu.com>  Fri, 03 Apr 2009 22:12:07 -0700
+
 shadow (1:4.1.1-6ubuntu5) jaunty; urgency=low
 
   * debian/login.preinst: add special-case handling to restore the
diff -pruN 1:4.1.1-6ubuntu5/debian/login.preinst 1:4.1.1-6ubuntu6/debian/login.preinst
--- 1:4.1.1-6ubuntu5/debian/login.preinst	2009-04-04 09:21:41.000000000 +0100
+++ 1:4.1.1-6ubuntu6/debian/login.preinst	2009-04-04 09:21:40.000000000 +0100
@@ -32,10 +32,10 @@ case "$1" in
         # 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
+            if grep -q '^UID_MIN 1000$' /etc/login.defs; 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
+            if grep -q '^UID_MAX 60000$' /etc/login.defs; then
                 sed -i -e 's/^UID_MAX 60000$/UID_MAX			60000/' /etc/login.defs
             fi
         fi