[pkgsrc/trunk]: pkgsrc Update mail/courier-imap to 2.2.1. Changes from versi...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be882782cac9
branches:  trunk
changeset: 469321:be882782cac9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 22 03:13:02 2004 +0000

description:
Update mail/courier-imap to 2.2.1.  Changes from version 1.4.2 include
addition of keywords on Maildir messages, use of FAM if it exists to
allow simultaneous access to the same Maildir from multiple clients,
and fixed handling of DELETEd messages and the Trash folder.

diffstat:

 doc/CHANGES                             |   3 +-
 mail/courier-imap/DEINSTALL             |   9 +++-
 mail/courier-imap/Makefile              |  39 ++++++++----------
 mail/courier-imap/PLIST                 |   8 +-
 mail/courier-imap/distinfo              |  21 ++++-----
 mail/courier-imap/files/courierimap.sh  |  14 ++---
 mail/courier-imap/files/courierimaps.sh |  14 ++---
 mail/courier-imap/files/courierpop.sh   |  14 ++---
 mail/courier-imap/files/courierpops.sh  |  14 ++---
 mail/courier-imap/patches/patch-aa      |  68 ++++++++++++++++----------------
 mail/courier-imap/patches/patch-ab      |  33 +++------------
 mail/courier-imap/patches/patch-ac      |  12 -----
 mail/courier-imap/patches/patch-ad      |  16 +++---
 mail/courier-imap/patches/patch-ae      |  27 +++++++-----
 mail/courier-imap/patches/patch-af      |  27 +++++++-----
 mail/courier-imap/patches/patch-ag      |  20 ++++----
 mail/courier-imap/patches/patch-ah      |  20 ++++----
 17 files changed, 168 insertions(+), 191 deletions(-)

diffs (truncated from 698 to 300 lines):

diff -r 9b79e4625cf7 -r be882782cac9 doc/CHANGES
--- a/doc/CHANGES       Sun Feb 22 02:24:07 2004 +0000
+++ b/doc/CHANGES       Sun Feb 22 03:13:02 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4949 2004/02/22 01:59:37 minskim Exp $
+$NetBSD: CHANGES,v 1.4950 2004/02/22 03:13:02 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -967,3 +967,4 @@
        Added p5-DBI-Shell-11.9 [minskim 2004-02-22]
        Added libtcpa-1.1b [schmonz 2004-02-22]
        Added p5-Perl-Tidy-20021130 [minskim 2004-02-22]
+       Updated courier-imap to 2.2.1 [jlam 2004-02-22]
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/DEINSTALL
--- a/mail/courier-imap/DEINSTALL       Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/DEINSTALL       Sun Feb 22 03:13:02 2004 +0000
@@ -1,7 +1,14 @@
-# $NetBSD: DEINSTALL,v 1.3 2002/01/22 22:08:48 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2004/02/22 03:13:07 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 @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
+       ;;
+esac
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/Makefile        Sun Feb 22 03:13:02 2004 +0000
@@ -1,34 +1,36 @@
-# $NetBSD: Makefile,v 1.19 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/22 03:13:07 jlam Exp $
 
-DISTNAME=      courier-imap-1.4.2
-PKGREVISION=   2
+DISTNAME=      courier-imap-2.2.1
 COMMENT=       IMAP server for access to Maildir-style mailboxes
 HOMEPAGE=      http://www.inter7.com/courierimap/
 
-DEPENDS+=      courier-auth>=0.37.1:../../mail/courier-auth
-DEPENDS+=      courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
+DEPENDS+=      courier-auth>=${BASE_VERS}:../../mail/courier-auth
+DEPENDS+=      courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
 
+USE_BUILDLINK3=                yes
+USE_LANGUAGES=         c c++
 USE_PERL5=             yes
 REPLACE_PERL=          sysconftool
+
 USE_PKGINSTALL=                yes
 DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=    ${.CURDIR}/../courier-auth/INSTALL
 
 .include "../../mail/courier-auth/Makefile.common"
 
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=       --with-waitfunc=wait3
-.endif
-
-CONFIGURE_ENV+=                OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl
+CONFIGURE_ENV+=                OPENSSL=${SSLBASE}/bin/openssl
 
 .if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s)
 INSTALL_TARGET=         install-strip
 .endif
+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
-RCD_SCRIPTS=           courierimap courierimaps courierpop courierpops
+FILES_SUBST+=          SYSCONFTOOL=${SYSCONFTOOL:Q}
+FILES_SUBST+=          SSLCERTS=${SSLCERTS}
+FILES_SUBST+=          GEN_FILES=${GEN_FILES:Q}
 
 CONF_FILES_PERMS=      # empty
 .for FILE in ${GEN_FILES}
@@ -39,11 +41,9 @@
 CONF_FILES_PERMS+=     ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}      \
                        ${ROOT_USER} ${ROOT_GROUP} 0600
 .endfor
+RCD_SCRIPTS=           courierimap courierimaps courierpop courierpops
 
-INSTALL_EXTRA_TMPL=    ${.CURDIR}/../../mail/courier-auth/INSTALL
-FILES_SUBST+=          SYSCONFTOOL=${SYSCONFTOOL:Q}
-FILES_SUBST+=          SSLCERTS=${SSLCERTS}
-FILES_SUBST+=          GEN_FILES=${GEN_FILES:Q}
+.include "../../security/openssl/buildlink3.mk"
 
 pre-configure:
        cd ${WRKSRC}; for file in                                       \
@@ -68,11 +68,8 @@
        ${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
-       cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/imap/BUGS ${DOCDIR}/BUGS.imap
+       ${INSTALL_DATA} ${WRKSRC}/imap/README ${DOCDIR}/README.imap
+       cd ${WRKSRC}/imap; ${INSTALL_DATA} imapd.authpam pop3d.authpam ${EGDIR}
 
-.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/PLIST
--- a/mail/courier-imap/PLIST   Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/PLIST   Sun Feb 22 03:13:02 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/01/23 02:22:20 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/22 03:13:07 jlam Exp $
 bin/couriertls
 bin/imapd
 bin/pop3d
@@ -6,10 +6,10 @@
 etc/rc.d/courierimaps
 etc/rc.d/courierpop
 etc/rc.d/courierpops
+libexec/courier/courierlogger
 libexec/courier/couriertcpd
 libexec/courier/imapd-ssl.rc
 libexec/courier/imapd.rc
-libexec/courier/logger
 libexec/courier/pop3d-ssl.rc
 libexec/courier/pop3d.rc
 man/man1/couriertcpd.1
@@ -26,13 +26,13 @@
 share/doc/courier/BUGS.imap
 share/doc/courier/README.imap
 share/examples/courier/imapd-ssl.dist
+share/examples/courier/imapd.authpam
 share/examples/courier/imapd.cnf
 share/examples/courier/imapd.dist
-share/examples/courier/imapd.pam
 share/examples/courier/pop3d-ssl.dist
+share/examples/courier/pop3d.authpam
 share/examples/courier/pop3d.cnf
 share/examples/courier/pop3d.dist
-share/examples/courier/pop3d.pam
 @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/doc/courier 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/distinfo
--- a/mail/courier-imap/distinfo        Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/distinfo        Sun Feb 22 03:13:02 2004 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2002/06/26 16:05:37 schmonz Exp $
+$NetBSD: distinfo,v 1.10 2004/02/22 03:13:07 jlam Exp $
 
-SHA1 (courier-imap-1.4.2.tar.gz) = 7c869f6b7d9b43bbf3435cddfadcbae777acdccc
-Size (courier-imap-1.4.2.tar.gz) = 1189909 bytes
-SHA1 (patch-aa) = 55013db5260044ebeb5b7236ceb482535ca06487
-SHA1 (patch-ab) = 9f6afb8f2e046c5d7d5d94e659d8dc9b544816a3
-SHA1 (patch-ac) = f85ae9f2f56c1885180ae86b156ff508aa2491c4
-SHA1 (patch-ad) = d4c91ca56a85896f4f7fef72003f4f8c3be1b315
-SHA1 (patch-ae) = 842c76a8d6cd7820c337469966b3bb7e901e271f
-SHA1 (patch-af) = e2982c2120a582fe20763f85e00ca611b45ac98f
-SHA1 (patch-ag) = e29f5e481704285e366d31d0d3be211f6a91d79d
-SHA1 (patch-ah) = d0b7b7d11d016e632c49d21412cad76b3e5876de
+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 (patch-ad) = 50fb9666cab86de650e1a09e6d4a8ba7062be017
+SHA1 (patch-ae) = 41f3b00426ea630d1bb6d243cacda842d14a3b3b
+SHA1 (patch-af) = f28470abe1a269e86eb21459b1d9a5de6989fe11
+SHA1 (patch-ag) = 9123600cd875b18523c78786fc62ac1c8dea910b
+SHA1 (patch-ah) = 6615aba99c62cc459fdbcadb230f70f916e7178d
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/files/courierimap.sh
--- a/mail/courier-imap/files/courierimap.sh    Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/files/courierimap.sh    Sun Feb 22 03:13:02 2004 +0000
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierimap.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
 fi
 
@@ -26,18 +25,17 @@
 {
        action=$1
        case ${action} in
-       start)  echo "Starting ${name}." ;;
-       stop)   echo "Stopping ${name}." ;;
+       start)  @ECHO@ "Starting ${name}." ;;
+       stop)   @ECHO@ "Stopping ${name}." ;;
        esac
 
        ${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"
 else
-       echo -n " ${name}"
+       @ECHO@ -n " ${name}"
        ${start_cmd}
 fi
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/files/courierimaps.sh
--- a/mail/courier-imap/files/courierimaps.sh   Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/files/courierimaps.sh   Sun Feb 22 03:13:02 2004 +0000
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierimaps.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
 fi
 
@@ -27,18 +26,17 @@
 {
        action=$1
        case ${action} in
-       start)  echo "Starting ${name}." ;;
-       stop)   echo "Stopping ${name}." ;;
+       start)  @ECHO@ "Starting ${name}." ;;
+       stop)   @ECHO@ "Stopping ${name}." ;;
        esac
 
        ${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"
 else
-       echo -n " ${name}"
+       @ECHO@ -n " ${name}"
        ${start_cmd}
 fi
diff -r 9b79e4625cf7 -r be882782cac9 mail/courier-imap/files/courierpop.sh
--- a/mail/courier-imap/files/courierpop.sh     Sun Feb 22 02:24:07 2004 +0000
+++ b/mail/courier-imap/files/courierpop.sh     Sun Feb 22 03:13:02 2004 +0000
@@ -1,14 +1,13 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
+# $NetBSD: courierpop.sh,v 1.7 2004/02/22 03:13:07 jlam Exp $
 #
 # Courier POP services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: authdaemond
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
 fi
 
@@ -26,18 +25,17 @@
 {
        action=$1
        case ${action} in
-       start)  echo "Starting ${name}." ;;
-       stop)   echo "Stopping ${name}." ;;
+       start)  @ECHO@ "Starting ${name}." ;;
+       stop)   @ECHO@ "Stopping ${name}." ;;
        esac
 
        ${ctl_command} ${action}
 }
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        load_rc_config $name
        run_rc_command "$1"