[Pkg-shadow-devel] Ubuntu shadow 1:4.5-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: Wed, 21 Aug 2019 11:40:17 +0200
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.5-1.1ubuntu3
Distribution: eoan
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: 1840375
Changes: 
 shadow (1:4.5-1.1ubuntu3) eoan; urgency=medium
 .
   * debian/patches/1014_extrausers_delgroup.patch
     - add --extrausers option to "groupdel" (LP: #1840375)
Checksums-Sha1: 
 a8bef2f30f77cb732e991c9e34cbb83669087753 2434 shadow_4.5-1.1ubuntu3.dsc
 6618cc875365a640f94966c5396c6c6691c9cd9b 471484 shadow_4.5-1.1ubuntu3.debian.tar.xz
Checksums-Sha256: 
 c0a31ee73056a7170a7f5c0234c026947331737adecf9b67088a34c15ccd1ce0 2434 shadow_4.5-1.1ubuntu3.dsc
 1b51fa35d59ee913ef82b9d843c8ddc3a610513f0986d64bd4981a481a755c9d 471484 shadow_4.5-1.1ubuntu3.debian.tar.xz
Files: 
 51c922fd9352bb1ef6afabe0090e6177 2434 admin required shadow_4.5-1.1ubuntu3.dsc
 37746e5f376dfc7fddc30c71692ba450 471484 admin required shadow_4.5-1.1ubuntu3.debian.tar.xz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.5-1.1ubuntu2/debian/changelog 1:4.5-1.1ubuntu3/debian/changelog
--- 1:4.5-1.1ubuntu2/debian/changelog	2019-03-22 18:32:50.000000000 +0000
+++ 1:4.5-1.1ubuntu3/debian/changelog	2019-08-21 09:40:17.000000000 +0000
@@ -1,3 +1,10 @@
+shadow (1:4.5-1.1ubuntu3) eoan; urgency=medium
+
+  * debian/patches/1014_extrausers_delgroup.patch
+    - add --extrausers option to "groupdel" (LP: #1840375)
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Wed, 21 Aug 2019 11:40:17 +0200
+
 shadow (1:4.5-1.1ubuntu2) disco; urgency=medium
 
   * debian/patches/1013_extrausers_deluser.patch
diff -pruN 1:4.5-1.1ubuntu2/debian/patches/1014_extrausers_delgroup.patch 1:4.5-1.1ubuntu3/debian/patches/1014_extrausers_delgroup.patch
--- 1:4.5-1.1ubuntu2/debian/patches/1014_extrausers_delgroup.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.5-1.1ubuntu3/debian/patches/1014_extrausers_delgroup.patch	2019-08-21 09:40:01.000000000 +0000
@@ -0,0 +1,62 @@
+Index: shadow-4.5/src/groupdel.c
+===================================================================
+--- shadow-4.5.orig/src/groupdel.c
++++ shadow-4.5/src/groupdel.c
+@@ -84,6 +84,12 @@ static void open_files (void);
+ static void group_busy (gid_t gid);
+ static void process_flags (int argc, char **argv);
+ 
++#ifndef EXTRAUSERS_OPT
++#define EXTRAUSERS_OPT 100000
++#endif
++
++static bool use_extrausers = false;
++
+ /*
+  * usage - display usage message and exit
+  */
+@@ -98,6 +104,7 @@ static /*@noreturn@*/void usage (int sta
+ 	(void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
+ 	(void) fputs (_("  -R, --root CHROOT_DIR         directory to chroot into\n"), usageout);
+ 	(void) fputs (_("  -f, --force                   delete group even if it is the primary group of a user\n"), usageout);
++        (void) fputs (_("      --extrausers              Use the extra users database\n"), usageout);
+ 	(void) fputs ("\n", usageout);
+ 	exit (status);
+ }
+@@ -320,6 +327,7 @@ static void process_flags (int argc, cha
+ 	static struct option long_options[] = {
+ 		{"help", no_argument,       NULL, 'h'},
+ 		{"root", required_argument, NULL, 'R'},
++		{"extrausers", no_argument, NULL, EXTRAUSERS_OPT},
+ 		{NULL, 0, NULL, '\0'}
+ 	};
+ 
+@@ -334,6 +342,9 @@ static void process_flags (int argc, cha
+ 		case 'f':
+ 			check_group_busy = false;
+ 			break;
++		case EXTRAUSERS_OPT:
++			use_extrausers = true;
++			break;
+ 		default:
+ 			usage (E_USAGE);
+ 		}
+@@ -474,6 +485,18 @@ int main (int argc, char **argv)
+ 		group_busy (group_id);
+ 	}
+ 
++        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, delete the group entries,
+ 	 * then close and update the files.
diff -pruN 1:4.5-1.1ubuntu2/debian/patches/series 1:4.5-1.1ubuntu3/debian/patches/series
--- 1:4.5-1.1ubuntu2/debian/patches/series	2019-03-22 18:27:38.000000000 +0000
+++ 1:4.5-1.1ubuntu3/debian/patches/series	2019-08-21 09:05:40.000000000 +0000
@@ -18,3 +18,4 @@
 1011_extrausers_toggle.patch
 1012_extrausers_chfn.patch
 1013_extrausers_deluser.patch
+1014_extrausers_delgroup.patch