Please merge 3.134 into mantic

[Mateus Rodrigues de Morais]

The upstream version 3.134 should be merged into mantic. The current version is 3.129ubuntu1.

See the merge conflict report: https://merges.ubuntu.com/a/adduser/REPORT

Note: this is a tracking bug

PPA for review: https://launchpad.net/~mateus-morais/+archive/ubuntu/adduser-merge-mantic-3.134-lp2021498

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "debdiff between debian adduser 1.134 and 1.134ubuntu1" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

[Benjamin Drung (bdrung)]

I reviewed https://salsa.debian.org/mateus-morais/adduser/-/tree/ubuntu/devel since that was the easiest way for me. I have some remarks:

* Your ubuntu/devel branch should be based on the released commit (The top commit "prepare new version" is not released yet)
* The rebase/merge for doc/adduser.8 looks incorrect (see comment on https://salsa.debian.org/debian/adduser/-/merge_requests/87)
* Will you add the test case for https://salsa.debian.org/debian/adduser/-/merge_requests/87 to the Ubuntu package?
* The upstream changes to adduser.conf should be incorporated in our rebase/merge (see commit "Enable private home directories by default" and "Allow uppercase letters in the names of system users")
* Please forward the two d/t/f/firstlastuidgid.t fixes to Debian (you can reference the merge request numbers in d/changelog then)
* "Fix failing tests by smartly incrementing test uids and gids" add some trailing spaces to d/t/f/firstlastuidgid.t
* d/changelog: "Rename NAME_REGEX_SYSTEM to SYS_NAME_REGEX" should be dropped. And "AdduserCommon.pm, adduser.conf: Change default SYS_NAME_REGEX to allow uppercase letters in the names of system users" should be moved to the "Remaining changes" list.

I unsubscribed ~ubuntu-sponsors.

[Mateus Rodrigues de Morais (mateus-morais)]

bdrung: thanks for your review! I addressed your requests accordingly:

* Fixed ubuntu/devel rebase on correct commit
* Fixed doc/adduser.8 rebase (on both the merge and the encrypt home MR)
* Yes, I added the test case to make our testing more robust and referenced the MR in d/changelog
* Fixed the adduser.conf merge changes in the comments
* Forwarded the autopkgtest fixes and referenced them in d/changelog (https://salsa.debian.org/debian/adduser/-/merge_requests/89)
* Removed the extra spaces added to d/t/f/firstlastuidgid.t
* Fixed d/changelog entries as stated

[Benjamin Drung (bdrung)]

Thanks. There are some smaller points to address. Among other things:

* "extrausers support for adduser" adds "--encrypt-home" to the --help output. That should be in the other commit.

Let us discuss/address that on Monday together.

[Benjamin Drung (bdrung)]

Uploaded adduser 3.134ubuntu1 and pushed to https://code.launchpad.net/~ubuntu-core-dev/ubuntu/+source/adduser/+git/adduser/+ref/ubuntu/devel with some small changes:

* Add commit "Update doc translation" with the changes that come from building the source
* Fix the lintian warning: debian-changelog-has-wrong-day-of-week 2023-06-20 was a Tuesday
* Changed the description of your top commit from "Changelog" to "Release adduser 3.134ubuntu1"

Thanks for your contribution and the added test case.

[Launchpad Janitor (janitor)]

This bug was fixed in the package adduser - 3.134ubuntu1

---------------
adduser (3.134ubuntu1) mantic; urgency=medium

  * Merge from Debian unstable (LP: #2021498). Remaining changes:
    - Add support for encrypting home directories (MR: !87):
      + adduser: Add --encrypt-home option, which calls ecryptfs-setup-private
        for the hard work.
      + doc/adduser.8: document the --encrypt-home option
      + debian/control: suggest ecryptfs-utils >= 67-1
      + deluser: remove all of /var/lib/ecryptfs/$user with --remove-home
    - extrausers support for adduser and gpasswd (LP: #1323732)
    - Add support for ZFS home directories (LP: #1873263)
    - Enable private home directories by default (LP: #48734)
      + Set DIR_MODE=0750 and SYS_DIR_MODE=0750 in the default adduser.conf
    - AdduserCommon.pm, adduser.conf: Change default SYS_NAME_REGEX to allow
      uppercase letters in the names of system users.
  * d/t/ecryptfs: test cases for adduser and deluser with --encrypt-home
  * Fixed failing autopkgtests (MR: !89):
    - d/t/f/adduser_system.t: Smart increment of test uid to next available
      value.
    - d/t/f/firstlastuidgid.t: Smart increment of test uid and gid values to
      next available value.
    - d/t/f/firstlastuidgid.t: Changed S4L test group first and last uid
      values to 3xx instead of 4xx to comply with SYS_UID_MAX.

adduser (3.134) unstable; urgency=medium

  * Revert "mark adduser as Protected:yes"

adduser (3.133) unstable; urgency=medium

  [ Johannes Schauer Marin Rodrigues ]
  * mark adduser as Protected:yes. This is a temporary fix for #1035694

adduser (3.132) unstable; urgency=medium

  * This is a translation/documentation only release

  [ Marc Haber ]
  * Update on Portuguese translation of man page.
    Thanks to Américo Monteiro (Closes: #1028103)

  [ Helge Kreutzmann ]
  * Fix various trivial issues in man pages.
    This partly addresses #1031081
    Thanks to Helge Kreutzmann
  * Update German translation of man page.
    Thanks to Helge Kreutzmann (Closes: #1031079)

adduser (3.131) unstable; urgency=medium

  [ Marc Haber ]
  * Fix a bug: system user names are now allowed to begin with an
    underscore. Thanks to Guillem Jover for spotting this.
  * Updated Portuguese translation of program messages.
    Thanks to Américo Monteiro (Closes: #1028147)
  * Update on Portuguese translation of man page.
    Thanks to Américo Monteiro (Closes: #1028103)
  * New Dutch translation of man page.
    Thanks to Frans Spiesschaert (Closes: #1028337)
  * Update french program translation.
    Thanks to Jean-Paul Guillonneau (Closes: #1029486)

  [ Helge Kreutzmann ]
  * Update german program translation.
    Thanks to Helge Kreutzmann (Closes: #1029572)
  * Update Dutch program translation.
    Thanks to Frans Spiesschaert (Closes: #1028336)
  * Update French translation of man page.
    Thanks to Jean-Paul Guillonneau (Closes: #1029124)

adduser (3.130) unstable; urgency=low

  [ Marc Haber ]

  * debian/NEWS: inform about planned deprecations
  * Fully implement and test (first|last)(uid|gid).
    (Closes: #579107, #344824)
  * Implement usage of UID-Pool.
    Thanks to Hilko Bengen and Christop...