Author: Alexander Zangerl <az@debian.org>
Subject: #681778, mhmail: pull fix for missing from: header from git

diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nmh-1.5-release~/man/mhmail.man nmh-1.5-release/man/mhmail.man
--- nmh-1.5-release~/man/mhmail.man	2012-02-05 14:16:59.000000000 +1000
+++ nmh-1.5-release/man/mhmail.man	2012-07-18 15:11:30.536092214 +1000
@@ -88,7 +88,12 @@
 .B \-from
 .IR addr ,
 you can specify the \*(lqFrom:\*(rq header of
-the draft.  Naturally,
+the draft.  If no
+.B \-from
+switch is used when sending,
+.B mhmail
+will supply a \*(lqFrom:\*(rq header field using the sender's local mailbox.
+Naturally,
 .B post
 will fill\-in the \*(lqSender:\*(rq
 header correctly.
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nmh-1.5-release~/uip/mhmail.c nmh-1.5-release/uip/mhmail.c
--- nmh-1.5-release~/uip/mhmail.c	2012-06-11 14:06:19.000000000 +1000
+++ nmh-1.5-release/uip/mhmail.c	2012-07-18 15:11:30.536092214 +1000
@@ -8,6 +8,7 @@
  */
 
 #include <h/mh.h>
+#include <h/mts.h>
 #include <h/signals.h>
 #include <h/utils.h>
 #include <signal.h>
@@ -140,6 +141,8 @@
 	fprintf (out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
     if (from)
 	fprintf (out, "%sFrom: %s\n", resent ? "Resent-" : "", from);
+    else
+	fprintf (out, "From: %s\n", getlocalmbox ());
     if (!resent)
 	fputs ("\n", out);
 
