pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/courier-imap Update mail/courier-imap to 3.0.5 (b...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1a5f2e40eefb
branches: trunk
changeset: 478024:1a5f2e40eefb
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Jul 14 20:07:16 2004 +0000
description:
Update mail/courier-imap to 3.0.5 (based on the courier-0.45.6
distribution). Changes from version 2.2.1 include:
* Honor ${VARBASE}.
* courierlogger(1) has been moved to mail/courier-auth.
* Use the sysconftool from courier-auth to merge config files.
* The courier* rc.d scripts now check that authdaemond is also set to
"YES" to ensure that authdaemond is running before the courier-imap
daemons are started.
* Support for the ACL IMAP extension (RFC 2086 as well as the 2nd draft
revision of the ACL specification) via shared maildirs.
* Bug fixes and improvements to MIME encoding.
* Fixes buffer overflow vulnerability (PR 25774):
http://www.securityfocus.com/bid/9845
http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0224
diffstat:
mail/courier-imap/DEINSTALL | 8 +++---
mail/courier-imap/DESCR | 6 ++--
mail/courier-imap/Makefile | 21 ++++++---------
mail/courier-imap/PLIST | 9 +++---
mail/courier-imap/distinfo | 20 ++++++++------
mail/courier-imap/files/courierimap.sh | 16 +++++++++++-
mail/courier-imap/files/courierimaps.sh | 16 +++++++++++-
mail/courier-imap/files/courierpop.sh | 18 ++++++++++++-
mail/courier-imap/files/courierpops.sh | 16 +++++++++++-
mail/courier-imap/patches/patch-aa | 44 ++++++++++++++++++++------------
mail/courier-imap/patches/patch-ab | 10 +++----
mail/courier-imap/patches/patch-ae | 12 ++++----
mail/courier-imap/patches/patch-af | 12 ++++----
mail/courier-imap/patches/patch-ag | 12 ++++----
mail/courier-imap/patches/patch-ah | 12 ++++----
mail/courier-imap/patches/patch-ai | 24 ++++++++++++++++++
mail/courier-imap/patches/patch-aj | 24 ++++++++++++++++++
17 files changed, 194 insertions(+), 86 deletions(-)
diffs (truncated from 619 to 300 lines):
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/DEINSTALL
--- a/mail/courier-imap/DEINSTALL Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/DEINSTALL Wed Jul 14 20:07:16 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: DEINSTALL,v 1.4 2004/02/22 03:13:07 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.5 2004/07/14 20:07:16 jlam Exp $
# Additional files that are may be created for courier-imap.
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/imapd.rand"
-ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/pop3d.rand"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/imapd.rand"
+ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/pop3d.rand"
ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/imapd.pem"
ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/pop3d.pem"
case ${STAGE} in
POST-DEINSTALL)
# Unconditionally remove the SSL cache file.
- ${RM} -f /var/couriersslcache
+ ${RM} -f @VARBASE@/couriersslcache
;;
esac
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/DESCR
--- a/mail/courier-imap/DESCR Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/DESCR Wed Jul 14 20:07:16 2004 +0000
@@ -1,13 +1,13 @@
-Courier-IMAP is a server that provides IMAP access to Maildirs. This IMAP
+Courier-IMAP is a server that provides IMAP access to maildirs. 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.
+access to maildirs.
"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.
+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.
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/Makefile Wed Jul 14 20:07:16 2004 +0000
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.29 2004/05/12 23:40:12 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/07/14 20:07:16 jlam Exp $
-DISTNAME= courier-imap-2.2.1
-PKGREVISON= 1
+DISTNAME= courier-imap-3.0.5
-COMMENT= IMAP server for access to Maildir-style mailboxes
+COMMENT= IMAP server for access to maildir-style mailboxes
HOMEPAGE= http://www.inter7.com/courierimap/
DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
+DEPENDS+= courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
-USE_PERL5= yes
-REPLACE_PERL= sysconftool
+USE_PERL5= build
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
@@ -24,10 +22,8 @@
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
-SYSCONFTOOL= ${PREFIX}/sbin/imapd.sysconftool
GEN_FILES= imapd imapd-ssl pop3d pop3d-ssl
SSLCNF_FILES= imapd.cnf pop3d.cnf
-FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
FILES_SUBST+= SSLCERTS=${SSLCERTS}
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
@@ -66,10 +62,9 @@
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
- ${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/BUGS.imap
- ${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/README.imap
+ ${INSTALL_DATA_DIR} ${DOCDIR}/imap
+ ${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/imap
+ ${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/imap
${INSTALL_DATA} ${WRKSRC}/imap/imapd.authpam ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/imap/pop3d.authpam ${EGDIR}
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/PLIST
--- a/mail/courier-imap/PLIST Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/PLIST Wed Jul 14 20:07:16 2004 +0000
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2004/04/23 22:07:54 reed Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/07/14 20:07:16 jlam Exp $
bin/couriertls
bin/imapd
bin/pop3d
-libexec/courier/courierlogger
libexec/courier/couriertcpd
libexec/courier/imapd-ssl.rc
libexec/courier/imapd.rc
@@ -12,15 +11,14 @@
man/man8/courier-imapd.8
man/man8/mkimapdcert.8
man/man8/mkpop3dcert.8
-sbin/imapd.sysconftool
sbin/imaplogin
sbin/mkimapdcert
sbin/mkpop3dcert
sbin/pop3login
share/courier/mkimapdcert
share/courier/mkpop3dcert
-share/doc/courier/BUGS.imap
-share/doc/courier/README.imap
+share/doc/courier/imap/BUGS
+share/doc/courier/imap/README
share/examples/courier/imapd-ssl.dist
share/examples/courier/imapd.authpam
share/examples/courier/imapd.cnf
@@ -30,6 +28,7 @@
share/examples/courier/pop3d.cnf
share/examples/courier/pop3d.dist
@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
+@dirrm share/doc/courier/imap
@unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
@unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
@unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/distinfo
--- a/mail/courier-imap/distinfo Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/distinfo Wed Jul 14 20:07:16 2004 +0000
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.10 2004/02/22 03:13:07 jlam Exp $
+$NetBSD: distinfo,v 1.11 2004/07/14 20:07:16 jlam Exp $
-SHA1 (courier-imap-2.2.1.tar.bz2) = c5bf64c07509745730ec002468f5bba76d8a0b7d
-Size (courier-imap-2.2.1.tar.bz2) = 1342879 bytes
-SHA1 (patch-aa) = 811da9525943f64286c6f8f18670b35f7d2ea03f
-SHA1 (patch-ab) = d2aab90ab745e502e588474517d6233b2e94e1bb
+SHA1 (courier-imap-3.0.5.tar.bz2) = aea9068594cadc2210922d822e2d52795ba47cb1
+Size (courier-imap-3.0.5.tar.bz2) = 1648873 bytes
+SHA1 (patch-aa) = 0deead26ed61b42b7b8e564fc932ee9818e9c6ac
+SHA1 (patch-ab) = f8186acc61f3c54510b89dda8841bfbf44526718
SHA1 (patch-ad) = 50fb9666cab86de650e1a09e6d4a8ba7062be017
-SHA1 (patch-ae) = 41f3b00426ea630d1bb6d243cacda842d14a3b3b
-SHA1 (patch-af) = f28470abe1a269e86eb21459b1d9a5de6989fe11
-SHA1 (patch-ag) = 9123600cd875b18523c78786fc62ac1c8dea910b
-SHA1 (patch-ah) = 6615aba99c62cc459fdbcadb230f70f916e7178d
+SHA1 (patch-ae) = 5d240e3d4e239eb146da1a41c3fb560c2ab158e2
+SHA1 (patch-af) = feed1d40f9e5eabb06b5a9937ffaaf38784990b4
+SHA1 (patch-ag) = 053807924b94d05832166449b0f33484be0ad7cf
+SHA1 (patch-ah) = be0636cd9a790bda8b76def53a460913b85ddfd1
+SHA1 (patch-ai) = f8c091fd095d36b665fa5afb5f8e0d8420f5cdcf
+SHA1 (patch-aj) = 92bf04ce239fe0a07745c728d6670e29f3f44c8d
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/files/courierimap.sh
--- a/mail/courier-imap/files/courierimap.sh Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/files/courierimap.sh Wed Jul 14 20:07:16 2004 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierimap.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
#
# Courier IMAP services daemon
#
@@ -17,6 +17,7 @@
ctl_command="@PREFIX@/libexec/courier/imapd.rc"
pidfile="/var/run/imapd.pid"
required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
+required_vars="authdaemond"
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
@@ -26,6 +27,19 @@
action=$1
case ${action} in
start)
+ for _f in $required_vars; do
+ eval _value=\$${_f}
+ case $_value in
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ @ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+ if [ -z $rc_force ]; then
+ return 1
+ fi
+ ;;
+ esac
+ done
for f in $required_files; do
if [ ! -r "$f" ]; then
@ECHO@ "$0: WARNING: $f is not readable"
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/files/courierimaps.sh
--- a/mail/courier-imap/files/courierimaps.sh Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/files/courierimaps.sh Wed Jul 14 20:07:16 2004 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierimaps.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
#
# Courier IMAP/SSL services daemon
#
@@ -18,6 +18,7 @@
pidfile="/var/run/imapd-ssl.pid"
required_files="@PKG_SYSCONFDIR@/imapd @PKG_SYSCONFDIR@/imapd-ssl"
required_files="${required_files} @SSLCERTS@/imapd.pem"
+required_vars="authdaemond"
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
@@ -27,6 +28,19 @@
action=$1
case ${action} in
start)
+ for _f in $required_vars; do
+ eval _value=\$${_f}
+ case $_value in
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ @ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+ if [ -z $rc_force ]; then
+ return 1
+ fi
+ ;;
+ esac
+ done
for f in $required_files; do
if [ ! -r "$f" ]; then
@ECHO@ "$0: WARNING: $f is not readable"
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/files/courierpop.sh
--- a/mail/courier-imap/files/courierpop.sh Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/files/courierpop.sh Wed Jul 14 20:07:16 2004 +0000
@@ -1,8 +1,8 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierpop.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
#
-# Courier POP services daemon
+# Courier POP3 services daemon
#
# PROVIDE: courierpop
# REQUIRE: authdaemond
@@ -17,6 +17,7 @@
ctl_command="@PREFIX@/libexec/courier/pop3d.rc"
pidfile="/var/run/pop3d.pid"
required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
+required_vars="authdaemond"
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
@@ -26,6 +27,19 @@
action=$1
case ${action} in
start)
+ for _f in $required_vars; do
+ eval _value=\$${_f}
+ case $_value in
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ @ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
+ if [ -z $rc_force ]; then
+ return 1
+ fi
+ ;;
+ esac
+ done
for f in $required_files; do
if [ ! -r "$f" ]; then
@ECHO@ "$0: WARNING: $f is not readable"
diff -r b5ab7286b239 -r 1a5f2e40eefb mail/courier-imap/files/courierpops.sh
--- a/mail/courier-imap/files/courierpops.sh Wed Jul 14 20:07:07 2004 +0000
+++ b/mail/courier-imap/files/courierpops.sh Wed Jul 14 20:07:16 2004 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: courierpops.sh,v 1.8 2004/02/24 01:18:52 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.9 2004/07/14 20:07:16 jlam Exp $
#
# Courier POP3/SSL services daemon
#
@@ -18,6 +18,7 @@
pidfile="/var/run/pop3d-ssl.pid"
required_files="@PKG_SYSCONFDIR@/pop3d @PKG_SYSCONFDIR@/pop3d-ssl"
required_files="${required_files} @SSLCERTS@/pop3d.pem"
+required_vars="authdaemond"
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
@@ -27,6 +28,19 @@
action=$1
Home |
Main Index |
Thread Index |
Old Index