Update to 4.6.0 and take maintainership

ok landry@
This commit is contained in:
giovanni 2009-10-28 14:20:19 +00:00
parent 819180c82e
commit ac448ac1e6
13 changed files with 161 additions and 111 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.55 2009/09/15 17:37:21 jasper Exp $
# $OpenBSD: Makefile,v 1.56 2009/10/28 14:20:19 giovanni Exp $
COMMENT-main= imap server for maildir format mailboxes
COMMENT-pop3= pop3 server for maildir format mailboxes
V= 4.1.1
V= 4.6.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}p3
FULLPKGNAME-pop3= courier-pop3-${V}p1
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
CATEGORIES= mail
@ -14,8 +14,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.courier-mta.org/imap/
MAINTAINER= Giovanni Bechis <giovanni@openbsd.org>
# GPL
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -36,7 +37,7 @@ 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
SYSCONFDIR= /etc/courier
CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \
--datadir=${PREFIX}/sbin \
@ -94,11 +95,18 @@ CNFFILES= etc/courier/imapd-ssl.dist etc/courier/imapd.dist \
etc/courier/imapd.cnf etc/courier/pop3d.cnf \
etc/courier/quotawarnmsg.example
# Regression tests need ulimit -p 256 and are not compatible
# with no_trashquota and imap_bugs flavors.
# If those flavors are not built you can do regress tests with
# ulimit -p 256
# make regress NO_REGRESS=NO
NO_REGRESS= Yes
post-extract:
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/arandom,g' \
${WRKSRC}/imap/imapd.cnf.in
${WRKSRC}/imap/imapd.cnf.openssl.in
@perl -pi -e 's,\@datadir\@\/imapd.rand,\/dev\/arandom,g' \
${WRKSRC}/imap/pop3d.cnf.in
${WRKSRC}/imap/pop3d.cnf.openssl.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/courier

View File

@ -1,5 +1,5 @@
MD5 (courier-imap-4.1.1.tar.bz2) = 9COmCdnM4Nzxk8rGTrTL3Q==
RMD160 (courier-imap-4.1.1.tar.bz2) = 5/TA18uwzPBhwx3hsLI4fsnYcIQ=
SHA1 (courier-imap-4.1.1.tar.bz2) = UF81qKfW9VudYk5UR4W8dYcAE1w=
SHA256 (courier-imap-4.1.1.tar.bz2) = lunuruZNss8vSqllg5Lnt5d77p9DSvHoWQa9cl18ggE=
SIZE (courier-imap-4.1.1.tar.bz2) = 3211569
MD5 (courier-imap-4.6.0.tar.bz2) = hzf7G1UkLCCnj9LReXBzEQ==
RMD160 (courier-imap-4.6.0.tar.bz2) = Zk+ybBNRllr2sbsh4iIw72Yy8RA=
SHA1 (courier-imap-4.6.0.tar.bz2) = vsJMN0AHw9omXgVEiRmSzlmU1X8=
SHA256 (courier-imap-4.6.0.tar.bz2) = 2E5L1PZD7APvG96pdDxLkX/OejbPiWft7u+3wVuCWzc=
SIZE (courier-imap-4.6.0.tar.bz2) = 3397972

View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.6 2009/10/28 14:20:19 giovanni Exp $
--- imap/imapd-ssl.dist.in.orig Sat Jul 12 22:17:24 2008
+++ imap/imapd-ssl.dist.in Mon Jun 15 15:26:36 2009
@@ -72,13 +72,13 @@ SSLLOGGEROPTS="-name=imapd-ssl"
#
# Whether or not to start IMAP over SSL on simap port:
@ -17,16 +17,16 @@ $OpenBSD: patch-imap_imapd-ssl_dist_in,v 1.5 2006/11/03 16:19:56 mbalmer Exp $
##NAME: IMAP_TLS_REQUIRED:1
#
@@ -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.
@@ -260,7 +260,7 @@ TLS_CERTS=X509
#
-TLS_CERTFILE=@datadir@/imapd.pem
# This is an experimental feature.
-TLS_CERTFILE=@mydatadir@/imapd.pem
+TLS_CERTFILE=/etc/ssl/private/imapd.pem
##NAME: TLS_TRUSTCERTS:0
#
@@ -194,8 +194,8 @@ TLS_VERIFYPEER=NONE
@@ -322,8 +322,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-imap_imaplogin_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
--- imap/imaplogin.c.orig Sun Jun 29 22:18:36 2008
+++ imap/imaplogin.c Mon Jun 15 15:25:07 2009
@@ -235,7 +235,7 @@ int login_callback(struct authinfo *ainfo, void *dummy
execl(imapd, imapd,
ainfo->maildir ?
ainfo->maildir:defaultmaildir,

View File

@ -1,46 +1,66 @@
$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
$OpenBSD: patch-imap_mkimapdcert_in,v 1.7 2009/10/28 14:20:19 giovanni Exp $
--- imap/mkimapdcert.in.orig Sun Nov 4 21:49:58 2007
+++ imap/mkimapdcert.in Mon Jun 15 15:30:20 2009
@@ -17,42 +17,43 @@ else
fi
prefix="@prefix@"
+SSLDIR="/etc/ssl/private"
-if test -f @datadir@/imapd.pem
-if test -f @mydatadir@/imapd.pem
+if test -f ${SSLDIR}/imapd.pem
then
- echo "@datadir@/imapd.pem already exists."
- echo "@mydatadir@/imapd.pem already exists."
+ echo "${SSLDIR}/imapd.pem already exists."
exit 1
fi
umask 077
-cp /dev/null @datadir@/imapd.pem
-chmod 600 @datadir@/imapd.pem
-chown @mailuser@ @datadir@/imapd.pem
+cp /dev/null ${SSLDIR}/imapd.pem
+chmod 600 ${SSLDIR}/imapd.pem
+chown @mailuser@ ${SSLDIR}/imapd.pem
cleanup() {
- rm -f @datadir@/imapd.pem
- rm -f @datadir@/imapd.rand
- rm -f @mydatadir@/imapd.pem
- rm -f @mydatadir@/imapd.rand
- rm -f @mydatadir@/imapd.key
- rm -f @mydatadir@/imapd.cert
+ rm -f ${SSLDIR}/imapd.pem
+ rm -f ${SSLDIR}/imapd.rand
+ rm -f ${SSLDIR}/imapd.key
+ rm -f ${SSLDIR}/imapd.cert
exit 1
}
-cd @datadir@
-dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
-cd @mydatadir@
+cd ${SSLDIR}
+dd if=@RANDOMV@ of=${SSLDIR}/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 || 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 ${SSLDIR}/imapd.pem -keyout ${SSLDIR}/imapd.pem || cleanup
+@OPENSSL@ gendh -rand ${SSLDIR}/imapd.rand 512 >>${SSLDIR}/imapd.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${SSLDIR}/imapd.pem || cleanup
+rm -f ${SSLDIR}/imapd.rand
if test "@ssllib@" = "openssl"
then
- cp /dev/null @mydatadir@/imapd.pem
- chmod 600 @mydatadir@/imapd.pem
- chown @mailuser@ @mydatadir@/imapd.pem
+ cp /dev/null ${SSLDIR}/imapd.pem
+ chmod 600 ${SSLDIR}/imapd.pem
+ chown @mailuser@ ${SSLDIR}/imapd.pem
- dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null
+ dd if=@RANDOMV@ of=${SSLDIR}/imapd.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/imapd.cnf -out @mydatadir@/imapd.pem -keyout @mydatadir@/imapd.pem || cleanup
- @OPENSSL@ gendh -rand @mydatadir@/imapd.rand 512 >>@mydatadir@/imapd.pem || cleanup
- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/imapd.pem || cleanup
- rm -f @mydatadir@/imapd.rand
+ -config @sysconfdir@/imapd.cnf -out ${SSLDIR}/imapd.pem -keyout ${SSLDIR}/imapd.pem || cleanup
+ @OPENSSL@ gendh -rand ${SSLDIR}/imapd.rand 512 >>${SSLDIR}/imapd.pem || cleanup
+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${SSLDIR}/imapd.pem || cleanup
+ rm -f ${SSLDIR}/imapd.rand
else
- cp /dev/null @mydatadir@/imapd.key
- chmod 600 @mydatadir@/imapd.key
- cp /dev/null @mydatadir@/imapd.cert
- chmod 600 @mydatadir@/imapd.cert
+ cp /dev/null ${SSLDIR}/imapd.key
+ chmod 600 ${SSLDIR}/imapd.key
+ cp /dev/null ${SSLDIR}/imapd.cert
+ chmod 600 ${SSLDIR}/imapd.cert
@CERTTOOL@ --generate-privkey --outfile imapd.key
@CERTTOOL@ --generate-self-signed --load-privkey imapd.key --outfile imapd.cert --template @sysconfdir@/imapd.cnf

View File

@ -1,44 +1,66 @@
$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
$OpenBSD: patch-imap_mkpop3dcert_in,v 1.4 2009/10/28 14:20:19 giovanni Exp $
--- imap/mkpop3dcert.in.orig Sun Nov 4 21:49:58 2007
+++ imap/mkpop3dcert.in Mon Jun 15 15:31:09 2009
@@ -17,42 +17,43 @@ else
fi
prefix="@prefix@"
+SSLDIR=/etc/ssl/private
+SSLDIR="/etc/ssl/private"
-if test -f @datadir@/pop3d.pem
-if test -f @mydatadir@/pop3d.pem
+if test -f ${SSLDIR}/pop3d.pem
then
- echo "@datadir@/pop3d.pem already exists."
- echo "@mydatadir@/pop3d.pem already exists."
+ echo "${SSLDIR}/pop3d.pem already exists."
exit 1
fi
umask 077
-cp /dev/null @datadir@/pop3d.pem
-chmod 600 @datadir@/pop3d.pem
-chown @mailuser@ @datadir@/pop3d.pem
+cp /dev/null ${SSLDIR}/pop3d.pem
+chmod 600 ${SSLDIR}/pop3d.pem
+chown @mailuser@ ${SSLDIR}/pop3d.pem
cleanup() {
- rm -f @datadir@/pop3d.pem
- rm -f @datadir@/pop3d.rand
- rm -f @mydatadir@/pop3d.pem
- rm -f @mydatadir@/pop3d.rand
- rm -f @mydatadir@/pop3d.key
- rm -f @mydatadir@/pop3d.cert
+ rm -f ${SSLDIR}/pop3d.pem
+ rm -f ${SSLDIR}/pop3d.rand
+ rm -f ${SSLDIR}/pop3d.key
+ rm -f ${SSLDIR}/pop3d.cert
exit 1
}
-dd if=@RANDOMV@ of=@datadir@/pop3d.rand count=1 2>/dev/null
+dd if=@RANDOMV@ of=${SSLDIR}/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
-@OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup
-@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup
-rm -f @datadir@/pop3d.rand
+ -config @sysconfdir@/pop3d.cnf -out ${SSLDIR}/pop3d.pem -keyout ${SSLDIR}/pop3d.pem || cleanup
+@OPENSSL@ gendh -rand ${SSLDIR}/pop3d.rand 512 >>${SSLDIR}/pop3d.pem || cleanup
+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${SSLDIR}/pop3d.pem || cleanup
+rm -f ${SSLDIR}/pop3d.rand
-cd @mydatadir@
+cd ${SSLDIR}
if test "@ssllib@" = "openssl"
then
- cp /dev/null @mydatadir@/pop3d.pem
- chmod 600 @mydatadir@/pop3d.pem
- chown @mailuser@ @mydatadir@/pop3d.pem
+ cp /dev/null ${SSLDIR}/pop3d.pem
+ chmod 600 ${SSLDIR}/pop3d.pem
+ chown @mailuser@ ${SSLDIR}/pop3d.pem
- dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null
+ dd if=@RANDOMV@ of=${SSLDIR}/pop3d.rand count=1 2>/dev/null
@OPENSSL@ req -new -x509 -days 365 -nodes \
- -config @sysconfdir@/pop3d.cnf -out @mydatadir@/pop3d.pem -keyout @mydatadir@/pop3d.pem || cleanup
- @OPENSSL@ gendh -rand @mydatadir@/pop3d.rand 512 >>@mydatadir@/pop3d.pem || cleanup
- @OPENSSL@ x509 -subject -dates -fingerprint -noout -in @mydatadir@/pop3d.pem || cleanup
- rm -f @mydatadir@/pop3d.rand
+ -config @sysconfdir@/pop3d.cnf -out ${SSLDIR}/pop3d.pem -keyout ${SSLDIR}/pop3d.pem || cleanup
+ @OPENSSL@ gendh -rand ${SSLDIR}/pop3d.rand 512 >>${SSLDIR}/pop3d.pem || cleanup
+ @OPENSSL@ x509 -subject -dates -fingerprint -noout -in ${SSLDIR}/pop3d.pem || cleanup
+ rm -f ${SSLDIR}/pop3d.rand
else
- cp /dev/null @mydatadir@/pop3d.key
- chmod 600 @mydatadir@/pop3d.key
- cp /dev/null @mydatadir@/pop3d.cert
- chmod 600 @mydatadir@/pop3d.cert
+ cp /dev/null ${SSLDIR}/pop3d.key
+ chmod 600 ${SSLDIR}/pop3d.key
+ cp /dev/null ${SSLDIR}/pop3d.cert
+ chmod 600 ${SSLDIR}/pop3d.cert
@CERTTOOL@ --generate-privkey --outfile pop3d.key
@CERTTOOL@ --generate-self-signed --load-privkey pop3d.key --outfile pop3d.cert --template @sysconfdir@/pop3d.cnf

View File

@ -1,16 +1,16 @@
$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.
$OpenBSD: patch-imap_pop3d-ssl_dist_in,v 1.6 2009/10/28 14:20:19 giovanni Exp $
--- imap/pop3d-ssl.dist.in.orig Sat Jul 12 22:17:25 2008
+++ imap/pop3d-ssl.dist.in Mon Jun 15 15:31:54 2009
@@ -248,7 +248,7 @@ TLS_CERTS=X509
#
-TLS_CERTFILE=@datadir@/pop3d.pem
# This is an experimental feature.
-TLS_CERTFILE=@mydatadir@/pop3d.pem
+TLS_CERTFILE=/etc/ssl/private/pop3d.pem
##NAME: TLS_TRUSTCERTS:0
#
@@ -180,8 +180,8 @@ TLS_VERIFYPEER=NONE
@@ -308,8 +308,8 @@ TLS_VERIFYPEER=NONE
# problems with SSL clients. Disable SSL caching by commenting out the
# following settings:

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-imap_pop3login_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
--- imap/pop3login.c.orig Sun Jun 29 22:18:36 2008
+++ imap/pop3login.c Mon Jun 15 15:25:07 2009
@@ -213,7 +213,7 @@ static int login_callback(struct authinfo *ainfo, void
execl(pop3d, pop3d,
ainfo->maildir ?
ainfo->maildir:defaultmaildir,

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-tcpd_libcouriertls_c,v 1.2 2009/10/28 14:20:19 giovanni Exp $
--- tcpd/libcouriertls.c.orig Sun Jul 13 16:27:33 2008
+++ tcpd/libcouriertls.c Mon Jun 15 15:25:07 2009
@@ -814,7 +814,7 @@ static int get_func(void *rec, size_t recsize,
time_t timeout;
size_t session_id_len;

View File

@ -1,5 +1,5 @@
You now need to edit appropriately the Courier-IMAP configuration files
installed in ${SYSCONFDIR}/courier/.
installed in ${SYSCONFDIR}/.
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

View File

@ -1,5 +1,5 @@
You now need to edit appropriately the Courier-POP3 configuration files
installed in ${SYSCONFDIR}/courier/.
installed in ${SYSCONFDIR}/.
To use POP3-SSL, be sure to read ssl(8) and run the mkpop3dcert script
if you require a self-signed certificate.

View File

@ -1,19 +1,19 @@
@comment $OpenBSD: PLIST-main,v 1.2 2007/06/22 07:34:45 mbalmer Exp $
@pkgpath ${BASE_PKGPATH}
@comment $OpenBSD: PLIST-main,v 1.3 2009/10/28 14:20:19 giovanni Exp $
@conflict imap-uw-*
@conflict courier-utils-*
@pkgpath ${BASE_PKGPATH}
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
bin/couriertls
bin/deliverquota
bin/imapd
bin/maildiracl
bin/maildirkw
bin/maildirmake
libexec/couriertcpd
@bin bin/couriertls
@bin bin/deliverquota
@bin bin/imapd
@bin bin/maildiracl
@bin bin/maildirkw
@bin bin/maildirmake
@bin libexec/couriertcpd
libexec/imapd-ssl.rc
libexec/imapd.rc
libexec/makedatprog
@bin libexec/makedatprog
@man man/man1/couriertcpd.1
@man man/man1/maildiracl.1
@man man/man1/maildirkw.1
@ -21,7 +21,7 @@ libexec/makedatprog
@man man/man8/deliverquota.8
@man man/man8/imapd.8
@man man/man8/mkimapdcert.8
sbin/imaplogin
@bin sbin/imaplogin
sbin/mkimapdcert
sbin/sharedindexinstall
sbin/sharedindexsplit

View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST-pop3,v 1.5 2006/11/03 16:20:58 mbalmer Exp $
@comment $OpenBSD: PLIST-pop3,v 1.6 2009/10/28 14:20:19 giovanni Exp $
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
bin/pop3d
@bin bin/pop3d
libexec/pop3d-ssl.rc
libexec/pop3d.rc
@man man/man8/mkpop3dcert.8
sbin/mkpop3dcert
sbin/pop3login
@bin sbin/pop3login
@mode 600
share/examples/courier/pop3d-ssl.dist
@sample ${SYSCONFDIR}/pop3d-ssl