merge of a987cd4a48f20932db8281f6af42bb07c7a2a9c7

     and aa213887d0cf541ce139ba06eb391211421d1817

20 files changed, 82 insertions, 403 deletions

diff --git a/packages/dropbear/dropbear-0.45/.mtn2git_empty b/packages/dropbear/dropbear-0.45/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dropbear/dropbear-0.45/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dropbear/dropbear-0.46/.mtn2git_empty b/packages/dropbear/dropbear-0.46/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dropbear/dropbear-0.46/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dropbear/dropbear-0.46/allow-nopw.patch b/packages/dropbear/dropbear-0.46/allow-nopw.patch
deleted file mode 100644
index 1a709b8da0..0000000000
--- a/packages/dropbear/dropbear-0.46/allow-nopw.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nurd dropbear-0.45/svr-auth.c dropbear-0.45.patched/svr-auth.c
---- dropbear-0.45/svr-auth.c	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/svr-auth.c	2005-03-08 15:22:43.998592744 -0800
-@@ -237,6 +237,7 @@
- 	}
- 
- 	/* check for an empty password */
-+#ifdef DISALLOW_EMPTY_PW
- 	if (ses.authstate.pw->pw_passwd[0] == '\0') {
- 		TRACE(("leave checkusername: empty pword"))
- 		dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
-@@ -244,7 +245,7 @@
- 		send_msg_userauth_failure(0, 1);
- 		return DROPBEAR_FAILURE;
- 	}
--
-+#endif
- 	TRACE(("shell is %s", ses.authstate.pw->pw_shell))
- 
- 	/* check that the shell is set */
-diff -Nurd dropbear-0.45/svr-authpasswd.c dropbear-0.45.patched/svr-authpasswd.c
---- dropbear-0.45/svr-authpasswd.c	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/svr-authpasswd.c	2005-03-08 15:22:44.010591023 -0800
-@@ -64,9 +64,13 @@
- 	 * since the shadow password may differ to that tested
- 	 * in auth.c */
- 	if (passwdcrypt[0] == '\0') {
-+#ifdef DISALLOW_EMPTY_PASSWD
- 		dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
- 				ses.authstate.printableuser);
- 		send_msg_userauth_failure(0, 1);
-+#else
-+		send_msg_userauth_success();
-+#endif
- 		return;
- 	}
- 
diff --git a/packages/dropbear/dropbear-0.46/configure.patch b/packages/dropbear/dropbear-0.46/configure.patch
deleted file mode 100644
index 9ae84b2604..0000000000
--- a/packages/dropbear/dropbear-0.46/configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nurd dropbear-0.45/configure.in dropbear-0.45.patched/configure.in
---- dropbear-0.45/configure.in	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/configure.in	2005-03-08 15:22:44.040586721 -0800
-@@ -161,15 +161,20 @@
- 			AC_MSG_RESULT(Not using openpty)
- 		else
- 			AC_MSG_RESULT(Using openpty if available)
--			AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)])
-+			AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
- 		fi
- 	],
- 	[
- 		AC_MSG_RESULT(Using openpty if available)
--		AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)])
-+		AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
- 	]
- )
--		
-+
-+if test "x$dropbear_cv_func_have_openpty" = "xyes"; then
-+	AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)
-+	no_ptc_check=yes
-+	no_ptmx_check=yes
-+fi
- 
- AC_ARG_ENABLE(syslog,
- 	[  --disable-syslog        Don't include syslog support],
diff --git a/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch b/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch
deleted file mode 100644
index ba2b19d44a..0000000000
--- a/packages/dropbear/dropbear-0.46/fix-2kb-keys.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nurd dropbear-0.45/kex.h dropbear-0.45.patched/kex.h
---- dropbear-0.45/kex.h	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/kex.h	2005-03-08 15:22:44.064583279 -0800
-@@ -64,6 +64,6 @@
- 
- };
- 
--#define MAX_KEXHASHBUF 2000
-+#define MAX_KEXHASHBUF 3000
- 
- #endif /* _KEX_H_ */
diff --git a/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch b/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch
deleted file mode 100644
index e2b1dd5da5..0000000000
--- a/packages/dropbear/dropbear-0.46/urandom-xauth-changes-to-options.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h
---- dropbear-0.45/options.h	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/options.h	2005-03-08 15:25:09.368742090 -0800
-@@ -143,7 +143,7 @@
-  * however significantly reduce the security of your ssh connections
-  * if the PRNG state becomes guessable - make sure you know what you are
-  * doing if you change this. */
--#define DROPBEAR_RANDOM_DEV "/dev/random"
-+#define DROPBEAR_RANDOM_DEV "/dev/urandom"
- 
- /* prngd must be manually set up to produce output */
- /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/
-@@ -167,7 +167,7 @@
- /* The command to invoke for xauth when using X11 forwarding.
-  * "-q" for quiet */
- #ifndef XAUTH_COMMAND
--#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
-+#define XAUTH_COMMAND "xauth -q"
- #endif
- 
- /* if you want to enable running an sftp server (such as the one included with
diff --git a/packages/dropbear/dropbear-0.47/.mtn2git_empty b/packages/dropbear/dropbear-0.47/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dropbear/dropbear-0.47/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dropbear/dropbear-0.47/allow-nopw.patch b/packages/dropbear/dropbear-0.47/allow-nopw.patch
deleted file mode 100644
index 1a709b8da0..0000000000
--- a/packages/dropbear/dropbear-0.47/allow-nopw.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nurd dropbear-0.45/svr-auth.c dropbear-0.45.patched/svr-auth.c
---- dropbear-0.45/svr-auth.c	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/svr-auth.c	2005-03-08 15:22:43.998592744 -0800
-@@ -237,6 +237,7 @@
- 	}
- 
- 	/* check for an empty password */
-+#ifdef DISALLOW_EMPTY_PW
- 	if (ses.authstate.pw->pw_passwd[0] == '\0') {
- 		TRACE(("leave checkusername: empty pword"))
- 		dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
-@@ -244,7 +245,7 @@
- 		send_msg_userauth_failure(0, 1);
- 		return DROPBEAR_FAILURE;
- 	}
--
-+#endif
- 	TRACE(("shell is %s", ses.authstate.pw->pw_shell))
- 
- 	/* check that the shell is set */
-diff -Nurd dropbear-0.45/svr-authpasswd.c dropbear-0.45.patched/svr-authpasswd.c
---- dropbear-0.45/svr-authpasswd.c	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/svr-authpasswd.c	2005-03-08 15:22:44.010591023 -0800
-@@ -64,9 +64,13 @@
- 	 * since the shadow password may differ to that tested
- 	 * in auth.c */
- 	if (passwdcrypt[0] == '\0') {
-+#ifdef DISALLOW_EMPTY_PASSWD
- 		dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
- 				ses.authstate.printableuser);
- 		send_msg_userauth_failure(0, 1);
-+#else
-+		send_msg_userauth_success();
-+#endif
- 		return;
- 	}
- 
diff --git a/packages/dropbear/dropbear-0.47/configure.patch b/packages/dropbear/dropbear-0.47/configure.patch
deleted file mode 100644
index 9ae84b2604..0000000000
--- a/packages/dropbear/dropbear-0.47/configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nurd dropbear-0.45/configure.in dropbear-0.45.patched/configure.in
---- dropbear-0.45/configure.in	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/configure.in	2005-03-08 15:22:44.040586721 -0800
-@@ -161,15 +161,20 @@
- 			AC_MSG_RESULT(Not using openpty)
- 		else
- 			AC_MSG_RESULT(Using openpty if available)
--			AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)])
-+			AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
- 		fi
- 	],
- 	[
- 		AC_MSG_RESULT(Using openpty if available)
--		AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)])
-+		AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes])
- 	]
- )
--		
-+
-+if test "x$dropbear_cv_func_have_openpty" = "xyes"; then
-+	AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)
-+	no_ptc_check=yes
-+	no_ptmx_check=yes
-+fi
- 
- AC_ARG_ENABLE(syslog,
- 	[  --disable-syslog        Don't include syslog support],
diff --git a/packages/dropbear/dropbear-0.47/fix-2kb-keys.patch b/packages/dropbear/dropbear-0.47/fix-2kb-keys.patch
deleted file mode 100644
index ba2b19d44a..0000000000
--- a/packages/dropbear/dropbear-0.47/fix-2kb-keys.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nurd dropbear-0.45/kex.h dropbear-0.45.patched/kex.h
---- dropbear-0.45/kex.h	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/kex.h	2005-03-08 15:22:44.064583279 -0800
-@@ -64,6 +64,6 @@
- 
- };
- 
--#define MAX_KEXHASHBUF 2000
-+#define MAX_KEXHASHBUF 3000
- 
- #endif /* _KEX_H_ */
diff --git a/packages/dropbear/dropbear-0.47/urandom-xauth-changes-to-options.h.patch b/packages/dropbear/dropbear-0.47/urandom-xauth-changes-to-options.h.patch
deleted file mode 100644
index e2b1dd5da5..0000000000
--- a/packages/dropbear/dropbear-0.47/urandom-xauth-changes-to-options.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h
---- dropbear-0.45/options.h	2005-03-06 20:27:02.000000000 -0800
-+++ dropbear-0.45.patched/options.h	2005-03-08 15:25:09.368742090 -0800
-@@ -143,7 +143,7 @@
-  * however significantly reduce the security of your ssh connections
-  * if the PRNG state becomes guessable - make sure you know what you are
-  * doing if you change this. */
--#define DROPBEAR_RANDOM_DEV "/dev/random"
-+#define DROPBEAR_RANDOM_DEV "/dev/urandom"
- 
- /* prngd must be manually set up to produce output */
- /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/
-@@ -167,7 +167,7 @@
- /* The command to invoke for xauth when using X11 forwarding.
-  * "-q" for quiet */
- #ifndef XAUTH_COMMAND
--#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
-+#define XAUTH_COMMAND "xauth -q"
- #endif
- 
- /* if you want to enable running an sftp server (such as the one included with
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
new file mode 100644
index 0000000000..301ac24cb2
--- /dev/null
+++ b/packages/dropbear/dropbear.inc
@@ -0,0 +1,73 @@
+DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
+HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
+SECTION = "console/network"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+PROVIDES = "ssh sshd"
+RPROVIDES = "ssh sshd"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
+	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
+	   file://configure.patch;patch=1 \
+	   file://fix-2kb-keys.patch;patch=1 \
+	   file://allow-nopw.patch \
+	   file://init"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = " -I. "
+LD = "${CC}"
+
+SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
+BINCOMMANDS = "dbclient ssh scp"
+EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
+
+do_configure_prepend() {
+	if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then
+		oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
+		patch -p1 < ${WORKDIR}/allow-nopw.patch
+	fi
+}
+
+do_install() {
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+                   ${D}${bindir} \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
+	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
+	
+	for i in ${SBINCOMMANDS}
+	do
+		ln -s ./dropbearmulti ${D}${sbindir}/$i
+	done
+	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
+				  -e 's,/usr/sbin,${sbindir},g' \
+				  -e 's,/var,${localstatedir},g' \
+				  -e 's,/usr/bin,${bindir},g' \
+				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+	chmod 755 ${D}${sysconfdir}/init.d/dropbear
+}
+
+pkg_postinst () {
+	update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
+	update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
+}
+
+pkg_postrm_append () {
+  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+  fi
+  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+  fi
+  update-alternatives --remove ssh ${bindir}/dropbearmulti
+  update-alternatives --remove scp ${bindir}/dropbearmulti
+}
diff --git a/packages/dropbear/dropbear-0.45/allow-nopw.patch b/packages/dropbear/dropbear/allow-nopw.patch
index 1a709b8da0..1a709b8da0 100644
--- a/packages/dropbear/dropbear-0.45/allow-nopw.patch
+++ b/packages/dropbear/dropbear/allow-nopw.patch
diff --git a/packages/dropbear/dropbear-0.45/configure.patch b/packages/dropbear/dropbear/configure.patch
index 9ae84b2604..9ae84b2604 100644
--- a/packages/dropbear/dropbear-0.45/configure.patch
+++ b/packages/dropbear/dropbear/configure.patch
diff --git a/packages/dropbear/dropbear-0.45/fix-2kb-keys.patch b/packages/dropbear/dropbear/fix-2kb-keys.patch
index ba2b19d44a..ba2b19d44a 100644
--- a/packages/dropbear/dropbear-0.45/fix-2kb-keys.patch
+++ b/packages/dropbear/dropbear/fix-2kb-keys.patch
diff --git a/packages/dropbear/dropbear-0.45/urandom-xauth-changes-to-options.h.patch b/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
index e2b1dd5da5..e2b1dd5da5 100644
--- a/packages/dropbear/dropbear-0.45/urandom-xauth-changes-to-options.h.patch
+++ b/packages/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch
diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb
index 652a5f24ed..8daf54aac3 100644
--- a/packages/dropbear/dropbear_0.45.bb
+++ b/packages/dropbear/dropbear_0.45.bb
@@ -1,69 +1,5 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
-HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
-SECTION = "console/network"
-LICENSE = "MIT"
-DEPENDS = "zlib"
-PROVIDES = "ssh sshd"
-PR = "r3"
+include dropbear.inc
 
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
-	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-	   file://allow-nopw.patch \
-	   file://fix-2kb-keys.patch;patch=1 \
-	   file://chansession-security-fix.patch;patch=1 \
-	   file://init"
+PR = "r4"
 
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "dropbear"
-INITSCRIPT_PARAMS = "defaults 10"
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-
-SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
-BINCOMMANDS = "dbclient ssh scp"
-EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-
-do_configure_prepend() {
-	if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then
-		oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
-		patch -p1 < ${WORKDIR}/allow-nopw.patch
-	fi
-}
-
-do_install() {
-	install -d ${D}${sysconfdir} \
-		   ${D}${sysconfdir}/init.d \
-		   ${D}${sysconfdir}/default \
-		   ${D}${sysconfdir}/dropbear \
-                   ${D}${bindir} \
-		   ${D}${sbindir} \
-		   ${D}${localstatedir}
-
-	install -m 0755 dropbearmulti ${D}${sbindir}/
-	for i in ${BINCOMMANDS}
-	do
-		ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
-	done
-	for i in ${SBINCOMMANDS}
-	do
-		ln -s ./dropbearmulti ${D}${sbindir}/$i
-	done
-	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
-				  -e 's,/usr/sbin,${sbindir},g' \
-				  -e 's,/var,${localstatedir},g' \
-				  -e 's,/usr/bin,${bindir},g' \
-				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
-	chmod 755 ${D}${sysconfdir}/init.d/dropbear
-}
-
-pkg_postrm_append () {
-  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
-  fi
-  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
-  fi
-}
+SRC_URI += "file://chansession-security-fix.patch;patch=1 "
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index ee6ed90cfe..9aed2dc976 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -1,74 +1,5 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
-HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
-SECTION = "console/network"
-LICENSE = "MIT"
-DEPENDS = "zlib"
-PROVIDES = "ssh sshd"
-PR = "r5"
+include dropbear.inc
 
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
-	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-	   file://allow-nopw.patch \
-	   file://fix-2kb-keys.patch;patch=1 \
-	   file://chansession-security-fix.patch;patch=1 \
-	   file://init"
+PR = "r6"
 
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "dropbear"
-INITSCRIPT_PARAMS = "defaults 10"
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-
-SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
-BINCOMMANDS = "dbclient ssh scp"
-EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-
-do_configure_prepend() {
-	if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then
-		oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
-		patch -p1 < ${WORKDIR}/allow-nopw.patch
-	fi
-}
-
-do_install() {
-	install -d ${D}${sysconfdir} \
-		   ${D}${sysconfdir}/init.d \
-		   ${D}${sysconfdir}/default \
-		   ${D}${sysconfdir}/dropbear \
-                   ${D}${bindir} \
-		   ${D}${sbindir} \
-		   ${D}${localstatedir}
-
-	install -m 0755 dropbearmulti ${D}${sbindir}/
-	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
-	
-	for i in ${SBINCOMMANDS}
-	do
-		ln -s ./dropbearmulti ${D}${sbindir}/$i
-	done
-	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
-				  -e 's,/usr/sbin,${sbindir},g' \
-				  -e 's,/var,${localstatedir},g' \
-				  -e 's,/usr/bin,${bindir},g' \
-				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
-	chmod 755 ${D}${sysconfdir}/init.d/dropbear
-}
-
-pkg_postinst () {
-	update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
-	update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
-}
-
-pkg_postrm_append () {
-  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
-  fi
-  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
-  fi
-  update-alternatives --remove ssh ${bindir}/dropbearmulti
-  update-alternatives --remove scp ${bindir}/dropbearmulti
-}
+SRC_URI += "file://chansession-security-fix.patch;patch=1 "
diff --git a/packages/dropbear/dropbear_0.47.bb b/packages/dropbear/dropbear_0.47.bb
index a2906f6b11..5990260b87 100644
--- a/packages/dropbear/dropbear_0.47.bb
+++ b/packages/dropbear/dropbear_0.47.bb
@@ -1,73 +1,3 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
-HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
-SECTION = "console/network"
-LICENSE = "MIT"
-DEPENDS = "zlib"
-PROVIDES = "ssh sshd"
-PR = "r1"
+include dropbear.inc
 
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
-	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
-	   file://configure.patch;patch=1 \
-	   file://allow-nopw.patch \
-	   file://fix-2kb-keys.patch;patch=1 \
-	   file://init"
-
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "dropbear"
-INITSCRIPT_PARAMS = "defaults 10"
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-
-SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
-BINCOMMANDS = "dbclient ssh scp"
-EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-
-do_configure_prepend() {
-	if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then
-		oenote "WARNING: applying allow-nopw.patch which allows password-less logins!"
-		patch -p1 < ${WORKDIR}/allow-nopw.patch
-	fi
-}
-
-do_install() {
-	install -d ${D}${sysconfdir} \
-		   ${D}${sysconfdir}/init.d \
-		   ${D}${sysconfdir}/default \
-		   ${D}${sysconfdir}/dropbear \
-                   ${D}${bindir} \
-		   ${D}${sbindir} \
-		   ${D}${localstatedir}
-
-	install -m 0755 dropbearmulti ${D}${sbindir}/
-	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
-	
-	for i in ${SBINCOMMANDS}
-	do
-		ln -s ./dropbearmulti ${D}${sbindir}/$i
-	done
-	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
-				  -e 's,/usr/sbin,${sbindir},g' \
-				  -e 's,/var,${localstatedir},g' \
-				  -e 's,/usr/bin,${bindir},g' \
-				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
-	chmod 755 ${D}${sysconfdir}/init.d/dropbear
-}
-
-pkg_postinst () {
-	update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
-	update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
-}
-
-pkg_postrm_append () {
-  if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
-  fi
-  if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-        rm ${sysconfdir}/dropbear/dropbear_dss_host_key
-  fi
-  update-alternatives --remove ssh ${bindir}/dropbearmulti
-  update-alternatives --remove scp ${bindir}/dropbearmulti
-}
+PR = "r2"
diff --git a/packages/dropbear/dropbear_0.48.1.bb b/packages/dropbear/dropbear_0.48.1.bb
new file mode 100644
index 0000000000..d039209764
--- /dev/null
+++ b/packages/dropbear/dropbear_0.48.1.bb
@@ -0,0 +1 @@
+include dropbear.inc