update to courier-imap-1.7.0 and removed some PFRAGs which should have

disappeared a few updates ago
This commit is contained in:
avsm 2003-02-17 16:14:34 +00:00
parent cd5442e847
commit 22b099d797
12 changed files with 49 additions and 40 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2002/12/29 15:12:31 fgsch Exp $
# $OpenBSD: Makefile,v 1.32 2003/02/17 16:14:34 avsm Exp $
COMMENT= "imap server for maildir format mailboxes"
COMMENT-pop3= "pop3 server for maildir format mailboxes"
@ -6,13 +6,14 @@ COMMENT-ldap= "ldap authentication module for courier-imap"
COMMENT-mysql= "mysql authentication module for courier-imap"
COMMENT-pgsql= "pgsql authentication module for courier-imap"
COURIERVER= 1.5.3
COURIERVER= 1.7.0
DISTNAME= courier-imap-${COURIERVER}
FULLPKGNAME-pop3= courier-pop3-${COURIERVER}
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
HOMEPAGE= http://www.inter7.com/courierimap/
@ -44,7 +45,8 @@ CONFIGURE_ARGS= --disable-root-check --datadir=${PREFIX}/sbin \
--sysconfdir=${COURIERCONF} --with-authdaemon \
--with-authdaemonvar=${COURIERSTATE} \
--enable-workarounds-for-imap-client-bugs \
--with-db=gdbm --with-authpwd
--with-db=gdbm --with-authpwd \
--localstatedir=${COURIERSTATE}
# mysql
PSEUDO_FLAVORS+= no_mysql

View File

@ -1,3 +1,3 @@
MD5 (courier-imap-1.5.3.tar.gz) = 132c2405e3857b3fa2a6369d77e19fd9
RMD160 (courier-imap-1.5.3.tar.gz) = e5eb6815bd7f989c84dcb749d20cb3d2ea725a92
SHA1 (courier-imap-1.5.3.tar.gz) = b5394cef8eb37cfbc1eababdeba4955974116641
MD5 (courier-imap-1.7.0.tar.bz2) = f74abb58b45810cc485426bc8bad14e6
RMD160 (courier-imap-1.7.0.tar.bz2) = 83c95b071d975e731e963a18665109430dbcb5f8
SHA1 (courier-imap-1.7.0.tar.bz2) = de9163ed1bb290387edd7f1755edef137e83c1b9

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.4 2002/08/08 17:03:21 avsm Exp $
--- Makefile.in.orig Thu Aug 8 16:48:19 2002
+++ Makefile.in Thu Aug 8 16:48:41 2002
@@ -832,9 +832,6 @@ install-exec-local:
$OpenBSD: patch-Makefile_in,v 1.5 2003/02/17 16:14:34 avsm Exp $
--- Makefile.in.orig Sun Feb 16 21:38:36 2003
+++ Makefile.in Sun Feb 16 21:38:42 2003
@@ -860,9 +860,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 mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
- do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- $(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
- $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
$(mkinstalldirs) $(DESTDIR)$(localstatedir)
install-exec-hook:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.2 2002/08/08 17:03:21 avsm Exp $
--- imap/imapd-ssl.dist.in.orig Mon Jun 24 04:45:26 2002
+++ imap/imapd-ssl.dist.in Thu Aug 8 16:48:10 2002
@@ -72,13 +72,13 @@ SSLPIDFILE=@piddir@/imapd-ssl.pid
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.3 2003/02/17 16:14:34 avsm Exp $
--- imap/imapd-ssl.dist.in.orig Sun Aug 11 21:01:25 2002
+++ imap/imapd-ssl.dist.in Mon Feb 17 15:58:54 2003
@@ -65,13 +65,13 @@ SSLPIDFILE=@piddir@/imapd-ssl.pid
#
# Whether or not to start IMAP over SSL on simap port:
@ -17,7 +17,7 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.2 2002/08/08 17:03:21 avsm Exp $
##NAME: IMAP_TLS_REQUIRED:1
#
@@ -153,7 +153,7 @@ TLS_STARTTLS_PROTOCOL=TLS1
@@ -146,7 +146,7 @@ TLS_STARTTLS_PROTOCOL=TLS1
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
#
@ -26,3 +26,11 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.2 2002/08/08 17:03:21 avsm Exp $
##NAME: TLS_TRUSTCERTS:0
#
@@ -187,5 +187,5 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
-TLS_CACHEFILE=@localstatedir@/couriersslcache
-TLS_CACHESIZE=524288
+#TLS_CACHEFILE=@localstatedir@/couriersslcache
+#TLS_CACHESIZE=524288

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.2 2002/08/08 17:03:21 avsm Exp $
--- imap/pop3d-ssl.dist.in.orig Mon Jun 24 04:45:26 2002
+++ imap/pop3d-ssl.dist.in Thu Aug 8 16:48:10 2002
@@ -143,7 +143,7 @@ TLS_STARTTLS_PROTOCOL=TLS1
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.3 2003/02/17 16:14:34 avsm Exp $
--- imap/pop3d-ssl.dist.in.orig Wed Aug 28 13:32:19 2002
+++ imap/pop3d-ssl.dist.in Mon Feb 17 15:59:23 2003
@@ -135,7 +135,7 @@ TLS_STARTTLS_PROTOCOL=TLS1
# servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually
# treated as confidential, and must not be world-readable.
#
@ -10,3 +10,11 @@ $OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.2 2002/08/08 17:03:21 avsm Exp $
##NAME: TLS_TRUSTCERTS:0
#
@@ -175,5 +175,5 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
-TLS_CACHEFILE=@localstatedir@/couriersslcache
-TLS_CACHESIZE=524288
+#TLS_CACHEFILE=@localstatedir@/couriersslcache
+#TLS_CACHESIZE=524288

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: INSTALL,v 1.3 2001/03/22 03:10:50 avsm Exp $
# $OpenBSD: INSTALL,v 1.4 2003/02/17 16:14:34 avsm Exp $
#
# courier-imap installation to detect old-format config files
@ -57,7 +57,7 @@ case $2 in
if [ -f /etc/imapd.cnf -o -f /etc/imapd.config -o -f /etc/imapd-ssl.config ]; then
do_notice
fi
if [ ! -f ${COURIERCONF}/authdaemonrc ]; then
if [ -d ${COURIERCONF} -a ! -f ${COURIERCONF}/authdaemonrc ]; then
do_notice2
fi
;;

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PFRAG.ldap,v 1.3 2002/02/11 00:51:27 avsm Exp $
libexec/authlib/authdaemond.ldap
man/man7/authldap.7
share/examples/courier-imap/authldaprc

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PFRAG.mysql,v 1.3 2002/02/11 00:51:27 avsm Exp $
libexec/authlib/authdaemond.mysql
man/man7/authmysql.7
share/examples/courier-imap/authmysqlrc

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2002/08/08 17:03:21 avsm Exp $
@comment $OpenBSD: PLIST,v 1.11 2003/02/17 16:14:34 avsm Exp $
bin/couriertls
bin/deliverquota
bin/imapd
@ -9,10 +9,10 @@ libexec/authlib/authdaemond
libexec/authlib/authdaemond.plain
libexec/authlib/authpwd
libexec/authlib/authuserdb
libexec/courierlogger
libexec/couriertcpd
libexec/imapd-ssl.rc
libexec/imapd.rc
libexec/courierlogger
libexec/makedatprog
man/man1/couriertcpd.1
man/man1/maildirmake.1
@ -37,15 +37,10 @@ sbin/pw2userdb
sbin/userdb
sbin/userdbpw
sbin/vchkpw2userdb
share/doc/courier-imap/README.authmysql.html
share/doc/courier-imap/README.authmysql.myownquery
share/doc/courier-imap/README.authpostgres.html
share/doc/courier-imap/README.ldap
share/examples/courier-imap/authdaemonrc
share/examples/courier-imap/imapd
share/examples/courier-imap/imapd-ssl
share/examples/courier-imap/imapd.cnf
share/examples/courier-imap/quotawarnmsg.example
@dirrm share/examples/courier-imap
@dirrm share/doc/courier-imap
@dirrm libexec/authlib

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-ldap,v 1.1 2002/07/08 21:24:51 avsm Exp $
@comment $OpenBSD: PLIST-ldap,v 1.2 2003/02/17 16:14:34 avsm Exp $
libexec/authlib/authdaemond.ldap
man/man7/authldap.7
share/examples/courier-imap/authldaprc
share/doc/courier-imap/README.ldap

View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-mysql,v 1.1 2002/07/08 21:24:51 avsm Exp $
@comment $OpenBSD: PLIST-mysql,v 1.2 2003/02/17 16:14:34 avsm Exp $
libexec/authlib/authdaemond.mysql
man/man7/authmysql.7
share/examples/courier-imap/authmysqlrc
share/doc/courier-imap/README.authmysql.html
share/doc/courier-imap/README.authmysql.myownquery

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-pgsql,v 1.1 2002/07/08 21:24:51 avsm Exp $
@comment $OpenBSD: PLIST-pgsql,v 1.2 2003/02/17 16:14:34 avsm Exp $
libexec/authlib/authdaemond.pgsql
share/examples/courier-imap/authpgsqlrc
share/doc/courier-imap/README.authpostgres.html