packages: cronie/cron.sysconfig, cronie/cronie.init, cronie/cronie.spec - a...

[glen]

Author: glen                         Date: Tue Mar  2 21:28:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add support for -m and -s options via sysconfig; rel 3

---- Files affected:
packages/cronie:
   cron.sysconfig (1.1 -> 1.2) , cronie.init (1.5 -> 1.6) , cronie.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/cronie/cron.sysconfig
diff -u packages/cronie/cron.sysconfig:1.1 packages/cronie/cron.sysconfig:1.2
--- packages/cronie/cron.sysconfig:1.1	Tue Aug 11 22:04:59 2009
+++ packages/cronie/cron.sysconfig	Tue Mar  2 22:27:57 2010
@@ -1,4 +1,19 @@
-# Customized settings for cron
+# Customized settings for cronie crond
 
-# Define nice level for cron
+# Define nice level for crond
 SERVICE_RUN_NICE_LEVEL="+0"
+
+# This option will direct cron to send job output to the system log using syslog(3).
+# This is useful if your system has no sendmail(8), or if mail is disabled using "off".
+#CROND_SYSLOG_RESULT="yes"
+
+# This option allows you to specify a shell command string to use
+# for sending cron mail output instead of sendmail(8).
+# This command must accept a fully formatted mail message (with headers) on
+# stdin and send it as a mail message to the recipients specified in the mail
+# headers.
+# As a special case, the string "off" will disable sending mail.
+#CROND_MAIL_PROG="sendmail"
+
+# Extra arguments to crond(8)
+#CROND_ARGS=""

================================================================
Index: packages/cronie/cronie.init
diff -u packages/cronie/cronie.init:1.5 packages/cronie/cronie.init:1.6
--- packages/cronie/cronie.init:1.5	Tue Nov 17 09:52:48 2009
+++ packages/cronie/cronie.init	Tue Mar  2 22:27:57 2010
@@ -16,6 +16,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+CROND_ARGS=""
+
 # Get service config
 [ -f /etc/sysconfig/cron ] && . /etc/sysconfig/cron
 
@@ -26,8 +28,17 @@
 		return
 	fi
 
+	if is_yes "$CROND_SYSLOG_RESULT"; then
+		CROND_ARGS="$CROND_ARGS -s"
+	fi
+
+	if [ -n "$CROND_MAIL_PROG" ]; then
+		# XXX: should we handle spaces in $CROND_MAIL_PROG?
+		CROND_ARGS="$CROND_ARGS -m $CROND_MAIL_PROG"
+	fi
+
 	msg_starting "cronie crond"
-	daemon /usr/sbin/crond
+	daemon /usr/sbin/crond $CROND_ARGS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/crond
 }

================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.27 packages/cronie/cronie.spec:1.28
--- packages/cronie/cronie.spec:1.27	Mon Feb 22 11:51:30 2010
+++ packages/cronie/cronie.spec	Tue Mar  2 22:27:57 2010
@@ -16,7 +16,7 @@
 Summary:	Cron daemon for executing programs at set times
 Name:		cronie
 Version:	1.4.4
-Release:	2
+Release:	3
 License:	MIT and BSD and GPL v2
 Group:		Daemons
 Source0:	https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
@@ -205,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/03/02 21:27:57  glen
+- add support for -m and -s options via sysconfig; rel 3
+
 Revision 1.27  2010/02/22 10:51:30  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cron.sysconfig?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.init?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.27&r2=1.28&f=u