summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-12-02 14:11:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:42:52 +0000
commitb4db53ae66ba36b8e134de31f49a57e842439e7f (patch)
treee9d85435cef568799d43d48f0f258b136dec70f0 /meta/recipes-core
parente0162c1f8c7dee3d9ebaba39a6a555a638dfc787 (diff)
downloadpoky-b4db53ae66ba36b8e134de31f49a57e842439e7f.tar.gz
dropbear: Upgrade 2015.68 -> 2015.70
Tweak a pam patch to make it apply on current source. (From OE-Core rev: 9116a9346556837328a42059bd8af02ea17d081b) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch26
-rw-r--r--meta/recipes-core/dropbear/dropbear_2015.68.bb4
-rw-r--r--meta/recipes-core/dropbear/dropbear_2015.70.bb5
3 files changed, 22 insertions, 13 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
index c408c571e6..539cb12e91 100644
--- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
+++ b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
@@ -1,28 +1,36 @@
1Subject: [PATCH 5/6] dropbear enable pam 1From b8cece92ba19aa77ac013ea161bfe4c7147747c9 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 2 Dec 2015 11:36:02 +0200
4Subject: Enable pam
2 5
3dropbear: We need modify file option.h besides enabling pam in \ 6We need modify file option.h besides enabling pam in
4configure if we want dropbear to support pam. 7configure if we want dropbear to support pam.
5 8
6Upstream-Status: Pending 9Upstream-Status: Pending
7 10
8Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 11Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9--- 13---
10 options.h | 4 ++-- 14 options.h | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
12 16
13Index: dropbear-2013.62/options.h 17diff --git a/options.h b/options.h
14=================================================================== 18index 94261f6..90bfe2f 100644
15--- dropbear-2013.62.orig/options.h 2014-01-14 21:53:02.803262009 +0000 19--- a/options.h
16+++ dropbear-2013.62/options.h 2014-01-14 21:53:56.119263462 +0000 20+++ b/options.h
17@@ -192,9 +192,9 @@ 21@@ -208,10 +208,10 @@ If you test it please contact the Dropbear author */
18 * PAM challenge/response.
19 * You can't enable both PASSWORD and PAM. */
20 22
23 /* This requires crypt() */
24 #ifdef HAVE_CRYPT
21-#define ENABLE_SVR_PASSWORD_AUTH 25-#define ENABLE_SVR_PASSWORD_AUTH
22+/*#define ENABLE_SVR_PASSWORD_AUTH*/ 26+/*#define ENABLE_SVR_PASSWORD_AUTH*/
27 #endif
23 /* PAM requires ./configure --enable-pam */ 28 /* PAM requires ./configure --enable-pam */
24-/*#define ENABLE_SVR_PAM_AUTH */ 29-/*#define ENABLE_SVR_PAM_AUTH */
25+#define ENABLE_SVR_PAM_AUTH 30+#define ENABLE_SVR_PAM_AUTH
26 #define ENABLE_SVR_PUBKEY_AUTH 31 #define ENABLE_SVR_PUBKEY_AUTH
27 32
28 /* Whether to take public key options in 33 /* Whether to take public key options in
34--
352.1.4
36
diff --git a/meta/recipes-core/dropbear/dropbear_2015.68.bb b/meta/recipes-core/dropbear/dropbear_2015.68.bb
deleted file mode 100644
index 1b749d703f..0000000000
--- a/meta/recipes-core/dropbear/dropbear_2015.68.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "7664ac10f7cc2301c530eb80c756fc5d"
4SRC_URI[sha256sum] = "55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446"
diff --git a/meta/recipes-core/dropbear/dropbear_2015.70.bb b/meta/recipes-core/dropbear/dropbear_2015.70.bb
new file mode 100644
index 0000000000..3da8d5f44d
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2015.70.bb
@@ -0,0 +1,5 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "0b0a1d9be6a094710d884209562a626c"
4SRC_URI[sha256sum] = "62a8cc3df1d0f136d46f50d4f8d92f7ab7ce1addac76b25446b3f6aaf80bf257"
5