From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 1/3] openssh: Support PAM
Date: Mon, 25 Jul 2011 12:45:53 +0100 [thread overview]
Message-ID: <1311594353.2344.176.camel@rex> (raw)
In-Reply-To: <0c23fefb55154f9a35ec9e942d011728e6c8f6c1.1311574519.git.xiaofeng.yan@windriver.com>
On Mon, 2011-07-25 at 16:34 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> Change as follows:
> * Adding configuration file "sshd" in /etc/pam.d/ for supporting pam.
> * Using four spaces instead of tab
>
> Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
> ---
> .../openssh/openssh-5.8p2/sshd | 10 +++
> meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 77 +++++++++++---------
> 2 files changed, 53 insertions(+), 34 deletions(-)
> create mode 100644 meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
>
> diff --git a/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
> new file mode 100644
> index 0000000..4882e58
> --- /dev/null
> +++ b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
> @@ -0,0 +1,10 @@
> +#%PAM-1.0
> +
> +auth include common-auth
> +account required pam_nologin.so
> +account include common-account
> +password include common-password
> +session optional pam_keyinit.so force revoke
> +session include common-session
> +session required pam_loginuid.so
> +
> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> index e23069c..d5ccba1 100644
> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> @@ -7,13 +7,11 @@ SECTION = "console/network"
> LICENSE = "BSD"
> LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
>
> -PR = "r0"
> +PR = "r1"
>
> DEPENDS = "zlib openssl"
> DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
> -
> RPROVIDES = "ssh sshd"
> -
> CONFLICTS_${PN} = "dropbear"
> RCONFLICTS_${PN}-sshd = "dropbear"
> RCONFLICTS_${PN}-keygen = "ssh-keygen"
> @@ -23,7 +21,9 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
> file://sshd_config \
> file://ssh_config \
> file://init \
> - "
> + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
> +
> +PAM_SRC_URI = "file://sshd"
> SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
> SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
>
> @@ -47,23 +47,32 @@ EXTRA_OECONF = "--with-rand-helper=no \
> EXTRA_OECONF_append_libc-uclibc=" --without-pam"
>
> do_configure_prepend () {
> - if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
> - cp aclocal.m4 acinclude.m4
> - fi
> +
> + if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
> + cp aclocal.m4 acinclude.m4
> + fi
> }
Please resubmit this without changing the whitespace in the file!
Cheers,
Richard
next prev parent reply other threads:[~2011-07-25 11:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-25 8:23 [PATCH 0/3] Adding pam supporting Xiaofeng Yan
2011-07-25 8:23 ` [PATCH 1/3] openssh: Support PAM Xiaofeng Yan
2011-07-25 11:45 ` Richard Purdie [this message]
2011-07-25 8:23 ` [PATCH 2/3] polkit: Support pam Xiaofeng Yan
2011-07-25 8:23 ` [PATCH 3/3] dropbear: " Xiaofeng Yan
2011-07-25 16:20 ` [PATCH 0/3] Adding pam supporting Saul Wold
2011-07-26 10:08 [PATCH 0/3] Adding patches to support pam Xiaofeng Yan
2011-07-26 10:08 ` [PATCH 1/3] openssh: Support PAM Xiaofeng Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311594353.2344.176.camel@rex \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.