diffstat for cron_3.0pl1-128 cron_3.0pl1-128ubuntu2 cron-3.0pl1/debian/changelog | 315 +++++++++++++++++++++++++++++++++++++++- cron-3.0pl1/debian/control | 8 - cron-3.0pl1/debian/cron.default | 31 --- cron-3.0pl1/debian/rules | 2 debian/cron.preinst | 10 + debian/cron.upstart | 14 + 6 files changed, 346 insertions(+), 34 deletions(-) diff -u cron-3.0pl1/debian/changelog cron-3.0pl1/debian/changelog --- cron-3.0pl1/debian/changelog +++ cron-3.0pl1/debian/changelog @@ -1,3 +1,22 @@ +cron (3.0pl1-128ubuntu2) xenial; urgency=medium + + * Add debian/cron.preinst: Handle /etc/init.d/cron symlink → real file + transition on upgrades. (LP: #1566333) + + -- Martin Pitt Tue, 05 Apr 2016 16:45:50 +0200 + +cron (3.0pl1-128ubuntu1) xenial; urgency=low + + * Merge with Debian; remaining changes: + - debian/control: + + Move MTA to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/rules: Call dh_installinit to install Upstart job properly. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Matthias Klose Wed, 17 Feb 2016 19:21:23 +0100 + cron (3.0pl1-128) unstable; urgency=medium * d/cron.service: Use KillMode=process to kill only the daemon. @@ -7,6 +26,18 @@ -- Christian Kastner Sun, 03 May 2015 15:25:18 +0200 +cron (3.0pl1-127ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Move MTA to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/rules: Call dh_installinit to install Upstart job properly. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Michael Vogt Mon, 27 Oct 2014 10:19:21 +0100 + cron (3.0pl1-127) unstable; urgency=medium * Drop $READ_ENV from cron's command line. It does not belong there. @@ -80,6 +111,18 @@ -- Ansgar Burchardt Mon, 04 Aug 2014 21:44:00 +0200 +cron (3.0pl1-124.1ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable. Remaining Changes: + - debian/control: + + Move MTA to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/rules: Call dh_installinit to install Upstart job properly. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Dimitri John Ledkov Mon, 07 Jul 2014 15:58:31 +0100 + cron (3.0pl1-124.1) unstable; urgency=medium * Non-maintainer upload. @@ -88,6 +131,42 @@ -- Laurent Bigonville Sun, 25 May 2014 21:21:19 +0200 +cron (3.0pl1-124ubuntu4) utopic; urgency=high + + * No change rebuild against new dh_installinit, to call update-rc.d at + postinst. + + -- Dimitri John Ledkov Wed, 28 May 2014 10:39:23 +0100 + +cron (3.0pl1-124ubuntu3) utopic; urgency=medium + + * No change rebuild to drop upstart-job symlink. + + -- Dimitri John Ledkov Mon, 19 May 2014 00:02:44 +0100 + +cron (3.0pl1-124ubuntu2) raring; urgency=low + + * Restore libaudit-dev build-dep now that it has been promoted to main. + + -- Adam Conrad Fri, 08 Feb 2013 23:54:51 -0700 + +cron (3.0pl1-124ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining Changes: + - Drop build-dependency on libaudit, not in main and the security + team doesn't want it there. + - debian/control: + + Move MTA to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/rules: Call dh_installinit to install Upstart job properly. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + * Dropped changes: + - debian/rules: add support for cross-compiling. (Applied in Debian) + - Requires debhelper >= 7.3.15ubuntu2 (for Upstart). (Debian req's >= 9) + + -- Clint Byrum Wed, 07 Nov 2012 00:03:51 -0800 + cron (3.0pl1-124) unstable; urgency=medium [ Release targeted to Wheezy including fixes for critical/important bugs ] @@ -123,6 +202,22 @@ -- Javier Fernández-Sanguino Peña Sat, 23 Jun 2012 08:28:27 +0200 +cron (3.0pl1-121ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rules: add support for cross-compiling. + - Drop build-dependency on libaudit, not in main and the security + team doesn't want it there. + - debian/control: + + Requires debhelper >= 7.3.15ubuntu2 (for Upstart). + + Move MTA to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/rules: Call dh_installinit to install Upstart job properly. + * d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. (LP: #794082) + + -- Clint Byrum Thu, 14 Jun 2012 11:05:24 -0700 + cron (3.0pl1-121) unstable; urgency=low * debian/control: @@ -147,6 +242,34 @@ -- Javier Fernández-Sanguino Peña Mon, 19 Sep 2011 00:20:17 +0200 +cron (3.0pl1-120ubuntu3) precise; urgency=low + + * debian/rules: add support for cross-compiling. + + -- Steve Langasek Mon, 02 Apr 2012 07:50:11 +0000 + +cron (3.0pl1-120ubuntu2) precise; urgency=low + + * Drop build-dependency on libaudit, not in main and the security team + doesn't want it there. LP: #878155. + + -- Steve Langasek Thu, 20 Oct 2011 07:57:06 -0700 + +cron (3.0pl1-120ubuntu1) precise; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Requires debhelper >= 7.3.15ubuntu2 (for Upstart). + + Move MTA to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/rules: Call dh_installinit to install Upstart job properly. + * Dropped changes, superseded upstream: + - debian/control: lockfile-progs no longer recommended. + - debian/{prerm,postinst,postrm}: scripts now generated with debhelper. + + -- Steve Langasek Mon, 17 Oct 2011 15:33:56 -0700 + cron (3.0pl1-120) unstable; urgency=low * do_command.c, cron.h, cron.8: @@ -327,6 +450,37 @@ -- Christian Kastner Sun, 08 May 2011 01:21:15 +0200 +cron (3.0pl1-116ubuntu3) oneiric; urgency=low + + * Cherry-pick fix from Debian: database.c, cron.c, cron.h, + debian/copyright: + - Check orphaned crontabs for adoption. Fix taken from Fedora cronie. + Closes: #634926, LP: #27520. + + -- Steve Langasek Mon, 19 Sep 2011 10:21:01 -0700 + +cron (3.0pl1-116ubuntu2) oneiric; urgency=low + + * No-change rebuild with current debhelper, to fix maintainer script + which keeps trying to start cron in my chroots due to bypassing + invoke-rc.d + + -- Steve Langasek Mon, 15 Aug 2011 16:30:24 -0700 + +cron (3.0pl1-116ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #696953), remaining changes: + - debian/control: + + Requires debhelper >= 7.3.15ubuntu2 (for Upstart). + + Move MTA,lockfile-progs to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/{prerm,postinst,postrm}: + + Don't call update-rc.d,invoke-rc.d and + /etc/init.d/cron. + - debian/rules: Call dh_installinit to install Upstart job properly. + + -- Lorenzo De Liso Mon, 03 Jan 2011 20:32:01 +0100 + cron (3.0pl1-116) unstable; urgency=high * Upload with approval from Release Team to get RC bug fixes in Squeeze @@ -350,6 +504,21 @@ -- Christian Kastner Wed, 10 Nov 2010 21:13:19 +0100 +cron (3.0pl1-115ubuntu1) natty; urgency=low + + * Merge from Debian testing, Ubuntu remaining changes: + - debian/control: + + Requires debhelper >= 7.3.15ubuntu2 (for Upstart). + + Move MTA,lockfile-progs to Suggests field. + - debian/cron.upstart: Add Upstart script. + - debian/{prerm,postinst,postrm}: + + Don't call update-rc.d,invoke-rc.d and + /etc/init.d/cron. + - debian/rules: + + Call dh_installinit to install Upstart job properly. + + -- Alessio Treglia Sat, 27 Nov 2010 10:46:19 +0100 + cron (3.0pl1-115) unstable; urgency=high * cron.c: set LC_COLLATE to 'C' in order to properly work when locales @@ -366,6 +535,22 @@ -- Javier Fernandez-Sanguino Pen~a Sat, 16 Oct 2010 13:05:02 +0200 +cron (3.0pl1-114ubuntu1) maverick; urgency=low + + * Merge from debian unstable for documentation updates and reading of + /etc/default/locale. Remaining changes: + - debian/control: + + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart + + Drop MTA and lockfile-args to Suggests + - add debian/cron.upstart + - debian/postinst: remove calls to update-rc.d, invoke-rc.d and + /etc/init.d/cron + - debian/postrm: remove call to update-rc.d + - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron + - debian/rules: install Upstart job + + -- Jamie Strandboge Tue, 24 Aug 2010 14:56:42 -0500 + cron (3.0pl1-114) unstable; urgency=low * Cleanup of the package in preparation of the next Debian release. @@ -410,6 +595,35 @@ -- Christian Kastner Sun, 18 Jul 2010 22:51:21 +0200 +cron (3.0pl1-113ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Fixes: + - LP: #46493 (this should have been fixed way back in 3.0pl1-87, and I + confirmed it is no longer a problem) + - LP: #118168 (Debian #79037) + - LP: #151231 (Debian #155109, #443615) + - LP: #308341 (Debian #437180) + * Remaining changes: + - debian/control: + + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart + + Drop MTA and lockfile-args to Suggests + - add debian/cron.upstart + - debian/postinst: remove calls to update-rc.d, invoke-rc.d and + /etc/init.d/cron + - debian/postrm: remove call to update-rc.d + - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron + - debian/rules: install Upstart job + * Drop the following changes, now in debian: + - popen.c: check return code of initgroups() in cron_popen() + - debian/control: add missing ${misc:Depends} + - debian/control: Depends bump on lsb to >= 3.2.12ubuntu2. No longer + required now that we use Upstart + - debian/cron.pam: switch from including common-session to including + the new common-session-noninteractive + - pathnames.h: use sensible-editor + + -- Jamie Strandboge Fri, 25 Jun 2010 16:08:12 -0500 + cron (3.0pl1-113) unstable; urgency=medium [ Christian Kastner / Javier Fernandez-Sanguino ] @@ -641,6 +855,52 @@ -- Javier Fernandez-Sanguino Pen~a Tue, 16 Mar 2010 22:55:26 +0100 +cron (3.0pl1-106ubuntu5) lucid; urgency=low + + * SECURITY UPDATE: check return code of initgroups() in cron_popen(). + Related to fix for CVE-2006-2607. Thanks to Javier Fernandez-Sanguino + Pen~a from Debian for pointing this out. This can be dropped in + 3.0pl1-109. + - http://svn.debian.org/wsvn/pkg-cron/trunk/popen.c?op=diff&rev=0&sc=0 + + -- Jamie Strandboge Wed, 14 Apr 2010 09:10:42 -0500 + +cron (3.0pl1-106ubuntu4) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Fri, 05 Mar 2010 04:06:36 +0100 + +cron (3.0pl1-106ubuntu3) karmic; urgency=low + + FFE LP: #427356. + + * Replace init script with Upstart job. + * debian/control: + - Add missing ${misc:Depends} + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 03:32:59 +0100 + +cron (3.0pl1-106ubuntu2) karmic; urgency=low + + * debian/cron.pam: switch from including common-session to including + the new common-session-noninteractive. + * debian/control: depend on libpam-runtime (>= 1.0.1-11) for the above. + + -- Steve Langasek Mon, 24 Aug 2009 03:19:49 +0000 + +cron (3.0pl1-106ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Depend on lsb-base >= 3.2-12ubuntu4 + - debian/control: Drop MTA and lockfile-args to Suggests + - pathnames.h: use sensible-editor + * New Debian release fixes LP: #46649 + + -- Jamie Strandboge Thu, 14 May 2009 09:53:08 -0500 + cron (3.0pl1-106) unstable; urgency=high * SECURITY UPDATE: cron does not check the return code of setgid() and @@ -678,6 +938,17 @@ -- Javier Fernandez-Sanguino Pen~a Wed, 13 May 2009 01:05:41 +0200 +cron (3.0pl1-105ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - crontab.5 : Add details about multiple recipients in MAILTO + - pathnames.h: use sensible-editor + - debian/control: Depend on lsb-base >= 3.2-12ubuntu3. + - Drop MTA to Suggests + - debian/cron.init: Add the 'status' action + + -- Michael Vogt Wed, 12 Nov 2008 16:41:26 +0100 + cron (3.0pl1-105) unstable; urgency=low * Non-maintainer upload with permission. @@ -694,6 +965,49 @@ -- Russell Coker Sun, 28 Sep 2008 19:23:50 +1000 +cron (3.0pl1-104+ubuntu5) intrepid; urgency=low + + * crontab.5 : Add details about multiple recipients in MAILTO (LP: #235464) + + -- Jean-Baptiste Lallement Wed, 30 Jul 2008 23:41:42 +0200 + +cron (3.0pl1-104+ubuntu4) intrepid; urgency=low + + * debian/control: Depend on lsb-base >= 3.2-12ubuntu3. + + -- Chuck Short Thu, 10 Jul 2008 14:57:12 +0000 + +cron (3.0pl1-104+ubuntu3) intrepid; urgency=low + + * debian/control: Depend on lsb >= 3.2.12ubuntu2, which has + the status_of_proc() function. + * debian/cron.init: Add the 'status' action (LP: #201504), + thanks to Dustin Kirkland. + + -- Chuck Short Thu, 10 Jul 2008 14:47:09 +0000 + +cron (3.0pl1-104+ubuntu2) intrepid; urgency=low + + * Drop MTA to Suggests for Ubuntu for the moment, now that apt installs + Recommends by default. + + -- Colin Watson Tue, 08 Jul 2008 10:37:59 +0100 + +cron (3.0pl1-104+ubuntu1) intrepid; urgency=low + + * pathnames.h: Use the Debian sensible-editor (LP: #222830). + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Dustin Kirkland Mon, 09 Jun 2008 11:42:25 -0500 + +cron (3.0pl1-104+build1) intrepid; urgency=low + + * Fake sync with Debian. The previous merge wasn't necessary, Debian adopted + our remaining change (do not call init script stop for runlevels 0 and 6). + + -- Martin Pitt Thu, 05 Jun 2008 09:05:55 +0200 + cron (3.0pl1-104) unstable; urgency=low * Discard errors from df in the standard daily cron task to prevent errors @@ -1526 +1839,0 @@ - diff -u cron-3.0pl1/debian/control cron-3.0pl1/debian/control --- cron-3.0pl1/debian/control +++ cron-3.0pl1/debian/control @@ -1,7 +1,8 @@ Source: cron Section: admin Priority: important -Maintainer: Javier Fernández-Sanguino Peña +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Maintainer: Javier Fernández-Sanguino Peña Uploaders: Christian Kastner Standards-Version: 3.9.6 Build-Depends: @@ -25,12 +26,11 @@ adduser, lsb-base (>= 3.0-10), libpam-runtime (>= 1.0.1-11) -Recommends: - exim4 | postfix | mail-transport-agent Suggests: anacron (>=2.0-1), logrotate, - checksecurity + checksecurity, + exim4 | postfix | mail-transport-agent Breaks: dpkg (<< 1.15.4) Provides: cron-daemon diff -u cron-3.0pl1/debian/cron.default cron-3.0pl1/debian/cron.default --- cron-3.0pl1/debian/cron.default +++ cron-3.0pl1/debian/cron.default @@ -1,28 +1,3 @@ -# Cron configuration options - -# Whether to read the system's default environment files (if present) -# If set to "yes", cron will set a proper mail charset from the -# locale information. If set to something other than 'yes', the default -# charset 'C' (canonical name: ANSI_X3.4-1968) will be used. -# -# This has no effect on tasks running under cron; their environment can -# only be changed via PAM or from within the crontab; see crontab(5). -READ_ENV="yes" - -# Extra options for cron, see cron(8) -# -# For example, to enable LSB name support in /etc/cron.d/, use -# EXTRA_OPTS='-l' -# -# Or, to log standard messages, plus jobs with exit status != 0: -# EXTRA_OPTS='-L 5' -# -# For quick reference, the currently available log levels are: -# 0 no logging (errors are logged regardless) -# 1 log start of jobs -# 2 log end of jobs -# 4 log jobs with exit status != 0 -# 8 log the process identifier of child process (in all logs) -# -#EXTRA_OPTS="" - +# This file has been deprecated. Please add custom options for cron to +# /etc/init/cron.conf and/or /etc/init/cron.override directly. See +# the init(5) man page for more information. diff -u cron-3.0pl1/debian/rules cron-3.0pl1/debian/rules --- cron-3.0pl1/debian/rules +++ cron-3.0pl1/debian/rules @@ -76,7 +76,7 @@ override_dh_installinit: - dh_installinit -- start 89 2 3 4 5 . + dh_installinit -- start 89 2 3 4 5 . stop 11 1 . override_dh_compress: only in patch2: unchanged: --- cron-3.0pl1.orig/debian/cron.preinst +++ cron-3.0pl1/debian/cron.preinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +# /etc/init.d/cron symlink gets replaced with a real file on upgrade +if [ "$1" = upgrade ] && [ -L /etc/init.d/cron ]; then + echo "Removing obsolete /etc/init.d/cron symlink..." + rm /etc/init.d/cron +fi + +#DEBHELPER# only in patch2: unchanged: --- cron-3.0pl1.orig/debian/cron.upstart +++ cron-3.0pl1/debian/cron.upstart @@ -0,0 +1,14 @@ +# cron - regular background program processing daemon +# +# cron is a standard UNIX program that runs user-specified programs at +# periodic scheduled times + +description "regular background program processing daemon" + +start on runlevel [2345] +stop on runlevel [!2345] + +expect fork +respawn + +exec cron