[Pkg-shadow-devel] [Git][debian/adduser][debian/latest] 6 commits: fix typos and add missing spaces
Marc Haber (@zugschlus)
gitlab at salsa.debian.org
Wed Oct 28 10:58:07 GMT 2026
Marc Haber pushed to branch debian/latest at Debian / adduser
Commits:
fe72b17f by Marc Haber at 2026-10-25T18:23:59+01:00
fix typos and add missing spaces
Thanks: Helge Kreutzmann
Closes: #1140472
- - - - -
084ebb2f by Marc Haber at 2026-10-25T18:25:01+01:00
Apply consistent formatting to packaging files
Run `debputy reformat --style black` and `wrap-and-sort -vast` to enforce
uniform deb822 formatting with one item per line. This makes future
changes to dependencies and other lists easier to track in git diffs.
No functional changes.
- - - - -
fccff133 by Marc Haber at 2026-10-25T18:25:26+01:00
Bump Debian Policy version to 4.7.4
No changes required after reviewing checklist at
https://www.debian.org/doc/debian-policy/upgrading-checklist.html#version-4_7_4
- - - - -
07363c0d by Marc Haber at 2026-10-25T18:25:38+01:00
Fix issues found by Shellcheck
Apply all fixes suggested by Shellcheck that can be applied automatically in
a way that is unlikely to change functionality, only make the syntax more
robust to protect from unintentional use and side effect.
- - - - -
96a1699e by Marc Haber at 2026-10-25T18:25:50+01:00
Fix spelling
Fix minor typos and spelling mistakes that can be automatically corrected.
No functional changes.
- - - - -
7f02f314 by Marc Haber at 2026-10-25T18:26:10+01:00
fix typos
Git-Dch: ignore
- - - - -
15 changed files:
- AdduserCommon.pm
- debian/NEWS
- debian/README
- debian/README.source
- debian/TODO
- debian/control
- debian/examples
- debian/links
- debian/manpages
- debian/tests/control
- debian/tests/f/cron_jobs.t
- debian/tests/f/firstlastuidgid.t
- debian/tests/f/valid_username.t
- debian/tests/lib/AdduserTestsCommon.pm
- debian/tests/no-autopkgtest
Changes:
=====================================
AdduserCommon.pm
=====================================
@@ -345,7 +345,7 @@ sub read_configfile {
my $conffh;
unless( open ($conffh, q{<}, $conf_file) ) {
- log_fatal( mtx("Can not open configuration file %s: `%s'\n"), $conf_file, $! );
+ log_fatal( mtx("Cannot open configuration file %s: `%s'\n"), $conf_file, $! );
exit( RET_CONFFILE );
}
while (<$conffh>) {
=====================================
debian/NEWS
=====================================
@@ -57,13 +57,13 @@ adduser (3.130) unstable; urgency=low
installations are probably using a directory service like LDAP and Active
Directory to manage their users and do not use adduser anyway. If you're
using one of these options and want them to stay, please write that to
- #1025623 and let us know. Some kind of help and committment, for example
+ #1025623 and let us know. Some kind of help and commitment, for example
verified autopkgtest scripts, would be appreciated and make it easier for
us to keep the feature around.
We are planning to deprecate and remove the QUOTAUSER configuration
option. If you're using this, please write that to #1026898 and let us
- know. Some kind of help and committment, for example verified autopkg
+ know. Some kind of help and commitment, for example verified autopkg
testscripts, would be appreciated and make it easier for us to keep
the feature around.
=====================================
debian/README
=====================================
@@ -1,4 +1,4 @@
-This document was last touched in Februar 2025.
+This document was last touched in February 2025.
adduser in Debian
=================
@@ -112,7 +112,7 @@ postinst when your package gets reinstalled.
Locking and unlocking system accounts should be handled by adduser.
Currently, it doesn't. See bug #1008082 for this discussion. The goal is
to enable the local admin to choose whether purging a package should
-remove a system account or just lock it. For othogonality, there should
+remove a system account or just lock it. For orthogonality, there should
also be a possibility to undo this operation within adduser. For a
regular user account, the local admin is better served with calling
usermod --lock and usermod --unlock to do this.
=====================================
debian/README.source
=====================================
@@ -35,7 +35,7 @@ debian/latest: the latest Debian packaging. This branch should always be
and/or unstable
debian/releasename: security, stable updates. branched off debian/latest
when needed from the appropriate debian/<number> tag.
-debian/unstable: only exists when unstable work was neeed while
+debian/unstable: only exists when unstable work was needed while
debian/latest holds an experimental branch. branched off
debian/latest from the latest debian/<number> tag that got
uploaded to unstable
@@ -62,7 +62,7 @@ The package has two distinct rather extensive test suites: One that can be
considered "upstream", in "testsuite", and an autopkgtest test suite in
debian/tests. All bug fixes and features should be accompanied by appropriate
test cases. In case of a bug fix, a test case should be written first and
-committed separatly, so that the test can be cherry-picked and proven to fail
+committed separately, so that the test can be cherry-picked and proven to fail
without the fix.
Autopkgtest needs a full perl to run, adduser is specified to run without full
=====================================
debian/TODO
=====================================
@@ -20,7 +20,7 @@ For adduser 3.x there is to do:
for removal in bookworm+2.
* The --force-badname command line is deprecated as of bookworm+1.
- Run-time warnings shold be added to notify users of the change;
+ Run-time warnings should be added to notify users of the change;
the feature is slated for removal in bookworm+2.
* get rid of --no-preserve-root, refuse removing the root account in any case
=====================================
debian/control
=====================================
@@ -2,19 +2,31 @@ Source: adduser
Section: admin
Priority: important
Maintainer: Debian Adduser Developers <adduser at packages.debian.org>
-Uploaders: Marc Haber <mh+debian-packages at zugschlus.de>
-Standards-Version: 4.7.2
-Build-Depends: debhelper-compat (= 13), po4a
-Build-Depends-Indep: gettext
+Uploaders:
+ Marc Haber <mh+debian-packages at zugschlus.de>,
+Standards-Version: 4.7.4
+Build-Depends:
+ debhelper-compat (= 13),
+ po4a,
+Build-Depends-Indep:
+ gettext,
Vcs-Browser: https://salsa.debian.org/debian/adduser
Vcs-Git: https://salsa.debian.org/debian/adduser.git
Package: adduser
Architecture: all
Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
-Depends: passwd (>= 1:4.19.0-4), ${misc:Depends}
-Suggests: liblocale-gettext-perl, perl, cron, quota, ecryptfs-utils (>= 67-1)
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ passwd (>= 1:4.19.0-4),
+ ${misc:Depends},
+Suggests:
+ cron,
+ ecryptfs-utils (>= 67-1),
+ liblocale-gettext-perl,
+ perl,
+ quota,
Description: add and remove users and groups
This package includes the 'adduser' and 'deluser' commands for creating
and removing users.
=====================================
debian/examples
=====================================
@@ -1,3 +1,3 @@
-examples/*
adduser.conf
deluser.conf
+examples/*
=====================================
debian/links
=====================================
@@ -8,16 +8,16 @@ ${MANDIR}/man8/adduser.8 ${MANDIR}/man8/addgroup.8
${MANDIR}/man8/deluser.8 ${MANDIR}/man8/delgroup.8
EOLINKS
-cd debian/adduser > /dev/null
+cd debian/adduser > /dev/null || exit
-for MPLANG in $(find ${MANDIR} -mindepth 1 -maxdepth 1 -type d -name 'man?' -prune -o -printf '%f\n'); do
- if [ -e "${MANDIR}/${MPLANG}/man8/adduser.local.8" ]; then
+for MPLANG in $(find "${MANDIR}" -mindepth 1 -maxdepth 1 -type d -name 'man?' -prune -o -printf '%f\n'); do
+ if [[ -e "${MANDIR}/${MPLANG}/man8/adduser.local.8" ]]; then
printf "%s/%s/man8/adduser.local.8 %s/%s/man8/deluser.local.8\\n" "${MANDIR}" "${MPLANG}" "${MANDIR}" "${MPLANG}"
fi
- if [ -e "${MANDIR}/${MPLANG}/man8/adduser.8" ]; then
+ if [[ -e "${MANDIR}/${MPLANG}/man8/adduser.8" ]]; then
printf "%s/%s/man8/adduser.8 %s/%s/man8/addgroup.8\\n" "${MANDIR}" "${MPLANG}" "${MANDIR}" "${MPLANG}"
fi
- if [ -e "${MANDIR}/${MPLANG}/man8/deluser.8" ]; then
+ if [[ -e "${MANDIR}/${MPLANG}/man8/deluser.8" ]]; then
printf "%s/%s/man8/deluser.8 %s/%s/man8/delgroup.8\\n" "${MANDIR}" "${MPLANG}" "${MANDIR}" "${MPLANG}"
fi
done
=====================================
debian/manpages
=====================================
@@ -9,19 +9,19 @@ doc/deluser.conf.5
EOMAN
for MPLANG in $(find doc/ -maxdepth 1 -type f -name '*.??.?' -printf '%f\n' | sed 's/.*\.\(..\)\../\1/' |sort -u); do
- if [ -e "doc/adduser.${MPLANG}.8" ]; then
+ if [[ -e "doc/adduser.${MPLANG}.8" ]]; then
printf "doc/adduser.%s.8\\n" "${MPLANG}"
fi
- if [ -e "doc/adduser.conf.${MPLANG}.5" ]; then
+ if [[ -e "doc/adduser.conf.${MPLANG}.5" ]]; then
printf "doc/adduser.conf.%s.5\\n" "${MPLANG}"
fi
- if [ -e "doc/adduser.local.${MPLANG}.8" ]; then
+ if [[ -e "doc/adduser.local.${MPLANG}.8" ]]; then
printf "doc/adduser.local.%s.8\\n" "${MPLANG}"
fi
- if [ -e "doc/deluser.${MPLANG}.8" ]; then
+ if [[ -e "doc/deluser.${MPLANG}.8" ]]; then
printf "doc/deluser.%s.8\\n" "${MPLANG}"
fi
- if [ -e "doc/deluser.conf.${MPLANG}.5" ]; then
+ if [[ -e "doc/deluser.conf.${MPLANG}.5" ]]; then
printf "doc/deluser.conf.%s.5\\n" "${MPLANG}"
fi
done
=====================================
debian/tests/control
=====================================
@@ -2,31 +2,70 @@
# after apt purge perl if you want to test operation without full perl
Test-Command: /usr/bin/prove -v debian/tests/f
-Depends: @, cron, perl, login
-Restrictions: needs-root
-Features: test-name=debian-tests-f
+Depends:
+ cron,
+ login,
+ perl,
+ @,
+Restrictions:
+ needs-root,
+Features:
+ test-name=package-test-suite,
Test-Command: /usr/bin/prove -p -v debian/tests/ecryptfs
-Depends: cron, ecryptfs-utils, kmod, perl
-Restrictions: allow-stderr isolation-machine needs-root
-Features: test-name=ecryptfs-with-pkg
+Depends:
+ cron,
+ ecryptfs-utils,
+ kmod,
+ perl,
+Restrictions:
+ allow-stderr,
+ isolation-machine,
+ needs-root,
+Features:
+ test-name=ecryptfs-with-pkg,
Test-Command: /usr/bin/prove -p -v debian/tests/ecryptfs-no-package
-Depends: cron, kmod, perl
-Restrictions: allow-stderr isolation-machine needs-root
-Features: test-name=ecryptfs-without-pkg
+Depends:
+ cron,
+ kmod,
+ perl,
+Restrictions:
+ allow-stderr,
+ isolation-machine,
+ needs-root,
+Features:
+ test-name=ecryptfs-without-pkg,
Test-Command: cd testsuite/ && ./runsuite.sh
-Depends: @, cron, perl, login
-Restrictions: allow-stderr breaks-testbed needs-root
-Features: test-name=upstream-test-suite-full
+Depends:
+ cron,
+ login,
+ perl,
+ @,
+Restrictions:
+ allow-stderr,
+ breaks-testbed,
+ needs-root,
+Features:
+ test-name=upstream-test-suite-full,
Test-Command: cd testsuite/ && ./runsuite.sh
-Depends: @, login
-Restrictions: allow-stderr breaks-testbed needs-root
-Features: test-name=upstream-test-suite-minimal
+Depends:
+ login,
+ @,
+Restrictions:
+ allow-stderr,
+ breaks-testbed,
+ needs-root,
+Features:
+ test-name=upstream-test-suite-minimal,
Test-Command: /usr/sbin/adduser --system austc3
-Depends: @, login
-Restrictions: needs-root
-Features: test-name=basic-system-user
+Depends:
+ login,
+ @,
+Restrictions:
+ needs-root,
+Features:
+ test-name=basic-system-user,
=====================================
debian/tests/f/cron_jobs.t
=====================================
@@ -2,7 +2,7 @@
# Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1006899
-# this test is skipped if /usr/bin/crontab is not foudn
+# this test is skipped if /usr/bin/crontab is not found
use diagnostics;
use strict;
=====================================
debian/tests/f/firstlastuidgid.t
=====================================
@@ -553,7 +553,7 @@ assert_usergroup_loop({prefix => 'u3a', system => 0, firstuid => 6100, firstgid
assert_command_success("true u3a2: FIRST_UID=6100 FIRST_GID=6150");
assert_plain_usergroup_loop({prefix => 'u3a2', system => 0, firstuid => 6100, expected_uidgid => 6150, via_cli => 0});
-# test group U4A: ranges requested by config, overriden by command line
+# test group U4A: ranges requested by config, overridden by command line
assert_usergroup_loop({prefix => 'u4a', system => 0, firstuid => 6200, firstgid => 6250, fuid => 6940, fgid => 6950});
@@ -587,7 +587,7 @@ assert_usergroup_loop({prefix => 's3a', system => 1, firstuid => 730, firstgid =
assert_plain_usergroup_loop({prefix => 's3a2', system => 1, firstuid => 730, via_cli => 0});
-# test group S4A: ranges requested by config, overriden by command line
+# test group S4A: ranges requested by config, overridden by command line
assert_usergroup_loop({prefix => 's4a', system => 1, firstuid => 760, firstgid => 780, fuid => 890, fgid => 900});
@@ -615,7 +615,7 @@ apply_config_hash(\%confhash);
assert_command_success("true firstuid=2090 firstgid=2190 lastuid=2093 lastgid=2193");
assert_usergroup_loop_to_exhaustion({prefix => 'u3l', system => 0, firstuid => 2090, lastuid => 2093, firstgid => 2190, lastgid => 2193, fuid => 3750, fgid => 3761, via_cli => 0});
-# test group U4L: ranges requested by config, overriden by command line
+# test group U4L: ranges requested by config, overridden by command line
assert_usergroup_loop_to_exhaustion({prefix => 'u4l', system => 0, firstuid => 2290, lastuid => 2293, firstgid => 2390, lastgid => 2393, fuid => 3750, fgid => 3761});
@@ -638,7 +638,7 @@ apply_config_hash(\%confhash);
assert_command_success("true firstsysuid=410 firstsysgid=510 lastsysuid=413 lastsysgid=513");
assert_usergroup_loop_to_exhaustion({prefix => 's3l', system => 1, firstuid => 410, lastuid => 413, firstgid => 510, lastgid => 513, fuid => 710, fgid => 760, via_cli => 0});
-# test group S4L: ranges requested by config, overriden by command line
+# test group S4L: ranges requested by config, overridden by command line
assert_usergroup_loop_to_exhaustion({prefix => 's4l', system => 1, firstuid => 320, lastuid => 323, firstgid => 520, lastgid => 523, fuid => 720, fgid => 770});
=====================================
debian/tests/f/valid_username.t
=====================================
@@ -166,7 +166,7 @@ test_name("\\}b", FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, FAIL|ALL,
# windows conventions
test_name('machine$', PASS,
$pat{ieee}, PASS);
-# useradd 4.17.2 doesnt accept \ any more
+# useradd 4.17.2 doesn't accept \ any more
test_name('DOMAIN\user', FAIL, FAIL|BAD, FAIL|FBAD, FAIL|ABAD, FAIL|ALL,
$pat{min}, FAIL);
@@ -193,7 +193,7 @@ test_name("test/slash", FAIL,
$pat{min}, FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, FAIL|ALL);
# some stranger choices
-# useradd 4.17.2 does not acccept *, > and % any more
+# useradd 4.17.2 does not accept *, > and % any more
test_name('*', FAIL|BAD, FAIL|ABAD, FAIL|FBAD, FAIL|ALL, $pat{min}, FAIL);
test_name('3>6', FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, FAIL|ALL, $pat{min}, FAIL);
test_name('.com', FAIL, PASS|BAD, PASS|ABAD, PASS|FBAD, PASS|ALL, $pat{min}, PASS);
=====================================
debian/tests/lib/AdduserTestsCommon.pm
=====================================
@@ -614,7 +614,7 @@ sub user_uid_exists {
}
sub assert_user_has_disabled_password {
- # this should be changed to check against the varios ways of
+ # this should be changed to check against the various ways of
# checking an account: !, * in shadow, and expiry. It should change
# to a two-argument variant that checks for certain kind of lock
my $user = shift;
=====================================
debian/tests/no-autopkgtest
=====================================
@@ -8,7 +8,7 @@ set -e
cd testsuite && ./runsuite.sh
cd ..
for t in debian/tests/f/*.t; do
- ./$t;
+ ./"$t";
done
echo "all tests run"
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/80c8f4b2c6a68838600a4df99ccf1d807fb8e189...7f02f31460228373d98b259971a93e44620ca475
--
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/80c8f4b2c6a68838600a4df99ccf1d807fb8e189...7f02f31460228373d98b259971a93e44620ca475
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/20261028/e96b87f5/attachment-0001.htm>
More information about the Pkg-shadow-devel
mailing list