diff -pruN 3.0pl1-151/debian/changelog 3.0pl1-151ubuntu1/debian/changelog --- 3.0pl1-151/debian/changelog 2022-11-13 16:26:56.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/changelog 2022-11-23 14:30:35.000000000 +0000 @@ -1,3 +1,18 @@ +cron (3.0pl1-151ubuntu1) lunar; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Move MTA to Suggests field. + - debian/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment, + thanks to Tom Jones for the patch (Closes: #688716) + - Inherit PATH by default (LP: #1779767): + + debian/crontab.main: Stop setting PATH + + debian/cron.service, debian/cron.init: Pass -P to cron + - Update crontab(5) manpage to match new behaviour (LP: #1938924) + + -- Łukasz 'sil2100' Zemczak Wed, 23 Nov 2022 15:30:35 +0100 + cron (3.0pl1-151) unstable; urgency=medium * bumped a breaks+replace clause, now against cronie (<< 1.6.1-5) @@ -159,6 +174,54 @@ cron (3.0pl1-137.1) unstable; urgency=me -- Georges Khaznadar Tue, 13 Jul 2021 11:04:41 +0200 +cron (3.0pl1-137ubuntu3) jammy; urgency=medium + + * No-change rebuild for ppc64el baseline bump. + + -- Łukasz 'sil2100' Zemczak Wed, 23 Mar 2022 14:49:13 +0100 + +cron (3.0pl1-137ubuntu2) impish; urgency=medium + + * Update crontab(5) manpage to match new behaviour (LP: #1938924) + + -- Graham Inggs Fri, 06 Aug 2021 10:59:44 +0000 + +cron (3.0pl1-137ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Move MTA to Suggests field. + - debian/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment, + thanks to Tom Jones for the patch (Closes: #688716) + - Inherit PATH by default (LP: #1779767): + + debian/crontab.main: Stop setting PATH + + debian/cron.service, debian/cron.init: Pass -P to cron + + -- Julian Andres Klode Mon, 17 May 2021 11:18:33 +0200 + +cron (3.0pl1-137) unstable; urgency=medium + + [ Laurent Combe ] + * Add patch Add-MAILFROM-environment-variable.patch + (Closes: #898177, #1750051) + + [ Christian Kastner ] + * Modify the above patch to use cronie's safe_p() function for email + validation + * Remove myself from Uploaders + + -- Christian Kastner Mon, 22 Feb 2021 23:43:24 +0100 + +cron (3.0pl1-136ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Move MTA to Suggests field. + - debian/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Ubuntu Merge-o-Matic Wed, 17 Mar 2021 23:14:11 +0000 + cron (3.0pl1-137) unstable; urgency=medium [ Laurent Combe ] @@ -172,6 +235,25 @@ cron (3.0pl1-137) unstable; urgency=medi -- Christian Kastner Mon, 22 Feb 2021 23:43:24 +0100 +cron (3.0pl1-136ubuntu2) hirsute; urgency=medium + + * d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment, + thanks to Tom Jones for the patch (Closes: #688716) + * Inherit PATH by default (LP: #1779767): + - debian/crontab.main: Stop setting PATH + - debian/cron.service, debian/cron.init: Pass -P to cron + + -- Julian Andres Klode Mon, 15 Mar 2021 15:10:36 +0100 + +cron (3.0pl1-136ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: Move MTA to Suggests field. + - debian/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Steve Langasek Thu, 13 Feb 2020 12:44:42 -0800 + cron (3.0pl1-136) unstable; urgency=medium * Convert package to source format 3.0 (quilt). Finally. @@ -181,6 +263,16 @@ cron (3.0pl1-136) unstable; urgency=medi -- Christian Kastner Mon, 10 Feb 2020 20:16:06 +0100 +cron (3.0pl1-135ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Move MTA to Suggests field. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Steve Langasek Fri, 18 Oct 2019 15:59:42 -0700 + cron (3.0pl1-135) unstable; urgency=medium [ Laurent Bigonville ] @@ -197,6 +289,16 @@ cron (3.0pl1-135) unstable; urgency=medi -- Christian Kastner Sun, 15 Sep 2019 09:13:43 +0200 +cron (3.0pl1-134ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Move MTA to Suggests field. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + + -- Steve Langasek Fri, 19 Jul 2019 07:49:23 -0700 + cron (3.0pl1-134) unstable; urgency=medium * Increase maximum crontab length to 10,000 lines. @@ -206,6 +308,20 @@ cron (3.0pl1-134) unstable; urgency=medi -- Christian Kastner Sun, 23 Jun 2019 19:49:01 +0200 +cron (3.0pl1-133ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Move MTA to Suggests field. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + * Dropped changes, no longer needed: + - Drop upstart system jobs; transition completed as of 18.04. + - Handle /etc/init.d/cron symlink→ real file transition; completed as of + 18.04. + + -- Steve Langasek Mon, 22 Apr 2019 16:08:45 -0700 + cron (3.0pl1-133) unstable; urgency=medium * SECURITY: Fix bypass of /etc/cron.{allow,deny} on failure to open @@ -353,6 +469,19 @@ cron (3.0pl1-129) unstable; urgency=medi -- Javier Fernández-Sanguino Peña Sun, 11 Mar 2018 22:38:06 +0100 +cron (3.0pl1-128.1ubuntu1) bionic; urgency=low + + * Merge with Debian; remaining changes: + - debian/control: + + Move MTA to Suggests field. + - d/cron.default: change to a deprecated message to make it clear + that the file is no longer in use. + - Drop upstart system jobs. + - Add debian/cron.preinst: Handle /etc/init.d/cron symlink → real file + transition on upgrades. + + -- Dimitri John Ledkov Thu, 16 Nov 2017 05:29:19 +0000 + cron (3.0pl1-128.1) unstable; urgency=medium * Non-maintainer upload. @@ -362,6 +491,44 @@ cron (3.0pl1-128.1) unstable; urgency=me -- Laurent Bigonville Tue, 03 Oct 2017 15:38:27 +0200 +cron (3.0pl1-128ubuntu5) artful; urgency=medium + + * Fix typo. + + -- Dimitri John Ledkov Mon, 21 Aug 2017 00:54:10 +0100 + +cron (3.0pl1-128ubuntu4) artful; urgency=medium + + * Drop upstart system jobs. + + -- Dimitri John Ledkov Sat, 19 Aug 2017 20:54:52 +0100 + +cron (3.0pl1-128ubuntu3) artful; urgency=medium + + * No-change rebuild to pick up -fPIE compiler default in static + libraries + + -- Steve Langasek Fri, 21 Apr 2017 20:46:39 +0000 + +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. @@ -371,6 +538,18 @@ cron (3.0pl1-128) unstable; urgency=medi -- 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. @@ -444,6 +623,18 @@ cron (3.0pl1-124.2) unstable; urgency=me -- 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. @@ -452,6 +643,42 @@ cron (3.0pl1-124.1) unstable; urgency=me -- 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 ] @@ -487,6 +714,22 @@ cron (3.0pl1-123) unstable; urgency=low -- 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: @@ -511,6 +754,34 @@ cron (3.0pl1-121) unstable; urgency=low -- 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: @@ -691,6 +962,37 @@ cron (3.0pl1-117) unstable; urgency=low -- 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 @@ -714,6 +1016,21 @@ cron (3.0pl1-116) unstable; urgency=high -- 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 @@ -730,6 +1047,22 @@ cron (3.0pl1-115) unstable; urgency=high -- 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. @@ -774,6 +1107,35 @@ cron (3.0pl1-114) unstable; urgency=low -- 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 ] @@ -1005,6 +1367,52 @@ cron (3.0pl1-107) unstable; urgency=low -- 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 @@ -1042,6 +1450,17 @@ cron (3.0pl1-106) unstable; urgency=high -- 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. @@ -1058,6 +1477,49 @@ cron (3.0pl1-105) unstable; urgency=low -- 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 @@ -1886,3 +2348,4 @@ cron (3.0pl1-35) frozen unstable; urgenc is fixed. Also added -DDEBIAN to build commands in Makefile. -- Steve Greenland Sun, 1 Dec 1996 16:21:52 -0600 + diff -pruN 3.0pl1-151/debian/control 3.0pl1-151ubuntu1/debian/control --- 3.0pl1-151/debian/control 2022-11-13 16:25:33.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/control 2022-11-23 13:19:16.000000000 +0000 @@ -1,8 +1,8 @@ Source: cron Section: admin Priority: important -Maintainer: Javier Fernández-Sanguino Peña -Uploaders: Georges Khaznadar +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Javier Fernández-Sanguino Peña Standards-Version: 4.6.1 Build-Depends: debhelper-compat (= 13), @@ -25,12 +25,11 @@ Depends: ${misc:Depends}, sensible-utils, libpam-runtime -Recommends: - default-mta | mail-transport-agent Suggests: anacron, logrotate, - checksecurity + checksecurity, + default-mta | mail-transport-agent Conflicts: systemd-cron, bcron, diff -pruN 3.0pl1-151/debian/cron.default 3.0pl1-151ubuntu1/debian/cron.default --- 3.0pl1-151/debian/cron.default 2022-07-17 08:49:40.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/cron.default 2022-11-14 03:23:03.000000000 +0000 @@ -1,28 +1,4 @@ -# 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 using +# $ systemctl edit cron.service +# or +# $ systemctl edit --full cron.service diff -pruN 3.0pl1-151/debian/cron.init 3.0pl1-151ubuntu1/debian/cron.init --- 3.0pl1-151/debian/cron.init 2022-07-17 08:49:40.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/cron.init 2022-11-14 03:23:03.000000000 +0000 @@ -65,7 +65,7 @@ fi case "$1" in start) log_daemon_msg "Starting periodic command scheduler" "cron" - start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS + start_daemon -p $PIDFILE $DAEMON -P $EXTRA_OPTS log_end_msg $? ;; stop) log_daemon_msg "Stopping periodic command scheduler" "cron" diff -pruN 3.0pl1-151/debian/cron.service 3.0pl1-151ubuntu1/debian/cron.service --- 3.0pl1-151/debian/cron.service 2022-07-17 08:49:40.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/cron.service 2022-11-14 03:23:03.000000000 +0000 @@ -5,7 +5,7 @@ After=remote-fs.target nss-user-lookup.t [Service] EnvironmentFile=-/etc/default/cron -ExecStart=/usr/sbin/cron -f $EXTRA_OPTS +ExecStart=/usr/sbin/cron -f -P $EXTRA_OPTS IgnoreSIGPIPE=false KillMode=process Restart=on-failure diff -pruN 3.0pl1-151/debian/crontab.main 3.0pl1-151ubuntu1/debian/crontab.main --- 3.0pl1-151/debian/crontab.main 2022-07-17 08:49:40.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/crontab.main 2022-11-14 03:23:03.000000000 +0000 @@ -5,7 +5,8 @@ # that none of the other crontabs do. SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +# You can also override PATH, but by default, newer versions inherit it from the environment +#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # Example of job definition: # .---------------- minute (0 - 59) diff -pruN 3.0pl1-151/debian/patches/features/inherit-path-crontab-manpage.patch 3.0pl1-151ubuntu1/debian/patches/features/inherit-path-crontab-manpage.patch --- 3.0pl1-151/debian/patches/features/inherit-path-crontab-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/patches/features/inherit-path-crontab-manpage.patch 2021-08-06 10:54:23.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Update crontab(5) manpage to match new behaviour +Bug-Debian: https://bugs.debian.org/688716 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/cron/+bug/1938924 +Author: Graham Inggs +Last-Update: 2021-08-06 + +--- a/crontab.5 ++++ b/crontab.5 +@@ -91,7 +91,7 @@ + .IR cron (8) + daemon. + SHELL is set to /bin/sh, and LOGNAME and HOME are set from the /etc/passwd +-line of the crontab's owner. PATH is set to "/usr/bin:/bin". ++line of the crontab's owner. PATH is inherited from the environment. + HOME, SHELL, and PATH may be overridden by settings in the crontab; + LOGNAME is the user that the job is running from, and may not be changed. + .PP +@@ -123,8 +123,7 @@ + .B NOT + override the settings described above nor any settings in the + .I crontab +-file itself. Note in particular that if you want a PATH other than +-"/usr/bin:/bin", you will need to set it in the crontab file. ++file itself. + .PP + By default, cron will send mail using the mail "Content-Type:" header of + "text/plain" with the "charset=" parameter set to the charmap / codeset of the +@@ -305,7 +304,8 @@ + # that none of the other crontabs do. + + SHELL=/bin/sh +-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin ++# You can also override PATH, but by default, newer versions inherit it from the environment ++#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin + + # Example of job definition: + # .---------------- minute (0 - 59) diff -pruN 3.0pl1-151/debian/patches/features/inherit-path.patch 3.0pl1-151ubuntu1/debian/patches/features/inherit-path.patch --- 3.0pl1-151/debian/patches/features/inherit-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/patches/features/inherit-path.patch 2021-03-15 14:10:36.000000000 +0000 @@ -0,0 +1,96 @@ +Description: optionally inherit PATH from parent process + The default PATH of cron isn't very useful. This patch adds an + option -P to leave PATH alone, so that it's inherited from whatever + execs cron. In our case that is daemontools, but could also be + start-stop-daemon or whatever. This puts our sysadmins in control + of cron's (and child processes') PATH, as they are able to set it in the + run script. Without the -P option, crontabs that don't set PATH + themselves get a value of /usr/bin:/bin, which is hardcoded as + _PATH_DEFPATH in pathnames.h. +Author: Tom Jones +Origin: vendor, https://bugs.debian.org/688716 +Bug-Debian: https://bugs.debian.org/688716 +--- a/cron.8 ++++ b/cron.8 +@@ -36,6 +36,9 @@ runlevels. + .B \-f + Stay in foreground mode, don't daemonize. + .TP ++.B -P ++Don't set PATH for child processes. Let it inherit instead. ++.TP + .B \-l + Enable LSB compliant names for /etc/cron.d files. This setting, however, does + not affect the parsing of files under /etc/cron.hourly, /etc/cron.daily, +--- a/cron.c ++++ b/cron.c +@@ -94,7 +94,9 @@ main(argc, argv) + set_cron_cwd(); + + #if defined(POSIX) +- setenv("PATH", _PATH_DEFPATH, 1); ++ if (change_child_path) { ++ setenv("PATH", _PATH_DEFPATH, 1); ++ } + #endif + + /* Get the default locale character set for the mail +@@ -448,9 +450,9 @@ sighup_handler(int x) { + + + #if DEBUGGING +-const char *getoptarg = "flL:nx:"; ++const char *getoptarg = "fPlL:nx:"; + #else +-const char *getoptarg = "flL:n"; ++const char *getoptarg = "fPlL:n"; + #endif + + static void +@@ -461,6 +463,7 @@ parse_args(argc, argv) + int argch; + + stay_foreground = 0; ++ change_child_path = 1; + lsbsysinit_mode = 0; + log_level = 1; + fqdn_in_subject = 0; +@@ -472,6 +475,9 @@ parse_args(argc, argv) + case 'f': + stay_foreground = 1; + break; ++ case 'P': ++ change_child_path = 0; ++ break; + case 'l': + lsbsysinit_mode = 1; + break; +--- a/cron.h ++++ b/cron.h +@@ -306,6 +306,7 @@ time_min clockTime; + static long GMToff; + + int stay_foreground; ++int change_child_path; + int lsbsysinit_mode; + int log_level; + int fqdn_in_subject; +--- a/entry.c ++++ b/entry.c +@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: entry.c,v 2. + + #include "cron.h" + ++extern int change_child_path; + + typedef enum ecode { + e_none, e_minute, e_hour, e_dom, e_month, e_dow, +@@ -289,7 +290,7 @@ load_entry(file, error_func, pw, envp) + goto eof; + } + } +- if (!env_get("PATH", e->envp)) { ++ if (!env_get("PATH", e->envp) && change_child_path) { + snprintf(envstr, MAX_ENVSTR, "PATH=%s", _PATH_DEFPATH); + if ((tenvp = env_set(e->envp, envstr))) { + e->envp = tenvp; diff -pruN 3.0pl1-151/debian/patches/series 3.0pl1-151ubuntu1/debian/patches/series --- 3.0pl1-151/debian/patches/series 2022-07-25 16:55:55.000000000 +0000 +++ 3.0pl1-151ubuntu1/debian/patches/series 2022-11-23 13:29:30.000000000 +0000 @@ -70,3 +70,5 @@ features/Add-option-to-include-FQDN-in-e features/Add-MAILFROM-environment-variable.patch fixes/Missing_bistring_h.patch features/protect-list.patch +features/inherit-path.patch +features/inherit-path-crontab-manpage.patch