[Pkg-shadow-devel] Ubuntu shadow 1:4.8.1-1ubuntu3

[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: Mon, 09 Mar 2020 10:43:16 +0100
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.8.1-1ubuntu3
Distribution: focal
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Michael Vogt <michael.vogt 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.8.1-1ubuntu3) focal; urgency=medium
 .
   * debian/patches/1013_extrausers_deluser.patch:
     - move "if (use_extrausers)" check before the test if the user
       actually exists in the local database
   * debian/tests:
     - add smoke autopkgtest tests around {user,group}{add,del} with
       and without extrausers to avoid regressions like the one fixed
       in 4.8.1-1ubuntu2
Checksums-Sha1: 
 1bb62c305a4780a744f21ed3e1fa92e82d3d5528 2378 shadow_4.8.1-1ubuntu3.dsc
 89ae9c654b0480392916c43f5482ab2d4b2c78c9 85156 shadow_4.8.1-1ubuntu3.debian.tar.xz
Checksums-Sha256: 
 319ae9ff41a612520f82327059d9dbd371c6921798e343de15e7a2bdf0a8cebb 2378 shadow_4.8.1-1ubuntu3.dsc
 fb673a59be6280bc9ebc0f446c3c9fb2e72e1728b8c30a73dfea854b18d09a0c 85156 shadow_4.8.1-1ubuntu3.debian.tar.xz
Files: 
 5971ac4457d059398ecb5b0a2c33ee31 2378 admin required shadow_4.8.1-1ubuntu3.dsc
 b2c0f48490824e348d3b6517cb41f45f 85156 admin required shadow_4.8.1-1ubuntu3.debian.tar.xz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.8.1-1ubuntu2/debian/changelog 1:4.8.1-1ubuntu3/debian/changelog
--- 1:4.8.1-1ubuntu2/debian/changelog	2020-03-07 09:16:01.000000000 +0000
+++ 1:4.8.1-1ubuntu3/debian/changelog	2020-03-09 09:43:16.000000000 +0000
@@ -1,3 +1,15 @@
+shadow (1:4.8.1-1ubuntu3) focal; urgency=medium
+
+  * debian/patches/1013_extrausers_deluser.patch:
+    - move "if (use_extrausers)" check before the test if the user
+      actually exists in the local database
+  * debian/tests:
+    - add smoke autopkgtest tests around {user,group}{add,del} with
+      and without extrausers to avoid regressions like the one fixed
+      in 4.8.1-1ubuntu2
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Mon, 09 Mar 2020 10:43:16 +0100
+
 shadow (1:4.8.1-1ubuntu2) focal; urgency=medium
 
   * No-change rebuild to pick up dependency on libcrypt1.
diff -pruN 1:4.8.1-1ubuntu2/debian/patches/1013_extrausers_deluser.patch 1:4.8.1-1ubuntu3/debian/patches/1013_extrausers_deluser.patch
--- 1:4.8.1-1ubuntu2/debian/patches/1013_extrausers_deluser.patch	2020-02-07 15:32:06.000000000 +0000
+++ 1:4.8.1-1ubuntu3/debian/patches/1013_extrausers_deluser.patch	2020-03-09 08:10:31.000000000 +0000
@@ -7,10 +7,10 @@ Subject: _extrausers_deluser
  src/userdel.c | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
-diff --git a/src/userdel.c b/src/userdel.c
-index cc951e5..f0b6790 100644
---- a/src/userdel.c
-+++ b/src/userdel.c
+Index: shadow-4.8.1/src/userdel.c
+===================================================================
+--- shadow-4.8.1.orig/src/userdel.c
++++ shadow-4.8.1/src/userdel.c
 @@ -139,6 +139,12 @@ static int remove_mailbox (void);
  static int remove_tcbdir (const char *user_name, uid_t user_id);
  #endif				/* WITH_TCB */
@@ -50,9 +50,9 @@ index cc951e5..f0b6790 100644
  			case 'f':	/* force remove even if not owned by user */
  				fflg = true;
  				break;
-@@ -1215,6 +1226,18 @@ int main (int argc, char **argv)
- 		}
- 	}
+@@ -1136,6 +1147,18 @@ int main (int argc, char **argv)
+ 	is_sub_gid = sub_gid_file_present ();
+ #endif				/* ENABLE_SUBIDS */
  
 +        if (use_extrausers) {
 +               pw_setdbname (EXTRAUSERS_PASSWD_FILE);
@@ -67,5 +67,5 @@ index cc951e5..f0b6790 100644
 +        }
 +
  	/*
- 	 * Do the hard stuff - open the files, create the user entries,
- 	 * create the home directory, then close and update the files.
+ 	 * Start with a quick check to see if the user exists.
+ 	 */
diff -pruN 1:4.8.1-1ubuntu2/debian/tests/control 1:4.8.1-1ubuntu3/debian/tests/control
--- 1:4.8.1-1ubuntu2/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.8.1-1ubuntu3/debian/tests/control	2020-03-09 09:33:50.000000000 +0000
@@ -0,0 +1,2 @@
+Tests: smoke
+Restrictions: needs-root, allow-stderr
diff -pruN 1:4.8.1-1ubuntu2/debian/tests/smoke 1:4.8.1-1ubuntu3/debian/tests/smoke
--- 1:4.8.1-1ubuntu2/debian/tests/smoke	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.8.1-1ubuntu3/debian/tests/smoke	2020-03-09 09:26:15.000000000 +0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+# smoke test for {user,group}{add,del}
+mkdir -p /var/lib/extrausers
+
+echo "Adding an user works"
+useradd shadow-test-user
+grep '^shadow-test-user:x:' /etc/passwd
+grep '^shadow-test-user:!:' /etc/shadow
+# nothing got added to the extrausers
+! grep 'shadow-test-user' /var/lib/extrausers/passwd
+! grep 'shadow-test-user' /var/lib/extrausers/shadow
+
+echo "Removing an user works"
+userdel shadow-test-user
+! grep 'shadow-test-user' /etc/passwd
+! grep 'shadow-test-user' /etc/shadow
+
+echo "Adding an extrauser works"
+useradd --extrausers shadow-test-user
+grep '^shadow-test-user:x:' /var/lib/extrausers/passwd
+grep '^shadow-test-user:!:' /var/lib/extrausers/shadow
+# nothing got added to the system
+! grep 'shadow-test-user' /etc/passwd
+! grep 'shadow-test-user' /etc/shadow
+
+echo "Removing an extrauser works"
+userdel --extrausers shadow-test-user
+! grep 'shadow-test-user' /var/lib/extrausers/passwd
+! grep 'shadow-test-user' /var/lib/extrausers/passwd