packages: cronie/cronie.init, cronie/cronie.spec, cronie/cronie.upstart (NE...
jajcus
jajcus at pld-linux.org
Mon May 24 16:57:40 CEST 2010
Author: jajcus Date: Mon May 24 14:57:40 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- upstart support added
- Release: 5
---- Files affected:
packages/cronie:
cronie.init (1.6 -> 1.7) , cronie.spec (1.32 -> 1.33) , cronie.upstart (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/cronie/cronie.init
diff -u packages/cronie/cronie.init:1.6 packages/cronie/cronie.init:1.7
--- packages/cronie/cronie.init:1.6 Tue Mar 2 22:27:57 2010
+++ packages/cronie/cronie.init Mon May 24 16:57:35 2010
@@ -77,6 +77,8 @@
start
}
+upstart_controlled
+
RETVAL=0
# See how we were called.
case "$1" in
================================================================
Index: packages/cronie/cronie.spec
diff -u packages/cronie/cronie.spec:1.32 packages/cronie/cronie.spec:1.33
--- packages/cronie/cronie.spec:1.32 Mon May 10 17:44:30 2010
+++ packages/cronie/cronie.spec Mon May 24 16:57:35 2010
@@ -18,7 +18,7 @@
Summary: Cron daemon for executing programs at set times
Name: cronie
Version: 1.4.4
-Release: 4
+Release: 5
License: MIT and BSD and GPL v2
Group: Daemons
Source0: https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@
Source3: cron.sysconfig
Source4: %{name}.crontab
Source5: %{name}.pam
+Source6: %{name}.upstart
Patch0: inotify-nosys.patch
Patch1: %{name}-nosyscrontab.patch
Patch2: sendmail-path.patch
@@ -38,7 +39,7 @@
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: pam-devel
BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.561
Requires(post): fileutils
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
@@ -47,7 +48,7 @@
Requires: /bin/run-parts
Requires: /sbin/chkconfig
Requires: psmisc >= 20.1
-Requires: rc-scripts >= 0.4.0.19
+Requires: rc-scripts >= 0.4.3.0
%{?with_inotify:Requires: uname(release) >= 2.6.13}
Provides: crondaemon
Provides: crontabs = 1.7
@@ -79,6 +80,19 @@
regular jobs. The default settings execute regular jobs by anacron,
however this could be overloaded in settings.
+%package upstart
+Summary: Upstart job description for Cronie
+Summary(pl.UTF-8): Opis zadania Upstart dla Cronie
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+Requires: upstart >= 0.6
+
+%description upstart
+Upstart job description for Cronie.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla Cronie.
+
%prep
%setup -q
%patch0 -p1
@@ -105,7 +119,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir}} \
- $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} \
+ $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig,init} \
$RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d}
%{__make} install \
@@ -118,6 +132,7 @@
cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron
cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab
cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/crond
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/crond.conf
touch $RPM_BUILD_ROOT/var/log/cron
@@ -167,6 +182,12 @@
/sbin/chkconfig --del crond
/sbin/chkconfig --add crond
+%post upstart
+%upstart_post crond
+
+%postun upstart
+%upstart_postun crond
+
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
@@ -198,12 +219,20 @@
%attr(1730,root,crontab) /var/spool/anacron
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/crond.conf
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2010/05/24 14:57:35 jajcus
+- upstart support added
+- Release: 5
+
Revision 1.32 2010/05/10 15:44:30 hawk
- release 4
================================================================
Index: packages/cronie/cronie.upstart
diff -u /dev/null packages/cronie/cronie.upstart:1.1
--- /dev/null Mon May 24 16:57:40 2010
+++ packages/cronie/cronie.upstart Mon May 24 16:57:35 2010
@@ -0,0 +1,34 @@
+description "Cronie - the cron daemon"
+
+# 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".
+env CROND_SYSLOG_RESULT="no"
+
+# 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.
+#env CROND_MAIL_PROG="/usr/lib/sendmail"
+env CROND_MAIL_PROG
+
+respawn
+
+script
+ CROND_ARGS=""
+ # Read the old-style service config
+ [ -f /etc/sysconfig/cron ] && . /etc/sysconfig/cron
+
+ # no 'is_yes' as we don't want the havy init.d/functions here
+ if [ "$CROND_SYSLOG_RESULT" = "yes" ] ; 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
+
+ exec /usr/sbin/crond -n $CROND_ARGS
+end script
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.init?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cronie/cronie.spec?r1=1.32&r2=1.33&f=u
More information about the pld-cvs-commit
mailing list