diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-14 21:55:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-14 21:57:22 +0000 |
commit | e4c23f7bcb79072ea6028fbdf8f3f0dc17a63371 (patch) | |
tree | 42d3b104c92e1e63123e2a7472033a0489f06a4f | |
parent | 253a58c6f3e841193d2f907d15d4c479134138d7 (diff) | |
download | poky-e4c23f7bcb79072ea6028fbdf8f3f0dc17a63371.tar.gz |
dropbear: Refresh pam patch so it applies against recent version
Patch application failed on the autobuilder for pam, this refresh of the
patch should resolve the build failure.
(From OE-Core rev: c4c5ec52effc2ff97ac17270c1aa7884c808f5a9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch | 17 |
1 files changed, 7 insertions, 10 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 e9307339ce..c408c571e6 100644 --- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch +++ b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch | |||
@@ -10,22 +10,19 @@ Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | |||
10 | options.h | 4 ++-- | 10 | options.h | 4 ++-- |
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/options.h b/options.h | 13 | Index: dropbear-2013.62/options.h |
14 | index 71a21c2..305f789 100644 | 14 | =================================================================== |
15 | --- a/options.h | 15 | --- dropbear-2013.62.orig/options.h 2014-01-14 21:53:02.803262009 +0000 |
16 | +++ b/options.h | 16 | +++ dropbear-2013.62/options.h 2014-01-14 21:53:56.119263462 +0000 |
17 | @@ -174,9 +174,9 @@ much traffic. */ | 17 | @@ -192,9 +192,9 @@ |
18 | * PAM challenge/response. | 18 | * PAM challenge/response. |
19 | * You can't enable both PASSWORD and PAM. */ | 19 | * You can't enable both PASSWORD and PAM. */ |
20 | 20 | ||
21 | -#define ENABLE_SVR_PASSWORD_AUTH | 21 | -#define ENABLE_SVR_PASSWORD_AUTH |
22 | +//#define ENABLE_SVR_PASSWORD_AUTH | 22 | +/*#define ENABLE_SVR_PASSWORD_AUTH*/ |
23 | /* PAM requires ./configure --enable-pam */ | 23 | /* PAM requires ./configure --enable-pam */ |
24 | -//#define ENABLE_SVR_PAM_AUTH | 24 | -/*#define ENABLE_SVR_PAM_AUTH */ |
25 | +#define ENABLE_SVR_PAM_AUTH | 25 | +#define ENABLE_SVR_PAM_AUTH |
26 | #define ENABLE_SVR_PUBKEY_AUTH | 26 | #define ENABLE_SVR_PUBKEY_AUTH |
27 | 27 | ||
28 | /* Whether to take public key options in | 28 | /* Whether to take public key options in |
29 | -- | ||
30 | 1.7.11.7 | ||
31 | |||