Fossil SCM
Changed all of the "sendmail -t" commands to "sendmail -ti" to make it ignore lines containing only a dot. This is separate from the smtp.c fix checked in just prior: that's about the SMTP level, where a leading dot is treated somewhat differently than the lone dot rule for sendmail(1)'s stdin. Need for fix noticed by gumblex on the forums.
Commit
8c0ec30bc3e84013b63447f8ea0c92ea5ac34297e487e72b1c671442d9e7fae3
Parent
6787aac97f2553e…
3 files changed
+1
-1
+1
-1
+3
-3
+1
-1
| --- src/email.c | ||
| +++ src/email.c | ||
| @@ -264,11 +264,11 @@ | ||
| 264 | 264 | @ that follow. Hint: Use the <a href="%R/announce">/announce</a> page |
| 265 | 265 | @ to send test message to debug this setting. |
| 266 | 266 | @ (Property: "email-send-method")</p> |
| 267 | 267 | email_schema(1); |
| 268 | 268 | entry_attribute("Pipe Email Text Into This Command", 60, "email-send-command", |
| 269 | - "ecmd", "sendmail -t", 0); | |
| 269 | + "ecmd", "sendmail -ti", 0); | |
| 270 | 270 | @ <p>When the send method is "pipe to a command", this is the command |
| 271 | 271 | @ that is run. Email messages are piped into the standard input of this |
| 272 | 272 | @ command. The command is expected to extract the sender address, |
| 273 | 273 | @ recepient addresses, and subject from the header of the piped email |
| 274 | 274 | @ text. (Property: "email-send-command")</p> |
| 275 | 275 |
| --- src/email.c | |
| +++ src/email.c | |
| @@ -264,11 +264,11 @@ | |
| 264 | @ that follow. Hint: Use the <a href="%R/announce">/announce</a> page |
| 265 | @ to send test message to debug this setting. |
| 266 | @ (Property: "email-send-method")</p> |
| 267 | email_schema(1); |
| 268 | entry_attribute("Pipe Email Text Into This Command", 60, "email-send-command", |
| 269 | "ecmd", "sendmail -t", 0); |
| 270 | @ <p>When the send method is "pipe to a command", this is the command |
| 271 | @ that is run. Email messages are piped into the standard input of this |
| 272 | @ command. The command is expected to extract the sender address, |
| 273 | @ recepient addresses, and subject from the header of the piped email |
| 274 | @ text. (Property: "email-send-command")</p> |
| 275 |
| --- src/email.c | |
| +++ src/email.c | |
| @@ -264,11 +264,11 @@ | |
| 264 | @ that follow. Hint: Use the <a href="%R/announce">/announce</a> page |
| 265 | @ to send test message to debug this setting. |
| 266 | @ (Property: "email-send-method")</p> |
| 267 | email_schema(1); |
| 268 | entry_attribute("Pipe Email Text Into This Command", 60, "email-send-command", |
| 269 | "ecmd", "sendmail -ti", 0); |
| 270 | @ <p>When the send method is "pipe to a command", this is the command |
| 271 | @ that is run. Email messages are piped into the standard input of this |
| 272 | @ command. The command is expected to extract the sender address, |
| 273 | @ recepient addresses, and subject from the header of the piped email |
| 274 | @ text. (Property: "email-send-command")</p> |
| 275 |
+1
-1
| --- tools/email-sender.tcl | ||
| +++ tools/email-sender.tcl | ||
| @@ -4,11 +4,11 @@ | ||
| 4 | 4 | # looking for email messages sent by Fossil. Forward each |
| 5 | 5 | # to /usr/sbin/sendmail. |
| 6 | 6 | # |
| 7 | 7 | set POLLING_INTERVAL 10000 ;# milliseconds |
| 8 | 8 | set DBFILE /home/www/fossil/emailqueue.db |
| 9 | -set PIPE "/usr/sbin/sendmail -t" | |
| 9 | +set PIPE "/usr/sbin/sendmail -ti" | |
| 10 | 10 | |
| 11 | 11 | package require sqlite3 |
| 12 | 12 | # puts "SQLite version [sqlite3 -version]" |
| 13 | 13 | sqlite3 db $DBFILE |
| 14 | 14 | db timeout 5000 |
| 15 | 15 |
| --- tools/email-sender.tcl | |
| +++ tools/email-sender.tcl | |
| @@ -4,11 +4,11 @@ | |
| 4 | # looking for email messages sent by Fossil. Forward each |
| 5 | # to /usr/sbin/sendmail. |
| 6 | # |
| 7 | set POLLING_INTERVAL 10000 ;# milliseconds |
| 8 | set DBFILE /home/www/fossil/emailqueue.db |
| 9 | set PIPE "/usr/sbin/sendmail -t" |
| 10 | |
| 11 | package require sqlite3 |
| 12 | # puts "SQLite version [sqlite3 -version]" |
| 13 | sqlite3 db $DBFILE |
| 14 | db timeout 5000 |
| 15 |
| --- tools/email-sender.tcl | |
| +++ tools/email-sender.tcl | |
| @@ -4,11 +4,11 @@ | |
| 4 | # looking for email messages sent by Fossil. Forward each |
| 5 | # to /usr/sbin/sendmail. |
| 6 | # |
| 7 | set POLLING_INTERVAL 10000 ;# milliseconds |
| 8 | set DBFILE /home/www/fossil/emailqueue.db |
| 9 | set PIPE "/usr/sbin/sendmail -ti" |
| 10 | |
| 11 | package require sqlite3 |
| 12 | # puts "SQLite version [sqlite3 -version]" |
| 13 | sqlite3 db $DBFILE |
| 14 | db timeout 5000 |
| 15 |
+3
-3
| --- www/forum.wiki | ||
| +++ www/forum.wiki | ||
| @@ -334,14 +334,14 @@ | ||
| 334 | 334 | |
| 335 | 335 | <verbatim> |
| 336 | 336 | $ fossil set email-send-command |
| 337 | 337 | </verbatim> |
| 338 | 338 | |
| 339 | -If that gives a blank value instead of <tt>sendmail -t</tt>, say | |
| 339 | +If that gives a blank value instead of <tt>sendmail -ti</tt>, say | |
| 340 | 340 | |
| 341 | 341 | <verbatim> |
| 342 | - $ fossil set email-send-command "sendmail -t" | |
| 342 | + $ fossil set email-send-command "sendmail -ti" | |
| 343 | 343 | </verbatim> |
| 344 | 344 | |
| 345 | 345 | to force the setting. That's a |
| 346 | 346 | [https://fossil-scm.org/forum/forumpost/840b676410 | known bug] which |
| 347 | 347 | should be squished soon. |
| @@ -354,11 +354,11 @@ | ||
| 354 | 354 | |
| 355 | 355 | <a id="status"></a>If you reload the Email Notification Setup page, the |
| 356 | 356 | Status section at the top should show: |
| 357 | 357 | |
| 358 | 358 | <verbatim> |
| 359 | - Outgoing Email: Piped to command "sendmail -t" | |
| 359 | + Outgoing Email: Piped to command "sendmail -ti" | |
| 360 | 360 | Pending Alerts: 0 normal, 0 digest |
| 361 | 361 | Subscribers: 0 active, 0 total |
| 362 | 362 | </verbatim> |
| 363 | 363 | |
| 364 | 364 | |
| 365 | 365 |
| --- www/forum.wiki | |
| +++ www/forum.wiki | |
| @@ -334,14 +334,14 @@ | |
| 334 | |
| 335 | <verbatim> |
| 336 | $ fossil set email-send-command |
| 337 | </verbatim> |
| 338 | |
| 339 | If that gives a blank value instead of <tt>sendmail -t</tt>, say |
| 340 | |
| 341 | <verbatim> |
| 342 | $ fossil set email-send-command "sendmail -t" |
| 343 | </verbatim> |
| 344 | |
| 345 | to force the setting. That's a |
| 346 | [https://fossil-scm.org/forum/forumpost/840b676410 | known bug] which |
| 347 | should be squished soon. |
| @@ -354,11 +354,11 @@ | |
| 354 | |
| 355 | <a id="status"></a>If you reload the Email Notification Setup page, the |
| 356 | Status section at the top should show: |
| 357 | |
| 358 | <verbatim> |
| 359 | Outgoing Email: Piped to command "sendmail -t" |
| 360 | Pending Alerts: 0 normal, 0 digest |
| 361 | Subscribers: 0 active, 0 total |
| 362 | </verbatim> |
| 363 | |
| 364 | |
| 365 |
| --- www/forum.wiki | |
| +++ www/forum.wiki | |
| @@ -334,14 +334,14 @@ | |
| 334 | |
| 335 | <verbatim> |
| 336 | $ fossil set email-send-command |
| 337 | </verbatim> |
| 338 | |
| 339 | If that gives a blank value instead of <tt>sendmail -ti</tt>, say |
| 340 | |
| 341 | <verbatim> |
| 342 | $ fossil set email-send-command "sendmail -ti" |
| 343 | </verbatim> |
| 344 | |
| 345 | to force the setting. That's a |
| 346 | [https://fossil-scm.org/forum/forumpost/840b676410 | known bug] which |
| 347 | should be squished soon. |
| @@ -354,11 +354,11 @@ | |
| 354 | |
| 355 | <a id="status"></a>If you reload the Email Notification Setup page, the |
| 356 | Status section at the top should show: |
| 357 | |
| 358 | <verbatim> |
| 359 | Outgoing Email: Piped to command "sendmail -ti" |
| 360 | Pending Alerts: 0 normal, 0 digest |
| 361 | Subscribers: 0 active, 0 total |
| 362 | </verbatim> |
| 363 | |
| 364 | |
| 365 |