diff --git a/debian/passwd.postinst b/debian/passwd.postinst index 691733e8..f6d52210 100644 --- a/debian/passwd.postinst +++ b/debian/passwd.postinst @@ -4,20 +4,6 @@ set -e 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 --git a/debian/passwd.preinst b/debian/passwd.preinst deleted file mode 100644 index 05b5483c..00000000 --- a/debian/passwd.preinst +++ /dev/null @@ -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 - -