Update to 2.1. From the changelog:

- Added support for TLS anonymous authentication.
  Thanks Uffe Jakobsen.
- Fixed sendmail wrapper handling of empty sender on command line.
  Thanks Sebastian Wiedenroth.
- Fixed handling of quoted strings in the "remotes" file.
  Thanks Mihai Moldovan.
- Fixed nullmailer-inject handling of leading "From " lines.
- Some build fixes.
- Fixed bogus temporary gethostbyname error message when the protocol
  source address was incorrect.
- Fixed potential race condition in tests.
  Thanks Felix Lechner.
- Fixed handling of time values on 32-bit big-endian systems.
  Thanks Felix Lechner.
- Added support to nullmailer-send to move permanently failing messages
  out of the queue, and to generate bounce messages.
- Added support for IPv6.
- Added program to generate bounce/delay messages.
- Added an "allmailfrom" control file to nullmailer-queue, causing all
  messages to share a hard-coded envelope sender.
- Added logging the message sender/recipient in nullmailer-send.
- Improved handling of system errors when reading config files.
- Secured handling of password options for protocol modules.
- Support standard shell quoting for options in the "remotes" file.
- Added protocol option to set a separate TLS client private key file.
- Added protocol option to bind the source address on connections.
- Fixed nullmailer-inject to report errors to stderr.
- Fixed gnutls cast to pointer from integer of different size warning.
- Fixed nullmailer-inject and -queue to handle the null (empty) sender
  address. Needed for RFC 3798 (Message Disposition Notification).
- Moved spool directory to /var/spool/nullmailer like other MTAs.


(schmonz)

$NetBSD: patch-Makefile.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Override hard-coded user and group.

--- Makefile.in.orig	2017-10-24 00:12:35.000000000 +0000
+++ Makefile.in
@@ -790,10 +790,10 @@ install-data-local:
 	chmod 600 $(DESTDIR)$(localstatedir)/trigger
 
 install-root:
-	chown nullmail $(DESTDIR)$(localstatedir)/*
-	chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
+	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(localstatedir)/*
+	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(sbindir)/nullmailer-queue
 	chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
-	chown nullmail $(DESTDIR)$(bindir)/mailq
+	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(bindir)/mailq
 	chmod u+s $(DESTDIR)$(bindir)/mailq
 
 dist-hook:

$NetBSD: patch-doc_nullmailer-queue.8,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Override hard-coded paths.

--- doc/nullmailer-queue.8.orig	2017-10-24 00:12:30.000000000 +0000
+++ doc/nullmailer-queue.8
@@ -35,13 +35,13 @@ If this file is not empty, its contents 
 sender on all messages.
 .SH OTHER FILES
 .TP
-.B /var/spool/nullmailer/queue
+.B @VARBASE@/spool/nullmailer/queue
 The directory into which the completed messages are moved.
 .TP
-.B /var/spool/nullmailer/tmp
+.B @VARBASE@/spool/nullmailer/tmp
 The directory in which messages are formed temporarily.
 .TP
-.B /var/spool/nullmailer/trigger
+.B @VARBASE@/spool/nullmailer/trigger
 A pipe used to trigger
 .BR nullmailer-send
 to immediately start sending the message from the queue.

$NetBSD: patch-doc_nullmailer-send.8,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Override hard-coded paths.

--- doc/nullmailer-send.8.orig	2017-10-24 00:12:30.000000000 +0000
+++ doc/nullmailer-send.8
@@ -182,19 +182,19 @@ However, the data are integrity protecte
 This option must be used with the insecure option - to acknowledge that you know what you are doing.
 .SH FILES
 .TP
-.B /var/spool/nullmailer/failed
+.B @VARBASE@/spool/nullmailer/failed
 The failed message queue.
 .TP
-.B /var/spool/nullmailer/queue
+.B @VARBASE@/spool/nullmailer/queue
 The outgoing message queue.
 .TP
-.B /var/spool/nullmailer/trigger
+.B @VARBASE@/spool/nullmailer/trigger
 A trigger file to cause immediate delivery.
 .TP
-.B /usr/local/etc/nullmailer
+.B @PKG_SYSCONFDIR@/nullmailer
 The configuration directory.
 .TP
-.B /usr/local/libexec/nullmailer
+.B @PREFIX@/libexec/nullmailer
 The protocol program directory.
 .SH SEE ALSO
 nullmailer-dsn(1),

$NetBSD: patch-src_sendmail.cc,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Avoid "variable-sized object may not be initialized".

--- src/sendmail.cc.orig	2017-10-25 23:36:35.000000000 +0000
+++ src/sendmail.cc
@@ -111,9 +111,10 @@ int do_exec(const char* program, const c
 
 int cli_main(int argc, char* argv[])
 {
-  const char* extra_args[argc + 5] = {0};
+  const char* extra_args[argc + 5];
   int extra_argc = 1;
 
+  extra_args[0] = 0;
   switch (o_mode) {
   case mode_smtp:
     return do_exec("nullmailer-smtpd", extra_args);

$NetBSD: patch-test_Makefile.am,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Use bash explicitly, and avoid GNUism in find(1).

--- test/Makefile.am.orig	2017-10-24 00:12:30.000000000 +0000
+++ test/Makefile.am
@@ -31,5 +31,5 @@ dist-hook:
 check: all
 	./address-test
 	./argparse-test
-	sh $(srcdir)/clitest.sh
-	$(srcdir)/runtests `find $(abs_srcdir)/tests -type f -not -name '.*'`
+	bash $(srcdir)/clitest.sh
+	$(srcdir)/runtests `find $(abs_srcdir)/tests -type f \! -name '.*'`

$NetBSD: patch-test_Makefile.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Use bash explicitly, and avoid GNUism in find(1).

--- test/Makefile.in.orig	2017-10-24 00:12:35.000000000 +0000
+++ test/Makefile.in
@@ -612,8 +612,8 @@ dist-hook:
 check: all
 	./address-test
 	./argparse-test
-	sh $(srcdir)/clitest.sh
-	$(srcdir)/runtests `find $(abs_srcdir)/tests -type f -not -name '.*'`
+	bash $(srcdir)/clitest.sh
+	$(srcdir)/runtests `find $(abs_srcdir)/tests -type f \! -name '.*'`
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

$NetBSD: patch-test_functions.in,v 1.1 2017/10/28 04:51:06 schmonz Exp $

Find and use mkfifo(8) and svc(8) for tests.

--- test/functions.in.orig	2017-10-24 02:56:07.000000000 +0000
+++ test/functions.in
@@ -10,7 +10,8 @@ mkdir -p \
     $tmpdir/protocols \
     $QUEUEDIR/{failed,queue,tmp} \
     $SYSCONFDIR
-mknod $QUEUEDIR/trigger p
+export PATH=/sbin:$PATH
+mkfifo $QUEUEDIR/trigger
 ln -s $builddir/src $tmpdir/sbin
 ln -s $builddir/src $tmpdir/bin
 ln -s $builddir/protocols/* $tmpdir/protocols/
@@ -128,7 +129,7 @@ splitblank() {
   done
 }
 
-export PATH=/bin:/usr/bin:/usr/local/bin
+export PATH=/bin:/usr/bin:/usr/local/bin:@PREFIX@/bin
 rm -f $SYSCONFDIR/*
 echo f.q.d.n >$SYSCONFDIR/me
 echo q.d.n >$SYSCONFDIR/defaultdomain