need testing: courier-imap-1.2.3

[Anil Madhavapeddy <anil_(_at_)_recoil_(_dot_)_org>]

Here's an update to the mail/courier-imap port.

This is a fairly beefy update from 1.1, since the package
now also includes a POP3 server (FLAVOR=pop3).

Also a number of bugfixes, additional character sets, and
closed leaks (memory leak in OpenLDAP, fd leak in quota checks)

There have been a few requests for this update, so if people
could test it I'd appreciate it (especially the userdb authmodule,
which I don't use myself).

-- 
Anil Madhavapeddy, <anil_(_at_)_recoil_(_dot_)_org>

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	2000/10/01 13:27:13	1.4
+++ Makefile	2000/11/19 00:21:06
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.4 2000/10/01 13:27:13 avsm Exp $ 
 
-DISTNAME=	courier-imap-1.1
+DISTNAME=	courier-imap-1.2.3
 CATEGORIES=	mail
-NEED_VERSION=	1.336
+NEED_VERSION=	1.340
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
 
@@ -15,17 +15,20 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+FLAVORS=	pop3
+FLAVOR?=
+
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--disable-root-check --datadir=${PREFIX}/sbin
+CONFIGURE_ARGS=	--disable-root-check --datadir=${PREFIX}/sbin --with-userdb=/etc/userdb --with-authuserdb
+EXAMPLE_DIR=	${PREFIX}/share/examples/courier-imap
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/courier-imap
-	${INSTALL_DATA} ${WRKBUILD}/imapd-ssl.config \
-		${PREFIX}/share/examples/courier-imap
-	${INSTALL_DATA} ${WRKBUILD}/imapd.config \
-		${PREFIX}/share/examples/courier-imap
-	${INSTALL_DATA} ${WRKBUILD}/imapd.cnf \
-		${PREFIX}/share/examples/courier-imap
+.for i in pop3d imapd
+	${INSTALL_DATA} ${WRKBUILD}/$i-ssl.config ${EXAMPLE_DIR}
+	${INSTALL_DATA} ${WRKBUILD}/$i.config ${EXAMPLE_DIR}
+	${INSTALL_DATA} ${WRKBUILD}/$i.cnf ${EXAMPLE_DIR}
+.endfor
 
 .include <bsd.port.mk>
Index: files/md5
===================================================================
RCS file: /cvs/ports/mail/courier-imap/files/md5,v
retrieving revision 1.4
diff -u -r1.4 md5
--- files/md5	2000/10/01 13:27:14	1.4
+++ files/md5	2000/11/19 00:21:06
@@ -1,3 +1,3 @@
-MD5 (courier-imap-1.1.tar.gz) = 8ded877b6d61e3ada1dc5df8519b7a52
-RMD160 (courier-imap-1.1.tar.gz) = d25ec89c619d43d41e6e4d6ccca15659bc906450
-SHA1 (courier-imap-1.1.tar.gz) = 5915b5133e56d6f7f565a988d3e8039f226327a2
+MD5 (courier-imap-1.2.3.tar.gz) = 0761019624253e34ec86509d8ebbf4ae
+RMD160 (courier-imap-1.2.3.tar.gz) = 6fc13d0dc3d8c1b54eeb2a6158b2ed86568e445f
+SHA1 (courier-imap-1.2.3.tar.gz) = 0ba4c34e24012bbeb3acf65e11d9fa8ff08e01b6
Index: patches/patch-Makefile.in
===================================================================
RCS file: /cvs/ports/mail/courier-imap/patches/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
--- patches/patch-Makefile.in	2000/11/04 21:13:36	1.1
+++ patches/patch-Makefile.in	2000/11/19 00:21:06
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Wed Nov  1 19:08:50 2000
-+++ Makefile.in	Wed Nov  1 19:09:09 2000
-@@ -763,9 +763,6 @@ install-exec-local:
+--- Makefile.in.orig	Sat Nov 18 23:06:22 2000
++++ Makefile.in	Sat Nov 18 23:06:53 2000
+@@ -805,9 +805,6 @@ install-exec-local:
  	test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
  		tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
  	$(mkinstalldirs) $(DESTDIR)$(sbindir)
--	for f in mkimapdcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
+-	for f in mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
 -		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
 -		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
  
Index: patches/patch-imap_mkpop3dcert.in
===================================================================
RCS file: patch-imap_mkpop3dcert.in
diff -N patch-imap_mkpop3dcert.in
--- /dev/null	Sat Nov 18 17:02:25 2000
+++ patch-imap_mkpop3dcert.in	Sat Nov 18 17:21:06 2000
@@ -0,0 +1,40 @@
+--- imap/mkpop3dcert.in.orig	Sun Nov 19 00:57:13 2000
++++ imap/mkpop3dcert.in	Sun Nov 19 00:58:11 2000
+@@ -13,25 +13,25 @@ test -x @OPENSSL@ || exit 0
+ 
+ prefix="@prefix@"
+ 
+-if test -f @datadir@/pop3d.pem
++if test -f @sysconfdir@/ssl/private/pop3d.pem
+ then
+-	echo "@datadir@/pop3d.pem already exists."
++	echo "@sysconfdir@/ssl/private/pop3d.pem already exists."
+ 	exit 1
+ fi
+ 
+-cp /dev/null @datadir@/pop3d.pem
+-chmod 600 @datadir@/pop3d.pem
+-chown @mailuser@ @datadir@/pop3d.pem
++cp /dev/null @sysconfdir@/ssl/private/pop3d.pem
++chmod 600 @sysconfdir@/ssl/private/pop3d.pem
++chown @mailuser@ @sysconfdir@/ssl/private/pop3d.pem
+ 
+ cleanup() {
+-	rm -f @datadir@/pop3d.pem
+-	rm -f @datadir@/pop3d.rand
++	rm -f @sysconfdir@/ssl/private/pop3d.pem
++	rm -f @sysconfdir@/ssl/private/pop3d.rand
+ 	exit 1
+ }
+ 
+-dd if=_(_at_)_RANDOMV@ of=_(_at_)_datadir@/pop3d.rand count=1 2>/dev/null
++dd if=_(_at_)_RANDOMV@ of=_(_at_)_sysconfdir@/ssl/private/pop3d.rand count=1 2>/dev/null
+ @OPENSSL@ req -new -x509 -days 365 -nodes \
+-	-config @sysconfdir@/pop3d.cnf -out @datadir@/pop3d.pem -keyout @datadir@/pop3d.pem || cleanup
+-_(_at_)_OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup
+-_(_at_)_OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup
+-rm -f @datadir@/pop3d.rand
++	-config @sysconfdir@/pop3d.cnf -out @sysconfdir@/ssl/private/pop3d.pem -keyout @sysconfdir@/ssl/private/pop3d.pem || cleanup
++_(_at_)_OPENSSL@ gendh -rand @sysconfdir@/ssl/private/pop3d.rand 512 >>@sysconfdir@/ssl/private/pop3d.pem || cleanup
++_(_at_)_OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfdir@/ssl/private/pop3d.pem || cleanup
++rm -f @sysconfdir@/ssl/private/pop3d.rand
Index: patches/patch-imap_pop3d-ssl.config.in
===================================================================
RCS file: patch-imap_pop3d-ssl.config.in
diff -N patch-imap_pop3d-ssl.config.in
--- /dev/null	Sat Nov 18 17:02:25 2000
+++ patch-imap_pop3d-ssl.config.in	Sat Nov 18 17:21:06 2000
@@ -0,0 +1,11 @@
+--- imap/pop3d-ssl.config.in.orig	Sun Nov 19 01:11:54 2000
++++ imap/pop3d-ssl.config.in	Sun Nov 19 01:12:34 2000
+@@ -108,7 +108,7 @@ TLS_PROTOCOL=SSL3
+ # servers, and is optional for SSL/TLS clients.  TLS_CERTFILE is usually
+ # treated as confidential, and must not be world-readable.
+ #
+-TLS_CERTFILE=_(_at_)_datadir@/pop3d.pem
++TLS_CERTFILE=_(_at_)_sysconfdir@/ssl/private/pop3d.pem
+ 
+ # TLS_PEERCERTDIR, TLS_OURCACERT - when it is required that all peer
+ # certificates are signed by a specific certificate authority, set
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/mail/courier-imap/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR	2000/08/10 21:12:49	1.2
+++ pkg/DESCR	2000/11/19 00:21:06
@@ -8,4 +8,7 @@
 authentication modules (e.g. /etc/passwd, LDAP, PAM), virtual mailbox
 support, resource controls, SSL/TLS, shared folders, and IPv6 support.
 
+The 'pop3' flavor also adds a POP3/POP3-SSL module to the package
+which can be used alongside the IMAP portion of the package.
+
 WWW: ${HOMEPAGE}
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/mail/courier-imap/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -r1.2 MESSAGE
--- pkg/MESSAGE	2000/08/10 21:12:49	1.2
+++ pkg/MESSAGE	2000/11/19 00:21:06
@@ -19,5 +19,10 @@
 
 To control the daemon use ${PREFIX}/libexec/imapd.rc and
 ${PREFIX}/libexec/imapd-ssl.rc
+
+If you also installed the 'pop3' flavor, then the relevant
+configuration files are called pop3d-* instead of imapd-*
+Follow similar instructions to those above to activate this.
+
 ==============================================================
 
Index: pkg/PFRAG.pop3
===================================================================
RCS file: PFRAG.pop3
diff -N PFRAG.pop3
--- /dev/null	Sat Nov 18 17:02:25 2000
+++ PFRAG.pop3	Sat Nov 18 17:21:06 2000
@@ -0,0 +1,10 @@
+_(_at_)_comment $OpenBSD$
+bin/pop3d
+libexec/pop3d-ssl.rc
+libexec/pop3d.rc
+man/man8/mkpop3dcert.8
+sbin/mkpop3dcert
+sbin/pop3login
+share/examples/courier-imap/pop3d-ssl.config
+share/examples/courier-imap/pop3d.cnf
+share/examples/courier-imap/pop3d.config
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/courier-imap/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST	2000/10/01 13:27:14	1.3
+++ pkg/PLIST	2000/11/19 00:21:06
@@ -3,6 +3,7 @@
 bin/imapd
 bin/maildirmake
 libexec/authlib/authcram
+libexec/authlib/authcustom
 libexec/authlib/authpwd
 libexec/authlib/authuserdb
 libexec/couriertcpd
@@ -42,4 +43,5 @@
 share/examples/courier-imap/imapd-ssl.config
 share/examples/courier-imap/imapd.cnf
 share/examples/courier-imap/imapd.config
+%%pop3%%
 @dirrm share/examples/courier-imap