committing changes in /etc after apt run

Package changes:
+dropbear 2017.75-3build1 all
+dropbear-bin 2017.75-3build1 amd64
+dropbear-initramfs 2017.75-3build1 all
+dropbear-run 2017.75-3build1 all
+libtomcrypt1 1.18.1-1ubuntu0.1 amd64

diff --git a/.etckeeper b/.etckeeper
index 2c319f654b0d117b06e1062331f022c09b62c114..8a2fa3d602daf660a42bf568ec52b1994397aee4 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2211,6 +2211,7 @@ maybe chmod 0644 'default/devolo-updates'
 maybe chmod 0644 'default/devpts'
 maybe chmod 0644 'default/docker'
 maybe chmod 0644 'default/dovecot'
+maybe chmod 0644 'default/dropbear'
 maybe chmod 0644 'default/fail2ban'
 maybe chmod 0644 'default/fetchmail'
 maybe chmod 0644 'default/grub'
@@ -2369,12 +2370,19 @@ maybe chmod 0644 'dpkg/origins/ubuntu'
 maybe chmod 0644 'dpkg/shlibs.default'
 maybe chmod 0644 'dpkg/shlibs.override'
 maybe chmod 0644 'drirc'
+maybe chmod 0755 'dropbear'
 maybe chmod 0755 'dropbear-initramfs'
 maybe chmod 0644 'dropbear-initramfs/authorized_keys'
 maybe chmod 0644 'dropbear-initramfs/config'
 maybe chmod 0600 'dropbear-initramfs/dropbear_dss_host_key'
 maybe chmod 0600 'dropbear-initramfs/dropbear_ecdsa_host_key'
 maybe chmod 0600 'dropbear-initramfs/dropbear_rsa_host_key'
+maybe chmod 0600 'dropbear/dropbear_dss_host_key'
+maybe chmod 0600 'dropbear/dropbear_ecdsa_host_key'
+maybe chmod 0600 'dropbear/dropbear_rsa_host_key'
+maybe chmod 0755 'dropbear/log'
+maybe chmod 0755 'dropbear/log/run'
+maybe chmod 0755 'dropbear/run'
 maybe chmod 0755 'emacs'
 maybe chmod 0755 'emacs/site-start.d'
 maybe chmod 0644 'emacs/site-start.d/00debian-vars.el'
@@ -3307,6 +3315,7 @@ maybe chmod 0755 'init.d/devolonetsvc'
 maybe chmod 0755 'init.d/dns-clean'
 maybe chmod 0755 'init.d/docker'
 maybe chmod 0755 'init.d/dovecot'
+maybe chmod 0755 'init.d/dropbear'
 maybe chmod 0755 'init.d/fail2ban'
 maybe chmod 0755 'init.d/fetchmail'
 maybe chmod 0755 'init.d/grub-common'

diff --git a/default/dropbear b/default/dropbear
new file mode 100644 (file)
index 0000000..b1e09ae
--- /dev/null
+++ b/default/dropbear
@@ -0,0 +1,25 @@
+# disabled because OpenSSH is installed
+# change to NO_START=0 to enable Dropbear
+NO_START=1
+# the TCP port that Dropbear listens on
+DROPBEAR_PORT=22
+
+# any additional arguments for Dropbear
+DROPBEAR_EXTRA_ARGS=
+
+# specify an optional banner file containing a message to be
+# sent to clients before they connect, such as "/etc/issue.net"
+DROPBEAR_BANNER=""
+
+# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key)
+#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+
+# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key)
+#DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
+
+# ECDSA hostkey file (default: /etc/dropbear/dropbear_ecdsa_host_key)
+#DROPBEAR_ECDSAKEY="/etc/dropbear/dropbear_ecdsa_host_key"
+
+# Receive window size - this is a tradeoff between memory and
+# network performance
+DROPBEAR_RECEIVE_WINDOW=65536

diff --git a/dropbear/dropbear_dss_host_key b/dropbear/dropbear_dss_host_key
new file mode 100644 (file)
index 0000000..1b054d0
Binary files /dev/null and b/dropbear/dropbear_dss_host_key differ

diff --git a/dropbear/dropbear_ecdsa_host_key b/dropbear/dropbear_ecdsa_host_key
new file mode 100644 (file)
index 0000000..135e916
Binary files /dev/null and b/dropbear/dropbear_ecdsa_host_key differ

diff --git a/dropbear/dropbear_rsa_host_key b/dropbear/dropbear_rsa_host_key
new file mode 100644 (file)
index 0000000..27c6cdc
Binary files /dev/null and b/dropbear/dropbear_rsa_host_key differ

diff --git a/dropbear/log/main b/dropbear/log/main
new file mode 120000 (symlink)
index 0000000..d1077ca
--- /dev/null
+++ b/dropbear/log/main
@@ -0,0 +1 @@
+/var/log/dropbear
\ No newline at end of file

diff --git a/dropbear/log/run b/dropbear/log/run
new file mode 100755 (executable)
index 0000000..2ffb13d
--- /dev/null
+++ b/dropbear/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec chpst -udropbearlog svlogd -tt ./main

diff --git a/dropbear/run b/dropbear/run
new file mode 100755 (executable)
index 0000000..f208085
--- /dev/null
+++ b/dropbear/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec dropbear -d ./dropbear_dss_host_key -r ./dropbear_rsa_host_key -F -E -p 22

diff --git a/init.d/dropbear b/init.d/dropbear
new file mode 100755 (executable)
index 0000000..ccd758d
--- /dev/null
+++ b/init.d/dropbear
@@ -0,0 +1,79 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          dropbear
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Lightweight SSH server
+# Description:       Init script for drobpear SSH server.  Edit
+#                    /etc/default/dropbear to configure the server.
+### END INIT INFO
+#
+# Do not configure this file. Edit /etc/default/dropbear instead!
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/dropbear
+NAME=dropbear
+DESC="Dropbear SSH server"
+DEFAULTCFG=/etc/default/dropbear
+
+DROPBEAR_PORT=22
+DROPBEAR_EXTRA_ARGS=
+NO_START=0
+
+set -e
+
+. /lib/lsb/init-functions
+
+cancel() { echo "$1" >&2; exit 0; };
+test ! -r $DEFAULTCFG || . $DEFAULTCFG
+test -x "$DAEMON" || cancel "$DAEMON does not exist or is not executable."
+test ! -x /usr/sbin/update-service || ! update-service --check dropbear ||
+  cancel 'The dropbear service is controlled through runit, use the sv(8) program'
+
+[ ! "$DROPBEAR_BANNER" ] || DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
+[ ! -f "$DROPBEAR_RSAKEY" ]   || DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -r $DROPBEAR_RSAKEY"
+[ ! -f "$DROPBEAR_DSSKEY" ]   || DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -r $DROPBEAR_DSSKEY"
+[ ! -f "$DROPBEAR_ECDSAKEY" ] || DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -r $DROPBEAR_ECDSAKEY"
+test -n "$DROPBEAR_RECEIVE_WINDOW" || \
+  DROPBEAR_RECEIVE_WINDOW="65536"
+
+case "$1" in
+  start)
+       test "$NO_START" = "0" ||
+       cancel "Starting $DESC: [abort] NO_START is not set to zero in $DEFAULTCFG"
+
+       echo -n "Starting $DESC: "
+       start-stop-daemon --start --quiet --pidfile /var/run/"$NAME".pid \
+         --exec "$DAEMON" -- -p "$DROPBEAR_PORT" -W "$DROPBEAR_RECEIVE_WINDOW" $DROPBEAR_EXTRA_ARGS
+       echo "$NAME."
+       ;;
+  stop)
+       echo -n "Stopping $DESC: "
+       start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/"$NAME".pid
+       echo "$NAME."
+       ;;
+  restart|force-reload)
+       test "$NO_START" = "0" ||
+       cancel "Restarting $DESC: [abort] NO_START is not set to zero in $DEFAULTCFG"
+
+       echo -n "Restarting $DESC: "
+       start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/"$NAME".pid
+       sleep 1
+       start-stop-daemon --start --quiet --pidfile /var/run/"$NAME".pid \
+         --exec "$DAEMON" -- $DROPBEAR_KEYS -p "$DROPBEAR_PORT" -W "$DROPBEAR_RECEIVE_WINDOW" $DROPBEAR_EXTRA_ARGS
+       echo "$NAME."
+       ;;
+  status)
+               status_of_proc -p /var/run/"$NAME".pid $DAEMON $NAME && exit 0 || exit $?
+       ;;
+  *)
+       N=/etc/init.d/$NAME
+       echo "Usage: $N {start|stop|status|restart|force-reload}" >&2
+       exit 1
+       ;;
+esac
+
+exit 0

diff --git a/rc0.d/K01avahi-daemon b/rc0.d/K01avahi-daemon
new file mode 120000 (symlink)
index 0000000..d28b326
--- /dev/null
+++ b/rc0.d/K01avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc0.d/K01dropbear b/rc0.d/K01dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc0.d/K01dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc0.d/K02avahi-daemon b/rc0.d/K02avahi-daemon
deleted file mode 120000 (symlink)
index d28b326..0000000
--- a/rc0.d/K02avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc1.d/K01avahi-daemon b/rc1.d/K01avahi-daemon
new file mode 120000 (symlink)
index 0000000..d28b326
--- /dev/null
+++ b/rc1.d/K01avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc1.d/K01dropbear b/rc1.d/K01dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc1.d/K01dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc1.d/K02avahi-daemon b/rc1.d/K02avahi-daemon
deleted file mode 120000 (symlink)
index d28b326..0000000
--- a/rc1.d/K02avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc2.d/S03dropbear b/rc2.d/S03dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc2.d/S03dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc3.d/S03dropbear b/rc3.d/S03dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc3.d/S03dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc4.d/S03dropbear b/rc4.d/S03dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc4.d/S03dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc5.d/S03dropbear b/rc5.d/S03dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc5.d/S03dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc6.d/K01avahi-daemon b/rc6.d/K01avahi-daemon
new file mode 120000 (symlink)
index 0000000..d28b326
--- /dev/null
+++ b/rc6.d/K01avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
\ No newline at end of file

diff --git a/rc6.d/K01dropbear b/rc6.d/K01dropbear
new file mode 120000 (symlink)
index 0000000..44af88d
--- /dev/null
+++ b/rc6.d/K01dropbear
@@ -0,0 +1 @@
+../init.d/dropbear
\ No newline at end of file

diff --git a/rc6.d/K02avahi-daemon b/rc6.d/K02avahi-daemon
deleted file mode 120000 (symlink)
index d28b326..0000000
--- a/rc6.d/K02avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
\ No newline at end of file