summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
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:31:40 +0000
commit9116a9346556837328a42059bd8af02ea17d081b (patch)
tree41f3f9b803aa5fab8a36cce46fa61744c7e884ed /meta/recipes-core/dropbear
parent18a913e54b40a1654d0967290088be5e7fcdd6f6 (diff)
downloadopenembedded-core-contrib-9116a9346556837328a42059bd8af02ea17d081b.tar.gz
openembedded-core-contrib-9116a9346556837328a42059bd8af02ea17d081b.tar.bz2
openembedded-core-contrib-9116a9346556837328a42059bd8af02ea17d081b.zip
dropbear: Upgrade 2015.68 -> 2015.70
Tweak a pam patch to make it apply on current source. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/dropbear')
-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 @@
-Subject: [PATCH 5/6] dropbear enable pam
+From b8cece92ba19aa77ac013ea161bfe4c7147747c9 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 2 Dec 2015 11:36:02 +0200
+Subject: Enable pam
-dropbear: We need modify file option.h besides enabling pam in \
+We need modify file option.h besides enabling pam in
configure if we want dropbear to support pam.
Upstream-Status: Pending
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
options.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: dropbear-2013.62/options.h
-===================================================================
---- dropbear-2013.62.orig/options.h 2014-01-14 21:53:02.803262009 +0000
-+++ dropbear-2013.62/options.h 2014-01-14 21:53:56.119263462 +0000
-@@ -192,9 +192,9 @@
- * PAM challenge/response.
- * You can't enable both PASSWORD and PAM. */
+diff --git a/options.h b/options.h
+index 94261f6..90bfe2f 100644
+--- a/options.h
++++ b/options.h
+@@ -208,10 +208,10 @@ If you test it please contact the Dropbear author */
+ /* This requires crypt() */
+ #ifdef HAVE_CRYPT
-#define ENABLE_SVR_PASSWORD_AUTH
+/*#define ENABLE_SVR_PASSWORD_AUTH*/
+ #endif
/* PAM requires ./configure --enable-pam */
-/*#define ENABLE_SVR_PAM_AUTH */
+#define ENABLE_SVR_PAM_AUTH
#define ENABLE_SVR_PUBKEY_AUTH
/* Whether to take public key options in
+--
+2.1.4
+
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 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "7664ac10f7cc2301c530eb80c756fc5d"
-SRC_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 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "0b0a1d9be6a094710d884209562a626c"
+SRC_URI[sha256sum] = "62a8cc3df1d0f136d46f50d4f8d92f7ab7ce1addac76b25446b3f6aaf80bf257"
+