diff options
| author | Wenzong Fan <wenzong.fan@windriver.com> | 2011-07-20 02:42:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 11:54:50 +0100 |
| commit | fec92e4b0c34adc9d512f61ff22de9026b83e3b4 (patch) | |
| tree | 3330d6d11dd4da5cd747df67a2c73b0f09257df8 | |
| parent | 1f7e088f2d570d33c2344e32a05193b37a75ea76 (diff) | |
| download | openembedded-core-fec92e4b0c34adc9d512f61ff22de9026b83e3b4.tar.gz openembedded-core-fec92e4b0c34adc9d512f61ff22de9026b83e3b4.tar.bz2 openembedded-core-fec92e4b0c34adc9d512f61ff22de9026b83e3b4.zip | |
cronie: enable PAM support for cronie
Enable PAM support for cronie and update its pam config file 'crond'.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
| -rw-r--r-- | meta/recipes-extended/cronie/cronie/crond_pam_config.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/cronie/cronie_1.4.7.bb | 12 |
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-extended/cronie/cronie/crond_pam_config.patch b/meta/recipes-extended/cronie/cronie/crond_pam_config.patch new file mode 100644 index 0000000000..675872c3cf --- /dev/null +++ b/meta/recipes-extended/cronie/cronie/crond_pam_config.patch @@ -0,0 +1,19 @@ +password-auth is the Fedora's common pam configure file, use oe common pam +configure files instead. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- cronie-1.4.7/pam/crond.orig 2010-12-16 16:59:02.000000000 +0800 ++++ cronie-1.4.7/pam/crond 2011-07-20 09:47:16.080819203 +0800 +@@ -4,7 +4,7 @@ + # + # No PAM authentication called, auth modules not needed + account required pam_access.so +-account include password-auth ++account include common-account + session required pam_loginuid.so +-session include password-auth +-auth include password-auth ++session include common-session-noninteractive ++auth include common-auth diff --git a/meta/recipes-extended/cronie/cronie_1.4.7.bb b/meta/recipes-extended/cronie/cronie_1.4.7.bb index 992b610a1e..bb715f2bf9 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.7.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.7.bb @@ -14,17 +14,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" -PR = "r2" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +PR = "r3" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://crond.init \ - file://crontab" + file://crontab \ + ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + +PAM_SRC_URI = "file://crond_pam_config.patch" + SRC_URI[md5sum] = "dfc26c47756d0c40ee27ae3c7ee98e0d" SRC_URI[sha256sum] = "83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd" inherit autotools update-rc.d +EXTRA_OECONF += "\ + ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}" + INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." |