[Pkg-shadow-devel] Ubuntu shadow 1:4.1.4.2+svn3283-3ubuntu7

[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, 31 Aug 2012 13:00:33 +0100
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.4.2+svn3283-3ubuntu7
Distribution: quantal
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Launchpad-Bugs-Fixed: 523896
Changes: 
 shadow (1:4.1.4.2+svn3283-3ubuntu7) quantal; urgency=low
 .
   * debian/passwd.upstart: Add an upstrat job to clear locks on
     [shadow-]passwd/group. (LP: #523896).
Checksums-Sha1: 
 b53c213de5600b72a6f2d04d53dd828de147e699 2396 shadow_4.1.4.2+svn3283-3ubuntu7.dsc
 4010ca16c149731e8c3f466c092578e990ccf7bc 332819 shadow_4.1.4.2+svn3283-3ubuntu7.diff.gz
Checksums-Sha256: 
 68f244efc1546e62ea785f307fc2b6860719f24ae0d76bba9dc23c639cf073da 2396 shadow_4.1.4.2+svn3283-3ubuntu7.dsc
 4ef6e1ef70e5fa5e01d1f76cd33b2477f1a9fdd17deb93dac5b1992d312a1100 332819 shadow_4.1.4.2+svn3283-3ubuntu7.diff.gz
Files: 
 07b46322cc64e293d75dc4c8e30b43b9 2396 admin required shadow_4.1.4.2+svn3283-3ubuntu7.dsc
 5911218403383cd77b65b12aad20b33e 332819 admin required shadow_4.1.4.2+svn3283-3ubuntu7.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.4.2+svn3283-3ubuntu6/debian/changelog 1:4.1.4.2+svn3283-3ubuntu7/debian/changelog
--- 1:4.1.4.2+svn3283-3ubuntu6/debian/changelog	2012-09-06 19:36:09.000000000 +0000
+++ 1:4.1.4.2+svn3283-3ubuntu7/debian/changelog	2012-09-06 19:36:08.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.1.4.2+svn3283-3ubuntu7) quantal; urgency=low
+
+  * debian/passwd.upstart: Add an upstrat job to clear locks on
+    [shadow-]passwd/group. (LP: #523896).
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Fri, 31 Aug 2012 13:00:33 +0100
+
 shadow (1:4.1.4.2+svn3283-3ubuntu6) quantal; urgency=low
 
   * debian/source_shadow.py: Fix compatibility with python3. Thanks Edward
diff -pruN 1:4.1.4.2+svn3283-3ubuntu6/debian/passwd.upstart 1:4.1.4.2+svn3283-3ubuntu7/debian/passwd.upstart
--- 1:4.1.4.2+svn3283-3ubuntu6/debian/passwd.upstart	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.1.4.2+svn3283-3ubuntu7/debian/passwd.upstart	2012-09-06 19:36:08.000000000 +0000
@@ -0,0 +1,18 @@
+# passwd - clear locks on passwd and related files
+#
+# Copyright 2012 Canonical Ltd.
+# Author: Dmitrijs Ledkovs
+#
+# This helper clears locks on passwd to avoid million duplicate bug reports
+# like this one: https://launchpad.net/bugs/523896
+# Ideally we'd know what lock-up, and doesn't clear the lock, and fix that.
+# But it appears to be safe enough to clear them unconditionally on boot.
+#
+
+description	"Clear passwd locks"
+
+start on filesystem
+
+task
+
+exec rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock
diff -pruN 1:4.1.4.2+svn3283-3ubuntu6/debian/rules 1:4.1.4.2+svn3283-3ubuntu7/debian/rules
--- 1:4.1.4.2+svn3283-3ubuntu6/debian/rules	2012-09-06 19:36:09.000000000 +0000
+++ 1:4.1.4.2+svn3283-3ubuntu7/debian/rules	2012-09-06 19:36:08.000000000 +0000
@@ -15,6 +15,8 @@ DEB_DH_INSTALL_SOURCEDIR=debian/tmp
 # (This is only needed on The Hurd, where only one package is built. On
 # the other arch, DEB_DESTDIR already points to debian/tmp)
 DEB_DESTDIR=$(CURDIR)/debian/tmp
+# Upstart job for clearing locks
+DEB_DH_INSTALLINIT_ARGS=--upstart-only --no-start
 
 include /usr/share/cdbs/1/class/autotools.mk
 # Automatically update autoconf, etc.