Update to 1.03. From the changelog:

- Fixed the SMTP protocol module to send QUIT on protocol failures.

- Added support for the SMTP AUTH LOGIN method.  Thanks to Sean
  MacLennan for the suggestion.

- Fixed the SMTP protocol module to send EHLO instead of HELO when doing
  authentication.  Thanks to Norbert Tretkowski for pointing this out.

- Fixed compile breakage on Solaris due to use of setenv.

- Fixed netstring length bug in QMQP sending module.

- If the sender name cannot be determined from the environment
  variables, try to pull it from /etc/passwd before using "unknown".
  Thanks Roderick Schertler.

5 files changed, 19 insertions, 33 deletions

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 1e9ea1a5029..1deb7005c1d 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2006/05/22 07:05:27 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/01 19:33:30 schmonz Exp $
 
-DISTNAME=		nullmailer-1.02
+DISTNAME=		nullmailer-1.03
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE:Q}
 
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index 6d4ade17f46..f585d1e8c6b 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2006/01/14 08:20:20 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2006/07/01 19:33:30 schmonz Exp $
 
-SHA1 (nullmailer-1.02.tar.gz) = eeb94fb0fdcf0944c8a1590d12f0572ae95d0dda
-RMD160 (nullmailer-1.02.tar.gz) = 5be509670c0524bec7d7e664901f88f0872536bf
-Size (nullmailer-1.02.tar.gz) = 171591 bytes
+SHA1 (nullmailer-1.03.tar.gz) = 95ed13bd0d4e05f5f66bb1a022e9424f892df3b2
+RMD160 (nullmailer-1.03.tar.gz) = b4b6244eb86a7c01330f0a65338a204c07794e23
+Size (nullmailer-1.03.tar.gz) = 172250 bytes
 SHA1 (patch-aa) = dc2ca7a43598e3057f7903319581d3d529d3326f
-SHA1 (patch-ab) = b0f48f4dd26129e9d622f06ae6522df482b3ebc6
-SHA1 (patch-ac) = 6e8f3e4ab3f11ceefdaede505b52db24d8a34fde
-SHA1 (patch-ad) = f97d25ab5ff73ca8603e06637bbae2f493af4ed6
+SHA1 (patch-ab) = 533eb2fe3203a27809f598ffedeb4f17d5e364c5
+SHA1 (patch-ac) = bcd8e868b9e8dbe5379d2a181515f358fbf1e92c
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
index 2c121af43c5..c8454a85a32 100644
--- a/mail/nullmailer/patches/patch-ab
+++ b/mail/nullmailer/patches/patch-ab
@@ -1,25 +1,25 @@
-$NetBSD: patch-ab,v 1.4 2006/01/03 19:12:52 schmonz Exp $
+$NetBSD: patch-ab,v 1.5 2006/07/01 19:33:30 schmonz Exp $
 
---- doc/nullmailer-send.8.orig	2005-11-07 13:30:04.000000000 -0500
+--- doc/nullmailer-send.8.orig	2006-06-23 11:19:40.000000000 -0400
 +++ doc/nullmailer-send.8
-@@ -67,16 +67,16 @@ which also requires SMTP authentication,
+@@ -74,16 +74,16 @@ PLAIN method, use:
  Blank lines and lines starting with a pound are ignored.
  .SH FILES
  .TP
 -.B /var/nullmailer/queue
-+.B @VARBASE@/spool/nullmailer/queue
++.B /var/spool/nullmailer/queue
  The message queue.
  .TP
 -.B /var/nullmailer/trigger
-+.B @VARBASE@/spool/nullmailer/trigger
++.B /var/spool/nullmailer/trigger
  A trigger file to cause immediate delivery.
  .TP
 -.B /usr/local/etc/nullmailer
-+.B @PKG_SYSCONFDIR@/nullmailer
++.B /etc/pkg/nullmailer
  The configuration directory.
  .TP
 -.B /usr/local/libexec/nullmailer
-+.B @PREFIX@/libexec/nullmailer
++.B /usr/pkg/libexec/nullmailer
  The protocol program directory.
  .SH SEE ALSO
  nullmailer-queue(8),
diff --git a/mail/nullmailer/patches/patch-ac b/mail/nullmailer/patches/patch-ac
index 23c5c4200fe..12d965aefe1 100644
--- a/mail/nullmailer/patches/patch-ac
+++ b/mail/nullmailer/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2005/08/20 02:20:45 schmonz Exp $
+$NetBSD: patch-ac,v 1.4 2006/07/01 19:33:30 schmonz Exp $
 
 --- doc/nullmailer-queue.8.orig	2002-12-23 12:29:20.000000000 -0500
 +++ doc/nullmailer-queue.8
@@ -7,15 +7,15 @@ $NetBSD: patch-ac,v 1.3 2005/08/20 02:20:45 schmonz Exp $
  .SH OTHER FILES
  .TP
 -.B /var/nullmailer/queue
-+.B @VARBASE@/spool/nullmailer/queue
++.B /var/spool/nullmailer/queue
  The directory into which the completed messages are moved.
  .TP
 -.B /var/nullmailer/tmp
-+.B @VARBASE@/spool/nullmailer/tmp
++.B /var/spool/nullmailer/tmp
  The directory in which messages are formed temporarily.
  .TP
 -.B /var/nullmailer/trigger
-+.B @VARBASE@/spool/nullmailer/trigger
++.B /var/spool/nullmailer/trigger
  A pipe used to trigger
  .BR nullmailer-send
  to immediately start sending the message from the queue.
diff --git a/mail/nullmailer/patches/patch-ad b/mail/nullmailer/patches/patch-ad
deleted file mode 100644
index cf65925b186..00000000000
--- a/mail/nullmailer/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/03 19:12:52 schmonz Exp $
-
---- lib/fdbuf/fdobuf.h.orig	2005-11-10 11:10:23.000000000 -0500
-+++ lib/fdbuf/fdobuf.h
-@@ -17,6 +17,8 @@
- #ifndef FDBUF__FDOBUF__H__
- #define FDBUF__FDOBUF__H__
- 
-+#include <unistd.h>
-+
- class fdobuf : protected fdbuf
- {
- public: