diff -Nru shadow-4.8.1/debian/changelog shadow-4.8.1/debian/changelog --- shadow-4.8.1/debian/changelog 2021-06-17 14:35:15.000000000 -0500 +++ shadow-4.8.1/debian/changelog 2021-11-15 16:13:44.000000000 -0600 @@ -1,3 +1,66 @@ +shadow (1:4.8.1-2ubuntu1) jammy; urgency=low + + * Merge from Debian unstable (LP: #1951161). Remaining changes: + - debian/login.defs: + + Update documentation of USERGROUPS_ENAB: with pam_umask, the UPG + handling does not only apply to "former (pre-PAM) uses". + + Update documentation of UMASK: Explain that USERGROUPS_ENAB + will modify this default for UPGs. + - debian/{source_shadow.py,login.install}: Add apport hook + - debian/patches/1010_extrausers.patch: Add support to passwd for + libnss-extrausers + - debian/patches/1011_extrausers_toggle.patch: extrausers support for + useradd and groupadd + - debian/patches/1014_extrausers_delgroup.patch + + add --extrausers option to "groupdel" + - debian/patches/1013_extrausers_deluser.patch + + add --extrausers option to "userdel" + - debian/patches/1012_extrausers_chfn.patch + + add support for --extrausers to the chfn tool + - debian/patches/1015_add_zsys_support.patch + + Call zsys to handle home directory if available. + - debian/patches/1016_extrausers_gpasswd.patch + + Add support for extrausers in gpasswd. + - debian/patches/506_relaxed_usernames.patch + + disallow purely numeric usernames + * Dropped changes, included in Debian: + - debian/passwd.maintscripts: Clean up upstart configuration + + -- William 'jawn-smith' Wilson Mon, 15 Nov 2021 16:13:44 -0600 + +shadow (1:4.8.1-2) unstable; urgency=medium + + * debian/control: Switch to libsemanage-dev from libsemanage1-dev + (Closes: #998633) + * ACK NMU, thanks for all the changes + * Make passwd recommend sensible-utils because vipw uses sensible-editor + * Add files to debian/not-installed or install them when they were missed + This change ships a few more man page translations + * debian/control: Bump debhelper-compat version to 13 + * List man pages to install in debian/*.manpages instead of in + debian/*.install + * Clean up debian/control using 'cme fix dpkg-control' + * Rename deprecated debian/passwd.tmpfile to debian/passwd.tmpfiles + * debian/control: Revert to my personal email address in the Maintainer field + + -- Balint Reczey Wed, 10 Nov 2021 10:39:04 +0100 + +shadow (1:4.8.1-1.1) unstable; urgency=medium + + [ Johannes Schauer Marin Rodrigues ] + * Non-maintainer upload. + + [ Niels Thykier ] + * Remove obsolete login.preinst + * Remove obsolete code from passwd maintscripts + + [ Helmut Grohne ] + * logoutd is gone since at least buster (closes: #989712) + * Delete duplicate subuid/subgid creation. + * login.postinstd support for DPKG_ROOT (closes: #992578) + + -- Johannes Schauer Marin Rodrigues Sat, 23 Oct 2021 21:04:57 +0200 + shadow (1:4.8.1-1ubuntu9) impish; urgency=medium * Disallow purely numeric usernames. This includes hexadecimal and diff -Nru shadow-4.8.1/debian/control shadow-4.8.1/debian/control --- shadow-4.8.1/debian/control 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/control 2021-11-15 16:13:37.000000000 -0600 @@ -1,11 +1,11 @@ Source: shadow Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Shadow package maintainers -Uploaders: Balint Reczey , +Uploaders: Balint Reczey , Serge Hallyn Section: admin Priority: required -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), gettext, libpam0g-dev, quilt, @@ -14,13 +14,13 @@ docbook-xml, libxml2-utils, libselinux1-dev [linux-any], - libsemanage1-dev [linux-any], + libsemanage-dev [linux-any], itstool, bison, libaudit-dev [linux-any] -Standards-Version: 3.9.5 -Vcs-Git: https://salsa.debian.org/debian/shadow -b master +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/debian/shadow +Vcs-Git: https://salsa.debian.org/debian/shadow -b master Homepage: https://github.com/shadow-maint/shadow Rules-Requires-Root: binary-targets @@ -30,8 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-modules -Replaces: manpages-tr (<< 1.0.5), - manpages-zh (<< 1.5.1-1) +Recommends: sensible-utils Description: change and administer password and group data This package includes passwd, chsh, chfn, and many other programs to maintain password and group data. @@ -45,22 +44,11 @@ Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime, - libpam-modules (>= 1.1.8-1) -Breaks: coreutils (<< 8.21~) [hurd-any], - passwd (<< 1:4.1.5.1-2~) [hurd-any], - hurd (<< 20140206~) [hurd-any], + libpam-modules +Breaks: hurd (<< 20140206~) [hurd-any], util-linux (<< 2.32-0.2~) -Conflicts: gnunet (<< 0.7.0c-2), - amavisd-new (<< 2.3.3-8), - python-4suite (<< 0.99cvs20060405-1), - backupninja (<< 0.9.3-5), - echolot (<< 2.1.8-4) -Replaces: manpages-de (<< 0.5-3), - manpages-tr (<< 1.0.5), - manpages-zh (<< 1.5.1-1), - passwd (<< 1:4.1.5.1-2~) [hurd-any], - coreutils (<< 8.21~) [hurd-any], - hurd (<< 20140206~) [hurd-any] +Conflicts: python-4suite (<< 0.99cvs20060405-1) +Replaces: hurd (<< 20140206~) [hurd-any] Description: system login tools This package provides some required infrastructure for logins and for changing effective user or group IDs, including: diff -Nru shadow-4.8.1/debian/login.install shadow-4.8.1/debian/login.install --- shadow-4.8.1/debian/login.install 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/login.install 2021-11-11 09:42:38.000000000 -0600 @@ -1,22 +1,6 @@ debian/login.defs etc debian/source_shadow.py usr/share/apport/package-hooks usr/share/locale/*/LC_MESSAGES/shadow.mo -usr/share/man/*/man1/login.1 -usr/share/man/*/man1/newgrp.1 -usr/share/man/*/man1/sg.1 -usr/share/man/*/man5/faillog.5 -usr/share/man/*/man5/login.defs.5 -usr/share/man/*/man8/faillog.8 -usr/share/man/*/man8/lastlog.8 -usr/share/man/*/man8/nologin.8 -usr/share/man/man1/login.1 -usr/share/man/man1/newgrp.1 -usr/share/man/man1/sg.1 -usr/share/man/man5/faillog.5 -usr/share/man/man5/login.defs.5 -usr/share/man/man8/faillog.8 -usr/share/man/man8/lastlog.8 -usr/share/man/man8/nologin.8 usr/sbin/nologin usr/bin/faillog usr/bin/lastlog diff -Nru shadow-4.8.1/debian/login.manpages shadow-4.8.1/debian/login.manpages --- shadow-4.8.1/debian/login.manpages 1969-12-31 18:00:00.000000000 -0600 +++ shadow-4.8.1/debian/login.manpages 2021-11-10 03:39:04.000000000 -0600 @@ -0,0 +1,16 @@ +usr/share/man/*/man1/login.1 +usr/share/man/*/man1/newgrp.1 +usr/share/man/*/man1/sg.1 +usr/share/man/*/man5/faillog.5 +usr/share/man/*/man5/login.defs.5 +usr/share/man/*/man8/faillog.8 +usr/share/man/*/man8/lastlog.8 +usr/share/man/*/man8/nologin.8 +usr/share/man/man1/login.1 +usr/share/man/man1/newgrp.1 +usr/share/man/man1/sg.1 +usr/share/man/man5/faillog.5 +usr/share/man/man5/login.defs.5 +usr/share/man/man8/faillog.8 +usr/share/man/man8/lastlog.8 +usr/share/man/man8/nologin.8 diff -Nru shadow-4.8.1/debian/login.postinst shadow-4.8.1/debian/login.postinst --- shadow-4.8.1/debian/login.postinst 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/login.postinst 2021-11-11 09:42:38.000000000 -0600 @@ -2,55 +2,29 @@ set -e -if test "$1" = configure -then - if test -f /etc/init.d/logoutd - then - if test "$(md5sum /etc/init.d/logoutd)" = "9080f92783dd53f6f2108e698c06bd53 /etc/init.d/logoutd" - then - echo "removing logoutd cruft" - rm /etc/init.d/logoutd - update-rc.d logoutd remove - fi - fi -fi -rm -f /etc/pam.d/login.pre-upgrade 2>/dev/null if [ "$1" = "configure" ]; then # Install faillog during initial installs only - if [ "$2" = "" ] && [ ! -f /var/log/faillog ] ; then - touch /var/log/faillog - chown root:root /var/log/faillog - chmod 644 /var/log/faillog + if [ "$2" = "" ] && [ ! -f "$DPKG_ROOT/var/log/faillog" ] ; then + touch "$DPKG_ROOT/var/log/faillog" + chown 0:0 "$DPKG_ROOT/var/log/faillog" + chmod 644 "$DPKG_ROOT/var/log/faillog" fi # Create subuid/subgid if missing - if [ ! -e /etc/subuid ]; then - touch /etc/subuid - chown root:root /etc/subuid - chmod 644 /etc/subuid + if [ ! -e "$DPKG_ROOT/etc/subuid" ]; then + touch "$DPKG_ROOT/etc/subuid" + chown 0:0 "$DPKG_ROOT/etc/subuid" + chmod 644 "$DPKG_ROOT/etc/subuid" fi - if [ ! -e /etc/subgid ]; then - touch /etc/subgid - chown root:root /etc/subgid - chmod 644 /etc/subgid + if [ ! -e "$DPKG_ROOT/etc/subgid" ]; then + touch "$DPKG_ROOT/etc/subgid" + chown 0:0 "$DPKG_ROOT/etc/subgid" + chmod 644 "$DPKG_ROOT/etc/subgid" fi fi - # Create subuid/subgid if missing - if [ ! -e /etc/subuid ]; then - touch /etc/subuid - chown root:root /etc/subuid - chmod 644 /etc/subuid - fi - - if [ ! -e /etc/subgid ]; then - touch /etc/subgid - chown root:root /etc/subgid - chmod 644 /etc/subgid - fi - #DEBHELPER# exit 0 diff -Nru shadow-4.8.1/debian/login.preinst shadow-4.8.1/debian/login.preinst --- shadow-4.8.1/debian/login.preinst 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/login.preinst 1969-12-31 18:00:00.000000000 -0600 @@ -1,52 +0,0 @@ -#! /bin/sh - -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -remove_md5() { - if md5sum $1 2>/dev/null |grep -q $2; then - cp $1 $1.pre-upgrade - sed -e '/^[^#][ \t]*assword[ \t]*required[ \t]*pam_unix.so/ s/ md5$//' $1 >$1.post-upgrade \ - && mv $1.post-upgrade $1 - fi - } - - -case "$1" in - install|upgrade) - if [ "x$2" != "x" ] ; then - if dpkg --compare-versions $2 lt 1:4.0.3 ; then - remove_md5 /etc/pam.d/login 5e61c3334e25625fe1fa4d79cf9123ff - fi - fi - - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru shadow-4.8.1/debian/not-installed shadow-4.8.1/debian/not-installed --- shadow-4.8.1/debian/not-installed 1969-12-31 18:00:00.000000000 -0600 +++ shadow-4.8.1/debian/not-installed 2021-11-10 03:39:04.000000000 -0600 @@ -0,0 +1,35 @@ +bin/groups +etc/default/useradd +etc/login.defs +etc/pam.d/chfn +etc/pam.d/chage +etc/pam.d/chpasswd +etc/pam.d/chsh +etc/pam.d/groupadd +etc/pam.d/groupdel +etc/pam.d/groupmems +etc/pam.d/groupmod +etc/pam.d/login +etc/pam.d/newusers +etc/pam.d/passwd +etc/pam.d/useradd +etc/pam.d/userdel +etc/pam.d/usermod +usr/bin/sg +usr/sbin/logoutd +usr/sbin/vigr +usr/share/man/*/man1/groups.1 +usr/share/man/*/man1/logoutd.1 +usr/share/man/*/man1/su.1 +usr/share/man/*/man3/getspnam.3 +usr/share/man/*/man3/shadow.3 +usr/share/man/*/man5/suauth.5 +usr/share/man/*/man8/logoutd.8 +usr/share/man/man1/groups.1 +usr/share/man/man1/logoutd.1 +usr/share/man/man1/su.1 +usr/share/man/man3/getspnam.3 +usr/share/man/man3/shadow.3 +usr/share/man/man5/suauth.5 +usr/share/man/man8/logoutd.8 + diff -Nru shadow-4.8.1/debian/passwd.install shadow-4.8.1/debian/passwd.install --- shadow-4.8.1/debian/passwd.install 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/passwd.install 2021-11-11 09:42:38.000000000 -0600 @@ -24,60 +24,3 @@ usr/sbin/userdel usr/sbin/usermod usr/sbin/vipw -usr/share/man/*/man1/chage.1 -usr/share/man/*/man1/chfn.1 -usr/share/man/*/man1/chsh.1 -usr/share/man/*/man1/expiry.1 -usr/share/man/*/man1/gpasswd.1 -usr/share/man/*/man1/passwd.1 -usr/share/man/*/man5/passwd.5 -usr/share/man/*/man5/shadow.5 -usr/share/man/*/man5/gshadow.5 -usr/share/man/*/man8/chpasswd.8 -usr/share/man/*/man8/groupadd.8 -usr/share/man/*/man8/groupdel.8 -usr/share/man/*/man8/groupmod.8 -usr/share/man/*/man8/groupmems.8 -usr/share/man/*/man8/grpck.8 -usr/share/man/*/man8/grpconv.8 -usr/share/man/*/man8/grpunconv.8 -usr/share/man/*/man8/newusers.8 -usr/share/man/*/man8/pwck.8 -usr/share/man/*/man8/pwconv.8 -usr/share/man/*/man8/pwunconv.8 -usr/share/man/*/man8/useradd.8 -usr/share/man/*/man8/userdel.8 -usr/share/man/*/man8/usermod.8 -usr/share/man/*/man8/vigr.8 -usr/share/man/*/man8/vipw.8 -usr/share/man/man1/chage.1 -usr/share/man/man1/chfn.1 -usr/share/man/man1/chsh.1 -usr/share/man/man1/expiry.1 -usr/share/man/man1/gpasswd.1 -usr/share/man/man1/passwd.1 -usr/share/man/man5/passwd.5 -usr/share/man/man5/shadow.5 -usr/share/man/man5/gshadow.5 -usr/share/man/man5/subuid.5 -usr/share/man/man5/subgid.5 -usr/share/man/man5/subgid.5 -usr/share/man/man5/subuid.5 -usr/share/man/man8/chgpasswd.8 -usr/share/man/man8/chpasswd.8 -usr/share/man/man8/groupadd.8 -usr/share/man/man8/groupdel.8 -usr/share/man/man8/groupmems.8 -usr/share/man/man8/groupmod.8 -usr/share/man/man8/grpck.8 -usr/share/man/man8/grpconv.8 -usr/share/man/man8/grpunconv.8 -usr/share/man/man8/newusers.8 -usr/share/man/man8/pwck.8 -usr/share/man/man8/pwconv.8 -usr/share/man/man8/pwunconv.8 -usr/share/man/man8/useradd.8 -usr/share/man/man8/userdel.8 -usr/share/man/man8/usermod.8 -usr/share/man/man8/vigr.8 -usr/share/man/man8/vipw.8 diff -Nru shadow-4.8.1/debian/passwd.manpages shadow-4.8.1/debian/passwd.manpages --- shadow-4.8.1/debian/passwd.manpages 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/passwd.manpages 2021-11-11 09:42:38.000000000 -0600 @@ -1,2 +1,60 @@ debian/cpgr.8 debian/cppw.8 +usr/share/man/*/man1/chage.1 +usr/share/man/*/man1/chfn.1 +usr/share/man/*/man1/chsh.1 +usr/share/man/*/man1/expiry.1 +usr/share/man/*/man1/gpasswd.1 +usr/share/man/*/man1/passwd.1 +usr/share/man/*/man5/passwd.5 +usr/share/man/*/man5/subgid.5 +usr/share/man/*/man5/subuid.5 +usr/share/man/*/man5/shadow.5 +usr/share/man/*/man5/gshadow.5 +usr/share/man/*/man8/chpasswd.8 +usr/share/man/*/man8/chgpasswd.8 +usr/share/man/*/man8/groupadd.8 +usr/share/man/*/man8/groupdel.8 +usr/share/man/*/man8/groupmod.8 +usr/share/man/*/man8/groupmems.8 +usr/share/man/*/man8/grpck.8 +usr/share/man/*/man8/grpconv.8 +usr/share/man/*/man8/grpunconv.8 +usr/share/man/*/man8/newusers.8 +usr/share/man/*/man8/pwck.8 +usr/share/man/*/man8/pwconv.8 +usr/share/man/*/man8/pwunconv.8 +usr/share/man/*/man8/useradd.8 +usr/share/man/*/man8/userdel.8 +usr/share/man/*/man8/usermod.8 +usr/share/man/*/man8/vigr.8 +usr/share/man/*/man8/vipw.8 +usr/share/man/man1/chage.1 +usr/share/man/man1/chfn.1 +usr/share/man/man1/chsh.1 +usr/share/man/man1/expiry.1 +usr/share/man/man1/gpasswd.1 +usr/share/man/man1/passwd.1 +usr/share/man/man5/passwd.5 +usr/share/man/man5/shadow.5 +usr/share/man/man5/gshadow.5 +usr/share/man/man5/subuid.5 +usr/share/man/man5/subgid.5 +usr/share/man/man8/chgpasswd.8 +usr/share/man/man8/chpasswd.8 +usr/share/man/man8/groupadd.8 +usr/share/man/man8/groupdel.8 +usr/share/man/man8/groupmems.8 +usr/share/man/man8/groupmod.8 +usr/share/man/man8/grpck.8 +usr/share/man/man8/grpconv.8 +usr/share/man/man8/grpunconv.8 +usr/share/man/man8/newusers.8 +usr/share/man/man8/pwck.8 +usr/share/man/man8/pwconv.8 +usr/share/man/man8/pwunconv.8 +usr/share/man/man8/useradd.8 +usr/share/man/man8/userdel.8 +usr/share/man/man8/usermod.8 +usr/share/man/man8/vigr.8 +usr/share/man/man8/vipw.8 diff -Nru shadow-4.8.1/debian/passwd.postinst shadow-4.8.1/debian/passwd.postinst --- shadow-4.8.1/debian/passwd.postinst 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/passwd.postinst 2021-11-11 09:42:38.000000000 -0600 @@ -4,20 +4,6 @@ case "$1" in configure) - # Fix permissions on various log files from old versions of the debian - # installer, some unrelated to passwd but we decided to put the fix - # here since there was no better place. This can safely be removed - # after etch is released. - if dpkg --compare-versions "$2" lt "1:4.0.14-9"; then - for log in /var/log/base-config* \ - $(find /var/log/debian-installer/ /var/log/installer/ -type f 2>/dev/null ); do - if [ -e "$log" ]; then - chmod 600 "$log" - fi - done - fi - - rm -f /etc/pam.d/passwd.pre-upgrade 2>/dev/null if ! getent group shadow | grep -q '^shadow:[^:]*:42' then groupadd -g 42 shadow || ( diff -Nru shadow-4.8.1/debian/passwd.preinst shadow-4.8.1/debian/passwd.preinst --- shadow-4.8.1/debian/passwd.preinst 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/passwd.preinst 1969-12-31 18:00:00.000000000 -0600 @@ -1,51 +0,0 @@ -#! /bin/sh - -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -remove_md5() { - if md5sum $1 2>/dev/null |grep -q $2; then - cp $1 $1.pre-upgrade - sed -e '/^[^#]*[ \t]*password[ \t]*required[ \t]*pam_unix.so/ s/ md5$//' $1 >$1.post-upgrade \ - && mv $1.post-upgrade $1 - fi - } - - -case "$1" in - install|upgrade) - if [ "x$2" != "x" ] ; then - if dpkg --compare-versions $2 lt 1:4.0.3 ; then - remove_md5 /etc/pam.d/passwd 23a5d1465bbc1e39ca6e0c32f22a75c9 - fi - fi - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nru shadow-4.8.1/debian/passwd.tmpfile shadow-4.8.1/debian/passwd.tmpfile --- shadow-4.8.1/debian/passwd.tmpfile 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/passwd.tmpfile 1969-12-31 18:00:00.000000000 -0600 @@ -1,8 +0,0 @@ -# If a password operation is in progress and we lose power, stale lockfiles -# can be left behind. Clear them on boot. -r! /etc/gshadow.lock -r! /etc/shadow.lock -r! /etc/passwd.lock -r! /etc/group.lock -r! /etc/subuid.lock -r! /etc/subgid.lock diff -Nru shadow-4.8.1/debian/passwd.tmpfiles shadow-4.8.1/debian/passwd.tmpfiles --- shadow-4.8.1/debian/passwd.tmpfiles 1969-12-31 18:00:00.000000000 -0600 +++ shadow-4.8.1/debian/passwd.tmpfiles 2021-11-10 03:39:04.000000000 -0600 @@ -0,0 +1,8 @@ +# If a password operation is in progress and we lose power, stale lockfiles +# can be left behind. Clear them on boot. +r! /etc/gshadow.lock +r! /etc/shadow.lock +r! /etc/passwd.lock +r! /etc/group.lock +r! /etc/subuid.lock +r! /etc/subgid.lock diff -Nru shadow-4.8.1/debian/uidmap.install shadow-4.8.1/debian/uidmap.install --- shadow-4.8.1/debian/uidmap.install 2020-02-07 09:32:06.000000000 -0600 +++ shadow-4.8.1/debian/uidmap.install 2021-11-11 09:42:38.000000000 -0600 @@ -1,4 +1,2 @@ usr/bin/newuidmap usr/bin/newgidmap -usr/share/man/man1/newuidmap.1 -usr/share/man/man1/newgidmap.1 diff -Nru shadow-4.8.1/debian/uidmap.manpages shadow-4.8.1/debian/uidmap.manpages --- shadow-4.8.1/debian/uidmap.manpages 1969-12-31 18:00:00.000000000 -0600 +++ shadow-4.8.1/debian/uidmap.manpages 2021-11-10 03:39:04.000000000 -0600 @@ -0,0 +1,4 @@ +usr/share/man/*/man1/newgidmap.1 +usr/share/man/*/man1/newuidmap.1 +usr/share/man/man1/newgidmap.1 +usr/share/man/man1/newuidmap.1