summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-07-20 02:42:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 12:02:42 +0100
commit0eac98e900e27d0f12e612f4638ac29c7d459a9a (patch)
treec83760579276c1ed07a6348e8c1d43e979e3445c /meta/recipes-extended
parent4e489a02e09196b8979ad0ed6c8a97bfb47ef1ea (diff)
downloadpoky-0eac98e900e27d0f12e612f4638ac29c7d459a9a.tar.gz
cronie: enable PAM support for cronie
Enable PAM support for cronie and update its pam config file 'crond'. (From OE-Core rev: fec92e4b0c34adc9d512f61ff22de9026b83e3b4) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/cronie/cronie/crond_pam_config.patch19
-rw-r--r--meta/recipes-extended/cronie/cronie_1.4.7.bb12
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 @@
1password-auth is the Fedora's common pam configure file, use oe common pam
2configure files instead.
3
4Upstream-Status: Pending
5
6Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
7--- cronie-1.4.7/pam/crond.orig 2010-12-16 16:59:02.000000000 +0800
8+++ cronie-1.4.7/pam/crond 2011-07-20 09:47:16.080819203 +0800
9@@ -4,7 +4,7 @@
10 #
11 # No PAM authentication called, auth modules not needed
12 account required pam_access.so
13-account include password-auth
14+account include common-account
15 session required pam_loginuid.so
16-session include password-auth
17-auth include password-auth
18+session include common-session-noninteractive
19+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 \
14 14
15SECTION = "utils" 15SECTION = "utils"
16 16
17PR = "r2" 17DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
18PR = "r3"
18 19
19SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ 20SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
20 file://crond.init \ 21 file://crond.init \
21 file://crontab" 22 file://crontab \
23 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
24
25PAM_SRC_URI = "file://crond_pam_config.patch"
26
22 27
23SRC_URI[md5sum] = "dfc26c47756d0c40ee27ae3c7ee98e0d" 28SRC_URI[md5sum] = "dfc26c47756d0c40ee27ae3c7ee98e0d"
24SRC_URI[sha256sum] = "83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd" 29SRC_URI[sha256sum] = "83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd"
25 30
26inherit autotools update-rc.d 31inherit autotools update-rc.d
27 32
33EXTRA_OECONF += "\
34 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}"
35
28INITSCRIPT_NAME = "crond" 36INITSCRIPT_NAME = "crond"
29INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." 37INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
30 38