[pkgsrc/trunk]: pkgsrc/mail/courier-imap Update mail/courier-imap to courier-...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/courier-imap Update mail/courier-imap to courier-...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:22:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d253ce1bc14f
branches:  trunk
changeset: 489232:d253ce1bc14f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 18 22:12:46 2005 +0000

description:
Update mail/courier-imap to courier-imap-4.0.1.  Changes from version
3.0.5 include:

    * Implemented IMAP and POP3 proxy aggregator.  With a proxy
      aggregator, the mail accounts are split between multiple,
      independent servers, with an IMAP/POP3 server running on each
      individual server.  A separate, proxy server sits in front and
      accepts ordinary IMAP and POP3 connections.  It reads the login
      ID, determines which server the account is located on, connects
      to the server, and logs in.  Then, for the lifetime on the login
      session the front-end server takes itself out of the loop, and
      forwards all session traffic between the IMAP/POP3 client, and
      the back-end server.

    * Use courier-authlib for user authentication.

    * IPv6 support.

    * Minor bug fixes.

Please note when updating that the locations of the userdb files has
changed to be within the courier-authlib config directory, e.g.
/usr/pkg/etc/authlib/userdb*.

diffstat:

 mail/courier-imap/DEINSTALL             |   34 ++++++--
 mail/courier-imap/DESCR                 |   25 +++--
 mail/courier-imap/Makefile              |   78 ++++++++++++--------
 mail/courier-imap/PLIST                 |   34 +++++---
 mail/courier-imap/distinfo              |   21 ++---
 mail/courier-imap/files/courierimap.sh  |   22 ++---
 mail/courier-imap/files/courierimaps.sh |   22 ++---
 mail/courier-imap/files/courierpop.sh   |   22 ++---
 mail/courier-imap/files/courierpops.sh  |   22 ++---
 mail/courier-imap/patches/patch-aa      |  121 ++++++++++++-------------------
 mail/courier-imap/patches/patch-ab      |   11 --
 mail/courier-imap/patches/patch-ad      |   15 +++-
 mail/courier-imap/patches/patch-ae      |   43 ++++------
 mail/courier-imap/patches/patch-af      |   43 ++++------
 mail/courier-imap/patches/patch-ag      |   41 +++++-----
 mail/courier-imap/patches/patch-ah      |   41 +++++-----
 mail/courier-imap/patches/patch-ai      |   24 ------
 mail/courier-imap/patches/patch-aj      |   24 ------
 18 files changed, 278 insertions(+), 365 deletions(-)

diffs (truncated from 915 to 300 lines):

diff -r 89f9b1aa0e9c -r d253ce1bc14f mail/courier-imap/DEINSTALL
--- a/mail/courier-imap/DEINSTALL       Fri Feb 18 22:12:43 2005 +0000
+++ b/mail/courier-imap/DEINSTALL       Fri Feb 18 22:12:46 2005 +0000
@@ -1,14 +1,30 @@
-# $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 @SSLCERTS@/imapd.pem"
-ALL_FILES="${ALL_FILES} /dev/null @SSLCERTS@/pop3d.pem"
+# $NetBSD: DEINSTALL,v 1.6 2005/02/18 22:12:46 jlam Exp $
 
 case ${STAGE} in
+DEINSTALL)
+       #
+       # Note some additional files that may be created by the sysadmin
+       # that can probably be removed.
+       #
+       if ${TEST} -x ./+FILES; then
+               for file in                                             \
+                       ${PKG_SYSCONFDIR}/imapd.rand                    \
+                       ${PKG_SYSCONFDIR}/pop3d.rand                    \
+                       @SSLCERTS@/imapd.pem                            \
+                       @SSLCERTS@/pop3d.pem
+               do
+                       ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
+               done
+       fi
+       ;;
+
 POST-DEINSTALL)
-       # Unconditionally remove the SSL cache file.
-       ${RM} -f @VARBASE@/couriersslcache
+       couriersslcache="@VARBASE@/couriersslcache"
+       if ${TEST} -f "$couriersslcache"; then
+               # Unconditionally remove the SSL cache file.
+               ${ECHO} "Removing Courier SSL cache file:"
+               ${ECHO} "       $couriersslcache"
+               ${RM} -f $couriersslcache
+       fi
        ;;
 esac
diff -r 89f9b1aa0e9c -r d253ce1bc14f mail/courier-imap/DESCR
--- a/mail/courier-imap/DESCR   Fri Feb 18 22:12:43 2005 +0000
+++ b/mail/courier-imap/DESCR   Fri Feb 18 22:12:46 2005 +0000
@@ -1,13 +1,18 @@
-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.
+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.
 
 "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.
+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.
+
+This package differs from a vanilla Courier-IMAP installation in that
+the files are installed at locations that more closely correspond to
+a Courier installation.
diff -r 89f9b1aa0e9c -r d253ce1bc14f mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Fri Feb 18 22:12:43 2005 +0000
+++ b/mail/courier-imap/Makefile        Fri Feb 18 22:12:46 2005 +0000
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:44 reed Exp $
+# $NetBSD: Makefile,v 1.33 2005/02/18 22:12:46 jlam Exp $
 
-DISTNAME=      courier-imap-3.0.5
-PKGREVISION=   2
+DISTNAME=      courier-imap-4.0.1
+PKGBASE=       ${DISTNAME:C/-[^-]*$//}
+CATEGORIES=    mail
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX=  .tar.bz2
 
+MAINTAINER=    jlam%NetBSD.org@localhost
 COMMENT=       IMAP server for access to maildir-style mailboxes
-HOMEPAGE=      http://www.inter7.com/courierimap/
+HOMEPAGE=      http://www.courier-mta.org/imap/
+
+DEPENDS+=      courier-maildir>=0.48.2:../../mail/courier-maildir
 
-DEPENDS+=      courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+=      courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
-
+USE_GNU_TOOLS+=                make
+USE_LANGUAGES=         c c++
 USE_BUILDLINK3=                yes
-USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
 USE_PERL5=             build
 
-USE_PKGINSTALL=                yes
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL=    ${.CURDIR}/../courier-auth/INSTALL
+.include "../../mail/courier-maildir/Makefile.common"
 
-.include "../courier-auth/Makefile.common"
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/courier
+CONFIGURE_ARGS+=       --libexecdir=${PREFIX}/libexec/courier
 
+CONFIGURE_ARGS+=       --with-mailuser=${ROOT_USER}
+CONFIGURE_ARGS+=       --with-piddir=${VARBASE}/run
+CONFIGURE_ARGS+=       --program-transform-name='s/\.rc$$//'
 CONFIGURE_ENV+=                OPENSSL=${SSLBASE}/bin/openssl
 
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR}
@@ -28,10 +35,12 @@
 FILES_SUBST+=          SSLCERTS=${SSLCERTS}
 FILES_SUBST+=          GEN_FILES=${GEN_FILES:Q}
 
+USE_PKGINSTALL=                yes
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+MAKE_DIRS=             ${VARBASE}/run
 CONF_FILES_PERMS=      # empty
 .for FILE in ${GEN_FILES}
-CONF_FILES_PERMS+=     ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} \
-                       ${ROOT_USER} ${ROOT_GROUP} 0600
+CONF_FILES+=           ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
 .endfor
 .for FILE in ${SSLCNF_FILES}
 CONF_FILES_PERMS+=     ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}      \
@@ -39,17 +48,16 @@
 .endfor
 RCD_SCRIPTS=           courierimap courierimaps courierpop courierpops
 
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-pre-configure:
-       cd ${WRKSRC}; for file in                                       \
-               imap/imapd.dist.in imap/imapd-ssl.dist.in               \
-               imap/pop3d.dist.in imap/pop3d-ssl.dist.in               \
-               imap/imapd.cnf.in imap/pop3d.cnf.in                     \
-               imap/mkimapdcert.in imap/mkpop3dcert.in;                \
-       do                                                              \
-               ${SED}  -e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"          \
+SUBST_CLASSES+=                courier
+SUBST_MESSAGE.courier= "Convert to match courier-mta expectations."
+SUBST_FILES.courier=   imap/imapd.dist.in imap/imapd-ssl.dist.in       \
+                       imap/pop3d.dist.in imap/pop3d-ssl.dist.in       \
+                       imap/imapd.cnf.in imap/pop3d.cnf.in             \
+                       imap/mkimapdcert.in imap/mkpop3dcert.in         \
+                       imap/imapd.8.in imap/courierpop3d.8.in          \
+                       imapd-ssl.rc.in imapd.rc.in                     \
+                       pop3d-ssl.rc.in pop3d.rc.in
+SUBST_SED.courier=     -e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"          \
                        -e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"    \
                        -e "s|^POP3DSTART=.*|POP3DSTART=YES|g"          \
                        -e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g"    \
@@ -57,16 +65,22 @@
                        -e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \
                        -e "s|@datadir@/pop3d.pem|${SSLCERTS}/pop3d.pem|g" \
                        -e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \
-                       $${file} > $${file}.fixed;                      \
-               ${MV} -f $${file}.fixed $${file};                       \
-       done
+                       -e "s|@libexecdir@/couriertcpd|@sbindir@/couriertcpd|g" \
+                       -e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g" \
+                       -e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g" \
+                       -e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
+SUBST_STAGE.courier=   pre-configure
+
+.include "../../security/courier-authlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${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}
+       ${INSTALL_DATA} ${WRKSRC}/imap/BUGS.html ${DOCDIR}/imap
+       ${INSTALL_DATA} ${WRKSRC}/imap/README.html ${DOCDIR}/imap
+       ${INSTALL_DATA} ${WRKSRC}/imap/README.proxy.html ${DOCDIR}/imap
+       ${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${EGDIR}/imap.pam
+       ${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${EGDIR}/pop3.pam
 
 .include "../../mk/bsd.pkg.mk"
diff -r 89f9b1aa0e9c -r d253ce1bc14f mail/courier-imap/PLIST
--- a/mail/courier-imap/PLIST   Fri Feb 18 22:12:43 2005 +0000
+++ b/mail/courier-imap/PLIST   Fri Feb 18 22:12:46 2005 +0000
@@ -1,30 +1,36 @@
-@comment $NetBSD: PLIST,v 1.10 2004/07/14 20:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/02/18 22:12:46 jlam Exp $
 bin/couriertls
 bin/imapd
-bin/pop3d
-libexec/courier/couriertcpd
-libexec/courier/imapd-ssl.rc
-libexec/courier/imapd.rc
-libexec/courier/pop3d-ssl.rc
-libexec/courier/pop3d.rc
+libexec/courier/courierpop3d
+libexec/courier/courierpop3login
+libexec/courier/imaplogin
 man/man1/couriertcpd.1
-man/man8/courier-imapd.8
+man/man8/courierimapd.8
+man/man8/courierpop3d.8
 man/man8/mkimapdcert.8
 man/man8/mkpop3dcert.8
-sbin/imaplogin
+sbin/couriertcpd
+sbin/imapd
+sbin/imapd-ssl
 sbin/mkimapdcert
 sbin/mkpop3dcert
-sbin/pop3login
+sbin/pop3d
+sbin/pop3d-ssl
+share/courier/imapd
+share/courier/imapd-ssl
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
-share/doc/courier/imap/BUGS
-share/doc/courier/imap/README
+share/courier/pop3d
+share/courier/pop3d-ssl
+share/doc/courier/imap/BUGS.html
+share/doc/courier/imap/README.html
+share/doc/courier/imap/README.proxy.html
+share/examples/courier/imap.pam
 share/examples/courier/imapd-ssl.dist
-share/examples/courier/imapd.authpam
 share/examples/courier/imapd.cnf
 share/examples/courier/imapd.dist
+share/examples/courier/pop3.pam
 share/examples/courier/pop3d-ssl.dist
-share/examples/courier/pop3d.authpam
 share/examples/courier/pop3d.cnf
 share/examples/courier/pop3d.dist
 @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
diff -r 89f9b1aa0e9c -r d253ce1bc14f mail/courier-imap/distinfo
--- a/mail/courier-imap/distinfo        Fri Feb 18 22:12:43 2005 +0000
+++ b/mail/courier-imap/distinfo        Fri Feb 18 22:12:46 2005 +0000
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.11 2004/07/14 20:07:16 jlam Exp $
+$NetBSD: distinfo,v 1.12 2005/02/18 22:12:46 jlam Exp $
 
-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) = 5d240e3d4e239eb146da1a41c3fb560c2ab158e2
-SHA1 (patch-af) = feed1d40f9e5eabb06b5a9937ffaaf38784990b4
-SHA1 (patch-ag) = 053807924b94d05832166449b0f33484be0ad7cf
-SHA1 (patch-ah) = be0636cd9a790bda8b76def53a460913b85ddfd1
-SHA1 (patch-ai) = f8c091fd095d36b665fa5afb5f8e0d8420f5cdcf
-SHA1 (patch-aj) = 92bf04ce239fe0a07745c728d6670e29f3f44c8d
+SHA1 (courier-imap-4.0.1.tar.bz2) = 747c122c7b7f033ff9f9ab5ba3e4b689aa5d4189
+Size (courier-imap-4.0.1.tar.bz2) = 3032350 bytes
+SHA1 (patch-aa) = f44c4c1ef778bc958ded32d3d83aeb51743b58ea
+SHA1 (patch-ad) = fda6348009340f39490e79e122e421aa21ac3763
+SHA1 (patch-ae) = eff5f9cd4a75e159610732104f2936683c672ec1
+SHA1 (patch-af) = 7e3ba78627ed46994f9bdf18ddcb201512c55c27
+SHA1 (patch-ag) = 889ca671aff35c16c3c6c19f2e06acf8493dfb31
+SHA1 (patch-ah) = f951b61fe4f56bd9e115479827b94c5c71032973
diff -r 89f9b1aa0e9c -r d253ce1bc14f mail/courier-imap/files/courierimap.sh
--- a/mail/courier-imap/files/courierimap.sh    Fri Feb 18 22:12:43 2005 +0000
+++ b/mail/courier-imap/files/courierimap.sh    Fri Feb 18 22:12:46 2005 +0000
@@ -1,21 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.10 2004/07/15 08:29:05 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.11 2005/02/18 22:12:46 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: authdaemond
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="courierimap"
 rcvar=${name}
-command="@PREFIX@/libexec/courier/couriertcpd"
-ctl_command="@PREFIX@/libexec/courier/imapd.rc"
-pidfile="/var/run/imapd.pid"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated file from 4.09 to file-4.13.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc The courier packages are updated.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated file from 4.09 to file-4.13.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc The courier packages are updated.
Indexes:
Home | Main Index | Thread Index | Old Index