- update to v1.1

(notable changes: better locking, improved RC scripts, THREAD semantics
   updated to latest IETF draft, unicode support, bug fixes)
- bump NEED_VERSION, MAINTAINER real name added
- regenerate RC patch
- PLIST tweaked to not delete libexec/authlib, which is being
  used by other applications now (e.g. vmailmgr)

mail/courier-imap/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2000/09/10 20:38:10 avsm Exp $ 
+# $OpenBSD: Makefile,v 1.4 2000/10/01 13:27:13 avsm Exp $ 
 
-DISTNAME=	courier-imap-1.0
+DISTNAME=	courier-imap-1.1
 CATEGORIES=	mail
-NEED_VERSION=	1.326
+NEED_VERSION=	1.336
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
 
-MAINTAINER=	avsm@openbsd.org
+MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
 HOMEPAGE=	http://www.inter7.com/courierimap/
 
 # GPL

mail/courier-imap/files/md5

@@ -1,3 +1,3 @@
-MD5 (courier-imap-1.0.tar.gz) = 4a785baddcf841ea52973c975093a505
-RMD160 (courier-imap-1.0.tar.gz) = 3c7615caa6f6da8d052393e096eca6bcaecf5751
-SHA1 (courier-imap-1.0.tar.gz) = 944d30b04470df40acfa7e2fa5f999d9b65f7bd9
+MD5 (courier-imap-1.1.tar.gz) = 8ded877b6d61e3ada1dc5df8519b7a52
+RMD160 (courier-imap-1.1.tar.gz) = d25ec89c619d43d41e6e4d6ccca15659bc906450
+SHA1 (courier-imap-1.1.tar.gz) = 5915b5133e56d6f7f565a988d3e8039f226327a2

mail/courier-imap/patches/patch-imap_mkimapdcert_in

@@ -1,40 +1,45 @@
-$OpenBSD: patch-imap_mkimapdcert_in,v 1.1 2000/08/10 21:12:49 danh Exp $
---- imap/mkimapdcert.in.orig	Sun Jul  9 14:27:21 2000
-+++ imap/mkimapdcert.in	Thu Aug 10 14:44:02 2000
-@@ -12,20 +12,24 @@
- test -x @OPENSSL@ || exit 0
+$OpenBSD: patch-imap_mkimapdcert_in,v 1.2 2000/10/01 13:27:14 avsm Exp $
+--- imap/mkimapdcert.in.orig	Sun Oct  1 13:49:22 2000
++++ imap/mkimapdcert.in	Sun Oct  1 14:00:26 2000
+@@ -9,29 +9,25 @@
+ # IMAP over SSL.  Normally this script would get called by an automatic
+ # package installation routine.
  
- prefix="@prefix@"
+-test -x @OPENSSL@ || exit 0
+-
+-prefix="@prefix@"
 -
 -if test -f @datadir@/imapd.pem
-+certdir=@sysconfdir@/ssl/private
-+if test -f ${certdir}/imapd.pem
++if test -f @sysconfdir@/ssl/private/imapd.pem
  then
 -	echo "@datadir@/imapd.pem already exists."
-+	echo "${certdir}/imapd.pem already exists."
++	echo "@sysconfdir@/ssl/private/imapd.pem already exists."
  	exit 1
  fi
-+if test -f ${certdir}/imapd.rand
-+then
-+	echo "${certdir}/imapd.rand exists - delete it to continue."
-+	exit 1
-+fi
-+cp /dev/null ${certdir}/imapd.pem
-+chmod 600 ${certdir}/imapd.pem
-+chown @mailuser@ ${certdir}/imapd.pem
  
 -cp /dev/null @datadir@/imapd.pem
 -chmod 600 @datadir@/imapd.pem
 -chown @mailuser@ @datadir@/imapd.pem
--
++cp /dev/null @sysconfdir@/ssl/private/imapd.pem
++chmod 600 @sysconfdir@/ssl/private/imapd.pem
++chown @mailuser@ @sysconfdir@/ssl/private/imapd.pem
+ 
+ cleanup() {
+-	rm -f @datadir@/imapd.pem
+-	rm -f @datadir@/imapd.rand
++	rm -f @sysconfdir@/ssl/private/imapd.pem
++	rm -f @sysconfdir@/ssl/private/imapd.rand
+ 	exit 1
+ }
+ 
 -dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
-+dd if=@RANDOMV@ of=${certdir}/imapd.rand count=1 2>/dev/null
++dd if=@RANDOMV@ of=@sysconfdir@/ssl/private/imapd.rand count=1 2>/dev/null
  @OPENSSL@ req -new -x509 -days 365 -nodes \
--	-config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem
--@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem
--@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem
+-	-config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup
+-@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem || cleanup
+-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem || cleanup
 -rm -f @datadir@/imapd.rand
-+	-config @sysconfdir@/imapd.cnf -out ${certdir}/imapd.pem -keyout ${certdir}/imapd.pem
-+@OPENSSL@ gendh -rand ${certdir}/imapd.rand 512 >>${certdir}/imapd.pem
-+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${certdir}/imapd.pem
-+rm -f ${certdir}/imapd.rand
++	-config @sysconfdir@/imapd.cnf -out @sysconfdir@/ssl/private/imapd.pem -keyout @sysconfdir@/ssl/private/imapd.pem || cleanup
++@OPENSSL@ gendh -rand @sysconfdir@/ssl/private/imapd.rand 512 >>@sysconfdir@/ssl/private/imapd.pem || cleanup
++@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @sysconfdir@/ssl/private/imapd.pem || cleanup
++rm -f @sysconfdir@/ssl/private/imapd.rand

mail/courier-imap/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2000/08/10 21:12:50 danh Exp $
+@comment $OpenBSD: PLIST,v 1.3 2000/10/01 13:27:14 avsm Exp $
 bin/couriertls
 bin/imapd
 bin/maildirmake
@@ -43,4 +43,3 @@ share/examples/courier-imap/imapd-ssl.config
 share/examples/courier-imap/imapd.cnf
 share/examples/courier-imap/imapd.config
 @dirrm share/examples/courier-imap
-@dirrm libexec/authlib