Hi Gerrit!

As you welcomed it, I have uploaded an NMU for dropbear fixing the
initramfs issue. Well, two actually. It only hit me after the first
that I had not verified upgrades from Squeeze, and indeed, they were
broken.

-- 
Jérémy Bobbio                        .''`. 
lu...@debian.org                    : :Ⓐ  :  # apt-get install anarchism
                                    `. `'` 
                                      `-   
diff -u dropbear-2012.55/debian/changelog dropbear-2012.55/debian/changelog
--- dropbear-2012.55/debian/changelog
+++ dropbear-2012.55/debian/changelog
@@ -1,3 +1,18 @@
+dropbear (2012.55-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Unbreak initramfs hook when upgrading from Squeeze.
+
+ -- Jérémy Bobbio <lu...@debian.org>  Tue, 25 Sep 2012 16:53:18 +0200
+
+dropbear (2012.55-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Adjust initramfs hook to work with multi-arch. Initial patch by
+    Michael Stapelberg. (Closes: #630581)
+
+ -- Jérémy Bobbio <lu...@debian.org>  Tue, 25 Sep 2012 09:17:06 +0200
+
 dropbear (2012.55-1) unstable; urgency=high
 
   * New upstream release.
diff -u dropbear-2012.55/debian/initramfs/dropbear-hook dropbear-2012.55/debian/initramfs/dropbear-hook
--- dropbear-2012.55/debian/initramfs/dropbear-hook
+++ dropbear-2012.55/debian/initramfs/dropbear-hook
@@ -27,7 +27,11 @@
 	else
 		rm -f "${DESTDIR}/sbin/dropbear"
 		copy_exec "/usr/sbin/dropbear" "/sbin/"
-		cp /lib/libnss_* "${DESTDIR}/lib/"
+		LIBC_DIR=$(ldd /usr/sbin/dropbear | sed -n -e 's,.* => \(/lib.*\)/libc\.so\..*,\1,p')
+		for so in $(find "${LIBC_DIR}" -name 'libnss_compat*'); do
+			copy_exec "${so}" "${LIBC_DIR}"
+		done
+		echo 'passwd: compat' > "${DESTDIR}/etc/nsswitch.conf"
 		echo "root:x:0:0:root:/root:/bin/sh" > "${DESTDIR}/etc/passwd"
 		for keytype in "dss" "rsa"; do
 			if [ ! -f "/etc/initramfs-tools/etc/dropbear/dropbear_${keytype}_host_key" ]; then

Attachment: signature.asc
Description: Digital signature

Reply via email to