diff -Nru dh-sysuser-1.3.1/debian/changelog dh-sysuser-1.3.3~18.04.sav0/debian/changelog --- dh-sysuser-1.3.1/debian/changelog 2018-03-07 00:33:07.000000000 +0000 +++ dh-sysuser-1.3.3~18.04.sav0/debian/changelog 2020-02-04 02:54:04.000000000 +0000 @@ -1,3 +1,25 @@ +dh-sysuser (1.3.3~18.04.sav0) bionic; urgency=medium + + * Backport to Bionic + + -- Rob Savoury Mon, 03 Feb 2020 18:54:04 -0800 + +dh-sysuser (1.3.3) unstable; urgency=medium + + * Do not block uninstallation if for some reason system user could not be + removed. (Closes: #901799) + * Update standards version to 4.1.4 (no changes needed) + * Use secure url when referring to debian/copyright format + + -- Dmitry Bogatov Mon, 25 Jun 2018 21:40:46 +0300 + +dh-sysuser (1.3.2) unstable; urgency=medium + + * Remove user on purge, not remove (Closes: #848239) + + Thanks: Antoine Beaupré + + -- Dmitry Bogatov Sun, 25 Mar 2018 14:58:19 +0300 + dh-sysuser (1.3.1) unstable; urgency=medium * Fix description of sysuser-helper package: s/it's/its. (Closes: #844342) diff -Nru dh-sysuser-1.3.1/debian/control dh-sysuser-1.3.3~18.04.sav0/debian/control --- dh-sysuser-1.3.1/debian/control 2018-03-07 00:33:07.000000000 +0000 +++ dh-sysuser-1.3.3~18.04.sav0/debian/control 2018-06-25 18:40:46.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Dmitry Bogatov Build-Depends: debhelper (>= 11~) -Standards-Version: 4.1.3 +Standards-Version: 4.1.4 Homepage: https://salsa.debian.org/runit-team/dh-sysuser Vcs-Git: https://salsa.debian.org/runit-team/dh-sysuser.git Vcs-Browser: https://salsa.debian.org/runit-team/dh-sysuser diff -Nru dh-sysuser-1.3.1/debian/copyright dh-sysuser-1.3.3~18.04.sav0/debian/copyright --- dh-sysuser-1.3.1/debian/copyright 2018-03-07 00:33:07.000000000 +0000 +++ dh-sysuser-1.3.3~18.04.sav0/debian/copyright 2018-06-25 18:40:46.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dh-sysuser Source: https://anonscm.debian.org/cgit/users/kaction-guest/dh-sysuser.git diff -Nru dh-sysuser-1.3.1/dh_sysuser dh-sysuser-1.3.3~18.04.sav0/dh_sysuser --- dh-sysuser-1.3.1/dh_sysuser 2018-03-07 00:33:07.000000000 +0000 +++ dh-sysuser-1.3.3~18.04.sav0/dh_sysuser 2018-05-12 19:52:47.000000000 +0000 @@ -123,7 +123,10 @@ B read its arguments from command line and file F.F> in pairs, first one being an username -and second one is options. +and second one is options. The configuration file or commandline +arguments must be used to create users: just calling `dh_sysuser` +without arguments does nothing. Here are the options that can be +specified after the username: =over @@ -177,6 +180,16 @@ =back +=head1 EXAMPLES + +In F.F>, this will create a B user with +defaults settings, will create a home in the default location for B, +and a custom location for B: + + foo defaults + bar home + baz home=/opt/baz + =head1 SEE ALSO useradd(8) diff -Nru dh-sysuser-1.3.1/sysuser-helper dh-sysuser-1.3.3~18.04.sav0/sysuser-helper --- dh-sysuser-1.3.1/sysuser-helper 2018-03-07 00:33:07.000000000 +0000 +++ dh-sysuser-1.3.3~18.04.sav0/sysuser-helper 2018-06-25 18:40:42.000000000 +0000 @@ -32,10 +32,12 @@ # Transition from dh-sysuser=1.3. It did not passed mainainer # script arguments to sysuser-helper. case ${1:-} in - remove|abort-install) + purge|abort-install) rmdir --ignore-fail-on-non-empty "${CONF_HOME}" if ! [ -d "${CONF_HOME}" ] ; then - userdel --force "${CONF_USERNAME}" + if ! userdel --force "${CONF_USERNAME}" ; then + echo >&2 "warning: failed to remove ${CONF_USERNAME}. Proceeding anyway." + fi fi esac esac