[Pkg-shadow-devel] Ubuntu shadow 1:4.2-3.1ubuntu2

[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: Thu, 04 Feb 2016 14:01:27 -0800
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.2-3.1ubuntu2
Distribution: xenial
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Steve Langasek <steve.langasek 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.2-3.1ubuntu2) xenial; urgency=medium
 .
   * Replace debian/passwd.service with debian/passwd.tmpfile, systemd tmpfile
     handling has support for removing files for us on boot.  Thanks to
     Martin Pitt <pitti at ubuntu.com> for the hint.
Checksums-Sha1: 
 d80db7285c5ed6870b9dd111086ad512f884540c 2458 shadow_4.2-3.1ubuntu2.dsc
 79a4a76ff5872d0c0c6d97b0ab0c8fa0dabf66ab 503288 shadow_4.2-3.1ubuntu2.debian.tar.xz
Checksums-Sha256: 
 286114830079eafc7766ebb3d342fbb6a5ecc2456ab77fe53d37d0c446e23088 2458 shadow_4.2-3.1ubuntu2.dsc
 277fab03e6607f6fba8c69b09e0064a6d361a5118577e272a1de7cba5a1fd1aa 503288 shadow_4.2-3.1ubuntu2.debian.tar.xz
Files: 
 7217641edb98004614a49b8925264360 2458 admin required shadow_4.2-3.1ubuntu2.dsc
 0f79f487291fea68c3c13f7e75e01dce 503288 admin required shadow_4.2-3.1ubuntu2.debian.tar.xz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.2-3.1ubuntu1/debian/changelog 1:4.2-3.1ubuntu2/debian/changelog
--- 1:4.2-3.1ubuntu1/debian/changelog	2016-01-30 02:50:52.000000000 +0000
+++ 1:4.2-3.1ubuntu2/debian/changelog	2016-02-04 22:30:29.000000000 +0000
@@ -1,3 +1,11 @@
+shadow (1:4.2-3.1ubuntu2) xenial; urgency=medium
+
+  * Replace debian/passwd.service with debian/passwd.tmpfile, systemd tmpfile
+    handling has support for removing files for us on boot.  Thanks to
+    Martin Pitt <pitti at ubuntu.com> for the hint.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Thu, 04 Feb 2016 14:01:27 -0800
+
 shadow (1:4.2-3.1ubuntu1) xenial; urgency=low
 
   * Merge from Debian unstable.
diff -pruN 1:4.2-3.1ubuntu1/debian/passwd.service 1:4.2-3.1ubuntu2/debian/passwd.service
--- 1:4.2-3.1ubuntu1/debian/passwd.service	2016-02-01 20:35:12.000000000 +0000
+++ 1:4.2-3.1ubuntu2/debian/passwd.service	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[Unit]
-Description=Clear passwd locks
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock /etc/subuid.lock /etc/subgid.lock
-
-[Install]
-WantedBy=multi-user.target
diff -pruN 1:4.2-3.1ubuntu1/debian/passwd.tmpfile 1:4.2-3.1ubuntu2/debian/passwd.tmpfile
--- 1:4.2-3.1ubuntu1/debian/passwd.tmpfile	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.2-3.1ubuntu2/debian/passwd.tmpfile	2016-02-04 22:00:50.000000000 +0000
@@ -0,0 +1,8 @@
+# If a password operation is in progress and we lose power, stale lockfiles
+# can be left behind.  Clear them on boot.
+r! /etc/gshadow.lock
+r! /etc/shadow.lock
+r! /etc/passwd.lock
+r! /etc/group.lock
+r! /etc/subuid.lock
+r! /etc/subgid.lock