* When installing openssh-client or openssh-server from scratch, remove

  any unchanged conffiles from the pre-split ssh package to work around a
  bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).

1 files changed, 25 insertions, 13 deletions

diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm
index 139fb4d12..4d52a7beb 100644
--- a/debian/openssh-client.postrm
+++ b/debian/openssh-client.postrm
@@ -2,19 +2,31 @@
 
 #DEBHELPER#
 
-if [ "$1" = "purge" ]
-then
-    # Remove all non-conffiles that ssh might create, so that we can
-    # smoothly remove /etc/ssh if and only if the user hasn't dropped some
-    # other files in there. Conffiles have already been removed at this
-    # point.
-    rm -f /etc/ssh/moduli /etc/ssh/primes
-    rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2
-    rmdir --ignore-fail-on-non-empty /etc/ssh
-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
+}
 
-if [ "$1" = "purge" ] ; then
-        delgroup --quiet ssh > /dev/null || true
-fi
+case $1 in
+        abort-install|abort-upgrade)
+                abort_transfer_conffile /etc/ssh/moduli
+                abort_transfer_conffile /etc/ssh/ssh_config
+                ;;
+        purge)
+                # Remove all non-conffiles that ssh might create, so that we
+                # can smoothly remove /etc/ssh if and only if the user
+                # hasn't dropped some other files in there. Conffiles have
+                # already been removed at this point.
+                rm -f /etc/ssh/moduli /etc/ssh/primes
+                rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2
+                rmdir --ignore-fail-on-non-empty /etc/ssh
+
+                delgroup --quiet ssh > /dev/null || true
+                ;;
+esac
 
 exit 0