Update to courier-imap 4.1.1. If you used courier-imap before, you should
now also use courier-authlib (which is new) as the authentication stuff has been moved there. This should make our courier system again faily complete, we have been running this code for almost a year.
This commit is contained in:
parent
0920699ffd
commit
835a514394
@ -1,129 +1,121 @@
|
||||
# $OpenBSD: Makefile,v 1.49 2006/08/03 19:56:08 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.50 2006/11/03 16:19:56 mbalmer Exp $
|
||||
|
||||
COMMENT= "imap server for maildir format mailboxes"
|
||||
COMMENT-pop3= "pop3 server for maildir format mailboxes"
|
||||
COMMENT-ldap= "ldap authentication module for courier-imap"
|
||||
COMMENT-mysql= "mysql authentication module for courier-imap"
|
||||
COMMENT-pgsql= "pgsql authentication module for courier-imap"
|
||||
COMMENT= "imap server for maildir format mailboxes"
|
||||
COMMENT-pop3= "pop3 server for maildir format mailboxes"
|
||||
|
||||
COURIERVER= 3.0.5
|
||||
DISTNAME= courier-imap-${COURIERVER}
|
||||
FULLPKGNAME= courier-imap-${COURIERVER}p4
|
||||
FULLPKGNAME-pop3= courier-pop3-${COURIERVER}p1
|
||||
FULLPKGNAME-ldap= courier-ldap-${COURIERVER}p1
|
||||
FULLPKGNAME-mysql= courier-mysql-${COURIERVER}p1
|
||||
FULLPKGNAME-pgsql= courier-pgsql-${COURIERVER}p1
|
||||
DISTNAME= courier-imap-4.1.1
|
||||
FULLPKGNAME-pop3= ${DISTNAME:S/imap/pop3/}
|
||||
|
||||
CATEGORIES= mail
|
||||
CATEGORIES= mail
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
HOMEPAGE= http://www.inter7.com/courierimap/
|
||||
HOMEPAGE= http://www.courier-mta.org/imap/
|
||||
MAINTAINER= Marc Balmer <mbalmer@openbsd.org>
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= c
|
||||
|
||||
MULTI_PACKAGES= -pop3
|
||||
SUBPACKAGE?=
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CXXFLAGS="-I${LOCALBASE}/include" \
|
||||
CPPFLAGS="-I${LOCALBASE}/include"
|
||||
|
||||
LIB_DEPENDS= courierauthsasl.>=0,courierauth.>=0::mail/courier-authlib
|
||||
|
||||
COURIERSTATE= /var/run/courier
|
||||
EXAMPLE_DIR= ${PREFIX}/share/examples/courier
|
||||
SUBST_VARS= COURIERSTATE
|
||||
SYSCONFDIR=/etc/courier
|
||||
|
||||
CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \
|
||||
--datadir=${PREFIX}/sbin \
|
||||
--localstatedir=${COURIERSTATE} \
|
||||
--prefix=${PREFIX} \
|
||||
--bindir=${PREFIX}/bin \
|
||||
--mandir=${PREFIX}/man \
|
||||
--enable-static \
|
||||
--disable-root-check \
|
||||
--with-dirsync \
|
||||
--with-random=/dev/arandom \
|
||||
--enable-mimecharset=iso-8859-1 \
|
||||
--enable-unicode \
|
||||
--with-locking-method=fcntl \
|
||||
--with-mailuser=_courier \
|
||||
--with-piddir=${COURIERSTATE} \
|
||||
--with-makedatprog \
|
||||
--cache-file=${WRKDIR}/courier-imap.cache
|
||||
|
||||
CONFIGURE_ENV+= OPENSSL=/usr/sbin/openssl
|
||||
|
||||
DOCS= AUTHORS INSTALL \
|
||||
NEWS imap/ChangeLog \
|
||||
imap/README imap/README.proxy \
|
||||
maildir/README.imapkeywords.html \
|
||||
maildir/README.maildirfilter.html \
|
||||
maildir/README.maildirquota.txt \
|
||||
maildir/README.sharedfolders.txt \
|
||||
tcpd/README.couriertls
|
||||
|
||||
FLAVORS= no_trashquota imap_bugs
|
||||
FLAVOR?=
|
||||
|
||||
COURIERCONF= ${SYSCONFDIR}/courier-imap
|
||||
COURIERSTATE= /var/run/courier-imap
|
||||
SUBST_VARS= COURIERSTATE COURIERCONF COURIERVER
|
||||
EXAMPLE_DIR= ${PREFIX}/share/examples/courier-imap
|
||||
USE_GMAKE= Yes
|
||||
|
||||
.if $(SUBPACKAGE) != "-pop3"
|
||||
LIB_DEPENDS= gdbm.>=2::databases/gdbm
|
||||
.endif
|
||||
|
||||
CONFIGURE_STYLE= gnu old
|
||||
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CXXFLAGS="${CFLAGS:C/ *$//} -I${LOCALBASE}/include" \
|
||||
CPPFLAGS="${CFLAGS:C/ *$//} -I${LOCALBASE}/include"
|
||||
CONFIGURE_ARGS= --disable-root-check --datadir=${PREFIX}/sbin \
|
||||
--with-userdb=${SYSCONFDIR}/userdb --with-authuserdb \
|
||||
--sysconfdir=${COURIERCONF} --with-authdaemon \
|
||||
--with-authdaemonvar=${COURIERSTATE} \
|
||||
--enable-workarounds-for-imap-client-bugs \
|
||||
--with-db=gdbm --with-authpwd \
|
||||
--localstatedir=${COURIERSTATE}
|
||||
|
||||
# mysql
|
||||
PSEUDO_FLAVORS+= no_mysql
|
||||
.if ${FLAVOR:L:Mno_mysql}
|
||||
CONFIGURE_ARGS+= --without-authmysql
|
||||
.if ${FLAVOR:L:Mno_trashquota}
|
||||
CONFIGURE_ARGS+= --without-trashquota
|
||||
.else
|
||||
MULTI_PACKAGES+= -mysql
|
||||
CONFIGURE_ARGS+= --with-authmysql \
|
||||
--with-mysql-libs=${LOCALBASE}/lib/mysql \
|
||||
--with-mysql-includes=${LOCALBASE}/include/mysql
|
||||
MYSQL_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
|
||||
MYSQL_WANTLIB= crypto ssl m z
|
||||
CONFIGURE_ARGS+= --with-trashquota
|
||||
.endif
|
||||
|
||||
# openldap
|
||||
PSEUDO_FLAVORS+= no_ldap
|
||||
.if ${FLAVOR:L:Mno_ldap}
|
||||
CONFIGURE_ARGS+= --without-authldap
|
||||
.if ${FLAVOR:L:Mimap_bugs}
|
||||
CONFIGURE_ARGS+= --enable-workarounds-for-imap-client-bugs
|
||||
.else
|
||||
MULTI_PACKAGES+= -ldap
|
||||
CONFIGURE_ARGS+= --with-authldap
|
||||
LDAP_DEPENDS+= ldap.>=2,lber.>=2:openldap-client-2.*:databases/openldap
|
||||
CONFIGURE_ARGS+= --disable-workarounds-for-imap-client-bugs
|
||||
.endif
|
||||
|
||||
# postgresql
|
||||
PSEUDO_FLAVORS+= no_pgsql
|
||||
.if !${FLAVOR:L:Mno_pgsql}
|
||||
MULTI_PACKAGES+= -pgsql
|
||||
CONFIGURE_ARGS+= --with-pgsql-libs=${LOCALBASE}/lib \
|
||||
--with-pgsql-includes=${LOCALBASE}/include/postgresql
|
||||
PGSQL_DEPENDS+= pq.>=2:postgresql-client-*:databases/postgresql
|
||||
PGSQL_WANTLIB= m
|
||||
MULTI_PACKAGES= -pop3
|
||||
SUBPACKAGE?=
|
||||
.if $(SUBPACKAGE) != "-pop3"
|
||||
LIB_DEPENDS+= gdbm.>=3::databases/gdbm
|
||||
CONFIGURE_ARGS+= --with-db=gdbm
|
||||
.endif
|
||||
|
||||
# pop3 has no dependencies
|
||||
POP3_DEPENDS=
|
||||
|
||||
.if defined(PACKAGING)
|
||||
. if !empty(SUBPACKAGE)
|
||||
LIB_DEPENDS+= ${${SUBPACKAGE:U:S/-//g}_DEPENDS}
|
||||
WANTLIB+= ${${SUBPACKAGE:U:S/-//g}_WANTLIB}
|
||||
RUN_DEPENDS= :courier-imap-${COURIERVER}:mail/courier-imap
|
||||
. else
|
||||
WANTLIB+= ssl crypto
|
||||
. endif
|
||||
.else
|
||||
.for i in ${MULTI_PACKAGES}
|
||||
LIB_DEPENDS+= ${${i:U:S/-//g}_DEPENDS}
|
||||
.endfor
|
||||
.if defined(PACKAGING) && $(SUBPACKAGE) != "-pop3"
|
||||
WANTLIB+= ssl crypto
|
||||
.endif
|
||||
|
||||
CNFFILES= etc/courier/imapd-ssl.dist etc/courier/imapd.dist \
|
||||
etc/courier/pop3d-ssl.dist etc/courier/pop3d.dist \
|
||||
etc/courier/imapd.cnf etc/courier/pop3d.cnf \
|
||||
etc/courier/quotawarnmsg.example
|
||||
|
||||
post-extract:
|
||||
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/arandom,g' \
|
||||
${WRKSRC}/imap/imapd.cnf.in
|
||||
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/arandom,g' \
|
||||
${WRKSRC}/imap/pop3d.cnf.in
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/courier-imap
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier-imap
|
||||
.for i in pop3d-ssl imapd-ssl pop3d imapd
|
||||
${INSTALL_DATA} ${WRKINST}${COURIERCONF}/$i.dist ${EXAMPLE_DIR}/$i
|
||||
.endfor
|
||||
.for i in imapd.cnf pop3d.cnf quotawarnmsg.example
|
||||
${INSTALL_DATA} ${WRKINST}${COURIERCONF}/$i ${EXAMPLE_DIR}
|
||||
.endfor
|
||||
.for i in mysql ldap pgsql daemon
|
||||
-${INSTALL_DATA} ${WRKINST}${COURIERCONF}/auth${i}rc.dist \
|
||||
${EXAMPLE_DIR}/auth${i}rc
|
||||
.endfor
|
||||
.for i in authmysql.html authmysql.myownquery authpostgres.html ldap
|
||||
-${INSTALL_DATA} ${WRKSRC}/authlib/README.${i} \
|
||||
${PREFIX}/share/doc/courier-imap
|
||||
.endfor
|
||||
.for i in cram pwd userdb
|
||||
${INSTALL_PROGRAM} ${WRKBUILD}/authlib/auth${i} \
|
||||
${PREFIX}/libexec/authlib
|
||||
.endfor
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier
|
||||
${INSTALL_DATA} ${WRKSRC}/unicode/README \
|
||||
${PREFIX}/share/doc/courier/README.unicode.txt
|
||||
${INSTALL_DATA} ${WRKSRC}/imap/README \
|
||||
${PREFIX}/share/doc/courier/README.imap.txt
|
||||
. for i in ${DOCS}
|
||||
${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/courier
|
||||
. endfor
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/courier
|
||||
. for i in ${CNFFILES}
|
||||
mv ${WRKINST}/${i} ${EXAMPLE_DIR}
|
||||
. endfor
|
||||
@rmdir ${WRKINST}/etc/courier/shared ${WRKINST}/etc/courier/shared.tmp
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
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
|
||||
SIZE (courier-imap-3.0.5.tar.bz2) = 1648873
|
||||
MD5 (courier-imap-4.1.1.tar.bz2) = f423a609d9cce0dcf193cac64eb4cbdd
|
||||
RMD160 (courier-imap-4.1.1.tar.bz2) = e7f4c0d7cbb0ccf061c31de1b0b2387ec9d87084
|
||||
SHA1 (courier-imap-4.1.1.tar.bz2) = 505f35a8a7d6f55b9d624e544785bc758700135c
|
||||
SIZE (courier-imap-4.1.1.tar.bz2) = 3211569
|
||||
|
@ -1,13 +0,0 @@
|
||||
$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)
|
||||
- for f in mkimapdcert mkpop3dcert vchkpw2userdb makeuserdb pw2userdb userdb ; \
|
||||
- do rm -f $(DESTDIR)$(sbindir)/$$f ; \
|
||||
- $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
|
||||
$(mkinstalldirs) $(DESTDIR)$(localstatedir)
|
||||
|
||||
install-exec-hook:
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.5 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- imap/imapd-ssl.dist.in.orig Mon Aug 1 00:38:00 2005
|
||||
+++ imap/imapd-ssl.dist.in Mon Aug 1 00:39:51 2005
|
||||
@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
|
||||
#
|
||||
# Whether or not to start IMAP over SSL on simap port:
|
||||
|
||||
@ -17,7 +17,7 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.4 2004/07/01 12:19:35 avsm Exp $
|
||||
|
||||
##NAME: IMAP_TLS_REQUIRED:1
|
||||
#
|
||||
@@ -146,7 +146,7 @@ TLS_STARTTLS_PROTOCOL=TLS1
|
||||
@@ -153,7 +153,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,12 +26,14 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.4 2004/07/01 12:19:35 avsm Exp $
|
||||
|
||||
##NAME: TLS_TRUSTCERTS:0
|
||||
#
|
||||
@@ -187,6 +187,6 @@ TLS_VERIFYPEER=NONE
|
||||
@@ -194,8 +194,8 @@ 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
|
||||
+# TLS_CACHEFILE=@localstatedir@/couriersslcache
|
||||
+# TLS_CACHESIZE=524288
|
||||
|
||||
##NAME: MAILDIRPATH:0
|
||||
#
|
||||
|
12
mail/courier-imap/patches/patch-imap_imaplogin_c
Normal file
12
mail/courier-imap/patches/patch-imap_imaplogin_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-imap_imaplogin_c,v 1.1 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- imap/imaplogin.c.orig Sat Aug 6 15:39:08 2005
|
||||
+++ imap/imaplogin.c Sat Aug 6 15:39:52 2005
|
||||
@@ -247,7 +247,7 @@ int login_callback(struct authinfo *ainf
|
||||
execl(imapd, imapd,
|
||||
ainfo->maildir ?
|
||||
ainfo->maildir:defaultmaildir,
|
||||
- NULL);
|
||||
+ (char *)NULL);
|
||||
fprintf(stderr, "ERR: exec(%s) failed!!\n",
|
||||
imapd);
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-imap_mkimapdcert_in,v 1.6 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- imap/mkimapdcert.in.orig Mon Aug 1 00:35:38 2005
|
||||
+++ imap/mkimapdcert.in Mon Aug 1 00:37:31 2005
|
||||
@@ -12,28 +12,29 @@
|
||||
test -x @OPENSSL@ || exit 0
|
||||
|
||||
prefix="@prefix@"
|
||||
@ -15,6 +15,7 @@ $OpenBSD: patch-imap_mkimapdcert_in,v 1.5 2004/07/01 12:19:35 avsm Exp $
|
||||
exit 1
|
||||
fi
|
||||
|
||||
umask 077
|
||||
-cp /dev/null @datadir@/imapd.pem
|
||||
-chmod 600 @datadir@/imapd.pem
|
||||
-chown @mailuser@ @datadir@/imapd.pem
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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 @@
|
||||
$OpenBSD: patch-imap_mkpop3dcert_in,v 1.3 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- imap/mkpop3dcert.in.orig Mon Aug 1 00:30:56 2005
|
||||
+++ imap/mkpop3dcert.in Mon Aug 1 00:35:05 2005
|
||||
@@ -12,27 +12,28 @@
|
||||
test -x @OPENSSL@ || exit 0
|
||||
|
||||
prefix="@prefix@"
|
||||
@ -15,6 +15,7 @@ $OpenBSD: patch-imap_mkpop3dcert_in,v 1.2 2004/07/01 12:19:35 avsm Exp $
|
||||
exit 1
|
||||
fi
|
||||
|
||||
umask 077
|
||||
-cp /dev/null @datadir@/pop3d.pem
|
||||
-chmod 600 @datadir@/pop3d.pem
|
||||
-chown @mailuser@ @datadir@/pop3d.pem
|
||||
|
@ -1,7 +1,7 @@
|
||||
$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
|
||||
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.5 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- imap/pop3d-ssl.dist.in.orig Mon Aug 1 00:27:59 2005
|
||||
+++ imap/pop3d-ssl.dist.in Mon Aug 1 00:30:03 2005
|
||||
@@ -140,7 +140,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,11 +10,14 @@ $OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.4 2004/07/01 12:19:35 avsm Exp $
|
||||
|
||||
##NAME: TLS_TRUSTCERTS:0
|
||||
#
|
||||
@@ -175,5 +175,5 @@ TLS_VERIFYPEER=NONE
|
||||
@@ -180,8 +180,8 @@ 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
|
||||
+# TLS_CACHEFILE=@localstatedir@/couriersslcache
|
||||
+# TLS_CACHESIZE=524288
|
||||
|
||||
##NAME: MAILDIRPATH:0
|
||||
#
|
||||
|
12
mail/courier-imap/patches/patch-imap_pop3login_c
Normal file
12
mail/courier-imap/patches/patch-imap_pop3login_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-imap_pop3login_c,v 1.1 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- imap/pop3login.c.orig Sat Aug 6 15:40:34 2005
|
||||
+++ imap/pop3login.c Sat Aug 6 15:40:50 2005
|
||||
@@ -229,7 +229,7 @@ static int login_callback(struct authinf
|
||||
execl(pop3d, pop3d,
|
||||
ainfo->maildir ?
|
||||
ainfo->maildir:defaultmaildir,
|
||||
- NULL);
|
||||
+ (char *)NULL);
|
||||
fprintf(stderr, "ERR: exec(%s) failed!!\n",
|
||||
pop3d);
|
||||
}
|
82
mail/courier-imap/patches/patch-liblock_locktest_c
Normal file
82
mail/courier-imap/patches/patch-liblock_locktest_c
Normal file
@ -0,0 +1,82 @@
|
||||
$OpenBSD: patch-liblock_locktest_c,v 1.1 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- liblock/locktest.c.orig Mon Dec 6 11:18:55 1999
|
||||
+++ liblock/locktest.c Fri Jan 6 19:06:31 2006
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
/* $Id */
|
||||
|
||||
+#include <paths.h>
|
||||
#include "liblock.h"
|
||||
#if USE_FCNTL
|
||||
#include "lockfcntl.c"
|
||||
@@ -20,11 +21,23 @@
|
||||
|
||||
int main()
|
||||
{
|
||||
+#define FILENAME "courier-authlib.locktest.XXXXX"
|
||||
int fd[2];
|
||||
pid_t p;
|
||||
int s;
|
||||
int f;
|
||||
|
||||
+ char *name;
|
||||
+ const char *tmpdir;
|
||||
+ if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
|
||||
+ tmpdir = _PATH_TMP;
|
||||
+ (void)asprintf(&name, "%s%s%s", tmpdir,
|
||||
+ (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
|
||||
+ if (name == NULL) {
|
||||
+ perror("get filename");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
signal(SIGCHLD, SIG_DFL);
|
||||
if (pipe(fd))
|
||||
{
|
||||
@@ -32,6 +45,12 @@ int f;
|
||||
return (1);
|
||||
}
|
||||
|
||||
+ if ((f=mkstemp(name)) < 0)
|
||||
+ {
|
||||
+ perror("open");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+
|
||||
if ((p=fork()) == (pid_t)-1)
|
||||
{
|
||||
perror("fork");
|
||||
@@ -46,7 +65,7 @@ int f;
|
||||
read(fd[0], &c, 1);
|
||||
close(fd[0]);
|
||||
|
||||
- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
|
||||
+ if ((f=open(name, O_RDWR)) < 0)
|
||||
{
|
||||
perror("open");
|
||||
exit(1);
|
||||
@@ -56,22 +75,18 @@ int f;
|
||||
if (ll_lockfd(f, ll_writelock, 0, 0))
|
||||
{
|
||||
close(f);
|
||||
+ unlink(name);
|
||||
exit(0);
|
||||
}
|
||||
close(f);
|
||||
exit(1);
|
||||
}
|
||||
-
|
||||
- if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
|
||||
- {
|
||||
- perror("open");
|
||||
- exit(1);
|
||||
- }
|
||||
|
||||
if (ll_lockfd(f, ll_writelock, 0, 0))
|
||||
{
|
||||
perror("lock");
|
||||
close(f);
|
||||
+ unlink(name);
|
||||
exit(1);
|
||||
}
|
||||
close(fd[1]);
|
12
mail/courier-imap/patches/patch-tcpd_libcouriertls_c
Normal file
12
mail/courier-imap/patches/patch-tcpd_libcouriertls_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-tcpd_libcouriertls_c,v 1.1 2006/11/03 16:19:56 mbalmer Exp $
|
||||
--- tcpd/libcouriertls.c.orig Fri Dec 30 18:46:37 2005
|
||||
+++ tcpd/libcouriertls.c Fri Dec 30 18:45:27 2005
|
||||
@@ -671,7 +671,7 @@ static int get_func(void *rec, size_t re
|
||||
time_t timeout;
|
||||
size_t session_id_len;
|
||||
|
||||
- unsigned char *sess;
|
||||
+ const unsigned char *sess;
|
||||
|
||||
if (recsize < sizeof(timeout)+sizeof(session_id_len))
|
||||
return (0);
|
@ -1,9 +1,29 @@
|
||||
This server provides IMAP access to Maildir format mailboxes. It
|
||||
does not handle traditional mailbox files.
|
||||
Courier-IMAP is a server that provides IMAP access to Maildirs
|
||||
mailboxes. This IMAP server does NOT handle traditional mailbox files
|
||||
(/var/spool/mail, and derivatives), it was written for the specific
|
||||
purpose of providing IMAP access to Maildirs.
|
||||
|
||||
It is part of the Courier mail server (http://www.courier-mta.org)
|
||||
but can be configured as a standalone IMAP server.
|
||||
The Courier-IMAP implements some extensions to the basic Maildir mail
|
||||
storage format in order to support some additional features, such as
|
||||
folders and "soft" quotas. This is done in a way that's backwards
|
||||
compatible with the standard Maildir users (although, of course, they
|
||||
will ignore the additional features). Other software that understands
|
||||
and uses the same Maildir extensions is SqWebMail, and maildrop.
|
||||
|
||||
"Maildir" is a directory-based mail storage format originally introduced
|
||||
in the Qmail mail server, and adopted as an alternative mail storage
|
||||
format by both Exim and Postfix. Courier-IMAP is popular on
|
||||
Qmail/Exim/Postfix sites that are configured to use maildirs. The
|
||||
primary advantage of maildirs is that multiple applications can access
|
||||
the same maildir simultaneously without requiring any kind of locking
|
||||
whatsoever. It is a faster and more efficient way to store mail. It
|
||||
works particularly well over NFS, which has a long history of
|
||||
locking-related woes.
|
||||
|
||||
It is part of the Courier mail server (http://www.courier-mta.org) but
|
||||
can be configured as a standalone IMAP server.
|
||||
|
||||
Features include an extremely small memory footprint, abstract
|
||||
authentication modules (e.g. /etc/passwd, LDAP, PAM), virtual mailbox
|
||||
support, resource controls, SSL/TLS, shared folders, and IPv6 support.
|
||||
support, resource controls, SSL/TLS, and IPv6 support.
|
||||
|
||||
|
@ -1,4 +0,0 @@
|
||||
This package provides an LDAP authentication backend for Courier-IMAP.
|
||||
|
||||
Documentation is installed in:
|
||||
${LOCALBASE}/share/doc/courier-imap
|
@ -1,5 +0,0 @@
|
||||
This package provides a MySQL database authentication backend for
|
||||
Courier-IMAP.
|
||||
|
||||
Documentation is installed in:
|
||||
${LOCALBASE}/share/doc/courier-imap
|
@ -1,5 +0,0 @@
|
||||
This package provides a PostgreSQL database authentication backend
|
||||
for Courier-IMAP.
|
||||
|
||||
Documentation is installed in:
|
||||
${LOCALBASE}/share/doc/courier-imap
|
@ -1,8 +1,8 @@
|
||||
This server provides POP3 access to Maildir format mailboxes. It
|
||||
does not handle traditional mailbox files.
|
||||
This server provides POP3 access to Maildir format mailboxes. It does
|
||||
not handle traditional mailbox files.
|
||||
|
||||
It is part of the Courier mail server (http://www.courier-mta.org)
|
||||
but can be configured as a standalone POP3 server.
|
||||
It is part of the Courier mail server (http://www.courier-mta.org) but
|
||||
can be configured as a standalone POP3 server.
|
||||
|
||||
Features include an extremely small memory footprint, abstract
|
||||
authentication modules (e.g. /etc/passwd, LDAP, PAM), virtual mailbox
|
||||
|
@ -1,22 +1,16 @@
|
||||
Example config files for Courier-IMAP have been installed
|
||||
in ${PREFIX}/share/examples/courier-imap.
|
||||
Example config files for Courier-IMAP have been installed in
|
||||
${PREFIX}/share/examples/courier-imap and copied also to
|
||||
${SYSCONFDIR}/courier-imap, edit them to your site's needs.
|
||||
|
||||
Copy all of the files to ${COURIERCONF} and
|
||||
edit them to your site's needs. Pay particular attention to
|
||||
the details in imapd.cnf, and read ssl(8) if necessary.
|
||||
You MUST set the CN in imapd.cnf to the hostname by which
|
||||
your IMAP server is accessed, or else clients will complain.
|
||||
|
||||
When this is done, you can use the 'mkimapdcert' script
|
||||
to automatically generate a server certificate, which
|
||||
is installed into /etc/ssl/private/imapd.pem
|
||||
Pay particular attention to the details in imapd.cnf, and read ssl(8) if
|
||||
necessary. You MUST set the CN in imapd.cnf to the hostname by which
|
||||
your IMAP server is accessed, or else clients will complain. When this
|
||||
is done, you can use the 'mkimapdcert' script to automatically generate
|
||||
a server certificate, which is installed into /etc/ssl/private/imapd.pem
|
||||
|
||||
To control the daemon use ${PREFIX}/libexec/imapd.rc and
|
||||
${PREFIX}/libexec/imapd-ssl.rc, and to run the authdaemon,
|
||||
place the following in /etc/rc.local:
|
||||
${PREFIX}/libexec/imapd-ssl.rc, and to run the authdaemon, place the
|
||||
following in /etc/rc.local:
|
||||
|
||||
mkdir -p ${COURIERSTATE}
|
||||
${PREFIX}/libexec/authlib/authdaemond start
|
||||
|
||||
If you require userdb or quota support, then install the
|
||||
courier-utils package.
|
||||
mkdir -p ${COURIERSTATE}
|
||||
${PREFIX}/sbin/authdaemond start
|
||||
|
@ -1,6 +1,6 @@
|
||||
You now need to copy the Courier-POP3 configuration files to
|
||||
${COURIERCONF} from ${PREFIX}/share/examples/courier-imap
|
||||
and edit them appropriately.
|
||||
You now need to edit appropriately the Courier-POP3 configuration files
|
||||
installed in ${SYSCONFDIR}/courier-imap from defaults placed in
|
||||
${PREFIX}/share/examples/courier-imap.
|
||||
|
||||
To use POP3-SSL, be sure to read ssl(8) and run the
|
||||
mkpop3dcert script if you require a self-signed certificate
|
||||
To use POP3-SSL, be sure to read ssl(8) and run the mkpop3dcert script
|
||||
if you require a self-signed certificate.
|
||||
|
@ -1,59 +1,60 @@
|
||||
@comment $OpenBSD: PLIST,v 1.19 2004/12/06 22:50:20 mbalmer Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.20 2006/11/03 16:19:56 mbalmer Exp $
|
||||
@conflict imap-uw-*
|
||||
@conflict courier-utils-*
|
||||
@newgroup _courier:571
|
||||
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
|
||||
bin/couriertls
|
||||
@comment bin/deliverquota
|
||||
bin/deliverquota
|
||||
bin/imapd
|
||||
bin/maildiracl
|
||||
bin/maildirkw
|
||||
@comment bin/maildirmake
|
||||
libexec/authlib/
|
||||
libexec/authlib/authcram
|
||||
libexec/authlib/authdaemon
|
||||
libexec/authlib/authdaemond
|
||||
libexec/authlib/authdaemond.plain
|
||||
libexec/authlib/authpwd
|
||||
libexec/authlib/authuserdb
|
||||
bin/maildirmake
|
||||
libexec/couriertcpd
|
||||
libexec/imapd-ssl.rc
|
||||
libexec/imapd.rc
|
||||
libexec/makedatprog
|
||||
@man man/man1/courierlogger.1
|
||||
@man man/man1/couriertcpd.1
|
||||
@man man/man1/maildiracl.1
|
||||
@man man/man1/maildirkw.1
|
||||
@comment @man man/man1/maildirmake.1
|
||||
@man man/man7/authcram.7
|
||||
@man man/man7/authdaemon.7
|
||||
@man man/man7/authdaemond.7
|
||||
@man man/man7/authlib.7
|
||||
@man man/man7/authpam.7
|
||||
@man man/man7/authpwd.7
|
||||
@man man/man7/authshadow.7
|
||||
@man man/man7/authuserdb.7
|
||||
@man man/man7/authvchkpw.7
|
||||
@comment @man man/man8/deliverquota.8
|
||||
@man man/man1/maildirmake.1
|
||||
@man man/man8/deliverquota.8
|
||||
@man man/man8/imapd.8
|
||||
@comment @man man/man8/makeuserdb.8
|
||||
@man man/man8/mkimapdcert.8
|
||||
@comment @man man/man8/pw2userdb.8
|
||||
@comment @man man/man8/userdb.8
|
||||
@comment @man man/man8/userdbpw.8
|
||||
@comment @man man/man8/vchkpw2userdb.8
|
||||
sbin/authenumerate
|
||||
sbin/courierlogger
|
||||
sbin/imaplogin
|
||||
@comment sbin/makeuserdb
|
||||
sbin/mkimapdcert
|
||||
@comment sbin/pw2userdb
|
||||
sbin/sharedindexinstall
|
||||
sbin/sharedindexsplit
|
||||
sbin/userdb
|
||||
@comment sbin/userdbpw
|
||||
@comment sbin/vchkpw2userdb
|
||||
share/doc/courier-imap/
|
||||
share/examples/courier-imap/
|
||||
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
|
||||
share/doc/courier/
|
||||
share/doc/courier/AUTHORS
|
||||
share/doc/courier/ChangeLog
|
||||
share/doc/courier/INSTALL
|
||||
share/doc/courier/NEWS
|
||||
share/doc/courier/README
|
||||
share/doc/courier/README.couriertls
|
||||
share/doc/courier/README.imap.txt
|
||||
share/doc/courier/README.imapkeywords.html
|
||||
share/doc/courier/README.maildirfilter.html
|
||||
share/doc/courier/README.maildirquota.txt
|
||||
share/doc/courier/README.proxy
|
||||
share/doc/courier/README.sharedfolders.txt
|
||||
share/doc/courier/README.unicode.txt
|
||||
share/examples/courier/
|
||||
@sample ${SYSCONFDIR}/
|
||||
@mode 600
|
||||
share/examples/courier/imapd-ssl.dist
|
||||
@sample ${SYSCONFDIR}/imapd-ssl
|
||||
share/examples/courier/imapd.cnf
|
||||
@sample ${SYSCONFDIR}/imapd.cnf
|
||||
share/examples/courier/imapd.dist
|
||||
@sample ${SYSCONFDIR}/imapd
|
||||
share/examples/courier/quotawarnmsg.example
|
||||
@mode 644
|
||||
@owner _courier
|
||||
@group _courier
|
||||
@sample ${SYSCONFDIR}/quotawarnmsg
|
||||
@sample ${SYSCONFDIR}/shared/
|
||||
@sample ${SYSCONFDIR}/shared.tmp/
|
||||
@mode 750
|
||||
@sample ${COURIERSTATE}/
|
||||
@extraunexec rm -rf ${SYSCONFDIR}/
|
||||
@extraunexec rm -rf ${COURIERSTATE}
|
||||
|
@ -1,5 +0,0 @@
|
||||
@comment $OpenBSD: PLIST-ldap,v 1.3 2004/09/15 09:09:41 espie Exp $
|
||||
libexec/authlib/authdaemond.ldap
|
||||
@man man/man7/authldap.7
|
||||
share/doc/courier-imap/README.ldap
|
||||
share/examples/courier-imap/authldaprc
|
@ -1,6 +0,0 @@
|
||||
@comment $OpenBSD: PLIST-mysql,v 1.3 2004/09/15 09:09:41 espie Exp $
|
||||
libexec/authlib/authdaemond.mysql
|
||||
@man man/man7/authmysql.7
|
||||
share/doc/courier-imap/README.authmysql.html
|
||||
share/doc/courier-imap/README.authmysql.myownquery
|
||||
share/examples/courier-imap/authmysqlrc
|
@ -1,4 +0,0 @@
|
||||
@comment $OpenBSD: PLIST-pgsql,v 1.3 2004/09/15 09:09:41 espie Exp $
|
||||
libexec/authlib/authdaemond.pgsql
|
||||
share/doc/courier-imap/README.authpostgres.html
|
||||
share/examples/courier-imap/authpgsqlrc
|
@ -1,10 +1,18 @@
|
||||
@comment $OpenBSD: PLIST-pop3,v 1.3 2004/09/15 09:09:41 espie Exp $
|
||||
@comment $OpenBSD: PLIST-pop3,v 1.4 2006/11/03 16:19:56 mbalmer Exp $
|
||||
@newgroup _courier:556
|
||||
@newuser _courier:556:556:daemon:Courier Mail Server:/var/empty:/sbin/nologin
|
||||
bin/pop3d
|
||||
libexec/pop3d-ssl.rc
|
||||
libexec/pop3d.rc
|
||||
@man man/man8/mkpop3dcert.8
|
||||
sbin/mkpop3dcert
|
||||
sbin/pop3login
|
||||
share/examples/courier-imap/pop3d
|
||||
share/examples/courier-imap/pop3d-ssl
|
||||
share/examples/courier-imap/pop3d.cnf
|
||||
@mode 600
|
||||
share/examples/courier/pop3d-ssl.dist
|
||||
@sample ${SYSCONFDIR}/pop3d-ssl
|
||||
share/examples/courier/pop3d.cnf
|
||||
@sample ${SYSCONFDIR}/pop3d.cnf
|
||||
share/examples/courier/pop3d.dist
|
||||
@sample ${SYSCONFDIR}/pop3d
|
||||
@extraunexec rm -rf ${SYSCONFDIR}/
|
||||
@extraunexec rm -rf ${COURIERSTATE}
|
||||
|
Loading…
Reference in New Issue
Block a user