Makefile | 31 30 + 1 - 0 !
USD.doc/Makefile | 14 9 + 5 - 0 !
2 files changed, 39 insertions(+), 6 deletions(-)

 00 makefiles

Fix makefiles to make it possible to compile mailx on non-BSD systems.

def.h | 4 3 + 1 - 0 !
edit.c | 6 6 + 0 - 0 !
list.c | 3 3 + 0 - 0 !
names.c | 1 1 + 0 - 0 !
send.c | 1 1 + 0 - 0 !
5 files changed, 14 insertions(+), 1 deletion(-)

 01 fix includes

USD.doc/mail1.nr | 2 1 + 1 - 0 !
USD.doc/mail5.nr | 2 1 + 1 - 0 !
collect.c | 2 2 + 0 - 0 !
head.c | 3 3 + 0 - 0 !
mail.1 | 6 3 + 3 - 0 !
main.c | 2 1 + 1 - 0 !
misc/mail.rc | 4 2 + 2 - 0 !
names.c | 3 2 + 1 - 0 !
pathnames.h | 39 35 + 4 - 0 !
9 files changed, 50 insertions(+), 13 deletions(-)

 02 base fixes 1

Fixes from  Debian patch 1:8.1.1-10

cmd1.c | 2 2 + 0 - 0 !
def.h | 9 9 + 0 - 0 !
extern.h | 2 1 + 1 - 0 !
mail.1 | 20 10 + 10 - 0 !
main.c | 21 17 + 4 - 0 !
vars.c | 9 7 + 2 - 0 !
6 files changed, 46 insertions(+), 17 deletions(-)

 03 base fixes 2

Fixes from  Debian patch 1:8.1.1-10.3

def.h | 1 1 + 0 - 0 !
mail.1 | 8 7 + 1 - 0 !
main.c | 24 21 + 3 - 0 !
send.c | 6 5 + 1 - 0 !
4 files changed, 34 insertions(+), 5 deletions(-)

 04 add custom header

Provide a possibility to add custom header fields such as
"X-Loop: This service" or "X-Generated: via cron"
(Closes: Bug#23356, Bug#13756).

extern.h | 2 1 + 1 - 0 !
mail.1 | 9 8 + 1 - 0 !
main.c | 20 20 + 0 - 0 !
names.c | 10 6 + 4 - 0 !
vars.c | 5 3 + 2 - 0 !
5 files changed, 38 insertions(+), 8 deletions(-)

 05 mailx fixes

mailx (1:8.1.1-10.1.3) frozen unstable; urgency=high

  * More security fixes
  * Don't allow one to set interactive in mailrc (or interactively)
  * Modify the variable-handling code to grok NULL values

 -- Wichert Akkerman <wakkerma@debian.org>  Mon,  7 Aug 2000 17:22:57 -0700

mailx (1:8.1.1-10.1.2) frozen unstable; urgency=high

 * Another security problem: refuse to get the interactive variable
   from the environment by explicitly setting it in the hashtable.

 -- Wichert Akkerman <wakkerma@debian.org>  Mon,  7 Aug 2000 12:36:10 -0700

quit.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 06 use lockf instead of flock

quit.c: Use lockf instead if flock.

cmd2.c | 2 1 + 1 - 0 !
cmd3.c | 2 2 + 0 - 0 !
collect.c | 2 1 + 1 - 0 !
3 files changed, 4 insertions(+), 2 deletions(-)

 07 initialize head struct

Initialize head struct and other fixes.

popen.c | 64 64 + 0 - 0 !
1 file changed, 64 insertions(+)

 08 use liblockfile library

Security fix: don't install mailx binary setgid mail.
Now the liblockfile library is used for mailbox locking.

quit.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 09 saved mbox message

Debian Bug#68920:
Save message says mbox even when $MBOX is set

cmd3.c | 9 9 + 0 - 0 !
collect.c | 11 10 + 1 - 0 !
def.h | 12 8 + 4 - 0 !
extern.h | 2 1 + 1 - 0 !
mail.1 | 10 9 + 1 - 0 !
main.c | 9 7 + 2 - 0 !
names.c | 3 2 + 1 - 0 !
send.c | 15 12 + 3 - 0 !
8 files changed, 58 insertions(+), 13 deletions(-)

 10 reply-to header

Applied some patches from FreeBSD:
 + Add Relpy-To header if REPLYTO environment variable is set.
 + Add In-Reply-To header for replies (closes: #23115).

aux.c | 9 7 + 2 - 0 !
cmd1.c | 2 1 + 1 - 0 !
cmd3.c | 18 9 + 9 - 0 !
extern.h | 2 1 + 1 - 0 !
4 files changed, 18 insertions(+), 13 deletions(-)

 11 showname option

Debian Bug#96867:

Dear mailx maintainer,

I have written a patch that mimics the SunOS mailx
"showname" option, that is, in the mail header listing the
senders full name is shown instead of the e-mail address.

I had to make the "skin" function aware of the reptype variable,
and thus give a reptype value for each call of skin. Ugly but
it seems to work.

cmd3.c | 4 2 + 2 - 0 !
extern.h | 2 1 + 1 - 0 !
main.c | 4 3 + 1 - 0 !
send.c | 2 1 + 1 - 0 !
4 files changed, 7 insertions(+), 5 deletions(-)

 12 replyto can be set in .mailrc too

REPLYTO can be set in ~/.mailrc too.

edit.c | 18 18 + 0 - 0 !
1 file changed, 18 insertions(+)

 13 mailx concatenates messages

Debian Bug#71759

Check if there is still an empty line at
the end of the edited message. If not, it adds one.

fio.c | 8 8 + 0 - 0 !
quit.c | 4 4 + 0 - 0 !
2 files changed, 12 insertions(+)

 14 truncate mailbox instead of deleting it

fio.c: Don't delete mailbox file, always truncate it,
because liblockfile fails to remove the lock file if mailbox doesn't exist (closes: #111537).

quit.c: change message saing that mailbox was "removed" to "truncated" (closes: #196682);

collect.c | 38 29 + 9 - 0 !
1 file changed, 29 insertions(+), 9 deletions(-)

 15 no space left in /tmp

Debian Bug#37104

The problem reported here, i.e. a segmentation fault when reading mail
is already corrected. The message "Message temporary file corrupted"
is printed by a call to "errx" instead of "panic" as it was in
mailx-8.1.1-10.

*But* there is another problem[1]: mailx sends an empty mail when
there is no space left in "/tmp". Here is a patch making mailx check
if all is ok when writing new mail in temporary file. If not, it
outputs an error message and no longer sends an empty mail.

tty.c | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 16 stdin not a tty

Return from grabh() if stdin is not a terminal.
This fixes the `-I' option (closes: #149005).

popen.c | 12 9 + 3 - 0 !
send.c | 16 16 + 0 - 0 !
2 files changed, 25 insertions(+), 3 deletions(-)

 18 wait for sendmail

* send.c: Always wait for a sendmail process, check its exit code
  and if non-zero, print a warning message to user and save original
  message to ~/dead.letter (closes: #145379).

* popen.c: Make wait_child() return an exit code of the child.

def.h | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 19 fix compilation on hurd

Fix problem with building on Hurd (closes: #213929).

edit.c | 17 16 + 1 - 0 !
1 file changed, 16 insertions(+), 1 deletion(-)

 20 don't delete temporary file

If the external editor (called by ~e or ~v commands) fails for
some reason, don't delete the temporary file if it has been modified.
This partly fixes bug#148071.

fio.c | 58 53 + 5 - 0 !
names.c | 5 3 + 2 - 0 !
2 files changed, 56 insertions(+), 7 deletions(-)

 21 use wordexpr instead of echo

fio.c: Use wordexpr() instead of calling /bin/echo not to allow
    executing external commands while expanding shell variables
    and wildcards.

main.c | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 22 replace newlines with spaces

main.c: Replace with spaces any embedded newline passed in arguments
for '-s' and '-a' options (closes: #419840).

extern.h | 1 1 + 0 - 0 !
popen.c | 9 9 + 0 - 0 !
send.c | 28 28 + 0 - 0 !
3 files changed, 38 insertions(+)

 24 false cant send email errors

Debian Bug  #550116:

This bug is caused by the patch in "send.c" for the bug report #145379.
Under certain circumstances, a race condition can occur if:
1. The parent fork()'s a process and exec()'s "sendmail" in "send.c".
The child process is born.
2. The child starts, finishes quickly and exits. The parent has not
called wait_child(pid) in "send.c" yet.
3. The parent immediately gets SIGCHLD because the child exited already.
The sigchild() handler in "popen.c" reaps the child via waitpid() and
exits directly because findchild(pid, 1) returned NULL. It returned NULL
because the PID of the child process has not been added to the "child"
structure list at all.
4. The execution of the parent process is resumed in "send.c", and it
now calls wait_child(pid). The function wait_child(pid) returns "-1"
because wait_child(pid) in "popen.c" calls waitpid(pid, ...) again for
the same child PID, which the sigchild() handler already reaped. The
second call to findchild(pid, 1) by wait_child(pid) in "popen.c" returns
NULL too, because as already stated the PID of the child process has not
been added to the "child" structure list. As a result, the false error
message "Can't send mail: sendmail process failed" is given.

This bug happens only rarely, usually when the system is under load and
the parent process lags a bit after the child one. But it does happen.
We send about 15 messages every hour on 36 servers each, and we get 10
false error messages on average for 24 hours (0.08% false error rate).

main.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 25 fix confusing error

Fix an error message shown when -s, -c, or -b is used without -t
to be less confusing for users (closes: #327809, #781170).

lex.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 26 add missing include

Add #include <bsd/err.h> to fix implicit declaration of
function 'warnc' warning.

aux.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 27 use fopen_max

Use FOPEN_MAX instead of OPEN_MAX, which is unavailable on Linux

lex.c | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 28 fix gcc warning

Fix the following warning:
lex.c:128:2: warning: implicit declaration of function 'mkostemp' [-Wimplicit-function-declaration]

mail.1 | 9 9 + 0 - 0 !
main.c | 2 1 + 1 - 0 !
2 files changed, 10 insertions(+), 1 deletion(-)

 29 document two dashes separator

Document that `--' marks end of options and should
be used  in scripts taking addresses from untrusted
sources (closes: #773317)

aux.c | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 30 add missing includes

Add includes for clock_gettime() and utimensat() calls
introduced in 8.1.2-0.20160123cvs.

main.c | 4 0 + 4 - 0 !
1 file changed, 4 deletions(-)

 31 do not call pledge

pledge(2) syscall is not available in Linux,
so the change introduced by upstream
in 8.1.2-0.20160123cvs.

aux.c | 20 20 + 0 - 0 !
1 file changed, 20 insertions(+)

 32 fix ftbfs on hurd

Fallback to a previously version of alter() function if UTIME_OMIT
is not defined (which happens most probably on Hurd only, see #762677).

mail.1 | 28 27 + 1 - 0 !
main.c | 4 4 + 0 - 0 !
send.c | 43 43 + 0 - 0 !
3 files changed, 74 insertions(+), 1 deletion(-)

 add mime headers unless set by user

Generate the three following headers by default:
  MIME-Version: 1.0
  Content-Type: text/plain; charset="<current charset from $LC_CTYPE>"
  Content-Transfer-Encoding: 8bit

However allow a user to override each of them with the -a flag.
Example:
   bsd-mailx -a "Content-Type: text/html; charset=UTF-8"
uses the above user-provided Content-Type, but still adds
the default MIME-Version and Content-Transfer-Encoding headers.

Bugs-Debian: https://bugs.debian.org/859935

cmd1.c | 4 2 + 2 - 0 !
def.h | 1 1 + 0 - 0 !
2 files changed, 3 insertions(+), 2 deletions(-)

 fix calls to strnvis

Define LIBBSD_NETBSD_VIS macro, and re-order arguments of strnvis
calls to fix warnings caused by incompatibilities with future
versions of libbsd, as documented in the following comment
from /usr/include/bsd/vis.h:

/*
 * NetBSD added an strnvis and unfortunately made it incompatible with the
 * existing one in OpenBSD and Freedesktop's libbsd (the former having existed
 * for over ten years). Despite this incompatibility being reported during
 * development (see http://gnats.netbsd.org/44977) they still shipped it.
 * Even more unfortunately FreeBSD and later MacOS picked up this incompatible
 * implementation.
 *
 * Provide both implementations and default for now on the historical one to
 * avoid breakage, we will switch to the NetBSD one in libbsd 0.10.0 or so.
 * Define LIBBSD_NETBSD_VIS to switch to the NetBSD one now.
 */

fio.c | 4 2 + 2 - 0 !
popen.c | 6 5 + 1 - 0 !
tty.c | 10 6 + 4 - 0 !
3 files changed, 13 insertions(+), 7 deletions(-)

 fix compilation issues

Fix the following gcc issues:
- disable code that references to ALTWERASE that is not
  defined on Debian;
- use 'char' rather than 'unsigned char' to get rid of warnings
  about unsigned/signed conversions;
- check result of snprintf calls to fix `output might be
  truncated' warnings.