[Pkg-shadow-devel] Ubuntu shadow 1:4.5-1.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: Fri, 22 Mar 2019 19:32:50 +0100
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.5-1.1ubuntu2
Distribution: disco
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
Launchpad-Bugs-Fixed: 1659534
Changes: 
 shadow (1:4.5-1.1ubuntu2) disco; urgency=medium
 .
   * debian/patches/1013_extrausers_deluser.patch
     - add --extrausers option to "userdel" (LP: #1659534)
Checksums-Sha1: 
 7aa3dddba1d6c281b2d02d4707889f5a7f2e6334 2434 shadow_4.5-1.1ubuntu2.dsc
 d215c406c1ca3fd990463c453f2143fb748c6794 471092 shadow_4.5-1.1ubuntu2.debian.tar.xz
Checksums-Sha256: 
 f275d3edd9288b78a862f5b03ca1fd1a10ec7c29dc60fb1438b296bf5b7b7e82 2434 shadow_4.5-1.1ubuntu2.dsc
 3c351f82b7d0763c2a14987bef5a8e7bf995911de854486f9d09d85d81bc32ad 471092 shadow_4.5-1.1ubuntu2.debian.tar.xz
Files: 
 e822be1a0dfe9d3714a14f4b244ea027 2434 admin required shadow_4.5-1.1ubuntu2.dsc
 43c58c107785e91d364f736437e7ca04 471092 admin required shadow_4.5-1.1ubuntu2.debian.tar.xz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.5-1.1ubuntu1/debian/changelog 1:4.5-1.1ubuntu2/debian/changelog
--- 1:4.5-1.1ubuntu1/debian/changelog	2019-01-24 23:46:48.000000000 +0000
+++ 1:4.5-1.1ubuntu2/debian/changelog	2019-03-22 18:32:50.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.5-1.1ubuntu2) disco; urgency=medium
+
+  * debian/patches/1013_extrausers_deluser.patch
+    - add --extrausers option to "userdel" (LP: #1659534)
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Fri, 22 Mar 2019 19:32:50 +0100
+
 shadow (1:4.5-1.1ubuntu1) disco; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -pruN 1:4.5-1.1ubuntu1/debian/patches/1013_extrausers_deluser.patch 1:4.5-1.1ubuntu2/debian/patches/1013_extrausers_deluser.patch
--- 1:4.5-1.1ubuntu1/debian/patches/1013_extrausers_deluser.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.5-1.1ubuntu2/debian/patches/1013_extrausers_deluser.patch	2019-03-22 18:32:33.000000000 +0000
@@ -0,0 +1,62 @@
+Index: shadow-4.5/src/userdel.c
+===================================================================
+--- shadow-4.5.orig/src/userdel.c
++++ shadow-4.5/src/userdel.c
+@@ -132,6 +132,12 @@ static int remove_mailbox (void);
+ static int remove_tcbdir (const char *user_name, uid_t user_id);
+ #endif				/* WITH_TCB */
+ 
++#ifndef EXTRAUSERS_OPT
++#define EXTRAUSERS_OPT 100000
++#endif
++
++static bool use_extrausers = false;
++
+ /*
+  * usage - display usage message and exit
+  */
+@@ -149,6 +155,7 @@ static void usage (int status)
+ 	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
+ 	(void) fputs (_("  -r, --remove                  remove home directory and mail spool\n"), usageout);
+ 	(void) fputs (_("  -R, --root CHROOT_DIR         directory to chroot into\n"), usageout);
++	(void) fputs (_("      --extrausers              Use the extra users database\n"), usageout);
+ #ifdef WITH_SELINUX
+ 	(void) fputs (_("  -Z, --selinux-user            remove any SELinux user mapping for the user\n"), usageout);
+ #endif				/* WITH_SELINUX */
+@@ -1006,6 +1013,7 @@ int main (int argc, char **argv)
+ 			{"help",         no_argument,       NULL, 'h'},
+ 			{"remove",       no_argument,       NULL, 'r'},
+ 			{"root",         required_argument, NULL, 'R'},
++                        {"extrausers", no_argument,       NULL, EXTRAUSERS_OPT},
+ #ifdef WITH_SELINUX
+ 			{"selinux-user", no_argument,       NULL, 'Z'},
+ #endif				/* WITH_SELINUX */
+@@ -1019,6 +1027,9 @@ int main (int argc, char **argv)
+ #endif				/* !WITH_SELINUX */
+ 		                         long_options, NULL)) != -1) {
+ 			switch (c) {
++                        case EXTRAUSERS_OPT:
++                                use_extrausers = true;
++                                break;
+ 			case 'f':	/* force remove even if not owned by user */
+ 				fflg = true;
+ 				break;
+@@ -1162,6 +1173,18 @@ int main (int argc, char **argv)
+ 		}
+ 	}
+ 
++        if (use_extrausers) {
++               pw_setdbname (EXTRAUSERS_PASSWD_FILE);
++               spw_setdbname (EXTRAUSERS_SHADOW_FILE);
++               gr_setdbname (EXTRAUSERS_GROUP_FILE);
++               /* TODO expose this information in other tools */
++               sub_uid_setdbname(EXTRAUSERS_SUBUID_FILE);
++               sub_gid_setdbname(EXTRAUSERS_SUBGID_FILE);
++#ifdef SHADOWGRP
++               sgr_setdbname (EXTRAUSERS_SHADOWGROUP_FILE);
++#endif
++        }
++
+ 	/*
+ 	 * Do the hard stuff - open the files, create the user entries,
+ 	 * create the home directory, then close and update the files.
diff -pruN 1:4.5-1.1ubuntu1/debian/patches/series 1:4.5-1.1ubuntu2/debian/patches/series
--- 1:4.5-1.1ubuntu1/debian/patches/series	2018-07-27 16:50:52.000000000 +0000
+++ 1:4.5-1.1ubuntu2/debian/patches/series	2019-03-22 18:27:38.000000000 +0000
@@ -17,3 +17,4 @@
 1010_extrausers.patch
 1011_extrausers_toggle.patch
 1012_extrausers_chfn.patch
+1013_extrausers_deluser.patch