diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2011-08-11 17:09:47 -0500 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2011-08-11 17:09:47 -0500 |
| commit | ec4d8af511617cecbc5568d612a8154ca342f7c3 (patch) | |
| tree | 7625481d0fc151ab35470f07d34330504484cdfe | |
| parent | 0ff8e2e57fa4e7434c6bdd300a65789a19cbee13 (diff) | |
cron: call sendmail with -f option (required with new busybox)
| -rw-r--r-- | multitech/recipes/cron/cron-3.0pl1/corecdp/sendmail.patch | 33 | ||||
| -rw-r--r-- | multitech/recipes/cron/cron_3.0pl1.bbappend | 4 |
2 files changed, 35 insertions, 2 deletions
diff --git a/multitech/recipes/cron/cron-3.0pl1/corecdp/sendmail.patch b/multitech/recipes/cron/cron-3.0pl1/corecdp/sendmail.patch new file mode 100644 index 0000000..d3e0176 --- /dev/null +++ b/multitech/recipes/cron/cron-3.0pl1/corecdp/sendmail.patch @@ -0,0 +1,33 @@ +Index: cron3.0pl1/config.h +=================================================================== +--- cron3.0pl1.orig/config.h 2011-08-11 14:14:30.016946551 -0500 ++++ cron3.0pl1/config.h 2011-08-11 14:15:19.417274025 -0500 +@@ -42,8 +42,8 @@ + */ + + #define MAILCMD _PATH_SENDMAIL /*-*/ +-#define MAILARGS "%s -FCronDaemon -odi -oem -or0s %s" /*-*/ +- /* -Fx = set full-name of sender ++#define MAILARGS "%s -f %s -odi -oem -or0s %s" /*-*/ ++ /* -f = set sender address + * -odi = Option Deliverymode Interactive + * -oem = Option Errors Mailedtosender + * -or0s = Option Readtimeout -- don't time out +Index: cron3.0pl1/do_command.c +=================================================================== +--- cron3.0pl1.orig/do_command.c 2011-08-11 14:06:52.917216917 -0500 ++++ cron3.0pl1/do_command.c 2011-08-11 14:09:39.507091277 -0500 +@@ -364,10 +364,12 @@ + register char **env; + auto char mailcmd[MAX_COMMAND]; + auto char hostname[MAXHOSTNAMELEN]; ++ auto char sender[MAX_TEMPSTR]; + + (void) gethostname(hostname, MAXHOSTNAMELEN); ++ (void) sprintf(sender, "root@%s", hostname); + (void) sprintf(mailcmd, MAILARGS, +- MAILCMD, mailto); ++ MAILCMD, sender, mailto); + if (!(mail = cron_popen(mailcmd, "w"))) { + perror(MAILCMD); + (void) _exit(ERROR_EXIT); diff --git a/multitech/recipes/cron/cron_3.0pl1.bbappend b/multitech/recipes/cron/cron_3.0pl1.bbappend index ece6498..a3e8108 100644 --- a/multitech/recipes/cron/cron_3.0pl1.bbappend +++ b/multitech/recipes/cron/cron_3.0pl1.bbappend @@ -1,8 +1,8 @@ FILESEXTRA := "${THISDIR}" FILESPATHBASE =. "${FILESEXTRA}:" -PR .= ".corecdp1" +PR .= ".corecdp2" SRC_URI_append_corecdp = " file://disable_logfile.patch \ - file://sendmail_args.patch \ + file://sendmail.patch \ " |