From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 4/6] cronie: Updates to cronie
Date: Wed, 24 Aug 2011 08:50:29 -0700 [thread overview]
Message-ID: <0fa1989b03cf70c7f27629c8340963fcef862097.1314200868.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1314200868.git.sgw@linux.intel.com>
In-Reply-To: <cover.1314200868.git.sgw@linux.intel.com>
From: Wenzong Fan <wenzong.fan@windriver.com>
1) Add required pam plugins to RDEPENDS list;
2) Correct configure option that used for enable pam support;
3) Create empty crond config file cron.deny;
4) Don't set readonly variable UID in crond init script.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-extended/cronie/cronie/crond.init | 2 --
meta/recipes-extended/cronie/cronie_1.4.8.bb | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/cronie/cronie/crond.init b/meta/recipes-extended/cronie/cronie/crond.init
index 050c37e..08f34be 100755
--- a/meta/recipes-extended/cronie/cronie/crond.init
+++ b/meta/recipes-extended/cronie/cronie/crond.init
@@ -21,8 +21,6 @@ CONFIG=/etc/sysconfig/crond
# Source function library.
. /etc/init.d/functions
-UID=`id -u`
-
case "$1" in
start)
if [ $UID -ne 0 ] ; then
diff --git a/meta/recipes-extended/cronie/cronie_1.4.8.bb b/meta/recipes-extended/cronie/cronie_1.4.8.bb
index 4cfdfad..064347e 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.8.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.8.bb
@@ -15,7 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \
SECTION = "utils"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r0"
+RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
+PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
+
+PR = "r1"
SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
file://crond.init \
@@ -31,7 +34,7 @@ SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785
inherit autotools update-rc.d
EXTRA_OECONF += "\
- ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}"
+ ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"
INITSCRIPT_NAME = "crond"
INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
@@ -50,6 +53,7 @@ do_install_append () {
mkdir -p ${D}${sysconfdir}/cron.daily
mkdir -p ${D}${sysconfdir}/cron.weekly
mkdir -p ${D}${sysconfdir}/cron.monthly
+ touch ${D}${sysconfdir}/cron.deny
}
FILES_${PN} += "${sysconfdir}/cron*"
--
1.7.6
next prev parent reply other threads:[~2011-08-24 15:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 15:50 [CONSOLIDATED PULL 0/6] Bugfixes for M4 Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 1/6] libtasn1: update SRC_URI Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 2/6] procps: Fix lib path to support multilib Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 3/6] mips32: add mips32el tuning Saul Wold
2011-08-24 15:50 ` Saul Wold [this message]
2011-08-24 15:50 ` [CONSOLIDATED PULL 5/6] libpam: Setting suid bit for unix_chkpwd Saul Wold
2011-08-24 15:50 ` [CONSOLIDATED PULL 6/6] initrdscripts: fix init-live.sh for hddimg and livecd Saul Wold
2011-08-24 18:17 ` [CONSOLIDATED PULL 0/6] Bugfixes for M4 Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0fa1989b03cf70c7f27629c8340963fcef862097.1314200868.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.