cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to courier-imap-3.05, from David Gwynne <loki at animata.net>

Browse Source
This commit is contained in:
avsm 2004-07-01 12:19:35 +00:00
parent f0f410d44d
commit 8f871badd1
9 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/courier-imap/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2004/06/06 18:25:57 avsm Exp $
# $OpenBSD: Makefile,v 1.39 2004/07/01 12:19:35 avsm Exp $
COMMENT= "imap server for maildir format mailboxes"
COMMENT-pop3= "pop3 server for maildir format mailboxes"
@ -6,10 +6,10 @@ 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.7.2
COURIERVER= 3.0.5
DISTNAME= courier-imap-${COURIERVER}
FULLPKGNAME= courier-imap-${COURIERVER}p0
FULLPKGNAME-pop3= courier-pop3-${COURIERVER}p0
FULLPKGNAME= courier-imap-${COURIERVER}
FULLPKGNAME-pop3= courier-pop3-${COURIERVER}
FULLPKGNAME-ldap= courier-ldap-${COURIERVER}
FULLPKGNAME-mysql= courier-mysql-${COURIERVER}
FULLPKGNAME-pgsql= courier-pgsql-${COURIERVER}
@ -49,8 +49,7 @@ CONFIGURE_ARGS= --disable-root-check --datadir=${PREFIX}/sbin \
--with-authdaemonvar=${COURIERSTATE} \
--enable-workarounds-for-imap-client-bugs \
--with-db=gdbm --with-authpwd \
--localstatedir=${COURIERSTATE} \
--without-ipv6
--localstatedir=${COURIERSTATE}
# mysql
PSEUDO_FLAVORS+= no_mysql

6
mail/courier-imap/distinfo
View File

@ -1,3 +1,3 @@
MD5 (courier-imap-1.7.2.tar.bz2) = 6b407d7f62636a7926ee79b6e86cbbb1
RMD160 (courier-imap-1.7.2.tar.bz2) = fac3229c9c2a0baee31073701cc757195460c5dc
SHA1 (courier-imap-1.7.2.tar.bz2) = 8894bbd47def9cc50824f389a94b2edcdb7609ed
MD5 (courier-imap-3.0.5.tar.bz2) = 8b0c79997905dc46cfe4cc13be74ceaf
RMD160 (courier-imap-3.0.5.tar.bz2) = dc2cd12cc955960235f05b268ff9dbff1afe68c0
SHA1 (courier-imap-3.0.5.tar.bz2) = aea9068594cadc2210922d822e2d52795ba47cb1

8
mail/courier-imap/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$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:
$OpenBSD: patch-Makefile_in,v 1.6 2004/07/01 12:19:35 avsm Exp $
--- Makefile.in.orig 2004-05-16 15:09:36.000000000 +1000
+++ Makefile.in 2004-05-16 15:10:34.000000000 +1000
@@ -1018,9 +1018,6 @@ install-exec-local:
test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
$(mkinstalldirs) $(DESTDIR)$(sbindir)

9
mail/courier-imap/patches/patch-imap_imapd-ssl_dist_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.4 2004/07/01 12:19:35 avsm Exp $
--- imap/imapd-ssl.dist.in.orig 2004-05-16 14:29:23.000000000 +1000
+++ imap/imapd-ssl.dist.in 2004-05-16 14:31:17.000000000 +1000
@@ -65,13 +65,13 @@ SSLPIDFILE=@piddir@/imapd-ssl.pid
#
# Whether or not to start IMAP over SSL on simap port:
@ -26,7 +26,7 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.3 2003/02/17 16:14:34 avsm Exp $
##NAME: TLS_TRUSTCERTS:0
#
@@ -187,5 +187,5 @@ TLS_VERIFYPEER=NONE
@@ -187,6 +187,6 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:
@ -34,3 +34,4 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.3 2003/02/17 16:14:34 avsm Exp $
-TLS_CACHESIZE=524288
+#TLS_CACHEFILE=@localstatedir@/couriersslcache
+#TLS_CACHESIZE=524288

13
mail/courier-imap/patches/patch-imap_mkimapdcert_in
View File

@ -1,12 +1,9 @@
$OpenBSD: patch-imap_mkimapdcert_in,v 1.4 2001/09/30 23:15:57 avsm Exp $
--- imap/mkimapdcert.in.orig Sun Aug 26 15:57:55 2001
+++ imap/mkimapdcert.in Sun Sep 30 22:32:35 2001
@@ -9,30 +9,29 @@
# IMAP over SSL. Normally this script would get called by an automatic
# package installation routine.
$OpenBSD: patch-imap_mkimapdcert_in,v 1.5 2004/07/01 12:19:35 avsm Exp $
--- imap/mkimapdcert.in.orig 2004-05-16 14:41:01.000000000 +1000
+++ imap/mkimapdcert.in 2004-05-16 14:52:55.000000000 +1000
@@ -12,27 +12,28 @@
test -x @OPENSSL@ || exit 0
-test -x @OPENSSL@ || exit 0
-
prefix="@prefix@"
+SSLDIR="/etc/ssl/private"

12
mail/courier-imap/patches/patch-imap_mkpop3dcert_in
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-imap_mkpop3dcert_in,v 1.1 2000/12/29 18:51:57 avsm Exp $
--- imap/mkpop3dcert.in.orig Fri Oct 6 17:50:37 2000
+++ imap/mkpop3dcert.in Fri Dec 29 17:29:17 2000
@@ -13,25 +13,27 @@ test -x @OPENSSL@ || exit 0
$OpenBSD: patch-imap_mkpop3dcert_in,v 1.2 2004/07/01 12:19:35 avsm Exp $
--- imap/mkpop3dcert.in.orig 2004-05-16 14:49:25.000000000 +1000
+++ imap/mkpop3dcert.in 2004-05-16 14:56:32.000000000 +1000
@@ -12,26 +12,27 @@
test -x @OPENSSL@ || exit 0
prefix="@prefix@"
+SSLDIR=/etc/ssl/private
-if test -f @datadir@/pop3d.pem
+SSLDIR=/etc/ssl/private
+
+if test -f ${SSLDIR}/pop3d.pem
then
- echo "@datadir@/pop3d.pem already exists."

6
mail/courier-imap/patches/patch-imap_pop3d-ssl_dist_in
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.4 2004/07/01 12:19:35 avsm Exp $
--- imap/pop3d-ssl.dist.in.orig 2004-05-16 14:57:32.000000000 +1000
+++ imap/pop3d-ssl.dist.in 2004-05-16 14:58:25.000000000 +1000
@@ -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.

12
mail/courier-imap/patches/patch-maildir_maildirdelfolder_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-maildir_maildirdelfolder_c,v 1.1 2004/02/16 17:14:52 avsm Exp $
--- maildir/maildirdelfolder.c.orig 2004-02-16 17:04:11.000000000 +0000
+++ maildir/maildirdelfolder.c 2004-02-16 17:04:20.000000000 +0000
@@ -60,7 +60,7 @@ char *p;
strcat(strcat(strcpy(p, s), "/"), de->d_name);
- if (unlink(p) && errno == EISDIR)
+ if (unlink(p) && errno == EPERM)
{
if (delsubdir(p))
{

22
mail/courier-imap/pkg/PLIST
View File

@ -1,34 +1,40 @@
@comment $OpenBSD: PLIST,v 1.14 2003/08/19 11:28:34 espie Exp $
@comment $OpenBSD: PLIST,v 1.15 2004/07/01 12:19:35 avsm Exp $
@pkgcfl imap-uw-*
bin/couriertls
bin/deliverquota
bin/imapd
bin/maildiracl
bin/maildirkw
@comment bin/maildirmake
libexec/authlib/authcram
libexec/authlib/authdaemon
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/makedatprog
man/man1/couriertcpd.1
man/man7/authcram.7
man/man7/authdaemon.7
man/man7/authdaemond.7
man/man1/maildiracl.1
man/man1/maildirkw.1
man/man1/maildirmake.1
@mode 0444
man/man7/authlib.7
@mode
man/man7/authpwd.7
man/man7/authuserdb.7
man/man8/deliverquota.8
man/man8/imapd.8
man/man8/makeuserdb.8
man/man8/mkimapdcert.8
man/man8/userdb.8
man/man8/userdbpw.8
sbin/authenumerate
sbin/courierlogger
sbin/imaplogin
sbin/makeuserdb
sbin/mkimapdcert
sbin/pw2userdb
sbin/userdb
sbin/userdbpw
sbin/vchkpw2userdb
share/examples/courier-imap/authdaemonrc