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.7.bb) | 18 |
2 files changed, 20 insertions, 8 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 @@ +From f5b325cba73018e5be984570fd4e680e59e7865d Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Wed, 20 Jul 2011 02:42:28 +0000 +Subject: [PATCH] cronie: enable PAM support for cronie + 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> + +--- + pam/crond | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/pam/crond b/pam/crond index 560529d..95a6457 100644 --- a/pam/crond diff --git a/meta/recipes-extended/cronie/cronie_1.5.7.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb index 72a45089fd..e4711fa31c 100644 --- a/meta/recipes-extended/cronie/cronie_1.5.7.bb +++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb @@ -7,16 +7,16 @@ HOMEPAGE = "https://github.com/cronie-crond/cronie/" BUGTRACKER = "https://bugzilla.redhat.com" # Internet Systems Consortium License -LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPLv2+" +LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ file://src/cron.c;endline=20;md5=b425c334265026177128353a142633b4 \ file://src/popen.c;beginline=3;endline=31;md5=edd50742d8def712e9472dba353668a9" SECTION = "utils" -UPSTREAM_CHECK_URI = "https://github.com/cronie-crond/${BPN}/releases/" +GITHUB_BASE_URI = "https://github.com/cronie-crond/${BPN}/releases/" -SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}/cronie-${PV}.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ file://crond.init \ file://crontab \ file://crond.service \ @@ -25,15 +25,17 @@ SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV} PAM_SRC_URI = "file://crond_pam_config.patch" PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" -SRC_URI[sha256sum] = "538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3" +SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571" -inherit autotools update-rc.d useradd systemd +inherit autotools update-rc.d useradd systemd github-releases +UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" PACKAGECONFIG[anacron] = "--enable-anacron,--disable-anacron,anacron" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." @@ -47,18 +49,18 @@ do_install:append () { install -d ${D}${sysconfdir}/sysconfig/ install -d ${D}${sysconfdir}/init.d/ install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond - install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond + install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond # install systemd unit files install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ ${D}${systemd_system_unitdir}/crond.service # below are necessary for a complete cron environment install -d ${D}${localstatedir}/spool/cron - install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ + install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/ mkdir -p ${D}${sysconfdir}/cron.d mkdir -p ${D}${sysconfdir}/cron.hourly mkdir -p ${D}${sysconfdir}/cron.daily |