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 <maxin.john@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John 2013-10-21 17:36:42 +02:00 committed by Richard Purdie
parent b831b8c072
commit 4af9886564
10 changed files with 13 additions and 23 deletions

View File

@ -1,28 +1,22 @@
Subject: [PATCH 6/6] dropbear configuration file Subject: [PATCH 6/6] dropbear configuration file
dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam 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 <maxin.john@enea.com>
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
--- ---
svr-authpam.c | 2 +- diff -Naur dropbear-2013.60-orig/svr-authpam.c dropbear-2013.60/svr-authpam.c
1 file changed, 1 insertion(+), 1 deletion(-) --- 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
diff --git a/svr-authpam.c b/svr-authpam.c @@ -211,7 +211,7 @@
index e84f076..e28be7d 100644
--- a/svr-authpam.c
+++ b/svr-authpam.c
@@ -195,7 +195,7 @@ void svr_auth_pam() {
userData.passwd = password; userData.passwd = password;
/* Init pam */ /* Init pam */
- if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { - if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
+ if ((rc = pam_start("dropbear", 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)); rc, pam_strerror(pamHandlep, rc));
goto cleanup; goto cleanup;
--
1.7.11.7

View File

@ -2,12 +2,10 @@ DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation"
HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html" HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
SECTION = "console/network" SECTION = "console/network"
INC_PR = "r1"
# some files are from other projects and have others license terms: # some files are from other projects and have others license terms:
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY # public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c" LIC_FILES_CHKSUM = "file://LICENSE;md5=de74413ba7e05b7a37c4722e75f436cd"
DEPENDS = "zlib" DEPENDS = "zlib"
RPROVIDES_${PN} = "ssh sshd" RPROVIDES_${PN} = "ssh sshd"

View File

@ -1,6 +0,0 @@
require dropbear.inc
SRC_URI[md5sum] = "8d3579bbbfcea48404a3219643076450"
SRC_URI[sha256sum] = "d866189b1d14e15353aeb4feb616f6132a63ea7c25ca8aa12b63a3a397822e55"
PR = "${INC_PR}.0"

View File

@ -0,0 +1,4 @@
require dropbear.inc
SRC_URI[md5sum] = "fffa2fec0c887201bed3a3cc6df7fa35"
SRC_URI[sha256sum] = "4c0c52453b4dd96ef79e5968ed3676de008ee0cf133632acae12bbad588681bb"