Merge ~vpa1977/ubuntu/+source/cron:merge-lp2028894 into ubuntu/+source/cron:debian/sid

Proposed by Vladimir Petko
Status: Approved
Approved by: Robie Basak
Approved revision: 82dd3ecfc51e948a6a13c6064a4db66eab0dbf75
Proposed branch: ~vpa1977/ubuntu/+source/cron:merge-lp2028894
Merge into: ubuntu/+source/cron:debian/sid
Diff against target: 917 lines (+621/-42)
9 files modified
debian/changelog (+499/-0)
debian/control (+4/-4)
debian/cron.default (+4/-28)
debian/cron.init (+1/-1)
debian/cron.service (+1/-1)
debian/crontab.main (+2/-1)
debian/patches/features/inherit-path.patch (+96/-0)
debian/patches/series (+1/-0)
debian/tests/compare-with-old-cron-files (+13/-7)
Reviewer Review Type Date Requested Status
Robie Basak Approve
Ubuntu Sponsors Pending
Review via email: mp+447944@code.launchpad.net

Description of the change

Summary of changes:
 - rebase existing commits on debian/new without any changes.

Please tag and sponsor.

PPA: ppa:vpa1977/cron-merge [1]

Testing:
 - package installation
 - package upgrade
 - package removal
 - autopkgtest

-------------cut---------------
$ autopkgtest -U -s -o dep8-mypackage-ppa --setup-commands="sudo add-apt-repository -y -u -s ppa:vpa1977/cron-merge " -B cron -- qemu ~/.auto-img/autopkgtest-mantic-amd64.img

....

results - - - - - - - - - -
autopkgtest [14:31:53]: @@@@@@@@@@@@@@@@@@@@ summary
compare-with-old-cron-files PASS
check-significant-header PASS
do-not-modify-previous-crontabs PASS
check-messages-sent-by-cron PASS
check-listings-protection PASS
-------------cut---------------

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/cron-merge

To post a comment you must log in.
Revision history for this message
Vladimir Petko (vpa1977) wrote :

Package upgrade:
--------------------
root@mantic:~# sudo add-apt-repository ppa:vpa1977/cron-merge

Repository: 'Types: deb
URIs: https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu/
Suites: mantic
Components: main
'
Description:
cron-merge
More info: https://launchpad.net/~vpa1977/+archive/ubuntu/cron-merge
Adding repository.
0% [Working]] to continue or Ctrl-c to cancel.
Get:1 http://archive.ubuntu.com/ubuntu mantic InRelease [255 kB]
Hit:2 http://security.ubuntu.com/ubuntu mantic-security InRelease
Hit:3 http://archive.ubuntu.com/ubuntu mantic-updates InRelease
Get:4 http://archive.ubuntu.com/ubuntu mantic/main amd64 Packages [1399 kB]
Get:5 http://archive.ubuntu.com/ubuntu mantic/main amd64 DEP-11 Metadata [438 kB]
Get:6 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic InRelease [18.1 kB]
Get:7 http://archive.ubuntu.com/ubuntu mantic/universe amd64 Packages [15.2 MB]
Get:8 http://archive.ubuntu.com/ubuntu mantic/universe Translation-en [5968 kB]
Get:9 http://archive.ubuntu.com/ubuntu mantic/universe amd64 DEP-11 Metadata [3783 kB]
Get:10 http://archive.ubuntu.com/ubuntu mantic/multiverse amd64 DEP-11 Metadata [30.4 kB]
Get:11 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main amd64 Packages [948 B]
Get:12 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main Translation-en [648 B]
Fetched 27.1 MB in 8s (3451 kB/s)
Reading package lists... Done
root@mantic:~# apt upgrade
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Calculating upgrade... Done
#
# An OpenSSL vulnerability has recently been fixed with USN-6188-1 & 6119-1:
# CVE-2023-2650: possible DoS translating ASN.1 object identifiers.
# Ensure you have updated the package to its latest version.
#
The following packages will be upgraded:
  cron cron-daemon-common
2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
Need to get 84.4 kB of archives.
After this operation, 0 B of additional disk space will be used.
Do you want to continue? [Y/n]
Get:1 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main amd64 cron amd64 3.0pl1-163ubuntu1~ppa1 [74.3 kB]
Get:2 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main amd64 cron-daemon-common all 3.0pl1-163ubuntu1~ppa1 [10.1 kB]
Fetched 84.4 kB in 5s (17.7 kB/s)
(Reading database ... 17235 files and directories currently installed.)
Preparing to unpack .../cron_3.0pl1-163ubuntu1~ppa1_amd64.deb ...
Unpacking cron (3.0pl1-163ubuntu1~ppa1) over (3.0pl1-162ubuntu1) ...
Preparing to unpack .../cron-daemon-common_3.0pl1-163ubuntu1~ppa1_all.deb ...
Unpacking cron-daemon-common (3.0pl1-163ubuntu1~ppa1) over (3.0pl1-162ubuntu1) .
..
Setting up cron-daemon-common (3.0pl1-163ubuntu1~ppa1) ...
Setting up cron (3.0pl1-163ubuntu1~ppa1) ...
root@mantic:~#

--------------------

Revision history for this message
Vladimir Petko (vpa1977) wrote :

Package install:
-----------------
root@mantic:~# apt install cron
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Suggested packages:
  anacron checksecurity default-mta | mail-transport-agent
The following NEW packages will be installed:
  cron
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 74.3 kB of archives.
After this operation, 215 kB of additional disk space will be used.
0% [Connecting to ppa.launchpadcontent.net]
Get:1 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main amd64 cron amd64 3.0pl1-163ubuntu1~ppa1 [74.3 kB]
Fetched 74.3 kB in 3s (24.6 kB/s)
Selecting previously unselected package cron.
(Reading database ... 17209 files and directories currently installed.)
Preparing to unpack .../cron_3.0pl1-163ubuntu1~ppa1_amd64.deb ...
Unpacking cron (3.0pl1-163ubuntu1~ppa1) ...
Setting up cron (3.0pl1-163ubuntu1~ppa1) ...
Created symlink /etc/systemd/system/multi-user.target.wants/cron.service → /lib/
systemd/system/cron.service.
root@mantic:~#
---------------

Revision history for this message
Vladimir Petko (vpa1977) wrote :
Download full text (6.1 KiB)

Package removal:
--------
root@mantic:~# apt remove cron
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following packages will be REMOVED:
  cron
0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
After this operation, 215 kB disk space will be freed.
Do you want to continue? [Y/n]
(Reading database ... 17235 files and directories currently installed.)
Removing cron (3.0pl1-162ubuntu1) ...
root@mantic:~# apt install cron
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Suggested packages:
  anacron checksecurity default-mta | mail-transport-agent
The following NEW packages will be installed:
  cron
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 74.0 kB of archives.
After this operation, 215 kB of additional disk space will be used.
Get:1 http://archive.ubuntu.com/ubuntu mantic/main amd64 cron amd64 3.0pl1-162ubuntu1 [74.0 kB]
Fetched 74.0 kB in 2s (40.1 kB/s)
Selecting previously unselected package cron.
(Reading database ... 17213 files and directories currently installed.)
Preparing to unpack .../cron_3.0pl1-162ubuntu1_amd64.deb ...
Unpacking cron (3.0pl1-162ubuntu1) ...
Setting up cron (3.0pl1-162ubuntu1) ...
root@mantic:~# sudo add-apt-repository ppa:vpa1977/cron-merge

Repository: 'Types: deb
URIs: https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu/
Suites: mantic
Components: main
'
Description:
cron-merge
More info: https://launchpad.net/~vpa1977/+archive/ubuntu/cron-merge
Adding repository.
0% [Working]] to continue or Ctrl-c to cancel.
Get:1 http://archive.ubuntu.com/ubuntu mantic InRelease [255 kB]
Hit:2 http://security.ubuntu.com/ubuntu mantic-security InRelease
Hit:3 http://archive.ubuntu.com/ubuntu mantic-updates InRelease
Get:4 http://archive.ubuntu.com/ubuntu mantic/main amd64 Packages [1399 kB]
Get:5 http://archive.ubuntu.com/ubuntu mantic/main amd64 DEP-11 Metadata [438 kB]
Get:6 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic InRelease [18.1 kB]
Get:7 http://archive.ubuntu.com/ubuntu mantic/universe amd64 Packages [15.2 MB]
Get:8 http://archive.ubuntu.com/ubuntu mantic/universe Translation-en [5968 kB]
Get:9 http://archive.ubuntu.com/ubuntu mantic/universe amd64 DEP-11 Metadata [3783 kB]
Get:10 http://archive.ubuntu.com/ubuntu mantic/multiverse amd64 DEP-11 Metadata [30.4 kB]
Get:11 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main amd64 Packages [948 B]
Get:12 https://ppa.launchpadcontent.net/vpa1977/cron-merge/ubuntu mantic/main Translation-en [648 B]
Fetched 27.1 MB in 8s (3451 kB/s)
Reading package lists... Done
root@mantic:~# apt upgrade
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Calculating upgrade... Done
#
# An OpenSSL vulnerability has recently been fixed with USN-6188-1 & 6119-1:
# CVE-2023-2650: possible DoS translating ASN.1 object identifiers.
# Ensure you have updated the package to its latest version.
#
The following packages will be upgraded:
  cron cron-daemon-common
2 upgraded, 0 newl...

Read more...

Revision history for this message
Robie Basak (racb) wrote :

Straightforward and correctly performed merge with nothing to change or drop. The -P work is already sent to Debian. Nothing else seems appropriate to upstream. Uploaded. Thanks!

review: Approve

Unmerged commits

82dd3ec... by Vladimir Petko

changelog

99ddf54... by Vladimir Petko

update-maintainer

427846d... by Vladimir Petko

reconstruct-changelog

aef6e77... by Vladimir Petko

merge-changelogs

ff6a429... by Nick Rosbrook

d/t/compare-with-old-cron-files: compare with cron shipped in jammy instead of bullseye

99b1e84... by Nick Rosbrook

debian/cron.service: Pass -P to cron

529fc3d... by Nick Rosbrook

debian/cron.init: Pass -P to cron

bbb8bd7... by Nick Rosbrook

debian/crontab.main: Stop setting PATH

f27e7ae... by Nick Rosbrook

d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment, thanks to Tom Jones for the patch

8484143... by Nick Rosbrook

debian/cron.default: change to a deprecated message to make it clear that the file is no longer in use.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 66c54c2..14033eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
1cron (3.0pl1-163ubuntu1) mantic; urgency=medium
2
3 * Merge with Debian unstable (LP: #2028894). Remaining changes:
4 - debian/control: Move MTA to Suggests field.
5 - debian/cron.default: change to a deprecated message to make it clear
6 that the file is no longer in use.
7 - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
8 thanks to Tom Jones for the patch
9 - Inherit PATH by default:
10 + debian/crontab.main: Stop setting PATH
11 + debian/cron.service, debian/cron.init: Pass -P to cron
12 - debian/tests/compare-with-old-cron-files: Compare against cron package
13 shipped in Ubuntu Jammy instead of that shipped in Debian Bullseye
14
15 -- Vladimir Petko <vladimir.petko@canonical.com> Fri, 28 Jul 2023 12:19:57 +1200
16
1cron (3.0pl1-163) unstable; urgency=medium17cron (3.0pl1-163) unstable; urgency=medium
218
3 * Checked that the patch debian/patches/fixes/crontab_5_manpage.patch19 * Checked that the patch debian/patches/fixes/crontab_5_manpage.patch
@@ -11,6 +27,26 @@ cron (3.0pl1-163) unstable; urgency=medium
1127
12 -- Georges Khaznadar <georgesk@debian.org> Wed, 26 Jul 2023 15:01:18 +020028 -- Georges Khaznadar <georgesk@debian.org> Wed, 26 Jul 2023 15:01:18 +0200
1329
30cron (3.0pl1-162ubuntu1) mantic; urgency=medium
31
32 * Merge with Debian unstable (LP: #2023077). Remaining changes:
33 - debian/control: Move MTA to Suggests field.
34 - debian/cron.default: change to a deprecated message to make it clear
35 that the file is no longer in use.
36 - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
37 thanks to Tom Jones for the patch
38 - Inherit PATH by default:
39 + debian/crontab.main: Stop setting PATH
40 + debian/cron.service, debian/cron.init: Pass -P to cron
41 * Dropped changes, patch no longer applies:
42 - Update crontab(5) manpage to match new behaviour
43 [Relevant sections removed by d/p/fixes/crontab_5_manpage.patch]
44 * New changes:
45 - debian/tests/compare-with-old-cron-files: Compare against cron package
46 shipped in Ubuntu Jammy instead of that shipped in Debian Bullseye
47
48 -- Nick Rosbrook <nick.rosbrook@canonical.com> Fri, 02 Jun 2023 12:41:04 -0400
49
14cron (3.0pl1-162) unstable; urgency=medium50cron (3.0pl1-162) unstable; urgency=medium
1551
16 * moved "Breaks: systemd-cron(<<1.15.19-5~)" to the package52 * moved "Breaks: systemd-cron(<<1.15.19-5~)" to the package
@@ -98,6 +134,21 @@ cron (3.0pl1-152) unstable; urgency=medium
98134
99 -- Georges Khaznadar <georgesk@debian.org> Sun, 27 Nov 2022 20:41:35 +0100135 -- Georges Khaznadar <georgesk@debian.org> Sun, 27 Nov 2022 20:41:35 +0100
100136
137cron (3.0pl1-151ubuntu1) lunar; urgency=low
138
139 * Merge from Debian unstable. Remaining changes:
140 - debian/control: Move MTA to Suggests field.
141 - debian/cron.default: change to a deprecated message to make it clear
142 that the file is no longer in use.
143 - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
144 thanks to Tom Jones for the patch (Closes: #688716)
145 - Inherit PATH by default (LP: #1779767):
146 + debian/crontab.main: Stop setting PATH
147 + debian/cron.service, debian/cron.init: Pass -P to cron
148 - Update crontab(5) manpage to match new behaviour (LP: #1938924)
149
150 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 23 Nov 2022 15:30:35 +0100
151
101cron (3.0pl1-151) unstable; urgency=medium152cron (3.0pl1-151) unstable; urgency=medium
102153
103 * bumped a breaks+replace clause, now against cronie (<< 1.6.1-5)154 * bumped a breaks+replace clause, now against cronie (<< 1.6.1-5)
@@ -259,6 +310,54 @@ cron (3.0pl1-137.1) unstable; urgency=medium
259310
260 -- Georges Khaznadar <georgesk@debian.org> Tue, 13 Jul 2021 11:04:41 +0200311 -- Georges Khaznadar <georgesk@debian.org> Tue, 13 Jul 2021 11:04:41 +0200
261312
313cron (3.0pl1-137ubuntu3) jammy; urgency=medium
314
315 * No-change rebuild for ppc64el baseline bump.
316
317 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 23 Mar 2022 14:49:13 +0100
318
319cron (3.0pl1-137ubuntu2) impish; urgency=medium
320
321 * Update crontab(5) manpage to match new behaviour (LP: #1938924)
322
323 -- Graham Inggs <ginggs@ubuntu.com> Fri, 06 Aug 2021 10:59:44 +0000
324
325cron (3.0pl1-137ubuntu1) impish; urgency=low
326
327 * Merge from Debian unstable. Remaining changes:
328 - debian/control: Move MTA to Suggests field.
329 - debian/cron.default: change to a deprecated message to make it clear
330 that the file is no longer in use.
331 - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
332 thanks to Tom Jones for the patch (Closes: #688716)
333 - Inherit PATH by default (LP: #1779767):
334 + debian/crontab.main: Stop setting PATH
335 + debian/cron.service, debian/cron.init: Pass -P to cron
336
337 -- Julian Andres Klode <juliank@ubuntu.com> Mon, 17 May 2021 11:18:33 +0200
338
339cron (3.0pl1-137) unstable; urgency=medium
340
341 [ Laurent Combe ]
342 * Add patch Add-MAILFROM-environment-variable.patch
343 (Closes: #898177, #1750051)
344
345 [ Christian Kastner ]
346 * Modify the above patch to use cronie's safe_p() function for email
347 validation
348 * Remove myself from Uploaders
349
350 -- Christian Kastner <ckk@debian.org> Mon, 22 Feb 2021 23:43:24 +0100
351
352cron (3.0pl1-136ubuntu1) focal; urgency=low
353
354 * Merge from Debian unstable. Remaining changes:
355 - debian/control: Move MTA to Suggests field.
356 - debian/cron.default: change to a deprecated message to make it clear
357 that the file is no longer in use.
358
359 -- Ubuntu Merge-o-Matic <mom@ubuntu.com> Wed, 17 Mar 2021 23:14:11 +0000
360
262cron (3.0pl1-137) unstable; urgency=medium361cron (3.0pl1-137) unstable; urgency=medium
263362
264 [ Laurent Combe ]363 [ Laurent Combe ]
@@ -272,6 +371,25 @@ cron (3.0pl1-137) unstable; urgency=medium
272371
273 -- Christian Kastner <ckk@debian.org> Mon, 22 Feb 2021 23:43:24 +0100372 -- Christian Kastner <ckk@debian.org> Mon, 22 Feb 2021 23:43:24 +0100
274373
374cron (3.0pl1-136ubuntu2) hirsute; urgency=medium
375
376 * d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
377 thanks to Tom Jones for the patch (Closes: #688716)
378 * Inherit PATH by default (LP: #1779767):
379 - debian/crontab.main: Stop setting PATH
380 - debian/cron.service, debian/cron.init: Pass -P to cron
381
382 -- Julian Andres Klode <juliank@ubuntu.com> Mon, 15 Mar 2021 15:10:36 +0100
383
384cron (3.0pl1-136ubuntu1) focal; urgency=low
385
386 * Merge from Debian unstable. Remaining changes:
387 - debian/control: Move MTA to Suggests field.
388 - debian/cron.default: change to a deprecated message to make it clear
389 that the file is no longer in use.
390
391 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 13 Feb 2020 12:44:42 -0800
392
275cron (3.0pl1-136) unstable; urgency=medium393cron (3.0pl1-136) unstable; urgency=medium
276394
277 * Convert package to source format 3.0 (quilt). Finally.395 * Convert package to source format 3.0 (quilt). Finally.
@@ -281,6 +399,16 @@ cron (3.0pl1-136) unstable; urgency=medium
281399
282 -- Christian Kastner <ckk@debian.org> Mon, 10 Feb 2020 20:16:06 +0100400 -- Christian Kastner <ckk@debian.org> Mon, 10 Feb 2020 20:16:06 +0100
283401
402cron (3.0pl1-135ubuntu1) focal; urgency=low
403
404 * Merge from Debian unstable. Remaining changes:
405 - debian/control:
406 + Move MTA to Suggests field.
407 - d/cron.default: change to a deprecated message to make it clear
408 that the file is no longer in use.
409
410 -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 18 Oct 2019 15:59:42 -0700
411
284cron (3.0pl1-135) unstable; urgency=medium412cron (3.0pl1-135) unstable; urgency=medium
285413
286 [ Laurent Bigonville ]414 [ Laurent Bigonville ]
@@ -297,6 +425,16 @@ cron (3.0pl1-135) unstable; urgency=medium
297425
298 -- Christian Kastner <ckk@debian.org> Sun, 15 Sep 2019 09:13:43 +0200426 -- Christian Kastner <ckk@debian.org> Sun, 15 Sep 2019 09:13:43 +0200
299427
428cron (3.0pl1-134ubuntu1) eoan; urgency=low
429
430 * Merge from Debian unstable. Remaining changes:
431 - debian/control:
432 + Move MTA to Suggests field.
433 - d/cron.default: change to a deprecated message to make it clear
434 that the file is no longer in use.
435
436 -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 19 Jul 2019 07:49:23 -0700
437
300cron (3.0pl1-134) unstable; urgency=medium438cron (3.0pl1-134) unstable; urgency=medium
301439
302 * Increase maximum crontab length to 10,000 lines.440 * Increase maximum crontab length to 10,000 lines.
@@ -306,6 +444,20 @@ cron (3.0pl1-134) unstable; urgency=medium
306444
307 -- Christian Kastner <ckk@debian.org> Sun, 23 Jun 2019 19:49:01 +0200445 -- Christian Kastner <ckk@debian.org> Sun, 23 Jun 2019 19:49:01 +0200
308446
447cron (3.0pl1-133ubuntu1) eoan; urgency=low
448
449 * Merge from Debian unstable. Remaining changes:
450 - debian/control:
451 + Move MTA to Suggests field.
452 - d/cron.default: change to a deprecated message to make it clear
453 that the file is no longer in use.
454 * Dropped changes, no longer needed:
455 - Drop upstart system jobs; transition completed as of 18.04.
456 - Handle /etc/init.d/cron symlink→ real file transition; completed as of
457 18.04.
458
459 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 22 Apr 2019 16:08:45 -0700
460
309cron (3.0pl1-133) unstable; urgency=medium461cron (3.0pl1-133) unstable; urgency=medium
310462
311 * SECURITY: Fix bypass of /etc/cron.{allow,deny} on failure to open463 * SECURITY: Fix bypass of /etc/cron.{allow,deny} on failure to open
@@ -453,6 +605,19 @@ cron (3.0pl1-129) unstable; urgency=medium
453605
454 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Sun, 11 Mar 2018 22:38:06 +0100606 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Sun, 11 Mar 2018 22:38:06 +0100
455607
608cron (3.0pl1-128.1ubuntu1) bionic; urgency=low
609
610 * Merge with Debian; remaining changes:
611 - debian/control:
612 + Move MTA to Suggests field.
613 - d/cron.default: change to a deprecated message to make it clear
614 that the file is no longer in use.
615 - Drop upstart system jobs.
616 - Add debian/cron.preinst: Handle /etc/init.d/cron symlink → real file
617 transition on upgrades.
618
619 -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 16 Nov 2017 05:29:19 +0000
620
456cron (3.0pl1-128.1) unstable; urgency=medium621cron (3.0pl1-128.1) unstable; urgency=medium
457622
458 * Non-maintainer upload.623 * Non-maintainer upload.
@@ -462,6 +627,44 @@ cron (3.0pl1-128.1) unstable; urgency=medium
462627
463 -- Laurent Bigonville <bigon@debian.org> Tue, 03 Oct 2017 15:38:27 +0200628 -- Laurent Bigonville <bigon@debian.org> Tue, 03 Oct 2017 15:38:27 +0200
464629
630cron (3.0pl1-128ubuntu5) artful; urgency=medium
631
632 * Fix typo.
633
634 -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 21 Aug 2017 00:54:10 +0100
635
636cron (3.0pl1-128ubuntu4) artful; urgency=medium
637
638 * Drop upstart system jobs.
639
640 -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 19 Aug 2017 20:54:52 +0100
641
642cron (3.0pl1-128ubuntu3) artful; urgency=medium
643
644 * No-change rebuild to pick up -fPIE compiler default in static
645 libraries
646
647 -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 21 Apr 2017 20:46:39 +0000
648
649cron (3.0pl1-128ubuntu2) xenial; urgency=medium
650
651 * Add debian/cron.preinst: Handle /etc/init.d/cron symlink → real file
652 transition on upgrades. (LP: #1566333)
653
654 -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 05 Apr 2016 16:45:50 +0200
655
656cron (3.0pl1-128ubuntu1) xenial; urgency=low
657
658 * Merge with Debian; remaining changes:
659 - debian/control:
660 + Move MTA to Suggests field.
661 - debian/cron.upstart: Add Upstart script.
662 - debian/rules: Call dh_installinit to install Upstart job properly.
663 - d/cron.default: change to a deprecated message to make it clear
664 that the file is no longer in use.
665
666 -- Matthias Klose <doko@ubuntu.com> Wed, 17 Feb 2016 19:21:23 +0100
667
465cron (3.0pl1-128) unstable; urgency=medium668cron (3.0pl1-128) unstable; urgency=medium
466669
467 * d/cron.service: Use KillMode=process to kill only the daemon.670 * d/cron.service: Use KillMode=process to kill only the daemon.
@@ -471,6 +674,18 @@ cron (3.0pl1-128) unstable; urgency=medium
471674
472 -- Christian Kastner <debian@kvr.at> Sun, 03 May 2015 15:25:18 +0200675 -- Christian Kastner <debian@kvr.at> Sun, 03 May 2015 15:25:18 +0200
473676
677cron (3.0pl1-127ubuntu1) vivid; urgency=low
678
679 * Merge from Debian unstable. Remaining changes:
680 - debian/control:
681 + Move MTA to Suggests field.
682 - debian/cron.upstart: Add Upstart script.
683 - debian/rules: Call dh_installinit to install Upstart job properly.
684 - d/cron.default: change to a deprecated message to make it clear
685 that the file is no longer in use.
686
687 -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 27 Oct 2014 10:19:21 +0100
688
474cron (3.0pl1-127) unstable; urgency=medium689cron (3.0pl1-127) unstable; urgency=medium
475690
476 * Drop $READ_ENV from cron's command line. It does not belong there.691 * Drop $READ_ENV from cron's command line. It does not belong there.
@@ -544,6 +759,18 @@ cron (3.0pl1-124.2) unstable; urgency=medium
544759
545 -- Ansgar Burchardt <ansgar@debian.org> Mon, 04 Aug 2014 21:44:00 +0200760 -- Ansgar Burchardt <ansgar@debian.org> Mon, 04 Aug 2014 21:44:00 +0200
546761
762cron (3.0pl1-124.1ubuntu1) utopic; urgency=medium
763
764 * Merge from Debian unstable. Remaining Changes:
765 - debian/control:
766 + Move MTA to Suggests field.
767 - debian/cron.upstart: Add Upstart script.
768 - debian/rules: Call dh_installinit to install Upstart job properly.
769 - d/cron.default: change to a deprecated message to make it clear
770 that the file is no longer in use.
771
772 -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 07 Jul 2014 15:58:31 +0100
773
547cron (3.0pl1-124.1) unstable; urgency=medium774cron (3.0pl1-124.1) unstable; urgency=medium
548775
549 * Non-maintainer upload.776 * Non-maintainer upload.
@@ -552,6 +779,42 @@ cron (3.0pl1-124.1) unstable; urgency=medium
552779
553 -- Laurent Bigonville <bigon@debian.org> Sun, 25 May 2014 21:21:19 +0200780 -- Laurent Bigonville <bigon@debian.org> Sun, 25 May 2014 21:21:19 +0200
554781
782cron (3.0pl1-124ubuntu4) utopic; urgency=high
783
784 * No change rebuild against new dh_installinit, to call update-rc.d at
785 postinst.
786
787 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 28 May 2014 10:39:23 +0100
788
789cron (3.0pl1-124ubuntu3) utopic; urgency=medium
790
791 * No change rebuild to drop upstart-job symlink.
792
793 -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 19 May 2014 00:02:44 +0100
794
795cron (3.0pl1-124ubuntu2) raring; urgency=low
796
797 * Restore libaudit-dev build-dep now that it has been promoted to main.
798
799 -- Adam Conrad <adconrad@ubuntu.com> Fri, 08 Feb 2013 23:54:51 -0700
800
801cron (3.0pl1-124ubuntu1) raring; urgency=low
802
803 * Merge from Debian unstable. Remaining Changes:
804 - Drop build-dependency on libaudit, not in main and the security
805 team doesn't want it there.
806 - debian/control:
807 + Move MTA to Suggests field.
808 - debian/cron.upstart: Add Upstart script.
809 - debian/rules: Call dh_installinit to install Upstart job properly.
810 - d/cron.default: change to a deprecated message to make it clear
811 that the file is no longer in use.
812 * Dropped changes:
813 - debian/rules: add support for cross-compiling. (Applied in Debian)
814 - Requires debhelper >= 7.3.15ubuntu2 (for Upstart). (Debian req's >= 9)
815
816 -- Clint Byrum <clint@ubuntu.com> Wed, 07 Nov 2012 00:03:51 -0800
817
555cron (3.0pl1-124) unstable; urgency=medium818cron (3.0pl1-124) unstable; urgency=medium
556819
557 [ Release targeted to Wheezy including fixes for critical/important bugs ]820 [ Release targeted to Wheezy including fixes for critical/important bugs ]
@@ -587,6 +850,22 @@ cron (3.0pl1-123) unstable; urgency=low
587850
588 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Sat, 23 Jun 2012 08:28:27 +0200851 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Sat, 23 Jun 2012 08:28:27 +0200
589852
853cron (3.0pl1-121ubuntu1) quantal; urgency=low
854
855 * Merge from Debian unstable. Remaining changes:
856 - debian/rules: add support for cross-compiling.
857 - Drop build-dependency on libaudit, not in main and the security
858 team doesn't want it there.
859 - debian/control:
860 + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
861 + Move MTA to Suggests field.
862 - debian/cron.upstart: Add Upstart script.
863 - debian/rules: Call dh_installinit to install Upstart job properly.
864 * d/cron.default: change to a deprecated message to make it clear
865 that the file is no longer in use. (LP: #794082)
866
867 -- Clint Byrum <clint@ubuntu.com> Thu, 14 Jun 2012 11:05:24 -0700
868
590cron (3.0pl1-121) unstable; urgency=low869cron (3.0pl1-121) unstable; urgency=low
591870
592 * debian/control:871 * debian/control:
@@ -611,6 +890,34 @@ cron (3.0pl1-121) unstable; urgency=low
611890
612 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Mon, 19 Sep 2011 00:20:17 +0200891 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Mon, 19 Sep 2011 00:20:17 +0200
613892
893cron (3.0pl1-120ubuntu3) precise; urgency=low
894
895 * debian/rules: add support for cross-compiling.
896
897 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 02 Apr 2012 07:50:11 +0000
898
899cron (3.0pl1-120ubuntu2) precise; urgency=low
900
901 * Drop build-dependency on libaudit, not in main and the security team
902 doesn't want it there. LP: #878155.
903
904 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 20 Oct 2011 07:57:06 -0700
905
906cron (3.0pl1-120ubuntu1) precise; urgency=low
907
908 [ Ubuntu Merge-o-Matic ]
909 * Merge from Debian unstable. Remaining changes:
910 - debian/control:
911 + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
912 + Move MTA to Suggests field.
913 - debian/cron.upstart: Add Upstart script.
914 - debian/rules: Call dh_installinit to install Upstart job properly.
915 * Dropped changes, superseded upstream:
916 - debian/control: lockfile-progs no longer recommended.
917 - debian/{prerm,postinst,postrm}: scripts now generated with debhelper.
918
919 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 17 Oct 2011 15:33:56 -0700
920
614cron (3.0pl1-120) unstable; urgency=low921cron (3.0pl1-120) unstable; urgency=low
615922
616 * do_command.c, cron.h, cron.8:923 * do_command.c, cron.h, cron.8:
@@ -791,6 +1098,37 @@ cron (3.0pl1-117) unstable; urgency=low
7911098
792 -- Christian Kastner <debian@kvr.at> Sun, 08 May 2011 01:21:15 +02001099 -- Christian Kastner <debian@kvr.at> Sun, 08 May 2011 01:21:15 +0200
7931100
1101cron (3.0pl1-116ubuntu3) oneiric; urgency=low
1102
1103 * Cherry-pick fix from Debian: database.c, cron.c, cron.h,
1104 debian/copyright:
1105 - Check orphaned crontabs for adoption. Fix taken from Fedora cronie.
1106 Closes: #634926, LP: #27520.
1107
1108 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 19 Sep 2011 10:21:01 -0700
1109
1110cron (3.0pl1-116ubuntu2) oneiric; urgency=low
1111
1112 * No-change rebuild with current debhelper, to fix maintainer script
1113 which keeps trying to start cron in my chroots due to bypassing
1114 invoke-rc.d
1115
1116 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 15 Aug 2011 16:30:24 -0700
1117
1118cron (3.0pl1-116ubuntu1) natty; urgency=low
1119
1120 * Merge from debian unstable (LP: #696953), remaining changes:
1121 - debian/control:
1122 + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
1123 + Move MTA,lockfile-progs to Suggests field.
1124 - debian/cron.upstart: Add Upstart script.
1125 - debian/{prerm,postinst,postrm}:
1126 + Don't call update-rc.d,invoke-rc.d and
1127 /etc/init.d/cron.
1128 - debian/rules: Call dh_installinit to install Upstart job properly.
1129
1130 -- Lorenzo De Liso <blackz@ubuntu.com> Mon, 03 Jan 2011 20:32:01 +0100
1131
794cron (3.0pl1-116) unstable; urgency=high1132cron (3.0pl1-116) unstable; urgency=high
7951133
796 * Upload with approval from Release Team to get RC bug fixes in Squeeze1134 * Upload with approval from Release Team to get RC bug fixes in Squeeze
@@ -814,6 +1152,21 @@ cron (3.0pl1-116) unstable; urgency=high
8141152
815 -- Christian Kastner <debian@kvr.at> Wed, 10 Nov 2010 21:13:19 +01001153 -- Christian Kastner <debian@kvr.at> Wed, 10 Nov 2010 21:13:19 +0100
8161154
1155cron (3.0pl1-115ubuntu1) natty; urgency=low
1156
1157 * Merge from Debian testing, Ubuntu remaining changes:
1158 - debian/control:
1159 + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
1160 + Move MTA,lockfile-progs to Suggests field.
1161 - debian/cron.upstart: Add Upstart script.
1162 - debian/{prerm,postinst,postrm}:
1163 + Don't call update-rc.d,invoke-rc.d and
1164 /etc/init.d/cron.
1165 - debian/rules:
1166 + Call dh_installinit to install Upstart job properly.
1167
1168 -- Alessio Treglia <quadrispro@ubuntu.com> Sat, 27 Nov 2010 10:46:19 +0100
1169
817cron (3.0pl1-115) unstable; urgency=high1170cron (3.0pl1-115) unstable; urgency=high
8181171
819 * cron.c: set LC_COLLATE to 'C' in order to properly work when locales1172 * cron.c: set LC_COLLATE to 'C' in order to properly work when locales
@@ -830,6 +1183,22 @@ cron (3.0pl1-115) unstable; urgency=high
8301183
831 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Sat, 16 Oct 2010 13:05:02 +02001184 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Sat, 16 Oct 2010 13:05:02 +0200
8321185
1186cron (3.0pl1-114ubuntu1) maverick; urgency=low
1187
1188 * Merge from debian unstable for documentation updates and reading of
1189 /etc/default/locale. Remaining changes:
1190 - debian/control:
1191 + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart
1192 + Drop MTA and lockfile-args to Suggests
1193 - add debian/cron.upstart
1194 - debian/postinst: remove calls to update-rc.d, invoke-rc.d and
1195 /etc/init.d/cron
1196 - debian/postrm: remove call to update-rc.d
1197 - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron
1198 - debian/rules: install Upstart job
1199
1200 -- Jamie Strandboge <jamie@ubuntu.com> Tue, 24 Aug 2010 14:56:42 -0500
1201
833cron (3.0pl1-114) unstable; urgency=low1202cron (3.0pl1-114) unstable; urgency=low
8341203
835 * Cleanup of the package in preparation of the next Debian release.1204 * Cleanup of the package in preparation of the next Debian release.
@@ -874,6 +1243,35 @@ cron (3.0pl1-114) unstable; urgency=low
8741243
875 -- Christian Kastner <debian@kvr.at> Sun, 18 Jul 2010 22:51:21 +02001244 -- Christian Kastner <debian@kvr.at> Sun, 18 Jul 2010 22:51:21 +0200
8761245
1246cron (3.0pl1-113ubuntu1) maverick; urgency=low
1247
1248 * Merge from debian unstable. Fixes:
1249 - LP: #46493 (this should have been fixed way back in 3.0pl1-87, and I
1250 confirmed it is no longer a problem)
1251 - LP: #118168 (Debian #79037)
1252 - LP: #151231 (Debian #155109, #443615)
1253 - LP: #308341 (Debian #437180)
1254 * Remaining changes:
1255 - debian/control:
1256 + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart
1257 + Drop MTA and lockfile-args to Suggests
1258 - add debian/cron.upstart
1259 - debian/postinst: remove calls to update-rc.d, invoke-rc.d and
1260 /etc/init.d/cron
1261 - debian/postrm: remove call to update-rc.d
1262 - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron
1263 - debian/rules: install Upstart job
1264 * Drop the following changes, now in debian:
1265 - popen.c: check return code of initgroups() in cron_popen()
1266 - debian/control: add missing ${misc:Depends}
1267 - debian/control: Depends bump on lsb to >= 3.2.12ubuntu2. No longer
1268 required now that we use Upstart
1269 - debian/cron.pam: switch from including common-session to including
1270 the new common-session-noninteractive
1271 - pathnames.h: use sensible-editor
1272
1273 -- Jamie Strandboge <jamie@ubuntu.com> Fri, 25 Jun 2010 16:08:12 -0500
1274
877cron (3.0pl1-113) unstable; urgency=medium1275cron (3.0pl1-113) unstable; urgency=medium
8781276
879 [ Christian Kastner / Javier Fernandez-Sanguino ]1277 [ Christian Kastner / Javier Fernandez-Sanguino ]
@@ -1105,6 +1503,52 @@ cron (3.0pl1-107) unstable; urgency=low
11051503
1106 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Tue, 16 Mar 2010 22:55:26 +01001504 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Tue, 16 Mar 2010 22:55:26 +0100
11071505
1506cron (3.0pl1-106ubuntu5) lucid; urgency=low
1507
1508 * SECURITY UPDATE: check return code of initgroups() in cron_popen().
1509 Related to fix for CVE-2006-2607. Thanks to Javier Fernandez-Sanguino
1510 Pen~a from Debian for pointing this out. This can be dropped in
1511 3.0pl1-109.
1512 - http://svn.debian.org/wsvn/pkg-cron/trunk/popen.c?op=diff&rev=0&sc=0
1513
1514 -- Jamie Strandboge <jamie@ubuntu.com> Wed, 14 Apr 2010 09:10:42 -0500
1515
1516cron (3.0pl1-106ubuntu4) lucid; urgency=low
1517
1518 * rebuild rest of main for armel armv7/thumb2 optimization;
1519 UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
1520
1521 -- Alexander Sack <asac@ubuntu.com> Fri, 05 Mar 2010 04:06:36 +0100
1522
1523cron (3.0pl1-106ubuntu3) karmic; urgency=low
1524
1525 FFE LP: #427356.
1526
1527 * Replace init script with Upstart job.
1528 * debian/control:
1529 - Add missing ${misc:Depends}
1530 - Bump build-dependency on debhelper for Upstart-aware dh_installinit
1531
1532 -- Scott James Remnant <scott@ubuntu.com> Tue, 15 Sep 2009 03:32:59 +0100
1533
1534cron (3.0pl1-106ubuntu2) karmic; urgency=low
1535
1536 * debian/cron.pam: switch from including common-session to including
1537 the new common-session-noninteractive.
1538 * debian/control: depend on libpam-runtime (>= 1.0.1-11) for the above.
1539
1540 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 24 Aug 2009 03:19:49 +0000
1541
1542cron (3.0pl1-106ubuntu1) karmic; urgency=low
1543
1544 * Merge from debian unstable, remaining changes:
1545 - debian/control: Depend on lsb-base >= 3.2-12ubuntu4
1546 - debian/control: Drop MTA and lockfile-args to Suggests
1547 - pathnames.h: use sensible-editor
1548 * New Debian release fixes LP: #46649
1549
1550 -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 May 2009 09:53:08 -0500
1551
1108cron (3.0pl1-106) unstable; urgency=high1552cron (3.0pl1-106) unstable; urgency=high
11091553
1110 * SECURITY UPDATE: cron does not check the return code of setgid() and1554 * SECURITY UPDATE: cron does not check the return code of setgid() and
@@ -1142,6 +1586,17 @@ cron (3.0pl1-106) unstable; urgency=high
11421586
1143 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Wed, 13 May 2009 01:05:41 +02001587 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Wed, 13 May 2009 01:05:41 +0200
11441588
1589cron (3.0pl1-105ubuntu1) jaunty; urgency=low
1590
1591 * Merge from debian unstable, remaining changes:
1592 - crontab.5 : Add details about multiple recipients in MAILTO
1593 - pathnames.h: use sensible-editor
1594 - debian/control: Depend on lsb-base >= 3.2-12ubuntu3.
1595 - Drop MTA to Suggests
1596 - debian/cron.init: Add the 'status' action
1597
1598 -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 12 Nov 2008 16:41:26 +0100
1599
1145cron (3.0pl1-105) unstable; urgency=low1600cron (3.0pl1-105) unstable; urgency=low
11461601
1147 * Non-maintainer upload with permission.1602 * Non-maintainer upload with permission.
@@ -1158,6 +1613,49 @@ cron (3.0pl1-105) unstable; urgency=low
11581613
1159 -- Russell Coker <russell@coker.com.au> Sun, 28 Sep 2008 19:23:50 +10001614 -- Russell Coker <russell@coker.com.au> Sun, 28 Sep 2008 19:23:50 +1000
11601615
1616cron (3.0pl1-104+ubuntu5) intrepid; urgency=low
1617
1618 * crontab.5 : Add details about multiple recipients in MAILTO (LP: #235464)
1619
1620 -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com> Wed, 30 Jul 2008 23:41:42 +0200
1621
1622cron (3.0pl1-104+ubuntu4) intrepid; urgency=low
1623
1624 * debian/control: Depend on lsb-base >= 3.2-12ubuntu3.
1625
1626 -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Jul 2008 14:57:12 +0000
1627
1628cron (3.0pl1-104+ubuntu3) intrepid; urgency=low
1629
1630 * debian/control: Depend on lsb >= 3.2.12ubuntu2, which has
1631 the status_of_proc() function.
1632 * debian/cron.init: Add the 'status' action (LP: #201504),
1633 thanks to Dustin Kirkland.
1634
1635 -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Jul 2008 14:47:09 +0000
1636
1637cron (3.0pl1-104+ubuntu2) intrepid; urgency=low
1638
1639 * Drop MTA to Suggests for Ubuntu for the moment, now that apt installs
1640 Recommends by default.
1641
1642 -- Colin Watson <cjwatson@ubuntu.com> Tue, 08 Jul 2008 10:37:59 +0100
1643
1644cron (3.0pl1-104+ubuntu1) intrepid; urgency=low
1645
1646 * pathnames.h: Use the Debian sensible-editor (LP: #222830).
1647 * Modify Maintainer value to match the DebianMaintainerField
1648 specification.
1649
1650 -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 09 Jun 2008 11:42:25 -0500
1651
1652cron (3.0pl1-104+build1) intrepid; urgency=low
1653
1654 * Fake sync with Debian. The previous merge wasn't necessary, Debian adopted
1655 our remaining change (do not call init script stop for runlevels 0 and 6).
1656
1657 -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Jun 2008 09:05:55 +0200
1658
1161cron (3.0pl1-104) unstable; urgency=low1659cron (3.0pl1-104) unstable; urgency=low
11621660
1163 * Discard errors from df in the standard daily cron task to prevent errors1661 * Discard errors from df in the standard daily cron task to prevent errors
@@ -1986,3 +2484,4 @@ cron (3.0pl1-35) frozen unstable; urgency=low
1986 is fixed. Also added -DDEBIAN to build commands in Makefile.2484 is fixed. Also added -DDEBIAN to build commands in Makefile.
19872485
1988 -- Steve Greenland <steveg@neuromancer.dmccorp.com> Sun, 1 Dec 1996 16:21:52 -06002486 -- Steve Greenland <steveg@neuromancer.dmccorp.com> Sun, 1 Dec 1996 16:21:52 -0600
2487
diff --git a/debian/control b/debian/control
index e73b348..31f2cf8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: cron1Source: cron
2Section: admin2Section: admin
3Priority: important3Priority: important
4Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
5Uploaders: Georges Khaznadar <georgesk@debian.org>6Uploaders: Georges Khaznadar <georgesk@debian.org>
6Standards-Version: 4.6.17Standards-Version: 4.6.1
7Build-Depends:8Build-Depends:
@@ -25,12 +26,11 @@ Depends:
25 ${misc:Depends},26 ${misc:Depends},
26 sensible-utils,27 sensible-utils,
27 libpam-runtime28 libpam-runtime
28Recommends:
29 default-mta | mail-transport-agent
30Suggests:29Suggests:
31 anacron,30 anacron,
32 logrotate,31 logrotate,
33 checksecurity32 checksecurity,
33 default-mta | mail-transport-agent
34Conflicts:34Conflicts:
35 systemd-cron,35 systemd-cron,
36 bcron,36 bcron,
diff --git a/debian/cron.default b/debian/cron.default
index f62b7be..bba2e52 100644
--- a/debian/cron.default
+++ b/debian/cron.default
@@ -1,28 +1,4 @@
1# Cron configuration options1# This file has been deprecated. Please add custom options for cron using
22# $ systemctl edit cron.service
3# Whether to read the system's default environment files (if present)3# or
4# If set to "yes", cron will set a proper mail charset from the4# $ systemctl edit --full cron.service
5# locale information. If set to something other than 'yes', the default
6# charset 'C' (canonical name: ANSI_X3.4-1968) will be used.
7#
8# This has no effect on tasks running under cron; their environment can
9# only be changed via PAM or from within the crontab; see crontab(5).
10READ_ENV="yes"
11
12# Extra options for cron, see cron(8)
13#
14# For example, to enable LSB name support in /etc/cron.d/, use
15# EXTRA_OPTS='-l'
16#
17# Or, to log standard messages, plus jobs with exit status != 0:
18# EXTRA_OPTS='-L 5'
19#
20# For quick reference, the currently available log levels are:
21# 0 no logging (errors are logged regardless)
22# 1 log start of jobs
23# 2 log end of jobs
24# 4 log jobs with exit status != 0
25# 8 log the process identifier of child process (in all logs)
26#
27#EXTRA_OPTS=""
28
diff --git a/debian/cron.init b/debian/cron.init
index c90dc1e..ae607f7 100644
--- a/debian/cron.init
+++ b/debian/cron.init
@@ -65,7 +65,7 @@ fi
6565
66case "$1" in66case "$1" in
67start) log_daemon_msg "Starting periodic command scheduler" "cron"67start) log_daemon_msg "Starting periodic command scheduler" "cron"
68 start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS68 start_daemon -p $PIDFILE $DAEMON -P $EXTRA_OPTS
69 log_end_msg $?69 log_end_msg $?
70 ;;70 ;;
71stop) log_daemon_msg "Stopping periodic command scheduler" "cron"71stop) log_daemon_msg "Stopping periodic command scheduler" "cron"
diff --git a/debian/cron.service b/debian/cron.service
index 47651a1..f5d22b5 100644
--- a/debian/cron.service
+++ b/debian/cron.service
@@ -5,7 +5,7 @@ After=remote-fs.target nss-user-lookup.target
55
6[Service]6[Service]
7EnvironmentFile=-/etc/default/cron7EnvironmentFile=-/etc/default/cron
8ExecStart=/usr/sbin/cron -f $EXTRA_OPTS8ExecStart=/usr/sbin/cron -f -P $EXTRA_OPTS
9IgnoreSIGPIPE=false9IgnoreSIGPIPE=false
10KillMode=process10KillMode=process
11Restart=on-failure11Restart=on-failure
diff --git a/debian/crontab.main b/debian/crontab.main
index d4f236f..92e993b 100644
--- a/debian/crontab.main
+++ b/debian/crontab.main
@@ -5,7 +5,8 @@
5# that none of the other crontabs do.5# that none of the other crontabs do.
66
7SHELL=/bin/sh7SHELL=/bin/sh
8PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin8# You can also override PATH, but by default, newer versions inherit it from the environment
9#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
910
10# Example of job definition:11# Example of job definition:
11# .---------------- minute (0 - 59)12# .---------------- minute (0 - 59)
diff --git a/debian/patches/features/inherit-path.patch b/debian/patches/features/inherit-path.patch
12new file mode 10064413new file mode 100644
index 0000000..c9130a7
--- /dev/null
+++ b/debian/patches/features/inherit-path.patch
@@ -0,0 +1,96 @@
1Description: optionally inherit PATH from parent process
2 The default PATH of cron isn't very useful. This patch adds an
3 option -P to leave PATH alone, so that it's inherited from whatever
4 execs cron. In our case that is daemontools, but could also be
5 start-stop-daemon or whatever. This puts our sysadmins in control
6 of cron's (and child processes') PATH, as they are able to set it in the
7 run script. Without the -P option, crontabs that don't set PATH
8 themselves get a value of /usr/bin:/bin, which is hardcoded as
9 _PATH_DEFPATH in pathnames.h.
10Author: Tom Jones <tom@oxix.org>
11Origin: vendor, https://bugs.debian.org/688716
12Bug-Debian: https://bugs.debian.org/688716
13--- a/cron.8
14+++ b/cron.8
15@@ -36,6 +36,9 @@ runlevels.
16 .B \-f
17 Stay in foreground mode, don't daemonize.
18 .TP
19+.B -P
20+Don't set PATH for child processes. Let it inherit instead.
21+.TP
22 .B \-l
23 Enable LSB compliant names for /etc/cron.d files. This setting, however, does
24 not affect the parsing of files under /etc/cron.hourly, /etc/cron.daily,
25--- a/cron.c
26+++ b/cron.c
27@@ -94,7 +94,9 @@ main(argc, argv)
28 set_cron_cwd();
29
30 #if defined(POSIX)
31- setenv("PATH", _PATH_DEFPATH, 1);
32+ if (change_child_path) {
33+ setenv("PATH", _PATH_DEFPATH, 1);
34+ }
35 #endif
36
37 /* Get the default locale character set for the mail
38@@ -448,9 +450,9 @@ sighup_handler(int x) {
39
40
41 #if DEBUGGING
42-const char *getoptarg = "flL:nx:";
43+const char *getoptarg = "fPlL:nx:";
44 #else
45-const char *getoptarg = "flL:n";
46+const char *getoptarg = "fPlL:n";
47 #endif
48
49 static void
50@@ -461,6 +463,7 @@ parse_args(argc, argv)
51 int argch;
52
53 stay_foreground = 0;
54+ change_child_path = 1;
55 lsbsysinit_mode = 0;
56 log_level = 1;
57 fqdn_in_subject = 0;
58@@ -472,6 +475,9 @@ parse_args(argc, argv)
59 case 'f':
60 stay_foreground = 1;
61 break;
62+ case 'P':
63+ change_child_path = 0;
64+ break;
65 case 'l':
66 lsbsysinit_mode = 1;
67 break;
68--- a/cron.h
69+++ b/cron.h
70@@ -306,6 +306,7 @@ time_min clockTime;
71 static long GMToff;
72
73 int stay_foreground;
74+int change_child_path;
75 int lsbsysinit_mode;
76 int log_level;
77 int fqdn_in_subject;
78--- a/entry.c
79+++ b/entry.c
80@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: entry.c,v 2.
81
82 #include "cron.h"
83
84+extern int change_child_path;
85
86 typedef enum ecode {
87 e_none, e_minute, e_hour, e_dom, e_month, e_dow,
88@@ -289,7 +290,7 @@ load_entry(file, error_func, pw, envp)
89 goto eof;
90 }
91 }
92- if (!env_get("PATH", e->envp)) {
93+ if (!env_get("PATH", e->envp) && change_child_path) {
94 snprintf(envstr, MAX_ENVSTR, "PATH=%s", _PATH_DEFPATH);
95 if ((tenvp = env_set(e->envp, envstr))) {
96 e->envp = tenvp;
diff --git a/debian/patches/series b/debian/patches/series
index 71e5d4c..9b2aa71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -74,3 +74,4 @@ fixes/Check_for_timezone_changes.patch
74features/No-multiple-timezones.patch74features/No-multiple-timezones.patch
75fixes/crontab_5_manpage.patch75fixes/crontab_5_manpage.patch
76features/dry-run.patch76features/dry-run.patch
77features/inherit-path.patch
diff --git a/debian/tests/compare-with-old-cron-files b/debian/tests/compare-with-old-cron-files
index ef3b47f..babf12c 100644
--- a/debian/tests/compare-with-old-cron-files
+++ b/debian/tests/compare-with-old-cron-files
@@ -7,7 +7,7 @@ dir=$(pwd)/debian/tests
7frame "this test has been designed to check that when one uses the new" \7frame "this test has been designed to check that when one uses the new" \
8 "package set, cron + cron-daemon-common, the installed" \8 "package set, cron + cron-daemon-common, the installed" \
9 "configuration files are the same than those who used to be" \9 "configuration files are the same than those who used to be" \
10 "installed by the package cron which comes with bullseye." \10 "installed by the package cron which comes with jammy." \
11 "------------------------------------------------------------------" \11 "------------------------------------------------------------------" \
12 "one modification is allowed: parentheses () can be replaced" \12 "one modification is allowed: parentheses () can be replaced" \
13 "by curly braces {} in /etc/crontab"13 "by curly braces {} in /etc/crontab"
@@ -20,16 +20,22 @@ unfoldPackage (){
20 mkdir -p "$destdir"20 mkdir -p "$destdir"
21 apt-get download "$package" 2>/dev/null21 apt-get download "$package" 2>/dev/null
22 ar -x *.deb22 ar -x *.deb
23 tar xJf data.tar.xz -C "$destdir"23 tar xf data.tar.* -C "$destdir"
24 rm -f *.deb *.tar.xz debian-binary24 rm -f *.deb *.tar.* debian-binary
25}25}
2626
27# "==== including bullseye, updating apt dictionaries ===="27# "==== including jammy, updating apt dictionaries ===="
28echo "deb http://deb.debian.org/debian/ bullseye main" > /etc/apt/sources.list.d/bullseye.list28arch="$(dpkg --print-architecture)"
29if [ "$arch" = "amd64" ] || [ "$arch" = "i386" ]; then
30 uri="http://archive.ubuntu.com/ubuntu"
31else
32 uri="http://ports.ubuntu.com/ubuntu-ports"
33fi
34echo "deb $uri jammy main" > /etc/apt/sources.list.d/jammy.list
29apt-get update 2>/dev/null35apt-get update 2>/dev/null
3036
31# "= download, uncompress the old package cron=3.0pl1-137 ="37# "= download, uncompress the old package cron=3.0pl1-137ubuntu3 ="
32unfoldPackage "cron=3.0pl1-137" "old-cron"38unfoldPackage "cron=3.0pl1-137ubuntu3" "old-cron"
3339
34# same for packages cron-daemon-common and cron40# same for packages cron-daemon-common and cron
35unfoldPackage "cron" "new-cron"41unfoldPackage "cron" "new-cron"

Subscribers

People subscribed via source and target branches