diff options
Diffstat (limited to 'meta/recipes-extended/cronie')
-rw-r--r-- | meta/recipes-extended/cronie/cronie/crond_pam_config.patch | 10 | ||||
-rw-r--r-- | meta/recipes-extended/cronie/cronie_1.7.2.bb (renamed from meta/recipes-extended/cronie/cronie_1.5.5.bb) | 33 |
2 files changed, 27 insertions, 16 deletions
diff --git a/meta/recipes-extended/cronie/cronie/crond_pam_config.patch b/meta/recipes-extended/cronie/cronie/crond_pam_config.patch index c374790d1d..464d1470e3 100644 --- a/meta/recipes-extended/cronie/cronie/crond_pam_config.patch +++ b/meta/recipes-extended/cronie/cronie/crond_pam_config.patch | |||
@@ -1,9 +1,19 @@ | |||
1 | From f5b325cba73018e5be984570fd4e680e59e7865d Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | ||
3 | Date: Wed, 20 Jul 2011 02:42:28 +0000 | ||
4 | Subject: [PATCH] cronie: enable PAM support for cronie | ||
5 | |||
1 | password-auth is the Fedora's common pam configure file, use oe common pam | 6 | password-auth is the Fedora's common pam configure file, use oe common pam |
2 | configure files instead. | 7 | configure files instead. |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | 10 | ||
6 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 11 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
12 | |||
13 | --- | ||
14 | pam/crond | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
7 | diff --git a/pam/crond b/pam/crond | 17 | diff --git a/pam/crond b/pam/crond |
8 | index 560529d..95a6457 100644 | 18 | index 560529d..95a6457 100644 |
9 | --- a/pam/crond | 19 | --- a/pam/crond |
diff --git a/meta/recipes-extended/cronie/cronie_1.5.5.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb index 0def4a187d..e4711fa31c 100644 --- a/meta/recipes-extended/cronie/cronie_1.5.5.bb +++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb | |||
@@ -7,16 +7,16 @@ HOMEPAGE = "https://github.com/cronie-crond/cronie/" | |||
7 | BUGTRACKER = "https://bugzilla.redhat.com" | 7 | BUGTRACKER = "https://bugzilla.redhat.com" |
8 | 8 | ||
9 | # Internet Systems Consortium License | 9 | # Internet Systems Consortium License |
10 | LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPLv2+" | 10 | LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPL-2.0-or-later" |
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ |
12 | file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \ | 12 | file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \ |
13 | file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9" | 13 | file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9" |
14 | 14 | ||
15 | SECTION = "utils" | 15 | SECTION = "utils" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/cronie-crond/${BPN}/releases/" | 17 | GITHUB_BASE_URI = "https://github.com/cronie-crond/${BPN}/releases/" |
18 | 18 | ||
19 | SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}/cronie-${PV}.tar.gz \ | 19 | SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ |
20 | file://crond.init \ | 20 | file://crond.init \ |
21 | file://crontab \ | 21 | file://crontab \ |
22 | file://crond.service \ | 22 | file://crond.service \ |
@@ -25,41 +25,42 @@ SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV} | |||
25 | PAM_SRC_URI = "file://crond_pam_config.patch" | 25 | PAM_SRC_URI = "file://crond_pam_config.patch" |
26 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" | 26 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" |
27 | 27 | ||
28 | SRC_URI[md5sum] = "351a37d0b5bd0144816724b4482747ad" | 28 | SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571" |
29 | SRC_URI[sha256sum] = "be34c79505e5544323281854744b9955ff16b160ee569f9df7c0dddae5720eac" | ||
30 | 29 | ||
31 | inherit autotools update-rc.d useradd systemd | 30 | inherit autotools update-rc.d useradd systemd github-releases |
31 | UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" | ||
32 | 32 | ||
33 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 33 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
34 | 34 | ||
35 | PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," | 35 | PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," |
36 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" | 36 | PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" |
37 | PACKAGECONFIG[anacron] = "--enable-anacron,--disable-anacron,anacron" | 37 | PACKAGECONFIG[anacron] = "--enable-anacron,--disable-anacron,anacron" |
38 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" | ||
38 | 39 | ||
39 | INITSCRIPT_NAME = "crond" | 40 | INITSCRIPT_NAME = "crond" |
40 | INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." | 41 | INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." |
41 | 42 | ||
42 | USERADD_PACKAGES = "${PN}" | 43 | USERADD_PACKAGES = "${PN}" |
43 | GROUPADD_PARAM_${PN} = "--system crontab" | 44 | GROUPADD_PARAM:${PN} = "--system crontab" |
44 | 45 | ||
45 | SYSTEMD_SERVICE_${PN} = "crond.service" | 46 | SYSTEMD_SERVICE:${PN} = "crond.service" |
46 | 47 | ||
47 | do_install_append () { | 48 | do_install:append () { |
48 | install -d ${D}${sysconfdir}/sysconfig/ | 49 | install -d ${D}${sysconfdir}/sysconfig/ |
49 | install -d ${D}${sysconfdir}/init.d/ | 50 | install -d ${D}${sysconfdir}/init.d/ |
50 | install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond | 51 | install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond |
51 | install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond | 52 | install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond |
52 | 53 | ||
53 | # install systemd unit files | 54 | # install systemd unit files |
54 | install -d ${D}${systemd_unitdir}/system | 55 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system | 56 | install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir} |
56 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 57 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
57 | -e 's,@SBINDIR@,${sbindir},g' \ | 58 | -e 's,@SBINDIR@,${sbindir},g' \ |
58 | ${D}${systemd_unitdir}/system/crond.service | 59 | ${D}${systemd_system_unitdir}/crond.service |
59 | 60 | ||
60 | # below are necessary for a complete cron environment | 61 | # below are necessary for a complete cron environment |
61 | install -d ${D}${localstatedir}/spool/cron | 62 | install -d ${D}${localstatedir}/spool/cron |
62 | install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ | 63 | install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/ |
63 | mkdir -p ${D}${sysconfdir}/cron.d | 64 | mkdir -p ${D}${sysconfdir}/cron.d |
64 | mkdir -p ${D}${sysconfdir}/cron.hourly | 65 | mkdir -p ${D}${sysconfdir}/cron.hourly |
65 | mkdir -p ${D}${sysconfdir}/cron.daily | 66 | mkdir -p ${D}${sysconfdir}/cron.daily |
@@ -80,5 +81,5 @@ do_install_append () { | |||
80 | chmod 600 ${D}${sysconfdir}/crontab | 81 | chmod 600 ${D}${sysconfdir}/crontab |
81 | } | 82 | } |
82 | 83 | ||
83 | FILES_${PN} += "${sysconfdir}/cron*" | 84 | FILES:${PN} += "${sysconfdir}/cron*" |
84 | CONFFILES_${PN} += "${sysconfdir}/crontab" | 85 | CONFFILES:${PN} += "${sysconfdir}/crontab" |