[oe-commits] Richard Purdie : dropbear: Refresh pam patch so it applies against recent version

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c4c5ec52effc2ff97ac17270c1aa7884c808f5a9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c4c5ec52effc2ff97ac17270c1aa7884c808f5a9

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Tue Jan 14 21:55:43 2014 +0000

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../dropbear/dropbear/0005-dropbear-enable-pam.patch    | 17 +++++++----------
 1 file 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 e930733..c408c57 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 at windriver.com>
  options.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/options.h b/options.h
-index 71a21c2..305f789 100644
---- a/options.h
-+++ b/options.h
-@@ -174,9 +174,9 @@ much traffic. */
+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. */
  
 -#define ENABLE_SVR_PASSWORD_AUTH
-+//#define ENABLE_SVR_PASSWORD_AUTH
++/*#define ENABLE_SVR_PASSWORD_AUTH*/
  /* PAM requires ./configure --enable-pam */
--//#define ENABLE_SVR_PAM_AUTH
+-/*#define ENABLE_SVR_PAM_AUTH */
 +#define ENABLE_SVR_PAM_AUTH
  #define ENABLE_SVR_PUBKEY_AUTH
  
  /* Whether to take public key options in 
--- 
-1.7.11.7
-