Ubuntu
cron package

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

  1. Git
  2. lp:~vpa1977/ubuntu/+source/cron
  3. merge-lp2028894
  4. Merge into 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:~#

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

Reply
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:~#
---------------

Reply
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...

Reply
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
Reply

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
1diff --git a/debian/changelog b/debian/changelog
2index 66c54c2..14033eb 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,19 @@
6+cron (3.0pl1-163ubuntu1) mantic; urgency=medium
7+
8+ * Merge with Debian unstable (LP: #2028894). Remaining changes:
9+ - debian/control: Move MTA to Suggests field.
10+ - debian/cron.default: change to a deprecated message to make it clear
11+ that the file is no longer in use.
12+ - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
13+ thanks to Tom Jones for the patch
14+ - Inherit PATH by default:
15+ + debian/crontab.main: Stop setting PATH
16+ + debian/cron.service, debian/cron.init: Pass -P to cron
17+ - debian/tests/compare-with-old-cron-files: Compare against cron package
18+ shipped in Ubuntu Jammy instead of that shipped in Debian Bullseye
19+
20+ -- Vladimir Petko <vladimir.petko@canonical.com> Fri, 28 Jul 2023 12:19:57 +1200
21+
22 cron (3.0pl1-163) unstable; urgency=medium
23
24 * Checked that the patch debian/patches/fixes/crontab_5_manpage.patch
25@@ -11,6 +27,26 @@ cron (3.0pl1-163) unstable; urgency=medium
26
27 -- Georges Khaznadar <georgesk@debian.org> Wed, 26 Jul 2023 15:01:18 +0200
28
29+cron (3.0pl1-162ubuntu1) mantic; urgency=medium
30+
31+ * Merge with Debian unstable (LP: #2023077). Remaining changes:
32+ - debian/control: Move MTA to Suggests field.
33+ - debian/cron.default: change to a deprecated message to make it clear
34+ that the file is no longer in use.
35+ - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
36+ thanks to Tom Jones for the patch
37+ - Inherit PATH by default:
38+ + debian/crontab.main: Stop setting PATH
39+ + debian/cron.service, debian/cron.init: Pass -P to cron
40+ * Dropped changes, patch no longer applies:
41+ - Update crontab(5) manpage to match new behaviour
42+ [Relevant sections removed by d/p/fixes/crontab_5_manpage.patch]
43+ * New changes:
44+ - debian/tests/compare-with-old-cron-files: Compare against cron package
45+ shipped in Ubuntu Jammy instead of that shipped in Debian Bullseye
46+
47+ -- Nick Rosbrook <nick.rosbrook@canonical.com> Fri, 02 Jun 2023 12:41:04 -0400
48+
49 cron (3.0pl1-162) unstable; urgency=medium
50
51 * moved "Breaks: systemd-cron(<<1.15.19-5~)" to the package
52@@ -98,6 +134,21 @@ cron (3.0pl1-152) unstable; urgency=medium
53
54 -- Georges Khaznadar <georgesk@debian.org> Sun, 27 Nov 2022 20:41:35 +0100
55
56+cron (3.0pl1-151ubuntu1) lunar; urgency=low
57+
58+ * Merge from Debian unstable. Remaining changes:
59+ - debian/control: Move MTA to Suggests field.
60+ - debian/cron.default: change to a deprecated message to make it clear
61+ that the file is no longer in use.
62+ - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
63+ thanks to Tom Jones for the patch (Closes: #688716)
64+ - Inherit PATH by default (LP: #1779767):
65+ + debian/crontab.main: Stop setting PATH
66+ + debian/cron.service, debian/cron.init: Pass -P to cron
67+ - Update crontab(5) manpage to match new behaviour (LP: #1938924)
68+
69+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 23 Nov 2022 15:30:35 +0100
70+
71 cron (3.0pl1-151) unstable; urgency=medium
72
73 * bumped a breaks+replace clause, now against cronie (<< 1.6.1-5)
74@@ -259,6 +310,54 @@ cron (3.0pl1-137.1) unstable; urgency=medium
75
76 -- Georges Khaznadar <georgesk@debian.org> Tue, 13 Jul 2021 11:04:41 +0200
77
78+cron (3.0pl1-137ubuntu3) jammy; urgency=medium
79+
80+ * No-change rebuild for ppc64el baseline bump.
81+
82+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 23 Mar 2022 14:49:13 +0100
83+
84+cron (3.0pl1-137ubuntu2) impish; urgency=medium
85+
86+ * Update crontab(5) manpage to match new behaviour (LP: #1938924)
87+
88+ -- Graham Inggs <ginggs@ubuntu.com> Fri, 06 Aug 2021 10:59:44 +0000
89+
90+cron (3.0pl1-137ubuntu1) impish; urgency=low
91+
92+ * Merge from Debian unstable. Remaining changes:
93+ - debian/control: Move MTA to Suggests field.
94+ - debian/cron.default: change to a deprecated message to make it clear
95+ that the file is no longer in use.
96+ - d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
97+ thanks to Tom Jones for the patch (Closes: #688716)
98+ - Inherit PATH by default (LP: #1779767):
99+ + debian/crontab.main: Stop setting PATH
100+ + debian/cron.service, debian/cron.init: Pass -P to cron
101+
102+ -- Julian Andres Klode <juliank@ubuntu.com> Mon, 17 May 2021 11:18:33 +0200
103+
104+cron (3.0pl1-137) unstable; urgency=medium
105+
106+ [ Laurent Combe ]
107+ * Add patch Add-MAILFROM-environment-variable.patch
108+ (Closes: #898177, #1750051)
109+
110+ [ Christian Kastner ]
111+ * Modify the above patch to use cronie's safe_p() function for email
112+ validation
113+ * Remove myself from Uploaders
114+
115+ -- Christian Kastner <ckk@debian.org> Mon, 22 Feb 2021 23:43:24 +0100
116+
117+cron (3.0pl1-136ubuntu1) focal; urgency=low
118+
119+ * Merge from Debian unstable. Remaining changes:
120+ - debian/control: Move MTA to Suggests field.
121+ - debian/cron.default: change to a deprecated message to make it clear
122+ that the file is no longer in use.
123+
124+ -- Ubuntu Merge-o-Matic <mom@ubuntu.com> Wed, 17 Mar 2021 23:14:11 +0000
125+
126 cron (3.0pl1-137) unstable; urgency=medium
127
128 [ Laurent Combe ]
129@@ -272,6 +371,25 @@ cron (3.0pl1-137) unstable; urgency=medium
130
131 -- Christian Kastner <ckk@debian.org> Mon, 22 Feb 2021 23:43:24 +0100
132
133+cron (3.0pl1-136ubuntu2) hirsute; urgency=medium
134+
135+ * d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
136+ thanks to Tom Jones for the patch (Closes: #688716)
137+ * Inherit PATH by default (LP: #1779767):
138+ - debian/crontab.main: Stop setting PATH
139+ - debian/cron.service, debian/cron.init: Pass -P to cron
140+
141+ -- Julian Andres Klode <juliank@ubuntu.com> Mon, 15 Mar 2021 15:10:36 +0100
142+
143+cron (3.0pl1-136ubuntu1) focal; urgency=low
144+
145+ * Merge from Debian unstable. Remaining changes:
146+ - debian/control: Move MTA to Suggests field.
147+ - debian/cron.default: change to a deprecated message to make it clear
148+ that the file is no longer in use.
149+
150+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 13 Feb 2020 12:44:42 -0800
151+
152 cron (3.0pl1-136) unstable; urgency=medium
153
154 * Convert package to source format 3.0 (quilt). Finally.
155@@ -281,6 +399,16 @@ cron (3.0pl1-136) unstable; urgency=medium
156
157 -- Christian Kastner <ckk@debian.org> Mon, 10 Feb 2020 20:16:06 +0100
158
159+cron (3.0pl1-135ubuntu1) focal; urgency=low
160+
161+ * Merge from Debian unstable. Remaining changes:
162+ - debian/control:
163+ + Move MTA to Suggests field.
164+ - d/cron.default: change to a deprecated message to make it clear
165+ that the file is no longer in use.
166+
167+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 18 Oct 2019 15:59:42 -0700
168+
169 cron (3.0pl1-135) unstable; urgency=medium
170
171 [ Laurent Bigonville ]
172@@ -297,6 +425,16 @@ cron (3.0pl1-135) unstable; urgency=medium
173
174 -- Christian Kastner <ckk@debian.org> Sun, 15 Sep 2019 09:13:43 +0200
175
176+cron (3.0pl1-134ubuntu1) eoan; urgency=low
177+
178+ * Merge from Debian unstable. Remaining changes:
179+ - debian/control:
180+ + Move MTA to Suggests field.
181+ - d/cron.default: change to a deprecated message to make it clear
182+ that the file is no longer in use.
183+
184+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 19 Jul 2019 07:49:23 -0700
185+
186 cron (3.0pl1-134) unstable; urgency=medium
187
188 * Increase maximum crontab length to 10,000 lines.
189@@ -306,6 +444,20 @@ cron (3.0pl1-134) unstable; urgency=medium
190
191 -- Christian Kastner <ckk@debian.org> Sun, 23 Jun 2019 19:49:01 +0200
192
193+cron (3.0pl1-133ubuntu1) eoan; urgency=low
194+
195+ * Merge from Debian unstable. Remaining changes:
196+ - debian/control:
197+ + Move MTA to Suggests field.
198+ - d/cron.default: change to a deprecated message to make it clear
199+ that the file is no longer in use.
200+ * Dropped changes, no longer needed:
201+ - Drop upstart system jobs; transition completed as of 18.04.
202+ - Handle /etc/init.d/cron symlink→ real file transition; completed as of
203+ 18.04.
204+
205+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 22 Apr 2019 16:08:45 -0700
206+
207 cron (3.0pl1-133) unstable; urgency=medium
208
209 * SECURITY: Fix bypass of /etc/cron.{allow,deny} on failure to open
210@@ -453,6 +605,19 @@ cron (3.0pl1-129) unstable; urgency=medium
211
212 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Sun, 11 Mar 2018 22:38:06 +0100
213
214+cron (3.0pl1-128.1ubuntu1) bionic; urgency=low
215+
216+ * Merge with Debian; remaining changes:
217+ - debian/control:
218+ + Move MTA to Suggests field.
219+ - d/cron.default: change to a deprecated message to make it clear
220+ that the file is no longer in use.
221+ - Drop upstart system jobs.
222+ - Add debian/cron.preinst: Handle /etc/init.d/cron symlink → real file
223+ transition on upgrades.
224+
225+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 16 Nov 2017 05:29:19 +0000
226+
227 cron (3.0pl1-128.1) unstable; urgency=medium
228
229 * Non-maintainer upload.
230@@ -462,6 +627,44 @@ cron (3.0pl1-128.1) unstable; urgency=medium
231
232 -- Laurent Bigonville <bigon@debian.org> Tue, 03 Oct 2017 15:38:27 +0200
233
234+cron (3.0pl1-128ubuntu5) artful; urgency=medium
235+
236+ * Fix typo.
237+
238+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 21 Aug 2017 00:54:10 +0100
239+
240+cron (3.0pl1-128ubuntu4) artful; urgency=medium
241+
242+ * Drop upstart system jobs.
243+
244+ -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 19 Aug 2017 20:54:52 +0100
245+
246+cron (3.0pl1-128ubuntu3) artful; urgency=medium
247+
248+ * No-change rebuild to pick up -fPIE compiler default in static
249+ libraries
250+
251+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 21 Apr 2017 20:46:39 +0000
252+
253+cron (3.0pl1-128ubuntu2) xenial; urgency=medium
254+
255+ * Add debian/cron.preinst: Handle /etc/init.d/cron symlink → real file
256+ transition on upgrades. (LP: #1566333)
257+
258+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 05 Apr 2016 16:45:50 +0200
259+
260+cron (3.0pl1-128ubuntu1) xenial; urgency=low
261+
262+ * Merge with Debian; remaining changes:
263+ - debian/control:
264+ + Move MTA to Suggests field.
265+ - debian/cron.upstart: Add Upstart script.
266+ - debian/rules: Call dh_installinit to install Upstart job properly.
267+ - d/cron.default: change to a deprecated message to make it clear
268+ that the file is no longer in use.
269+
270+ -- Matthias Klose <doko@ubuntu.com> Wed, 17 Feb 2016 19:21:23 +0100
271+
272 cron (3.0pl1-128) unstable; urgency=medium
273
274 * d/cron.service: Use KillMode=process to kill only the daemon.
275@@ -471,6 +674,18 @@ cron (3.0pl1-128) unstable; urgency=medium
276
277 -- Christian Kastner <debian@kvr.at> Sun, 03 May 2015 15:25:18 +0200
278
279+cron (3.0pl1-127ubuntu1) vivid; urgency=low
280+
281+ * Merge from Debian unstable. Remaining changes:
282+ - debian/control:
283+ + Move MTA to Suggests field.
284+ - debian/cron.upstart: Add Upstart script.
285+ - debian/rules: Call dh_installinit to install Upstart job properly.
286+ - d/cron.default: change to a deprecated message to make it clear
287+ that the file is no longer in use.
288+
289+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 27 Oct 2014 10:19:21 +0100
290+
291 cron (3.0pl1-127) unstable; urgency=medium
292
293 * Drop $READ_ENV from cron's command line. It does not belong there.
294@@ -544,6 +759,18 @@ cron (3.0pl1-124.2) unstable; urgency=medium
295
296 -- Ansgar Burchardt <ansgar@debian.org> Mon, 04 Aug 2014 21:44:00 +0200
297
298+cron (3.0pl1-124.1ubuntu1) utopic; urgency=medium
299+
300+ * Merge from Debian unstable. Remaining Changes:
301+ - debian/control:
302+ + Move MTA to Suggests field.
303+ - debian/cron.upstart: Add Upstart script.
304+ - debian/rules: Call dh_installinit to install Upstart job properly.
305+ - d/cron.default: change to a deprecated message to make it clear
306+ that the file is no longer in use.
307+
308+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 07 Jul 2014 15:58:31 +0100
309+
310 cron (3.0pl1-124.1) unstable; urgency=medium
311
312 * Non-maintainer upload.
313@@ -552,6 +779,42 @@ cron (3.0pl1-124.1) unstable; urgency=medium
314
315 -- Laurent Bigonville <bigon@debian.org> Sun, 25 May 2014 21:21:19 +0200
316
317+cron (3.0pl1-124ubuntu4) utopic; urgency=high
318+
319+ * No change rebuild against new dh_installinit, to call update-rc.d at
320+ postinst.
321+
322+ -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 28 May 2014 10:39:23 +0100
323+
324+cron (3.0pl1-124ubuntu3) utopic; urgency=medium
325+
326+ * No change rebuild to drop upstart-job symlink.
327+
328+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 19 May 2014 00:02:44 +0100
329+
330+cron (3.0pl1-124ubuntu2) raring; urgency=low
331+
332+ * Restore libaudit-dev build-dep now that it has been promoted to main.
333+
334+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 08 Feb 2013 23:54:51 -0700
335+
336+cron (3.0pl1-124ubuntu1) raring; urgency=low
337+
338+ * Merge from Debian unstable. Remaining Changes:
339+ - Drop build-dependency on libaudit, not in main and the security
340+ team doesn't want it there.
341+ - debian/control:
342+ + Move MTA to Suggests field.
343+ - debian/cron.upstart: Add Upstart script.
344+ - debian/rules: Call dh_installinit to install Upstart job properly.
345+ - d/cron.default: change to a deprecated message to make it clear
346+ that the file is no longer in use.
347+ * Dropped changes:
348+ - debian/rules: add support for cross-compiling. (Applied in Debian)
349+ - Requires debhelper >= 7.3.15ubuntu2 (for Upstart). (Debian req's >= 9)
350+
351+ -- Clint Byrum <clint@ubuntu.com> Wed, 07 Nov 2012 00:03:51 -0800
352+
353 cron (3.0pl1-124) unstable; urgency=medium
354
355 [ Release targeted to Wheezy including fixes for critical/important bugs ]
356@@ -587,6 +850,22 @@ cron (3.0pl1-123) unstable; urgency=low
357
358 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Sat, 23 Jun 2012 08:28:27 +0200
359
360+cron (3.0pl1-121ubuntu1) quantal; urgency=low
361+
362+ * Merge from Debian unstable. Remaining changes:
363+ - debian/rules: add support for cross-compiling.
364+ - Drop build-dependency on libaudit, not in main and the security
365+ team doesn't want it there.
366+ - debian/control:
367+ + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
368+ + Move MTA to Suggests field.
369+ - debian/cron.upstart: Add Upstart script.
370+ - debian/rules: Call dh_installinit to install Upstart job properly.
371+ * d/cron.default: change to a deprecated message to make it clear
372+ that the file is no longer in use. (LP: #794082)
373+
374+ -- Clint Byrum <clint@ubuntu.com> Thu, 14 Jun 2012 11:05:24 -0700
375+
376 cron (3.0pl1-121) unstable; urgency=low
377
378 * debian/control:
379@@ -611,6 +890,34 @@ cron (3.0pl1-121) unstable; urgency=low
380
381 -- Javier Fernández-Sanguino Peña <jfs@debian.org> Mon, 19 Sep 2011 00:20:17 +0200
382
383+cron (3.0pl1-120ubuntu3) precise; urgency=low
384+
385+ * debian/rules: add support for cross-compiling.
386+
387+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 02 Apr 2012 07:50:11 +0000
388+
389+cron (3.0pl1-120ubuntu2) precise; urgency=low
390+
391+ * Drop build-dependency on libaudit, not in main and the security team
392+ doesn't want it there. LP: #878155.
393+
394+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 20 Oct 2011 07:57:06 -0700
395+
396+cron (3.0pl1-120ubuntu1) precise; urgency=low
397+
398+ [ Ubuntu Merge-o-Matic ]
399+ * Merge from Debian unstable. Remaining changes:
400+ - debian/control:
401+ + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
402+ + Move MTA to Suggests field.
403+ - debian/cron.upstart: Add Upstart script.
404+ - debian/rules: Call dh_installinit to install Upstart job properly.
405+ * Dropped changes, superseded upstream:
406+ - debian/control: lockfile-progs no longer recommended.
407+ - debian/{prerm,postinst,postrm}: scripts now generated with debhelper.
408+
409+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 17 Oct 2011 15:33:56 -0700
410+
411 cron (3.0pl1-120) unstable; urgency=low
412
413 * do_command.c, cron.h, cron.8:
414@@ -791,6 +1098,37 @@ cron (3.0pl1-117) unstable; urgency=low
415
416 -- Christian Kastner <debian@kvr.at> Sun, 08 May 2011 01:21:15 +0200
417
418+cron (3.0pl1-116ubuntu3) oneiric; urgency=low
419+
420+ * Cherry-pick fix from Debian: database.c, cron.c, cron.h,
421+ debian/copyright:
422+ - Check orphaned crontabs for adoption. Fix taken from Fedora cronie.
423+ Closes: #634926, LP: #27520.
424+
425+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 19 Sep 2011 10:21:01 -0700
426+
427+cron (3.0pl1-116ubuntu2) oneiric; urgency=low
428+
429+ * No-change rebuild with current debhelper, to fix maintainer script
430+ which keeps trying to start cron in my chroots due to bypassing
431+ invoke-rc.d
432+
433+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 15 Aug 2011 16:30:24 -0700
434+
435+cron (3.0pl1-116ubuntu1) natty; urgency=low
436+
437+ * Merge from debian unstable (LP: #696953), remaining changes:
438+ - debian/control:
439+ + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
440+ + Move MTA,lockfile-progs to Suggests field.
441+ - debian/cron.upstart: Add Upstart script.
442+ - debian/{prerm,postinst,postrm}:
443+ + Don't call update-rc.d,invoke-rc.d and
444+ /etc/init.d/cron.
445+ - debian/rules: Call dh_installinit to install Upstart job properly.
446+
447+ -- Lorenzo De Liso <blackz@ubuntu.com> Mon, 03 Jan 2011 20:32:01 +0100
448+
449 cron (3.0pl1-116) unstable; urgency=high
450
451 * Upload with approval from Release Team to get RC bug fixes in Squeeze
452@@ -814,6 +1152,21 @@ cron (3.0pl1-116) unstable; urgency=high
453
454 -- Christian Kastner <debian@kvr.at> Wed, 10 Nov 2010 21:13:19 +0100
455
456+cron (3.0pl1-115ubuntu1) natty; urgency=low
457+
458+ * Merge from Debian testing, Ubuntu remaining changes:
459+ - debian/control:
460+ + Requires debhelper >= 7.3.15ubuntu2 (for Upstart).
461+ + Move MTA,lockfile-progs to Suggests field.
462+ - debian/cron.upstart: Add Upstart script.
463+ - debian/{prerm,postinst,postrm}:
464+ + Don't call update-rc.d,invoke-rc.d and
465+ /etc/init.d/cron.
466+ - debian/rules:
467+ + Call dh_installinit to install Upstart job properly.
468+
469+ -- Alessio Treglia <quadrispro@ubuntu.com> Sat, 27 Nov 2010 10:46:19 +0100
470+
471 cron (3.0pl1-115) unstable; urgency=high
472
473 * cron.c: set LC_COLLATE to 'C' in order to properly work when locales
474@@ -830,6 +1183,22 @@ cron (3.0pl1-115) unstable; urgency=high
475
476 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Sat, 16 Oct 2010 13:05:02 +0200
477
478+cron (3.0pl1-114ubuntu1) maverick; urgency=low
479+
480+ * Merge from debian unstable for documentation updates and reading of
481+ /etc/default/locale. Remaining changes:
482+ - debian/control:
483+ + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart
484+ + Drop MTA and lockfile-args to Suggests
485+ - add debian/cron.upstart
486+ - debian/postinst: remove calls to update-rc.d, invoke-rc.d and
487+ /etc/init.d/cron
488+ - debian/postrm: remove call to update-rc.d
489+ - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron
490+ - debian/rules: install Upstart job
491+
492+ -- Jamie Strandboge <jamie@ubuntu.com> Tue, 24 Aug 2010 14:56:42 -0500
493+
494 cron (3.0pl1-114) unstable; urgency=low
495
496 * Cleanup of the package in preparation of the next Debian release.
497@@ -874,6 +1243,35 @@ cron (3.0pl1-114) unstable; urgency=low
498
499 -- Christian Kastner <debian@kvr.at> Sun, 18 Jul 2010 22:51:21 +0200
500
501+cron (3.0pl1-113ubuntu1) maverick; urgency=low
502+
503+ * Merge from debian unstable. Fixes:
504+ - LP: #46493 (this should have been fixed way back in 3.0pl1-87, and I
505+ confirmed it is no longer a problem)
506+ - LP: #118168 (Debian #79037)
507+ - LP: #151231 (Debian #155109, #443615)
508+ - LP: #308341 (Debian #437180)
509+ * Remaining changes:
510+ - debian/control:
511+ + Build-Depends on debhelper >= 7.3.15ubuntu2, for Upstart
512+ + Drop MTA and lockfile-args to Suggests
513+ - add debian/cron.upstart
514+ - debian/postinst: remove calls to update-rc.d, invoke-rc.d and
515+ /etc/init.d/cron
516+ - debian/postrm: remove call to update-rc.d
517+ - debian/prerm: remove calls to invoke-rc.d and /etc/init.d/cron
518+ - debian/rules: install Upstart job
519+ * Drop the following changes, now in debian:
520+ - popen.c: check return code of initgroups() in cron_popen()
521+ - debian/control: add missing ${misc:Depends}
522+ - debian/control: Depends bump on lsb to >= 3.2.12ubuntu2. No longer
523+ required now that we use Upstart
524+ - debian/cron.pam: switch from including common-session to including
525+ the new common-session-noninteractive
526+ - pathnames.h: use sensible-editor
527+
528+ -- Jamie Strandboge <jamie@ubuntu.com> Fri, 25 Jun 2010 16:08:12 -0500
529+
530 cron (3.0pl1-113) unstable; urgency=medium
531
532 [ Christian Kastner / Javier Fernandez-Sanguino ]
533@@ -1105,6 +1503,52 @@ cron (3.0pl1-107) unstable; urgency=low
534
535 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Tue, 16 Mar 2010 22:55:26 +0100
536
537+cron (3.0pl1-106ubuntu5) lucid; urgency=low
538+
539+ * SECURITY UPDATE: check return code of initgroups() in cron_popen().
540+ Related to fix for CVE-2006-2607. Thanks to Javier Fernandez-Sanguino
541+ Pen~a from Debian for pointing this out. This can be dropped in
542+ 3.0pl1-109.
543+ - http://svn.debian.org/wsvn/pkg-cron/trunk/popen.c?op=diff&rev=0&sc=0
544+
545+ -- Jamie Strandboge <jamie@ubuntu.com> Wed, 14 Apr 2010 09:10:42 -0500
546+
547+cron (3.0pl1-106ubuntu4) lucid; urgency=low
548+
549+ * rebuild rest of main for armel armv7/thumb2 optimization;
550+ UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
551+
552+ -- Alexander Sack <asac@ubuntu.com> Fri, 05 Mar 2010 04:06:36 +0100
553+
554+cron (3.0pl1-106ubuntu3) karmic; urgency=low
555+
556+ FFE LP: #427356.
557+
558+ * Replace init script with Upstart job.
559+ * debian/control:
560+ - Add missing ${misc:Depends}
561+ - Bump build-dependency on debhelper for Upstart-aware dh_installinit
562+
563+ -- Scott James Remnant <scott@ubuntu.com> Tue, 15 Sep 2009 03:32:59 +0100
564+
565+cron (3.0pl1-106ubuntu2) karmic; urgency=low
566+
567+ * debian/cron.pam: switch from including common-session to including
568+ the new common-session-noninteractive.
569+ * debian/control: depend on libpam-runtime (>= 1.0.1-11) for the above.
570+
571+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 24 Aug 2009 03:19:49 +0000
572+
573+cron (3.0pl1-106ubuntu1) karmic; urgency=low
574+
575+ * Merge from debian unstable, remaining changes:
576+ - debian/control: Depend on lsb-base >= 3.2-12ubuntu4
577+ - debian/control: Drop MTA and lockfile-args to Suggests
578+ - pathnames.h: use sensible-editor
579+ * New Debian release fixes LP: #46649
580+
581+ -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 May 2009 09:53:08 -0500
582+
583 cron (3.0pl1-106) unstable; urgency=high
584
585 * SECURITY UPDATE: cron does not check the return code of setgid() and
586@@ -1142,6 +1586,17 @@ cron (3.0pl1-106) unstable; urgency=high
587
588 -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org> Wed, 13 May 2009 01:05:41 +0200
589
590+cron (3.0pl1-105ubuntu1) jaunty; urgency=low
591+
592+ * Merge from debian unstable, remaining changes:
593+ - crontab.5 : Add details about multiple recipients in MAILTO
594+ - pathnames.h: use sensible-editor
595+ - debian/control: Depend on lsb-base >= 3.2-12ubuntu3.
596+ - Drop MTA to Suggests
597+ - debian/cron.init: Add the 'status' action
598+
599+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 12 Nov 2008 16:41:26 +0100
600+
601 cron (3.0pl1-105) unstable; urgency=low
602
603 * Non-maintainer upload with permission.
604@@ -1158,6 +1613,49 @@ cron (3.0pl1-105) unstable; urgency=low
605
606 -- Russell Coker <russell@coker.com.au> Sun, 28 Sep 2008 19:23:50 +1000
607
608+cron (3.0pl1-104+ubuntu5) intrepid; urgency=low
609+
610+ * crontab.5 : Add details about multiple recipients in MAILTO (LP: #235464)
611+
612+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com> Wed, 30 Jul 2008 23:41:42 +0200
613+
614+cron (3.0pl1-104+ubuntu4) intrepid; urgency=low
615+
616+ * debian/control: Depend on lsb-base >= 3.2-12ubuntu3.
617+
618+ -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Jul 2008 14:57:12 +0000
619+
620+cron (3.0pl1-104+ubuntu3) intrepid; urgency=low
621+
622+ * debian/control: Depend on lsb >= 3.2.12ubuntu2, which has
623+ the status_of_proc() function.
624+ * debian/cron.init: Add the 'status' action (LP: #201504),
625+ thanks to Dustin Kirkland.
626+
627+ -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Jul 2008 14:47:09 +0000
628+
629+cron (3.0pl1-104+ubuntu2) intrepid; urgency=low
630+
631+ * Drop MTA to Suggests for Ubuntu for the moment, now that apt installs
632+ Recommends by default.
633+
634+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 08 Jul 2008 10:37:59 +0100
635+
636+cron (3.0pl1-104+ubuntu1) intrepid; urgency=low
637+
638+ * pathnames.h: Use the Debian sensible-editor (LP: #222830).
639+ * Modify Maintainer value to match the DebianMaintainerField
640+ specification.
641+
642+ -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 09 Jun 2008 11:42:25 -0500
643+
644+cron (3.0pl1-104+build1) intrepid; urgency=low
645+
646+ * Fake sync with Debian. The previous merge wasn't necessary, Debian adopted
647+ our remaining change (do not call init script stop for runlevels 0 and 6).
648+
649+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 05 Jun 2008 09:05:55 +0200
650+
651 cron (3.0pl1-104) unstable; urgency=low
652
653 * Discard errors from df in the standard daily cron task to prevent errors
654@@ -1986,3 +2484,4 @@ cron (3.0pl1-35) frozen unstable; urgency=low
655 is fixed. Also added -DDEBIAN to build commands in Makefile.
656
657 -- Steve Greenland <steveg@neuromancer.dmccorp.com> Sun, 1 Dec 1996 16:21:52 -0600
658+
659diff --git a/debian/control b/debian/control
660index e73b348..31f2cf8 100644
661--- a/debian/control
662+++ b/debian/control
663@@ -1,7 +1,8 @@
664 Source: cron
665 Section: admin
666 Priority: important
667-Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
668+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
669+XSBC-Original-Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
670 Uploaders: Georges Khaznadar <georgesk@debian.org>
671 Standards-Version: 4.6.1
672 Build-Depends:
673@@ -25,12 +26,11 @@ Depends:
674 ${misc:Depends},
675 sensible-utils,
676 libpam-runtime
677-Recommends:
678- default-mta | mail-transport-agent
679 Suggests:
680 anacron,
681 logrotate,
682- checksecurity
683+ checksecurity,
684+ default-mta | mail-transport-agent
685 Conflicts:
686 systemd-cron,
687 bcron,
688diff --git a/debian/cron.default b/debian/cron.default
689index f62b7be..bba2e52 100644
690--- a/debian/cron.default
691+++ b/debian/cron.default
692@@ -1,28 +1,4 @@
693-# Cron configuration options
694-
695-# Whether to read the system's default environment files (if present)
696-# If set to "yes", cron will set a proper mail charset from the
697-# locale information. If set to something other than 'yes', the default
698-# charset 'C' (canonical name: ANSI_X3.4-1968) will be used.
699-#
700-# This has no effect on tasks running under cron; their environment can
701-# only be changed via PAM or from within the crontab; see crontab(5).
702-READ_ENV="yes"
703-
704-# Extra options for cron, see cron(8)
705-#
706-# For example, to enable LSB name support in /etc/cron.d/, use
707-# EXTRA_OPTS='-l'
708-#
709-# Or, to log standard messages, plus jobs with exit status != 0:
710-# EXTRA_OPTS='-L 5'
711-#
712-# For quick reference, the currently available log levels are:
713-# 0 no logging (errors are logged regardless)
714-# 1 log start of jobs
715-# 2 log end of jobs
716-# 4 log jobs with exit status != 0
717-# 8 log the process identifier of child process (in all logs)
718-#
719-#EXTRA_OPTS=""
720-
721+# This file has been deprecated. Please add custom options for cron using
722+# $ systemctl edit cron.service
723+# or
724+# $ systemctl edit --full cron.service
725diff --git a/debian/cron.init b/debian/cron.init
726index c90dc1e..ae607f7 100644
727--- a/debian/cron.init
728+++ b/debian/cron.init
729@@ -65,7 +65,7 @@ fi
730
731 case "$1" in
732 start) log_daemon_msg "Starting periodic command scheduler" "cron"
733- start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS
734+ start_daemon -p $PIDFILE $DAEMON -P $EXTRA_OPTS
735 log_end_msg $?
736 ;;
737 stop) log_daemon_msg "Stopping periodic command scheduler" "cron"
738diff --git a/debian/cron.service b/debian/cron.service
739index 47651a1..f5d22b5 100644
740--- a/debian/cron.service
741+++ b/debian/cron.service
742@@ -5,7 +5,7 @@ After=remote-fs.target nss-user-lookup.target
743
744 [Service]
745 EnvironmentFile=-/etc/default/cron
746-ExecStart=/usr/sbin/cron -f $EXTRA_OPTS
747+ExecStart=/usr/sbin/cron -f -P $EXTRA_OPTS
748 IgnoreSIGPIPE=false
749 KillMode=process
750 Restart=on-failure
751diff --git a/debian/crontab.main b/debian/crontab.main
752index d4f236f..92e993b 100644
753--- a/debian/crontab.main
754+++ b/debian/crontab.main
755@@ -5,7 +5,8 @@
756 # that none of the other crontabs do.
757
758 SHELL=/bin/sh
759-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
760+# You can also override PATH, but by default, newer versions inherit it from the environment
761+#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
762
763 # Example of job definition:
764 # .---------------- minute (0 - 59)
765diff --git a/debian/patches/features/inherit-path.patch b/debian/patches/features/inherit-path.patch
766new file mode 100644
767index 0000000..c9130a7
768--- /dev/null
769+++ b/debian/patches/features/inherit-path.patch
770@@ -0,0 +1,96 @@
771+Description: optionally inherit PATH from parent process
772+ The default PATH of cron isn't very useful. This patch adds an
773+ option -P to leave PATH alone, so that it's inherited from whatever
774+ execs cron. In our case that is daemontools, but could also be
775+ start-stop-daemon or whatever. This puts our sysadmins in control
776+ of cron's (and child processes') PATH, as they are able to set it in the
777+ run script. Without the -P option, crontabs that don't set PATH
778+ themselves get a value of /usr/bin:/bin, which is hardcoded as
779+ _PATH_DEFPATH in pathnames.h.
780+Author: Tom Jones <tom@oxix.org>
781+Origin: vendor, https://bugs.debian.org/688716
782+Bug-Debian: https://bugs.debian.org/688716
783+--- a/cron.8
784++++ b/cron.8
785+@@ -36,6 +36,9 @@ runlevels.
786+ .B \-f
787+ Stay in foreground mode, don't daemonize.
788+ .TP
789++.B -P
790++Don't set PATH for child processes. Let it inherit instead.
791++.TP
792+ .B \-l
793+ Enable LSB compliant names for /etc/cron.d files. This setting, however, does
794+ not affect the parsing of files under /etc/cron.hourly, /etc/cron.daily,
795+--- a/cron.c
796++++ b/cron.c
797+@@ -94,7 +94,9 @@ main(argc, argv)
798+ set_cron_cwd();
799+
800+ #if defined(POSIX)
801+- setenv("PATH", _PATH_DEFPATH, 1);
802++ if (change_child_path) {
803++ setenv("PATH", _PATH_DEFPATH, 1);
804++ }
805+ #endif
806+
807+ /* Get the default locale character set for the mail
808+@@ -448,9 +450,9 @@ sighup_handler(int x) {
809+
810+
811+ #if DEBUGGING
812+-const char *getoptarg = "flL:nx:";
813++const char *getoptarg = "fPlL:nx:";
814+ #else
815+-const char *getoptarg = "flL:n";
816++const char *getoptarg = "fPlL:n";
817+ #endif
818+
819+ static void
820+@@ -461,6 +463,7 @@ parse_args(argc, argv)
821+ int argch;
822+
823+ stay_foreground = 0;
824++ change_child_path = 1;
825+ lsbsysinit_mode = 0;
826+ log_level = 1;
827+ fqdn_in_subject = 0;
828+@@ -472,6 +475,9 @@ parse_args(argc, argv)
829+ case 'f':
830+ stay_foreground = 1;
831+ break;
832++ case 'P':
833++ change_child_path = 0;
834++ break;
835+ case 'l':
836+ lsbsysinit_mode = 1;
837+ break;
838+--- a/cron.h
839++++ b/cron.h
840+@@ -306,6 +306,7 @@ time_min clockTime;
841+ static long GMToff;
842+
843+ int stay_foreground;
844++int change_child_path;
845+ int lsbsysinit_mode;
846+ int log_level;
847+ int fqdn_in_subject;
848+--- a/entry.c
849++++ b/entry.c
850+@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: entry.c,v 2.
851+
852+ #include "cron.h"
853+
854++extern int change_child_path;
855+
856+ typedef enum ecode {
857+ e_none, e_minute, e_hour, e_dom, e_month, e_dow,
858+@@ -289,7 +290,7 @@ load_entry(file, error_func, pw, envp)
859+ goto eof;
860+ }
861+ }
862+- if (!env_get("PATH", e->envp)) {
863++ if (!env_get("PATH", e->envp) && change_child_path) {
864+ snprintf(envstr, MAX_ENVSTR, "PATH=%s", _PATH_DEFPATH);
865+ if ((tenvp = env_set(e->envp, envstr))) {
866+ e->envp = tenvp;
867diff --git a/debian/patches/series b/debian/patches/series
868index 71e5d4c..9b2aa71 100644
869--- a/debian/patches/series
870+++ b/debian/patches/series
871@@ -74,3 +74,4 @@ fixes/Check_for_timezone_changes.patch
872 features/No-multiple-timezones.patch
873 fixes/crontab_5_manpage.patch
874 features/dry-run.patch
875+features/inherit-path.patch
876diff --git a/debian/tests/compare-with-old-cron-files b/debian/tests/compare-with-old-cron-files
877index ef3b47f..babf12c 100644
878--- a/debian/tests/compare-with-old-cron-files
879+++ b/debian/tests/compare-with-old-cron-files
880@@ -7,7 +7,7 @@ dir=$(pwd)/debian/tests
881 frame "this test has been designed to check that when one uses the new" \
882 "package set, cron + cron-daemon-common, the installed" \
883 "configuration files are the same than those who used to be" \
884- "installed by the package cron which comes with bullseye." \
885+ "installed by the package cron which comes with jammy." \
886 "------------------------------------------------------------------" \
887 "one modification is allowed: parentheses () can be replaced" \
888 "by curly braces {} in /etc/crontab"
889@@ -20,16 +20,22 @@ unfoldPackage (){
890 mkdir -p "$destdir"
891 apt-get download "$package" 2>/dev/null
892 ar -x *.deb
893- tar xJf data.tar.xz -C "$destdir"
894- rm -f *.deb *.tar.xz debian-binary
895+ tar xf data.tar.* -C "$destdir"
896+ rm -f *.deb *.tar.* debian-binary
897 }
898
899-# "==== including bullseye, updating apt dictionaries ===="
900-echo "deb http://deb.debian.org/debian/ bullseye main" > /etc/apt/sources.list.d/bullseye.list
901+# "==== including jammy, updating apt dictionaries ===="
902+arch="$(dpkg --print-architecture)"
903+if [ "$arch" = "amd64" ] || [ "$arch" = "i386" ]; then
904+ uri="http://archive.ubuntu.com/ubuntu"
905+else
906+ uri="http://ports.ubuntu.com/ubuntu-ports"
907+fi
908+echo "deb $uri jammy main" > /etc/apt/sources.list.d/jammy.list
909 apt-get update 2>/dev/null
910
911-# "= download, uncompress the old package cron=3.0pl1-137 ="
912-unfoldPackage "cron=3.0pl1-137" "old-cron"
913+# "= download, uncompress the old package cron=3.0pl1-137ubuntu3 ="
914+unfoldPackage "cron=3.0pl1-137ubuntu3" "old-cron"
915
916 # same for packages cron-daemon-common and cron
917 unfoldPackage "cron" "new-cron"

Subscribers

People subscribed via source and target branches