Drop conffile handling for upgrades from pre-split ssh package; this was

originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a truly ghastly
hack around a misbehaviour in sarge's dpkg.  Since this is now four
Debian releases ago, we can afford to drop this and simplify the
packaging.

1 files changed, 0 insertions, 12 deletions

diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
index 655c1ae17..bc55df118 100644
--- a/debian/openssh-server.postrm
+++ b/debian/openssh-server.postrm
@@ -22,23 +22,11 @@ finish_mv_conffile () {
         fi
 }
 
-abort_transfer_conffile () {
-        CONFFILE="$1"
-        if [ -e "$CONFFILE.moved-by-preinst" ]; then
-                echo >&2 "Aborting ownership transfer of conffile $CONFFILE ..."
-                mv -f "$CONFFILE.moved-by-preinst" "$CONFFILE"
-                return 0
-        fi
-}
-
 case $1 in
         abort-install|abort-upgrade)
                 if dpkg --compare-versions "$2" lt 1:4.7p1-4; then
                         abort_mv_conffile /etc/pam.d/ssh
                 fi
-                abort_transfer_conffile /etc/default/ssh
-                abort_transfer_conffile /etc/init.d/ssh
-                abort_transfer_conffile /etc/pam.d/ssh
                 ;;
         purge)
                 # Remove all non-conffiles that ssh might create, so that we