diff options
| author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-07-26 17:06:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 11:54:51 +0100 |
| commit | e8f19e8616fb1b0c2d977fb63eaa64f504fb774b (patch) | |
| tree | da371bbc10d1ffa60725a20832a9f0b82f8a4f92 /meta/recipes-core | |
| parent | 8279f771a482d890ad897971cba1d656fdcaefe9 (diff) | |
| download | openembedded-core-e8f19e8616fb1b0c2d977fb63eaa64f504fb774b.tar.gz openembedded-core-e8f19e8616fb1b0c2d977fb63eaa64f504fb774b.tar.bz2 openembedded-core-e8f19e8616fb1b0c2d977fb63eaa64f504fb774b.zip | |
dropbear: Support pam
I make a patch and some changes in dropbear.inc for supporting pam.
- Enable pam in configure
- Modify file option.h to open pam supporting
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch | 22 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 526a5a045d..5af9ebd4d0 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc @@ -9,13 +9,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c" DEPENDS = "zlib" RPROVIDES = "ssh sshd" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ file://urandom-xauth-changes-to-options.h.patch \ file://configure.patch \ file://fix-2kb-keys.patch \ file://allow-nopw.patch;apply=no \ - file://init" + file://init \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " + +PAM_SRC_URI = "file://dropbear-enable-pam.patch" inherit autotools update-rc.d @@ -28,6 +32,8 @@ LD = "${CC}" SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" BINCOMMANDS = "dbclient ssh scp" EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' +EXTRA_OECONF += "\ + ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch new file mode 100644 index 0000000000..004d773dc3 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch @@ -0,0 +1,22 @@ +dropbear: 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> + +--- a/options.h 2011-07-12 13:27:39.008819183 +0800 ++++ b/options.h.new 2011-07-12 13:37:37.780819308 +0800 +@@ -149,9 +149,9 @@ + * but there's an interface via a PAM module - don't bother using it otherwise. + * You can't enable both PASSWORD and PAM. */ + +-#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_PUBKEY_AUTH + + /* Wether to ake public key options in authorized_keys file into account */ + |