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, 40 deletions

diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 510070645..9f3fa05ed 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -1,41 +1,8 @@
 #!/bin/sh -e
 
-ETC_DEFAULT_SSH=@ETC_DEFAULT_SSH@
-
-ETC_INIT_D_SSH=@ETC_INIT_D_SSH@
-
-ETC_PAM_D_SSH=@ETC_PAM_D_SSH@
-
 action=$1
 version=$2
 
-prepare_transfer_conffile () {
-        CONFFILE="$1"
-        TEXT="$2"
-        MODE="$3"
-        [ "$CONFFILES" ] || return 0
-        [ -e "$CONFFILE" ] || return 0
-
-        md5sum="$(md5sum "$CONFFILE" |sed -e 's/ .*//')"
-        old_md5sum="$(echo "$CONFFILES" | awk '$1 == "'"$CONFFILE"'" { print $2 }')"
-        if [ "$md5sum" = "$old_md5sum" ]; then
-                echo >&2 "Transferring ownership of conffile $CONFFILE ..."
-                # We have to write out the desired new text of the conffile,
-                # which is tricky in the preinst, hence the nasty way we
-                # have to hardcode the text here. Fortunately, this is only
-                # necessary with sarge's dpkg and older.
-                if echo "$TEXT" | head -n1 | grep -q '^@.*@$'; then
-                        echo >&2 'Unsubstituted conffile text! Please report this bug.'
-                        exit 1
-                fi
-                printf '%s' "$TEXT" >"$CONFFILE.dpkg-new"
-                chmod "$MODE" "$CONFFILE.dpkg-new"
-                mv -f "$CONFFILE" "$CONFFILE.moved-by-preinst"
-                mv -f "$CONFFILE.dpkg-new" "$CONFFILE"
-                return 0
-        fi
-}
-
 prepare_mv_conffile () {
         CONFFILE="$1"
         [ -e "$CONFFILE" ] || return 0
@@ -124,13 +91,6 @@ EOF
     }
   fi
 
-  if dpkg --compare-versions "$version" lt 0; then
-    CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh 2>/dev/null | sed 's/^ *//')"
-    prepare_transfer_conffile /etc/default/ssh "$ETC_DEFAULT_SSH" 0644
-    prepare_transfer_conffile /etc/init.d/ssh "$ETC_INIT_D_SSH" 0755
-    prepare_transfer_conffile /etc/pam.d/ssh "$ETC_PAM_D_SSH" 0644
-  fi
-
   if dpkg --compare-versions "$version" lt 1:4.7p1-4; then
     prepare_mv_conffile /etc/pam.d/ssh
   fi