Merge ~juliank/ubuntu/+source/cron:inherit-path into ubuntu/+source/cron:ubuntu/devel

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

Bileto ticket: https://bileto.ubuntu.com/#/ticket/4490

Needs a change in anacron to to make anacrontab work correctly

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

Ok, alignment with cronie is a reasonable justification. +1

review: Approve

Unmerged commits

b9457aa... by Julian Andres Klode on 2021-03-15

Add -P (inherit PATH) option and set it in service

* d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
  thanks to Tom Jones for the patch (Closes: #688716)
* Inherit PATH by default (LP: #1779767):
  - debian/crontab.main: Stop setting PATH
  - debian/cron.service, debian/cron.init: Pass -P to cron

94e1e5c... by Steve Langasek on 2020-02-13

3.0pl1-136ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 2c8e458..feb358a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+cron (3.0pl1-136ubuntu2) hirsute; urgency=medium
+
+  * d/p/f/inherit-path.patch: Add -P option to inherit PATH from environment,
+    thanks to Tom Jones for the patch (Closes: #688716)
+  * Inherit PATH by default (LP: #1779767):
+    - debian/crontab.main: Stop setting PATH
+    - debian/cron.service, debian/cron.init: Pass -P to cron
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 15 Mar 2021 15:10:36 +0100
+
 cron (3.0pl1-136ubuntu1) focal; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
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
 
 case "$1" in
 start)	log_daemon_msg "Starting periodic command scheduler" "cron"
-        start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS
+        start_daemon -p $PIDFILE $DAEMON -P $EXTRA_OPTS
         log_end_msg $?
 	;;
 stop)	log_daemon_msg "Stopping periodic command scheduler" "cron"
diff --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
 
 [Service]
 EnvironmentFile=-/etc/default/cron
-ExecStart=/usr/sbin/cron -f $EXTRA_OPTS
+ExecStart=/usr/sbin/cron -f -P $EXTRA_OPTS
 IgnoreSIGPIPE=false
 KillMode=process
 Restart=on-failure
diff --git a/debian/crontab.main b/debian/crontab.main
index c89cc0b..54aad03 100644
--- a/debian/crontab.main
+++ b/debian/crontab.main
@@ -5,7 +5,8 @@
 # that none of the other crontabs do.
 
 SHELL=/bin/sh
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+# You can also override PATH, by default, newer versions inherit it from the environment
+#PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # Example of job definition:
 # .---------------- minute (0 - 59)
diff --git a/debian/patches/features/inherit-path.patch b/debian/patches/features/inherit-path.patch
new file mode 100644
index 0000000..c9130a7
--- /dev/null
+++ b/debian/patches/features/inherit-path.patch
@@ -0,0 +1,96 @@
+Description: optionally inherit PATH from parent process
+ The default PATH of cron isn't very useful.  This patch adds an
+ option -P to leave PATH alone, so that it's inherited from whatever
+ execs cron.  In our case that is daemontools, but could also be
+ start-stop-daemon or whatever.  This puts our sysadmins in control
+ of cron's (and child processes') PATH, as they are able to set it in the 
+ run script.  Without the -P option, crontabs that don't set PATH
+ themselves get a value of /usr/bin:/bin, which is hardcoded as
+ _PATH_DEFPATH in pathnames.h.
+Author: Tom Jones <[e-mail]>
+Origin: vendor, https://bugs.debian.org/688716
+Bug-Debian: https://bugs.debian.org/688716
+--- a/cron.8
++++ b/cron.8
+@@ -36,6 +36,9 @@ runlevels.
+ .B \-f
+ Stay in foreground mode, don't daemonize.
+ .TP
++.B -P
++Don't set PATH for child processes.  Let it inherit instead.
++.TP
+ .B \-l
+ Enable LSB compliant names for /etc/cron.d files.  This setting, however, does
+ not affect the parsing of files under /etc/cron.hourly, /etc/cron.daily,
+--- a/cron.c
++++ b/cron.c
+@@ -94,7 +94,9 @@ main(argc, argv)
+ 	set_cron_cwd();
+ 
+ #if defined(POSIX)
+-	setenv("PATH", _PATH_DEFPATH, 1);
++	if (change_child_path) {
++		setenv("PATH", _PATH_DEFPATH, 1);
++	}
+ #endif
+ 
+ 	/* Get the default locale character set for the mail
+@@ -448,9 +450,9 @@ sighup_handler(int x) {
+ 
+ 
+ #if DEBUGGING
+-const char *getoptarg = "flL:nx:";
++const char *getoptarg = "fPlL:nx:";
+ #else
+-const char *getoptarg = "flL:n";
++const char *getoptarg = "fPlL:n";
+ #endif
+ 
+ static void
+@@ -461,6 +463,7 @@ parse_args(argc, argv)
+ 	int	argch;
+ 
+ 	stay_foreground = 0;
++	change_child_path = 1;
+ 	lsbsysinit_mode = 0;
+ 	log_level = 1;
+ 	fqdn_in_subject = 0;
+@@ -472,6 +475,9 @@ parse_args(argc, argv)
+ 		case 'f':
+ 			stay_foreground = 1;
+ 			break;
++		case 'P':
++			change_child_path = 0;
++			break;
+ 		case 'l':
+ 			lsbsysinit_mode = 1;
+ 			break;
+--- a/cron.h
++++ b/cron.h
+@@ -306,6 +306,7 @@ time_min clockTime;
+ static long GMToff;
+ 
+ int	stay_foreground;
++int	change_child_path;
+ int	lsbsysinit_mode;
+ int	log_level;
+ int	fqdn_in_subject;
+--- a/entry.c
++++ b/entry.c
+@@ -28,6 +28,7 @@ static char rcsid[] = "$Id: entry.c,v 2.
+ 
+ #include "cron.h"
+ 
++extern int change_child_path;
+ 
+ typedef	enum ecode {
+ 	e_none, e_minute, e_hour, e_dom, e_month, e_dow,
+@@ -289,7 +290,7 @@ load_entry(file, error_func, pw, envp)
+ 			goto eof;
+ 		}
+ 	}
+-	if (!env_get("PATH", e->envp)) {
++	if (!env_get("PATH", e->envp) && change_child_path) {
+ 		snprintf(envstr, MAX_ENVSTR, "PATH=%s", _PATH_DEFPATH);
+ 		if ((tenvp = env_set(e->envp, envstr))) {
+ 			e->envp = tenvp;
diff --git a/debian/patches/series b/debian/patches/series
index 145c4ca..e4a0c48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -67,3 +67,4 @@ features/Recover-from-crontab-errors.patch
 features/Selective-logging.patch
 features/Check-orphaned-crontabs-for-adoption.patch
 features/Add-option-to-include-FQDN-in-email.patch
+features/inherit-path.patch