diff -u dropbear-2014.65/debian/changelog dropbear-2014.65/debian/changelog --- dropbear-2014.65/debian/changelog +++ dropbear-2014.65/debian/changelog @@ -1,3 +1,15 @@ +dropbear (2014.65-1ubuntu1) utopic; urgency=low + + * Merge from Debian unstable. (LP: #1355670) Remaining changes: + + debian/initramfs/premount-devpts, debian/rules: drop the script, this is + handled by initramfs-tools. + + debian/initramfs/dropbear-hook: do not install dropbear in the initramfs + if there's no uncommented line in /etc/crypttab. + + debian/initramfs/premout-dropbear: fix so that the network configuration + happens before dropbear takes hold of the network card. + + -- Mattia Rizzolo Tue, 12 Aug 2014 11:04:21 +0200 + dropbear (2014.65-1) unstable; urgency=low [ Matt Johnston ] @@ -40,6 +52,26 @@ -- Gerrit Pape Fri, 01 Aug 2014 12:44:51 +0000 +dropbear (2013.60-1ubuntu2) trusty; urgency=medium + + * Fix initramfs hooks so that the network configuration happens before + dropbear takes hold of the network card. (LP: #363958) + * Drop premount-devpts script, this is handled by initramfs-tools. + (LP: #1070992) + * Do not install dropbear in the initramfs if there's no uncommented line in + /etc/crypttab. + + -- Margarita Manterola Wed, 19 Feb 2014 16:26:26 +0000 + +dropbear (2013.60-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1274195) + - debian/initrmfs/premount-devpts: if /dev/pts is already mounted, don't + re-mount it. + * debian/diff/autoconfupdate.diff: dropped, not needed anymore. + + -- Mattia Rizzolo Wed, 29 Jan 2014 17:44:42 +0100 + dropbear (2013.60-1) unstable; urgency=low [ Matt Johnston ] @@ -53,6 +85,14 @@ -- Gerrit Pape Fri, 25 Oct 2013 15:00:48 +0000 +dropbear (2012.55-1.4ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1245984) + - Update config.guess,sub for aarch634. + - If /dev/pts is already mounted, don't re-mount. + + -- Mattia Rizzolo Tue, 29 Oct 2013 16:55:51 +0200 + dropbear (2012.55-1.4) unstable; urgency=high * Non-maintainer upload by the Security Team. @@ -62,6 +102,14 @@ -- Michael Gilbert Wed, 16 Oct 2013 03:29:42 +0000 +dropbear (2012.55-1.3ubuntu1) raring-proposed; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #834174) + - Update config.guess,sub for aarch634 + - If /dev/pts is already mounted, don't re-mount. + + -- Luke Yelavich Wed, 14 Nov 2012 11:47:41 +1100 + dropbear (2012.55-1.3) unstable; urgency=medium * Non-maintainer upload. @@ -86,6 +134,18 @@ -- Jérémy Bobbio Tue, 25 Sep 2012 09:17:06 +0200 +dropbear (2012.55-1ubuntu2) quantal; urgency=low + + * Update config.guess,sub for aarch634 + + -- Wookey Mon, 01 Oct 2012 12:56:40 +0100 + +dropbear (2012.55-1ubuntu1) quantal; urgency=low + + * If /dev/pts is already mounted, don't re-mount. (LP: #933903) + + -- Chris J Arges Mon, 04 Jun 2012 12:43:57 +0100 + dropbear (2012.55-1) unstable; urgency=high * New upstream release. diff -u dropbear-2014.65/debian/control dropbear-2014.65/debian/control --- dropbear-2014.65/debian/control +++ dropbear-2014.65/debian/control @@ -1,7 +1,8 @@ Source: dropbear Section: net Priority: optional -Maintainer: Gerrit Pape +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Gerrit Pape Build-Depends: libz-dev Standards-Version: 3.9.5.0 diff -u dropbear-2014.65/debian/initramfs/bottom-dropbear dropbear-2014.65/debian/initramfs/bottom-dropbear --- dropbear-2014.65/debian/initramfs/bottom-dropbear +++ dropbear-2014.65/debian/initramfs/bottom-dropbear @@ -23,0 +24 @@ +log_end_msg diff -u dropbear-2014.65/debian/initramfs/dropbear-hook dropbear-2014.65/debian/initramfs/dropbear-hook --- dropbear-2014.65/debian/initramfs/dropbear-hook +++ dropbear-2014.65/debian/initramfs/dropbear-hook @@ -25,6 +25,10 @@ echo "dropbear: WARNING: Dropbear not found, remote unlocking of cryptroot via ssh won't work!" fi else + if [ $(sed '/^$/d;/^#/d' "/etc/crypttab" | wc -l) = "0" ]; then + echo "dropbear: NOTICE: Skipping dropbear installation because /etc/crypttab has no entries." + exit 0 + fi rm -f "${DESTDIR}/sbin/dropbear" copy_exec "/usr/sbin/dropbear" "/sbin/" LIBC_DIR=$(ldd /usr/sbin/dropbear | sed -n -e 's,.* => \(/lib.*\)/libc\.so\..*,\1,p') reverted: --- dropbear-2014.65/debian/initramfs/premount-devpts +++ dropbear-2014.65.orig/debian/initramfs/premount-devpts @@ -1,27 +0,0 @@ -#!/bin/sh - -PREREQ="udev" - -prereqs() { - echo "$PREREQ" -} - -case "$1" in - prereqs) - prereqs - exit 0 - ;; -esac - -. /scripts/functions - -grep -E "[[:space:]]+devpts$" /proc/filesystems >/dev/null 2>&1 || exit 0 - -# If /dev/pts is already mounted, don't re-mount it. -mountpoint -q /dev/pts || exit 0 - -log_begin_msg "Mounting devpts" - -mkdir -p /dev/pts -mount -t devpts none /dev/pts - diff -u dropbear-2014.65/debian/initramfs/premount-dropbear dropbear-2014.65/debian/initramfs/premount-dropbear --- dropbear-2014.65/debian/initramfs/premount-dropbear +++ dropbear-2014.65/debian/initramfs/premount-dropbear @@ -1,6 +1,6 @@ #!/bin/sh -PREREQ="udev devpts" +PREREQ="udev" prereqs() { echo "$PREREQ" @@ -17,8 +17,6 @@ [ -x /sbin/dropbear ] || exit 0 -log_begin_msg "Starting dropbear" - . /conf/initramfs.conf for x in $(cat /proc/cmdline); do @@ -31,6 +29,27 @@ +mkdir -p /var/run + +# We need to wait until udev finishes, because init-top/udev does not +# block until everything is initialized. +wait_for_udev + +# Configure the network in the background. +# +# This step can print messages like: +# /scripts/init-premount/dropbear: line XXX: ipconfig: not found +# The reason for these messages is that the root volume is not encrypted and +# the root switch happens before the network has been configured. After the +# root switch the ipconfig binary is no longer present and thus the messages. +# +# If you encounter this specific issue then you should disable dropbear in the +# initramfs as it isn't needed to unlock the passphrase prompt. For this do: +# 1) Edit /usr/share/initramfs-tools/conf-hooks.d/dropbear and set DROPBEAR=n +# 2) Run: sudo update-initramfs -k all -u configure_networking & -mkdir -p /var/run +# Start dropbear once the network subsystem of udev is ready and the network is +# configured. +log_begin_msg "Starting dropbear" /sbin/dropbear $PKGOPTION_dropbear_OPTION +log_end_msg diff -u dropbear-2014.65/debian/rules dropbear-2014.65/debian/rules --- dropbear-2014.65/debian/rules +++ dropbear-2014.65/debian/rules @@ -86,8 +86,6 @@ '$(DIR)'/usr/share/initramfs-tools/hooks/dropbear install -d -m0755 \ '$(DIR)'/usr/share/initramfs-tools/scripts/init-premount - install -m0755 debian/initramfs/premount-devpts \ - '$(DIR)'/usr/share/initramfs-tools/scripts/init-premount/devpts install -m0755 debian/initramfs/premount-dropbear \ '$(DIR)'/usr/share/initramfs-tools/scripts/init-premount/dropbear install -d -m0755 \