Patchwork [2/3] dropbear: Upgrade from 0.53.1 to 2011.54

login
register
mail settings
Submitter Mei Lei
Date Nov. 30, 2011, 5:57 a.m.
Message ID <d2556a3bcd208b2d6a8c02332b26b6e808632d7c.1322619553.git.lei.mei@intel.com>
Download mbox | patch
Permalink /patch/15759/
State New
Headers show

Comments

Mei Lei - Nov. 30, 2011, 5:57 a.m.
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../configure.patch                                |    0
 meta/recipes-core/dropbear/dropbear.inc            |    8 ----
 .../dropbear/dropbear/allow-nopw.patch             |   40 --------------------
 meta/recipes-core/dropbear/dropbear_0.53.1.bb      |    6 ---
 meta/recipes-core/dropbear/dropbear_2011.54.bb     |    6 +++
 5 files changed, 6 insertions(+), 54 deletions(-)
 rename meta/recipes-core/dropbear/{dropbear-0.53.1 => dropbear-2011.54}/configure.patch (100%)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/allow-nopw.patch
 delete mode 100644 meta/recipes-core/dropbear/dropbear_0.53.1.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bb
Koen Kooi - Nov. 30, 2011, 7:32 a.m.
Op 30 nov. 2011, om 06:57 heeft Mei Lei het volgende geschreven:

> Signed-off-by: Mei Lei <lei.mei@intel.com>

So the commit summary says 'upgrade', but look here:

> --- a/meta/recipes-core/dropbear/dropbear.inc
> +++ b/meta/recipes-core/dropbear/dropbear.inc
> @@ -16,7 +16,6 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
> 		 file://dropbear-0.53.1-static_build_fix.patch \
> 	         file://configure.patch \
> 	         file://fix-2kb-keys.patch \
> -	         file://allow-nopw.patch;apply=no \

Why did you remove that?

> 	         file://init \
>                  ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
> 
> @@ -40,13 +39,6 @@ EXTRA_OECONF += "\
> 
> DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
> 
> -do_debug_patch() {
> -	if [ "${DISTRO_TYPE}" = "debug" ]; then
> -		bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
> -		patch -p1 < ${WORKDIR}/allow-nopw.patch
> -	fi
> -}
> -

And why did you remove that as well?

> addtask do_debug_patch after do_patch before do_configure

After removing the previous 2, why did you leave this one in?

Why are you breaking passwwdless logins without mentioning it in the commit summary!?!?!?

Patch

diff --git a/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch b/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
similarity index 100%
rename from meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch
rename to meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 1894715..9de13f0 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -16,7 +16,6 @@  SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
 		 file://dropbear-0.53.1-static_build_fix.patch \
 	         file://configure.patch \
 	         file://fix-2kb-keys.patch \
-	         file://allow-nopw.patch;apply=no \
 	         file://init \
                  ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
 
@@ -40,13 +39,6 @@  EXTRA_OECONF += "\
 
 DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-do_debug_patch() {
-	if [ "${DISTRO_TYPE}" = "debug" ]; then
-		bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
-		patch -p1 < ${WORKDIR}/allow-nopw.patch
-	fi
-}
-
 addtask do_debug_patch after do_patch before do_configure
 
 do_install() {
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
deleted file mode 100644
index 3909ef2..0000000
--- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
+++ /dev/null
@@ -1,40 +0,0 @@ 
-Upstream-Status: Inappropriate [embedded specific]
-
-diff --git a/svr-auth.c b/svr-auth.c
-index 87e3c5e..3e78c1a 100644
---- a/svr-auth.c
-+++ b/svr-auth.c
-@@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
- 	}
- 
- 	/* check for an empty password */
-+#ifdef DISALLOW_EMPTY_PW
- 	if (ses.authstate.pw_passwd[0] == '\0') {
- 		TRACE(("leave checkusername: empty pword"))
- 		dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
-@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
- 		send_msg_userauth_failure(0, 1);
- 		return DROPBEAR_FAILURE;
- 	}
-+#endif
- 
- 	TRACE(("shell is %s", ses.authstate.pw_shell))
- 
-diff --git a/svr-authpasswd.c b/svr-authpasswd.c
-index a29fd63..6a3c7e9 100644
---- a/svr-authpasswd.c
-+++ b/svr-authpasswd.c
-@@ -64,9 +64,13 @@ void svr_auth_password() {
- 	 * 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.pw_name);
- 		send_msg_userauth_failure(0, 1);
-+#else
-+               send_msg_userauth_success();
-+#endif
- 		return;
- 	}
- 
diff --git a/meta/recipes-core/dropbear/dropbear_0.53.1.bb b/meta/recipes-core/dropbear/dropbear_0.53.1.bb
deleted file mode 100644
index 54f86e8..0000000
--- a/meta/recipes-core/dropbear/dropbear_0.53.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@ 
-require dropbear.inc
-
-SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03"
-SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6"
-
-PR = "r0"
diff --git a/meta/recipes-core/dropbear/dropbear_2011.54.bb b/meta/recipes-core/dropbear/dropbear_2011.54.bb
new file mode 100644
index 0000000..b7b4b83
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2011.54.bb
@@ -0,0 +1,6 @@ 
+require dropbear.inc
+
+SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
+SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
+
+PR = "r0"