From 4af98865640652006b13cf871ad255a3280c9019 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Mon, 21 Oct 2013 17:36:42 +0200 Subject: [PATCH] dropbear: update to 2013.60 version update to latest version 2013.60 Update 0006-dropbear-configuration-file.patch for 2013.60 (From OE-Core rev: 76e8b841d19789fe54ef650d6e8b42950fd27ceb) Signed-off-by: Maxin B. John Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...1-urandom-xauth-changes-to-options.h.patch | 0 .../0002-static_build_fix.patch | 0 .../0003-configure.patch | 0 .../0004-fix-2kb-keys.patch | 0 .../0005-dropbear-enable-pam.patch | 0 .../0006-dropbear-configuration-file.patch | 22 +++++++------------ .../0007-dropbear-fix-for-x32-abi.patch | 0 meta/recipes-core/dropbear/dropbear.inc | 4 +--- .../recipes-core/dropbear/dropbear_2013.58.bb | 6 ----- .../recipes-core/dropbear/dropbear_2013.60.bb | 4 ++++ 10 files changed, 13 insertions(+), 23 deletions(-) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0001-urandom-xauth-changes-to-options.h.patch (100%) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0002-static_build_fix.patch (100%) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0003-configure.patch (100%) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0004-fix-2kb-keys.patch (100%) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0005-dropbear-enable-pam.patch (100%) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0006-dropbear-configuration-file.patch (56%) rename meta/recipes-core/dropbear/{dropbear-2013.58 => dropbear-2013.60}/0007-dropbear-fix-for-x32-abi.patch (100%) delete mode 100644 meta/recipes-core/dropbear/dropbear_2013.58.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2013.60.bb diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0001-urandom-xauth-changes-to-options.h.patch similarity index 100% rename from meta/recipes-core/dropbear/dropbear-2013.58/0001-urandom-xauth-changes-to-options.h.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0001-urandom-xauth-changes-to-options.h.patch diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0002-static_build_fix.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0002-static_build_fix.patch similarity index 100% rename from meta/recipes-core/dropbear/dropbear-2013.58/0002-static_build_fix.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0002-static_build_fix.patch diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0003-configure.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0003-configure.patch similarity index 100% rename from meta/recipes-core/dropbear/dropbear-2013.58/0003-configure.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0003-configure.patch diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0004-fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0004-fix-2kb-keys.patch similarity index 100% rename from meta/recipes-core/dropbear/dropbear-2013.58/0004-fix-2kb-keys.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0004-fix-2kb-keys.patch diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0005-dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0005-dropbear-enable-pam.patch similarity index 100% rename from meta/recipes-core/dropbear/dropbear-2013.58/0005-dropbear-enable-pam.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0005-dropbear-enable-pam.patch diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0006-dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0006-dropbear-configuration-file.patch similarity index 56% rename from meta/recipes-core/dropbear/dropbear-2013.58/0006-dropbear-configuration-file.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0006-dropbear-configuration-file.patch index 7e38663981..fa4c8d0a67 100644 --- a/meta/recipes-core/dropbear/dropbear-2013.58/0006-dropbear-configuration-file.patch +++ b/meta/recipes-core/dropbear/dropbear-2013.60/0006-dropbear-configuration-file.patch @@ -1,28 +1,22 @@ Subject: [PATCH 6/6] dropbear configuration file dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \ -to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" +to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Maxin B. John Signed-off-by: Xiaofeng Yan --- - svr-authpam.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/svr-authpam.c b/svr-authpam.c -index e84f076..e28be7d 100644 ---- a/svr-authpam.c -+++ b/svr-authpam.c -@@ -195,7 +195,7 @@ void svr_auth_pam() { +diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c +--- dropbear-2013.60-orig/svr-authpam.c 2013-10-16 16:34:53.000000000 +0200 ++++ dropbear-2013.60/svr-authpam.c 2013-10-21 17:04:04.969416055 +0200 +@@ -211,7 +211,7 @@ userData.passwd = password; /* Init pam */ - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { + if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { - dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s\n", + dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", rc, pam_strerror(pamHandlep, rc)); goto cleanup; --- -1.7.11.7 - diff --git a/meta/recipes-core/dropbear/dropbear-2013.58/0007-dropbear-fix-for-x32-abi.patch b/meta/recipes-core/dropbear/dropbear-2013.60/0007-dropbear-fix-for-x32-abi.patch similarity index 100% rename from meta/recipes-core/dropbear/dropbear-2013.58/0007-dropbear-fix-for-x32-abi.patch rename to meta/recipes-core/dropbear/dropbear-2013.60/0007-dropbear-fix-for-x32-abi.patch diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 9498bf8111..ee17d9f22b 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -2,12 +2,10 @@ DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation" HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" SECTION = "console/network" -INC_PR = "r1" - # some files are from other projects and have others license terms: # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=de74413ba7e05b7a37c4722e75f436cd" DEPENDS = "zlib" RPROVIDES_${PN} = "ssh sshd" diff --git a/meta/recipes-core/dropbear/dropbear_2013.58.bb b/meta/recipes-core/dropbear/dropbear_2013.58.bb deleted file mode 100644 index 99a24a713f..0000000000 --- a/meta/recipes-core/dropbear/dropbear_2013.58.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "8d3579bbbfcea48404a3219643076450" -SRC_URI[sha256sum] = "d866189b1d14e15353aeb4feb616f6132a63ea7c25ca8aa12b63a3a397822e55" - -PR = "${INC_PR}.0" diff --git a/meta/recipes-core/dropbear/dropbear_2013.60.bb b/meta/recipes-core/dropbear/dropbear_2013.60.bb new file mode 100644 index 0000000000..42d9985d7c --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_2013.60.bb @@ -0,0 +1,4 @@ +require dropbear.inc + +SRC_URI[md5sum] = "fffa2fec0c887201bed3a3cc6df7fa35" +SRC_URI[sha256sum] = "4c0c52453b4dd96ef79e5968ed3676de008ee0cf133632acae12bbad588681bb"