Adding patches to support pam
cover Adding patches to support pam
Hi Saul & Richard,
I modified my patches about how to whitespace and tab in .bb file according to your suggestion.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/pam
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/pam
Thanks,
Xiaofeng Yan <[email protected]>
---
Xiaofeng Yan (3):
openssh: Support PAM
dropbear: Support pam
polkit: Support pam
.../openssh/openssh-5.8p2/sshd | 10 ++++++++ meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 13 +++++++++- meta/recipes-core/dropbear/dropbear.inc | 8 ++++++- .../dropbear/dropbear/dropbear-enable-pam.patch | 22 +++++++++++++++++++ meta/recipes-core/dropbear/dropbear_0.52.bb | 2 +- .../polkit/polkit-0.101/polkit-1_pam.patch | 23 ++++++++++++++++++++ meta/recipes-extended/polkit/polkit_0.101.bb | 7 ++++- 7 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh-5.8p2/sshd create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
PATCH 1/3 openssh: Support PAM
Adding configuration file "sshd" in /etc/pam.d/ for supporting pam.
--- .../openssh/openssh-5.8p2/sshd | 10 ++++++++++ meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 13 +++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh-5.8p2/sshd
meta/recipes-connectivity/openssh/openssh-5.8p2/sshd new file +10 -0
@@ -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 +
meta/recipes-connectivity/openssh/openssh_5.8p2.bb +11 -2
@@ -7,7 +7,7 @@ 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)}"
@@ -23,7 +23,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"
@@ -58,6 +60,13 @@ do_compile_append () { } do_install_append () { + for i in ${DISTRO_FEATURES}; + do + if [ ${i} = "pam" ]; then + install -d ${D}${sysconfdir}/pam.d + install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd + fi + done install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd mv ${D}${bindir}/scp ${D}${bindir}/scp.${PN}
Signature · 1 line
1.7.0.4
PATCH 2/3 dropbear: Support pam
In reply to Xiaofeng YanI make a patch and some changes in dropbear.inc for supporting pam.
- Enable pam in configure
- Modify file option.h to open pam supporting
--- meta/recipes-core/dropbear/dropbear.inc | 8 ++++++- .../dropbear/dropbear/dropbear-enable-pam.patch | 22 ++++++++++++++++++++ meta/recipes-core/dropbear/dropbear_0.52.bb | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch
meta/recipes-core/dropbear/dropbear.inc +7 -1
@@ -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)}"
meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch new file +22 -0
@@ -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 <[email protected]> + +--- 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 */ +
meta/recipes-core/dropbear/dropbear_0.52.bb +1 -1
@@ -3,4 +3,4 @@ require dropbear.inc SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e" SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108" -PR = "r2" +PR = "r3"
Signature · 1 line
1.7.0.4
PATCH 3/3 polkit: Support pam
In reply to Xiaofeng YanModify configuration "polkit-1" in /etc/pam.d/ for supporting pam.
--- .../polkit/polkit-0.101/polkit-1_pam.patch | 23 ++++++++++++++++++++ meta/recipes-extended/polkit/polkit_0.101.bb | 7 ++++- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch new file +23 -0
@@ -0,0 +1,23 @@ +polkit: No system-auth in OE-Core, we can use common-* in place of it. + +Upstream-Status:Inappropriate [configuration] + +Signed-off-by: Xiaofeng Yan <[email protected]> + +--- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 ++++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 +@@ -350,10 +350,10 @@ + PAM_FILE_INCLUDE_PASSWORD=system + PAM_FILE_INCLUDE_SESSION=system + else +- PAM_FILE_INCLUDE_AUTH=system-auth +- PAM_FILE_INCLUDE_ACCOUNT=system-auth +- PAM_FILE_INCLUDE_PASSWORD=system-auth +- PAM_FILE_INCLUDE_SESSION=system-auth ++ PAM_FILE_INCLUDE_AUTH=common-auth ++ PAM_FILE_INCLUDE_ACCOUNT=common-account ++ PAM_FILE_INCLUDE_PASSWORD=common-password ++ PAM_FILE_INCLUDE_SESSION=common-session + fi + + AC_SUBST(PAM_FILE_INCLUDE_AUTH)
meta/recipes-extended/polkit/polkit_0.101.bb +5 -2
@@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f" SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \ - file://introspection.patch" -PR = "r0" + file://introspection.patch \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + +PAM_SRC_URI = "file://polkit-1_pam.patch" +PR = "r1" DEPENDS = "libpam expat dbus-glib eggdbus intltool" RDEPENDS_${PN} = "libpam" EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
Signature · 1 line
1.7.0.4
Quoted 3 lines · Xiaofeng Yan
Hi Saul& Richard,
I modified my patches about how to whitespace and tab in .bb file according to your suggestion.
for this patch series.
Thank you Yan!
Quoted 32 lines
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/pam
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/pamThanks,
Xiaofeng Yan<[email protected]>
---Xiaofeng Yan (3):
openssh: Support PAM
dropbear: Support pam
polkit: Support pam.../openssh/openssh-5.8p2/sshd | 10 ++++++++ meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 13 +++++++++- meta/recipes-core/dropbear/dropbear.inc | 8 ++++++- .../dropbear/dropbear/dropbear-enable-pam.patch | 22 +++++++++++++++++++ meta/recipes-core/dropbear/dropbear_0.52.bb | 2 +- .../polkit/polkit-0.101/polkit-1_pam.patch | 23 ++++++++++++++++++++ meta/recipes-extended/polkit/polkit_0.101.bb | 7 ++++- 7 files changed, 79 insertions(+), 6 deletions(-)create mode 100644 meta/recipes-connectivity/openssh/openssh-5.8p2/sshd create mode 100644
meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patchcreate mode 100644meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 3 lines
Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center
Saul Wold
AppliedQuoted 31 lines · Xiaofeng Yan
Hi Saul& Richard,
I modified my patches about how to whitespace and tab in .bb file according to your suggestion.
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/pam
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/pamThanks,
Xiaofeng Yan<[email protected]>
---Xiaofeng Yan (3):
openssh: Support PAM
dropbear: Support pam
polkit: Support pam.../openssh/openssh-5.8p2/sshd | 10 ++++++++ meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 13 +++++++++- meta/recipes-core/dropbear/dropbear.inc | 8 ++++++- .../dropbear/dropbear/dropbear-enable-pam.patch | 22 +++++++++++++++++++ meta/recipes-core/dropbear/dropbear_0.52.bb | 2 +- .../polkit/polkit-0.101/polkit-1_pam.patch | 23 ++++++++++++++++++++ meta/recipes-extended/polkit/polkit_0.101.bb | 7 ++++- 7 files changed, 79 insertions(+), 6 deletions(-)create mode 100644 meta/recipes-connectivity/openssh/openssh-5.8p2/sshd create mode 100644
meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patchcreate mode 100644meta/recipes-extended/polkit/polkit-0.101/polkit-1_pam.patch
Quoted 5 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Merged into oe-core
Thanks
Sau!