Update net/couriertcpd to 0.57.1. Changes from version 0.56.0 include:

* Avoid hardcoding file descriptor numbers where possible.

* Include remote port number in IMAP and POP3 logs.

* Ignore SIGPIPE errors in couriertcpd, preventing couriertcpd from being
  terminated if the stderr logger crashes.

* Looping SPF query should abort with SPF UNKNOWN, as per specs.

* "SSL23" tries SSLv3 before falling back to SSLv2.

* Prime the OpenSSL entropy pool on platforms that don't have a ready
  source available.

4 files changed, 6 insertions, 55 deletions

diff --git a/net/couriertcpd/Makefile b/net/couriertcpd/Makefile
index cd4959a9f7b..7ea4e279d05 100644
--- a/net/couriertcpd/Makefile
+++ b/net/couriertcpd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/09/23 11:42:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/10/15 15:37:05 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/tcpd-/}
-PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -54,8 +53,7 @@ BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 INSTALLATION_DIRS=	bin sbin ${PKGMANDIR}/man1 ${DOCDIR}
 
 REQD_DIRS=		${DOCDIR}
-MAKE_DIRS+=		${VARBASE}/run ${COURIER_STATEDIR}
-BUILD_DEFS+=		VARBASE
+MAKE_DIRS+=		${COURIER_STATEDIR}
 
 .include "../../security/openssl/buildlink3.mk"
 
diff --git a/net/couriertcpd/distinfo b/net/couriertcpd/distinfo
index 95d54797f78..d09817db3ef 100644
--- a/net/couriertcpd/distinfo
+++ b/net/couriertcpd/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/09/23 11:42:43 jlam Exp $
+$NetBSD: distinfo,v 1.7 2007/10/15 15:37:05 jlam Exp $
 
-SHA1 (courier-0.56.0.tar.bz2) = 536f24db9f33f8d93445c03dd4edb50c7ec2f6b2
-RMD160 (courier-0.56.0.tar.bz2) = ce8e2d99f5b7baf500d748c18fbd126df8331398
-Size (courier-0.56.0.tar.bz2) = 7022057 bytes
-SHA1 (patch-aa) = df4847bcf1127766f35cfecd65a293fa2bf7d6c9
-SHA1 (patch-ab) = a777a767893642b8425c70e8a7a791d6e2c77eb7
+SHA1 (courier-0.57.1.tar.bz2) = 5e602d4a4d5dd33b17146c7f54467ac6352e9340
+RMD160 (courier-0.57.1.tar.bz2) = 28b9f409e281403280b69f3a4f4be8b9e4f74dc2
+Size (courier-0.57.1.tar.bz2) = 7098660 bytes
diff --git a/net/couriertcpd/patches/patch-aa b/net/couriertcpd/patches/patch-aa
deleted file mode 100644
index 0da8e025c7e..00000000000
--- a/net/couriertcpd/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/09/17 15:28:03 jlam Exp $
-
---- tcpd/libcouriertls.c.orig	Tue May 22 10:59:26 2007
-+++ tcpd/libcouriertls.c
-@@ -419,6 +419,7 @@ SSL_CTX *tls_create(int isserver, const 
- 	ctx=SSL_CTX_new(protocol && strcmp(protocol, "SSL2") == 0
- 							? SSLv2_method():
- 		protocol && strcmp(protocol, "SSL3") == 0 ? SSLv3_method():
-+		protocol && strcmp(protocol, "SSL23") == 0 ? SSLv23_method():
- 		TLSv1_method());
- 
- 	if (!ctx)
diff --git a/net/couriertcpd/patches/patch-ab b/net/couriertcpd/patches/patch-ab
deleted file mode 100644
index 3c6cc31c1bc..00000000000
--- a/net/couriertcpd/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/09/23 11:42:43 jlam Exp $
-
---- liblock/lockdaemon.c.orig	2007-05-04 23:04:41.000000000 -0400
-+++ liblock/lockdaemon.c
-@@ -8,4 +8,5 @@
- #include	<stdio.h>
- #include	<signal.h>
-+#include	<limits.h>
- #include	<stdlib.h>
- #include	<string.h>
-@@ -31,4 +32,8 @@
- #endif
- 
-+#ifndef OPEN_MAX
-+#define OPEN_MAX	64
-+#endif
-+
- #define exit(_a_) _exit(_a_)
- 
-@@ -146,5 +151,5 @@ int	lockfd;
- 	}
- 
--	if (lockfd < 0 || dup2(lockfd, 99) != 99)
-+	if (lockfd < 0 || dup2(lockfd, OPEN_MAX-1) != OPEN_MAX-1)
- 	{
- 		perror(lockfile);
-@@ -153,5 +158,5 @@ int	lockfd;
- 
- 	close(lockfd);
--	lockfd=99;
-+	lockfd=OPEN_MAX-1;
- 
- #ifdef	FD_CLOEXEC