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

[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, 02 Dec 2020 10:44:11 +0000
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.8.1-1ubuntu7
Distribution: hirsute
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Dimitri John Ledkov <xnox 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-1ubuntu7) hirsute; urgency=medium
 .
   [ Marcus Tomlinson ]
   * debian/patches/1016_extrausers_gpasswd.patch:
     - Add support for extrausers in gpasswd.
Checksums-Sha1: 
 67918e9d703c317c96a42f816e566af28c153e71 2345 shadow_4.8.1-1ubuntu7.dsc
 90b160b8266f9c01c6267b67d68e271514f189c9 86112 shadow_4.8.1-1ubuntu7.debian.tar.xz
Checksums-Sha256: 
 b6733392483ac9bbe90139405f8f33dad4592831f78aea0ab64c137c6f9fe9fb 2345 shadow_4.8.1-1ubuntu7.dsc
 1dd7b01144a7e5d6e09c61618b51b651729c1272e12c7853553d2fcedec9e0ba 86112 shadow_4.8.1-1ubuntu7.debian.tar.xz
Files: 
 b2b49dbdb1e8063e0381ec52e6092688 2345 admin required shadow_4.8.1-1ubuntu7.dsc
 97c8542221cc15b3e2742b912841ecd5 86112 admin required shadow_4.8.1-1ubuntu7.debian.tar.xz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.8.1-1ubuntu6/debian/changelog 1:4.8.1-1ubuntu7/debian/changelog
--- 1:4.8.1-1ubuntu6/debian/changelog	2020-05-28 06:37:47.000000000 +0000
+++ 1:4.8.1-1ubuntu7/debian/changelog	2020-12-02 10:44:11.000000000 +0000
@@ -1,3 +1,11 @@
+shadow (1:4.8.1-1ubuntu7) hirsute; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * debian/patches/1016_extrausers_gpasswd.patch:
+    - Add support for extrausers in gpasswd.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Wed, 02 Dec 2020 10:44:11 +0000
+
 shadow (1:4.8.1-1ubuntu6) groovy; urgency=medium
 
   * debian/patches/1015_add_zsys_support.patch:
diff -pruN 1:4.8.1-1ubuntu6/debian/patches/1016_extrausers_gpasswd.patch 1:4.8.1-1ubuntu7/debian/patches/1016_extrausers_gpasswd.patch
--- 1:4.8.1-1ubuntu6/debian/patches/1016_extrausers_gpasswd.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.8.1-1ubuntu7/debian/patches/1016_extrausers_gpasswd.patch	2020-12-02 10:44:02.000000000 +0000
@@ -0,0 +1,55 @@
+From bea0ec0e35d7417b258dcbf85c700e204afd1a1e Mon Sep 17 00:00:00 2001
+From: Marcus Tomlinson <marcus.tomlinson at canonical.com>
+Date: Wed, 21 Oct 2020 13:18:01 +0100
+Subject: add extrausers flag
+
+---
+ src/gpasswd.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/gpasswd.c b/src/gpasswd.c
+index 4d75af9..e72ae64 100644
+--- a/src/gpasswd.c
++++ b/src/gpasswd.c
+@@ -123,6 +123,10 @@ static void log_gpasswd_success (const char *suffix);
+ static void log_gpasswd_success_system (/*@null@*/unused void *arg);
+ static void log_gpasswd_success_group (/*@null@*/unused void *arg);
+ 
++#ifndef EXTRAUSERS_OPT
++#define EXTRAUSERS_OPT 100000
++#endif
++
+ /*
+  * usage - display usage message
+  */
+@@ -141,6 +145,7 @@ static void usage (int status)
+ 	(void) fputs (_("  -r, --remove-password         remove the GROUP's password\n"), usageout);
+ 	(void) fputs (_("  -R, --restrict                restrict access to GROUP to its members\n"), usageout);
+ 	(void) fputs (_("  -M, --members USER,...        set the list of members of GROUP\n"), usageout);
++	(void) fputs (_("      --extrausers              use the extra users database\n"), usageout);
+ #ifdef SHADOWGRP
+ 	(void) fputs (_("  -A, --administrators ADMIN,...\n"
+ 	                "                                set the list of administrators for GROUP\n"), usageout);
+@@ -238,12 +243,19 @@ static void process_flags (int argc, char **argv)
+ 		{"root",            required_argument, NULL, 'Q'},
+ 		{"remove-password", no_argument,       NULL, 'r'},
+ 		{"restrict",        no_argument,       NULL, 'R'},
++		{"extrausers",      no_argument,       NULL, EXTRAUSERS_OPT},
+ 		{NULL, 0, NULL, '\0'}
+ 		};
+ 
+ 	while ((c = getopt_long (argc, argv, "a:A:d:ghM:Q:rR",
+ 	                         long_options, NULL)) != -1) {
+ 		switch (c) {
++		case EXTRAUSERS_OPT:
++			gr_setdbname (EXTRAUSERS_GROUP_FILE);
++#ifdef SHADOWGRP
++			sgr_setdbname (EXTRAUSERS_SHADOWGROUP_FILE);
++#endif
++			break;
+ 		case 'a':	/* add a user */
+ 			aflg = true;
+ 			user = optarg;
+-- 
+cgit v1.1
+
diff -pruN 1:4.8.1-1ubuntu6/debian/patches/series 1:4.8.1-1ubuntu7/debian/patches/series
--- 1:4.8.1-1ubuntu6/debian/patches/series	2020-02-07 15:32:06.000000000 +0000
+++ 1:4.8.1-1ubuntu7/debian/patches/series	2020-12-02 10:44:02.000000000 +0000
@@ -20,3 +20,4 @@
 1013_extrausers_deluser.patch
 1014_extrausers_delgroup.patch
 1015_add_zsys_support.patch
+1016_extrausers_gpasswd.patch