The unified diff between revisions [2a6c9eb6..] and [743743c4..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'debian/dropbear.postinst'

#
#
# patch "debian/dropbear.postinst"
#  from [f1a7b7e6b65e9a3883b2adee3127f9a573886a38]
#    to [85bdd4d6328165d534bd5739cd5da7a27636db07]
#
============================================================
--- debian/dropbear.postinst	f1a7b7e6b65e9a3883b2adee3127f9a573886a38
+++ debian/dropbear.postinst	85bdd4d6328165d534bd5739cd5da7a27636db07
@@ -3,44 +3,12 @@ test "$1" = 'configure' || exit 0

 test "$1" = 'configure' || exit 0

-if test ! -e /etc/dropbear/dropbear_rsa_host_key; then
-  if test -f /etc/ssh/ssh_host_rsa_key; then
-    echo "Converting existing OpenSSH RSA host key to Dropbear format."
-    /usr/lib/dropbear/dropbearconvert openssh dropbear \
-      /etc/ssh/ssh_host_rsa_key /etc/dropbear/dropbear_rsa_host_key
-  else
-    echo "Generating Dropbear RSA key. Please wait."
-    dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
-  fi
-fi
-if test ! -e /etc/dropbear/dropbear_dss_host_key; then
-  if test -f /etc/ssh/ssh_host_dsa_key; then
-    echo "Converting existing OpenSSH RSA host key to Dropbear format."
-    /usr/lib/dropbear/dropbearconvert openssh dropbear \
-      /etc/ssh/ssh_host_dsa_key /etc/dropbear/dropbear_dss_host_key
-  else
-    echo "Generating Dropbear DSS key. Please wait."
-    dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
-  fi
-fi
-if test ! -s /etc/default/dropbear; then
-  # check whether OpenSSH seems to be installed.
-  if test -x /usr/sbin/sshd; then
-    cat <<EOT
-OpenSSH appears to be installed.  Setting /etc/default/dropbear so that
-Dropbear will not start by default.  Edit this file to change this behaviour.
+echo "You must manually convert your OpenSSH host keys if required."

-EOT
-    cat >>/etc/default/dropbear <<EOT
-# disabled because OpenSSH is installed
-# change to NO_START=0 to enable Dropbear
-NO_START=1
-
-EOT
-  fi
-  cat >>/etc/default/dropbear <<EOT
+if test ! -s /etc/default/cokedropbear; then
+  cat >>/etc/default/cokedropbear <<EOT
 # the TCP port that Dropbear listens on
-DROPBEAR_PORT=22
+DROPBEAR_PORT=376

 # any additional arguments for Dropbear
 DROPBEAR_EXTRA_ARGS=
@@ -57,11 +25,11 @@ fi
 EOT
 fi

-if test -x /etc/init.d/dropbear; then
-  update-rc.d dropbear defaults >/dev/null
+if test -x /etc/init.d/cokedropbear; then
+  update-rc.d cokedropbear defaults >/dev/null
   if test -x /usr/sbin/invoke-rc.d; then
-    invoke-rc.d dropbear restart
+    invoke-rc.d cokedropbear start
   else
-    /etc/init.d/dropbear restart
+    /etc/init.d/cokedropbear start
   fi
 fi