[Pkg-shadow-devel] [Git][debian/adduser][wip/uidpool] 9 commits: adduser (3.154) unstable; urgency=medium

Marc Haber (@zugschlus) gitlab at salsa.debian.org
Mon Jun 1 04:52:00 BST 2026



Marc Haber pushed to branch wip/uidpool at Debian / adduser


Commits:
ef6077b8 by Marc Haber at 2026-01-01T00:00:10+01:00
adduser (3.154) unstable; urgency=medium

  * The Happy New Year 2026 Release

  [ Matt Barry ]
  * add --no-copy-skel option (Closes: #1099633)
  * document --no-copy-skel
  * refactor existing_*_ok

  [ Marc Haber ]
  * make deluser --group work as documented.
  * have delgroup reject user-specific command line options.
  * correctly sanitize names in deluser.
    Thanks to Dagfinn Ilmari Mannsåker (Closes: #1109329)
  * update Swedish program and man page translation.
    Thanks to Daniel Nylander <daniel at danielnylander.se>
  * make adduser error out if --system and account has a password
    (Closes: #1099734)

[dgit import package adduser 3.154]

- - - - -
9f51b00a by Marc Haber at 2026-03-28T10:20:53+01:00
prepare release

- - - - -
da27998e by Marc Haber at 2026-03-28T10:21:10+01:00
fix typo in Portuguese

Git-Dch: ignore

- - - - -
a7de708b by Marc Haber at 2026-03-28T10:16:28+01:00
Declare fast forward from 3.154

[dgit --overwrite]

- - - - -
259fed18 by Marc Haber at 2026-06-01T05:51:57+02:00
clarify adduser pool format documentation

Git-Dch: ignore

- - - - -
b979e1ef by Marc Haber at 2026-06-01T05:51:57+02:00
remove trailing slashes from example pool directories

Git-Dch: ignore

- - - - -
402b47dd by Marc Haber at 2026-06-01T05:51:57+02:00
ignore extra fields at the end of pool file lines

- - - - -
febb7a47 by Marc Haber at 2026-06-01T05:51:57+02:00
clarify pool file read warnings

Git-Dch: ignore

- - - - -
87fdeaad by Marc Haber at 2026-06-01T05:51:57+02:00
remove trailing slaehes from pool directories

Git-Dch: ignore

- - - - -


5 changed files:

- AdduserCommon.pm
- adduser.conf
- debian/NEWS
- debian/changelog
- doc/adduser.conf.5


Changes:

=====================================
AdduserCommon.pm
=====================================
@@ -268,11 +268,12 @@ sub read_configfile {
 #  -- a hash for the pool data
 sub read_pool {
     my ($pool_file, $type, $poolref) = @_;
-    my ($name, $id, $comment, $home, $shell);
+    my ($name, $id, $comment, $home, $shell, $rest);
     my %ids = ();
     my %new;
 
     $pool_file = decode($charset, $pool_file);
+    $pool_file =~ s{/?$}{};
     if (-d $pool_file) {
         my $dir;
         unless( opendir( $dir, $pool_file) ) {
@@ -307,10 +308,10 @@ sub read_pool {
         my $new;
 
         if ($type eq "uid") {
-            ($name, $id, $comment, $home, $shell) = split (/:/);
+            ($name, $id, $comment, $home, $shell, $rest) = split (/:/);
             if (!$name || $name !~ /^([_a-zA-Z0-9-]+)$/ ||
                 !defined($id) || $id !~ /^(\d+)$/) {
-                log_warn( mtx("Couldn't parse `%s', line %d."), $pool_file, $.);
+                    log_warn( mtx("Couldn't parse uid line `%s', line %d."), $pool_file, $.);
                 next;
             }
             if( defined $name ) {
@@ -335,10 +336,10 @@ sub read_pool {
                 'shell' => $shell
             };
         } elsif ($type eq "gid") {
-            ($name, $id) = split (/:/);
+            ($name, $id, $rest) = split (/:/);
             if (!$name || $name !~ /^([_a-zA-Z0-9-]+)$/ ||
                 !defined($id) || $id !~ /^(\d+)$/) {
-                log_warn( mtx("Couldn't parse `%s', line %d."), $pool_file, $. );
+                    log_warn( mtx("Couldn't parse gid line `%s', line %d."), $pool_file, $. );
                 next;
             }
             if( defined $name ) {


=====================================
adduser.conf
=====================================
@@ -49,9 +49,9 @@
 
 # Specify a file or a directory containing UID and GID pool.
 #UID_POOL=/etc/adduser-pool.conf
-#UID_POOL=/etc/adduser-pool.d/
+#UID_POOL=/etc/adduser-pool.d
 #GID_POOL=/etc/adduser-pool.conf
-#GID_POOL=/etc/adduser-pool.d/
+#GID_POOL=/etc/adduser-pool.d
 #RESERVE_UID_POOL=yes
 #RESERVE_GID_POOL=yes
 


=====================================
debian/NEWS
=====================================
@@ -1,4 +1,4 @@
-adduser (3.155) UNRELEASED; urgency=medium
+adduser (3.155) unstable; urgency=medium
 
   The GROUPHOMES, LETTERHOMES, SGID_HOME and QUOTAUSER options were
   depreated for a while and got removed in this release.


=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-adduser (3.155) UNRELEASED; urgency=medium
+adduser (3.155) unstable; urgency=medium
 
   [ Marc Haber ]
   * remove GROUPHOMES and LETTERHOMES configuration options
@@ -24,7 +24,7 @@ adduser (3.155) UNRELEASED; urgency=medium
   * write test cases to trigger #1125601
   * Updated German man page translation.
     Thanks to Helge Kreutzmann (Closes: #1125135)
-  * Updated Portguese man page and program translation.
+  * Updated Portuguese man page and program translation.
     Thanks to Américo Monteiro (Closes: #1118370)
   * Updated Dutch man page translation.
     Thanks to Frans Spiesschaert (Closes: #1118209)
@@ -33,7 +33,7 @@ adduser (3.155) UNRELEASED; urgency=medium
   * Add adduser --unlock [--system] and deluser --lock [--system]
     (Closes: #1008082, #1008083, #1008084)
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Fri, 27 Mar 2026 21:52:48 +0100
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Sat, 28 Mar 2026 10:16:28 +0100
 
 adduser (3.154) unstable; urgency=medium
 


=====================================
doc/adduser.conf.5
=====================================
@@ -203,6 +203,8 @@ shell (ditto).
 .PP
 It is possible to use the same file/directory for
 \fBUID_POOL\fP and \fBGID_POOL\fP.
+But you cannot copy lines from \fI/etc/passwd\fP or \fI/etc/group\fP
+since pool file lines have less fields.
 .PP
 If an account / group is created,
 \fBadduser\fP(8) searches in all UID/GID pool files



View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/16d381b86a369d7130d791e51a298c07b217f992...87fdeaad272d2aaf353fc6e4fd0fe39b68d0ded1

-- 
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/16d381b86a369d7130d791e51a298c07b217f992...87fdeaad272d2aaf353fc6e4fd0fe39b68d0ded1
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-shadow-devel/attachments/20260601/96096f7f/attachment-0001.htm>


More information about the Pkg-shadow-devel mailing list