From 9116a9346556837328a42059bd8af02ea17d081b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 2 Dec 2015 14:11:38 +0200 Subject: dropbear: Upgrade 2015.68 -> 2015.70 Tweak a pam patch to make it apply on current source. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- .../dropbear/0005-dropbear-enable-pam.patch | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'meta/recipes-core/dropbear/dropbear') 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 +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 +Signed-off-by: Jussi Kukkonen --- 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 + -- cgit 1.2.3-korg