7 files changed, 126 insertions, 32 deletions

diff --git a/debian/changelog b/debian/changelog
index a17c7b942..413ddb271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ openssh (1:4.3p2-7) UNRELEASED; urgency=medium
     (thanks, Jari Aalto; closes: #335259).
   * Fix quoting error in configure.ac and regenerate configure (thanks, Ben
     Pfaff; closes: #391248).
+  * 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).
 
   [ Russ Allbery ]
   * Create transitional ssh-krb5 package which enables GSSAPI configuration
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst
index 466801057..3e33aeb82 100644
--- a/debian/openssh-client.postinst
+++ b/debian/openssh-client.postinst
@@ -94,6 +94,13 @@ set_ssh_agent_permissions() {
         fi
 }
 
+commit_transfer_conffile () {
+        CONFFILE="$1"
+        if [ -e "$CONFFILE.moved-by-preinst" ]; then
+                rm -f "$CONFFILE.moved-by-preinst"
+        fi
+}
+
 
 fix_rsh_diversion
 create_alternatives
@@ -102,5 +109,7 @@ if [ "$2" = "1:3.5p1-1" ]; then
     fix_ssh_group
 fi
 set_ssh_agent_permissions
+commit_transfer_conffile /etc/ssh/moduli
+commit_transfer_conffile /etc/ssh/ssh_config
 
 exit 0
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
diff --git a/debian/openssh-client.preinst b/debian/openssh-client.preinst
new file mode 100644
index 000000000..0e200712e
--- /dev/null
+++ b/debian/openssh-client.preinst
@@ -0,0 +1,30 @@
+#! /bin/sh -e
+
+action="$1"
+version="$2"
+
+prepare_transfer_conffile () {
+        CONFFILE="$1"
+        [ -e "$CONFFILE" ] || return 0
+
+        md5sum="$(md5sum "$CONFFILE" |sed -e 's/ .*//')"
+        old_md5sum="$(sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $CONFFILE'{s/^ [^ ]* //;s/ .*//;p}}" /var/lib/dpkg/status)"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+                echo >&2 "Transferring ownership of conffile $CONFFILE ..."
+                mv -f "$CONFFILE" "$CONFFILE.moved-by-preinst"
+                return 0
+        fi
+}
+
+case $action in
+        install|upgrade)
+                if dpkg --compare-versions "$version" lt 0; then
+                        prepare_transfer_conffile /etc/ssh/moduli
+                        prepare_transfer_conffile /etc/ssh/ssh_config
+                fi
+                ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 2d7dbc9ea..4e91098df 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -332,6 +332,13 @@ setup_init() {
         fi
 }
 
+commit_transfer_conffile () {
+        CONFFILE="$1"
+        if [ -e "$CONFFILE.moved-by-preinst" ]; then
+                rm -f "$CONFFILE.moved-by-preinst"
+        fi
+}
+
 
 fix_doc_symlink
 create_sshdconfig
@@ -346,6 +353,9 @@ if dpkg --compare-versions "$2" lt 1:3.6.1p2-2; then
     fix_conffile_permissions
 fi
 setup_init
+commit_transfer_conffile /etc/default/ssh
+commit_transfer_conffile /etc/init.d/ssh
+commit_transfer_conffile /etc/pam.d/ssh
 
 
 db_stop
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
index e7a437260..f63ba4d46 100644
--- a/debian/openssh-server.postrm
+++ b/debian/openssh-server.postrm
@@ -2,26 +2,37 @@
 
 #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/ssh_host_key /etc/ssh/ssh_host_key.pub
-    rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
-    rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub
-    rm -f /etc/ssh/sshd_config
-    rm -f /etc/ssh/sshd_not_to_be_run
-    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
-    update-rc.d ssh remove >/dev/null
-fi
+case $1 in
+        abort-install|abort-upgrade)
+                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
+                # 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/ssh_host_key /etc/ssh/ssh_host_key.pub
+                rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub
+                rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub
+                rm -f /etc/ssh/sshd_config
+                rm -f /etc/ssh/sshd_not_to_be_run
+                rmdir --ignore-fail-on-non-empty /etc/ssh
 
-if [ "$1" = "purge" ] ; then
-        deluser --quiet sshd > /dev/null || true
-fi
+                update-rc.d ssh remove >/dev/null
+
+                deluser --quiet sshd > /dev/null || true
+                ;;
+esac
 
 exit 0
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 412e51564..a5c507bd4 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -3,6 +3,19 @@
 action=$1
 version=$2
 
+prepare_transfer_conffile () {
+        CONFFILE="$1"
+        [ -e "$CONFFILE" ] || return 0
+
+        md5sum="$(md5sum "$CONFFILE" |sed -e 's/ .*//')"
+        old_md5sum="$(sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $CONFFILE'{s/^ [^ ]* //;s/ .*//;p}}" /var/lib/dpkg/status)"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+                echo >&2 "Transferring ownership of conffile $CONFFILE ..."
+                mv -f "$CONFFILE" "$CONFFILE.moved-by-preinst"
+                return 0
+        fi
+}
+
 if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
   version=1.2.27
 fi
@@ -77,6 +90,12 @@ EOF
       fi
     }
   fi
+
+  if dpkg --compare-versions "$version" lt 0; then
+    prepare_transfer_conffile /etc/default/ssh
+    prepare_transfer_conffile /etc/init.d/ssh
+    prepare_transfer_conffile /etc/pam.d/ssh
+  fi
 fi
 
 #DEBHELPER#