6 files changed, 7 insertions, 60 deletions

diff --git a/debian/changelog b/debian/changelog
index ecc89d021..9db3f5648 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ openssh (1:6.2p2-2) UNRELEASED; urgency=low
     pre-etch (three releases before current stable).
   * Add #DEBHELPER# tokens to openssh-client.postinst and
     openssh-server.postinst.
+  * Replace old manual conffile handling code with dpkg-maintscript-helper,
+    via dh_installdeb.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 21 May 2013 17:49:35 +0100
 
diff --git a/debian/control b/debian/control
index a56e12e9f..a9ef496f6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 7.4.2~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf
 Standards-Version: 3.8.4
 Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
 Homepage: http://www.openssh.org/
@@ -44,6 +44,7 @@ Description: secure shell (SSH) client, for secure access to remote machines
 Package: openssh-server
 Priority: optional
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 3.2-13), procps, debianutils (>= 4)
 Recommends: xauth, ncurses-term, ${openssh-server:Recommends}
 Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
diff --git a/debian/openssh-server.maintscript b/debian/openssh-server.maintscript
new file mode 100644
index 000000000..f9e3c4d53
--- /dev/null
+++ b/debian/openssh-server.maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd 1:4.7p1-4~
diff --git a/debian/openssh-server.postinst.in b/debian/openssh-server.postinst.in
index a91ec082a..ce1165ac9 100644
--- a/debian/openssh-server.postinst.in
+++ b/debian/openssh-server.postinst.in
@@ -320,20 +320,6 @@ setup_init() {
         esac
 }
 
-commit_mv_conffile () {
-        OLDCONFFILE="$1"
-        NEWCONFFILE="$2"
-
-        if [ -e "$OLDCONFFILE.moving" ]; then
-                echo "Preserving user changes to $NEWCONFFILE ..."
-                mv -f "$NEWCONFFILE" "$NEWCONFFILE.dpkg-new"
-                mv -f "$OLDCONFFILE.moving" "$NEWCONFFILE"
-        elif [ -e "$OLDCONFFILE.dpkg-old" ]; then
-                rm -f "$OLDCONFFILE.dpkg-old"
-        fi
-}
-
-
 if [ "$action" = configure ]; then
         create_sshdconfig
         create_keys
@@ -344,7 +330,6 @@ if [ "$action" = configure ]; then
             remove_old_init_links
         fi
         setup_init
-        commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd
         # Renamed to /etc/ssh/moduli in 2.9.9 (!)
         if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
             rm -f /etc/ssh/primes
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
index bc55df118..9bb9f1839 100644
--- a/debian/openssh-server.postrm
+++ b/debian/openssh-server.postrm
@@ -2,32 +2,7 @@
 
 #DEBHELPER#
 
-abort_mv_conffile () {
-        CONFFILE="$1"
-
-        if [ ! -e "$CONFFILE" ]; then
-                if [ -e "$CONFFILE.dpkg-old" ]; then
-                        mv -f "$CONFFILE.dpkg-old" "$CONFFILE"
-                elif [ -e "$CONFFILE.moving" ]; then
-                        mv -f "$CONFFILE.moving" "$CONFFILE"
-                fi
-        fi
-}
-
-finish_mv_conffile () {
-        CONFFILE="$1"
-
-        if [ -e "$CONFFILE.dpkg-old" ]; then
-                rm -f "$CONFFILE.dpkg-old"
-        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
-                ;;
         purge)
                 # Remove all non-conffiles that ssh might create, so that we
                 # can smoothly remove /etc/ssh if and only if the user
@@ -46,8 +21,6 @@ case $1 in
                 if which deluser >/dev/null 2>&1; then
                         deluser --quiet sshd > /dev/null || true
                 fi
-
-                finish_mv_conffile /etc/pam.d/ssh
                 ;;
 esac
 
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 8bb2d6f1a..559693f7b 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -3,25 +3,8 @@
 action=$1
 version=$2
 
-prepare_mv_conffile () {
-        CONFFILE="$1"
-        [ -e "$CONFFILE" ] || return 0
-
-        md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
-        old_md5sum="$(dpkg-query -W -f '${Conffiles}\n' openssh-server 2>/dev/null | sed 's/^ *//' | awk '$1 == "'"$CONFFILE"'" { print $2 }')"
-        if [ "$md5sum" = "$old_md5sum" ]; then
-                mv -f "$CONFFILE" "$CONFFILE.dpkg-old"
-        else
-                mv -f "$CONFFILE" "$CONFFILE.moving"
-        fi
-}
-
 if [ "$action" = upgrade ] || [ "$action" = install ]
 then
-  if dpkg --compare-versions "$version" lt 1:4.7p1-4; then
-    prepare_mv_conffile /etc/pam.d/ssh
-  fi
-
   if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \
      [ -d /var/run/sshd ]; then
     # make sure /var/run/sshd is not removed on upgrades
@@ -30,3 +13,5 @@ then
 fi
 
 #DEBHELPER#
+
+exit 0