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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/courier-imap Update mail/courier-imap to 4.2.1. ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:23:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe38bfc9e816
branches:  trunk
changeset: 534281:fe38bfc9e816
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Oct 15 15:37:20 2007 +0000

description:
Update mail/courier-imap to 4.2.1.  Changes from version 4.1.3 include:

* Try to autodetect clock skew.

* Include remote port number in IMAP and POP3 logs.

* Optimization: skip over folders not in the current scope, avoiding
  unnecessary overhead of checking their ACLs.

diffstat:

 mail/courier-imap/INSTALL          |  38 --------------------------------------
 mail/courier-imap/Makefile         |  12 ++++--------
 mail/courier-imap/distinfo         |  17 ++++++++---------
 mail/courier-imap/patches/patch-aa |  25 ++++++++++++++-----------
 mail/courier-imap/patches/patch-ad |  10 +++++-----
 mail/courier-imap/patches/patch-ak |  10 +++++-----
 mail/courier-imap/patches/patch-al |  35 -----------------------------------
 mail/courier-imap/patches/patch-am |  14 --------------
 mail/courier-imap/patches/patch-an |  16 ++++++++++++++++
 9 files changed, 52 insertions(+), 125 deletions(-)

diffs (truncated from 301 to 300 lines):

diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/INSTALL
--- a/mail/courier-imap/INSTALL Mon Oct 15 15:37:13 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# $NetBSD: INSTALL,v 1.5 2006/06/09 22:12:10 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-       TLS_CERTFILE=
-       oldcert="@SSLCERTS@/imapd.pem"
-       newcert="@PKG_SYSCONFDIR@/imapd.pem"
-       if ${TEST} -f @PKG_SYSCONFDIR@/imapd-ssl; then
-               . @PKG_SYSCONFDIR@/imapd-ssl
-               if ${TEST} "$TLS_CERTFILE" != "$newcert"; then
-                       imapdmsg="$oldcert      -> $newcert"
-               fi
-       fi
-       TLS_CERTFILE=
-       oldcert="@SSLCERTS@/pop3d.pem"
-       newcert="@PKG_SYSCONFDIR@/pop3d.pem"
-       if ${TEST} -f @PKG_SYSCONFDIR@/pop3d-ssl; then
-               . @PKG_SYSCONFDIR@/pop3d-ssl
-               if ${TEST} "$TLS_CERTFILE" != "$newcert"; then
-                       pop3dmsg="$oldcert      -> $newcert"
-               fi
-       fi
-       if ${TEST} -n "$imapdmsg" -o -n "$pop3dmsg"; then
-               ${CAT} << EOF
-===========================================================================
-
-If you are upgrading Courier-IMAP from a previous version, please note
-that the default locations of the SSL certificates for the IMAP and
-POP3 servers have moved:
-
-       $imapdmsg
-       $pop3dmsg
-
-===========================================================================
-EOF
-       fi
-       ;;
-esac
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Mon Oct 15 15:37:13 2007 +0000
+++ b/mail/courier-imap/Makefile        Mon Oct 15 15:37:20 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2007/09/22 04:42:03 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2007/10/15 15:37:20 jlam Exp $
 
-DISTNAME=      courier-imap-4.1.3
-PKGREVISION=   2
+DISTNAME=      courier-imap-4.2.1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,8 +9,8 @@
 COMMENT=       IMAP server for access to maildir-style mailboxes
 HOMEPAGE=      http://www.courier-mta.org/imap/
 
-DEPENDS+=      courier-maildir>=0.53.1:../../mail/courier-maildir
-DEPENDS+=      couriertcpd>=0.56.0nb1:../../net/couriertcpd
+DEPENDS+=      courier-maildir>=0.57.1:../../mail/courier-maildir
+DEPENDS+=      couriertcpd>=0.57.1:../../net/couriertcpd
 
 USE_TOOLS+=            env gmake openssl:run perl
 USE_LANGUAGES=         c c++
@@ -48,9 +47,6 @@
 INSTALL_AM_MAKEFLAGS=  sysconfdir=${EGDIR:Q}
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} AM_MAKEFLAGS=${INSTALL_AM_MAKEFLAGS:Q}
 
-# Used in ${PKGDIR}/INSTALL
-FILES_SUBST+=          SSLCERTS=${SSLCERTS:Q}
-
 REQD_DIRS+=            ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
 MAKE_DIRS+=            ${COURIER_STATEDIR}
 MAKE_DIRS_PERMS+=      ${COURIER_STATEDIR}/tmp                         \
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/distinfo
--- a/mail/courier-imap/distinfo        Mon Oct 15 15:37:13 2007 +0000
+++ b/mail/courier-imap/distinfo        Mon Oct 15 15:37:20 2007 +0000
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.21 2007/09/17 15:28:04 jlam Exp $
+$NetBSD: distinfo,v 1.22 2007/10/15 15:37:21 jlam Exp $
 
-SHA1 (courier-imap-4.1.3.tar.bz2) = d0042e585d6df658a41a1768887d135c89e51ac0
-RMD160 (courier-imap-4.1.3.tar.bz2) = b1422973a7c3b13cf35e895a8494761aa4b80834
-Size (courier-imap-4.1.3.tar.bz2) = 3262429 bytes
-SHA1 (patch-aa) = 81b1f736141da4a38226be12b342c8e69f1ee55c
-SHA1 (patch-ad) = c23fdfcf1a37fb828850c9fbf3b9d0c8a9eb6f9e
+SHA1 (courier-imap-4.2.1.tar.bz2) = e21b464680fb8fe2e473966bf6faa19944a68485
+RMD160 (courier-imap-4.2.1.tar.bz2) = 41151ebb892ad26d5ae2efd7e89105b4d7aa721b
+Size (courier-imap-4.2.1.tar.bz2) = 3300749 bytes
+SHA1 (patch-aa) = 9b60c07f2a8c4c3fea3fac8c22a8386de3f7d53b
+SHA1 (patch-ad) = d027f094eae80f6493380947cd98ed6bb3006d6d
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
 SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29
 SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
 SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c
-SHA1 (patch-ak) = 8919d48a0bc8093f30e2cc8316ff242752bcbc4a
-SHA1 (patch-al) = 5e3d549c96a0d25f963ecd08f8bf9f077263cd38
-SHA1 (patch-am) = dad09106cda99b6f43f5dff01ee7b33fc33def51
+SHA1 (patch-ak) = bdc5a6a25ab5f1c320feda40970073f3a1ef8e17
+SHA1 (patch-an) = da8ce37a8a4ff57a25325153f1d68b7df865faee
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/patches/patch-aa
--- a/mail/courier-imap/patches/patch-aa        Mon Oct 15 15:37:13 2007 +0000
+++ b/mail/courier-imap/patches/patch-aa        Mon Oct 15 15:37:20 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2006/06/09 22:12:10 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
 
---- Makefile.in.orig   2006-05-24 19:51:00.000000000 -0400
+--- Makefile.in.orig   Sat Sep 29 14:48:20 2007
 +++ Makefile.in
-@@ -246,10 +246,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
+@@ -250,9 +250,10 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
  
 -sbin_SCRIPTS = sharedindexinstall sharedindexsplit
 +sbin_SCRIPTS = 
@@ -12,23 +12,26 @@
 -binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
 -sbinPROGRAMS = imaplogin pop3login
 -libexecPROGRAMS = makedatprog couriertcpd
--man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
 +databin_SCRIPTS = mkimapdcert mkpop3dcert \
 +      imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +binPROGRAMS = imapd
 +sbinPROGRAMS = 
 +libexecPROGRAMS = imaplogin courierpop3login courierpop3d
+ bin_PROGRAMS = @binPROGRAMS_exec@
+@@ -260,3 +261,3 @@ sbin_PROGRAMS = @sbinPROGRAMS_exec@
+ libexec_PROGRAMS = @libexecPROGRAMS_exec@
+-man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
 +man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
  
-@@ -264,5 +265,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
+@@ -271,5 +272,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -      imapd.cnf pop3d.cnf quotawarnmsg.example
 +      imapd.cnf pop3d.cnf
  
 -libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +libexec_SCRIPTS = 
- HTML2TXT = links -dump -no-numbering
-@@ -1031,7 +1032,7 @@ sharedindexsplit: maildir/sharedindexspl
+ HTML2TXT = links -dump -no-numbering -no-references
+@@ -1045,7 +1046,7 @@ sharedindexsplit: maildir/sharedindexspl
  
 -pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
 -      cp imap/pop3login$(EXEEXT) .
@@ -40,7 +43,7 @@
 +courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
 +      cp imap/pop3d$(EXEEXT) ./$@
  
-@@ -1079,4 +1080,7 @@ maildirkw.1: maildir/maildirkw.1
+@@ -1093,4 +1094,7 @@ maildirkw.1: maildir/maildirkw.1
  
 -imapd.8: imap/imapd.8
 -      cp imap/imapd.8 .
@@ -50,7 +53,7 @@
 +courierpop3d.8: imap/courierpop3d.8
 +      cp imap/courierpop3d.8 .
  
-@@ -1106,6 +1110,4 @@ install-exec-local:
+@@ -1120,6 +1124,4 @@ install-exec-local:
        $(mkinstalldirs) $(DESTDIR)$(bindir)
 -      test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
 -              tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
@@ -58,7 +61,7 @@
 -      for f in mkimapdcert mkpop3dcert ; \
 +      for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
                do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-@@ -1115,17 +1117,4 @@ install-exec-local:
+@@ -1129,17 +1131,4 @@ install-exec-local:
  install-exec-hook:
 -      chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared
@@ -76,7 +79,7 @@
 -              $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
 -              $(DESTDIR)/etc/pam.d/pop3 || exit 1
        for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
-@@ -1136,3 +1125,2 @@ uninstall-local:
+@@ -1150,3 +1139,2 @@ uninstall-local:
                do rm -f $(DESTDIR)$(sbindir)/$$f ; done
 -      rm -f $(DESTDIR)$(bindir)/couriertls
  
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/patches/patch-ad
--- a/mail/courier-imap/patches/patch-ad        Mon Oct 15 15:37:13 2007 +0000
+++ b/mail/courier-imap/patches/patch-ad        Mon Oct 15 15:37:20 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.7 2006/04/28 18:15:20 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2007/10/15 15:37:21 jlam Exp $
 
---- configure.orig     2006-02-25 12:16:40.000000000 -0500
+--- configure.orig     Sat Sep 29 14:48:19 2007
 +++ configure
-@@ -20892,9 +20892,6 @@ else
-   ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null"
- fi;
+@@ -20490,9 +20490,6 @@ else
+ fi
+ 
  
 -INSTALL_DATA='${INSTALL} -m 0600'
 -INSTALL_SCRIPT='${INSTALL}'
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/patches/patch-ak
--- a/mail/courier-imap/patches/patch-ak        Mon Oct 15 15:37:13 2007 +0000
+++ b/mail/courier-imap/patches/patch-ak        Mon Oct 15 15:37:20 2007 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.1 2006/04/28 18:15:20 jlam Exp $
+$NetBSD: patch-ak,v 1.2 2007/10/15 15:37:21 jlam Exp $
 
---- imap/mkimapdcert.in.orig   2005-06-29 14:01:17.000000000 -0400
+--- imap/mkimapdcert.in.orig   Sun Jul  1 15:54:59 2007
 +++ imap/mkimapdcert.in
 @@ -30,7 +30,6 @@ cleanup() {
        exit 1
  }
  
--cd @datadir@
- dd if=@RANDOMV@ of=@datadir@/imapd.rand count=1 2>/dev/null
+-cd @mydatadir@
+ dd if=@RANDOMV@ of=@mydatadir@/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
+       -config @sysconfdir@/imapd.cnf -out @mydatadir@/imapd.pem -keyout @mydatadir@/imapd.pem || cleanup
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/patches/patch-al
--- a/mail/courier-imap/patches/patch-al        Mon Oct 15 15:37:13 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/10/10 12:55:39 ben Exp $
-
---- bdbobj/Makefile.in.orig    2006-01-29 12:36:19.000000000 -0500
-+++ bdbobj/Makefile.in
-@@ -225,21 +225,6 @@ all: config.h
- 
- .SUFFIXES:
- .SUFFIXES: .C .c .lo .o .obj
--am--refresh:
--      @:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--      @for dep in $?; do \
--        case '$(am__configure_deps)' in \
--          *$$dep*) \
--            echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
--            cd $(srcdir) && $(AUTOMAKE) --foreign  \
--              && exit 0; \
--            exit 1;; \
--        esac; \
--      done; \
--      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
--      cd $(top_srcdir) && \
--        $(AUTOMAKE) --foreign  Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-@@ -618,7 +603,7 @@ ps-am:
- 
- uninstall-am: uninstall-info-am
- 
--.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-+.PHONY: CTAGS GTAGS all all-am check check-am clean \
-       clean-generic clean-libtool clean-noinstLTLIBRARIES \
-       clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
-       dist-shar dist-tarZ dist-zip distcheck distclean \
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/patches/patch-am
--- a/mail/courier-imap/patches/patch-am        Mon Oct 15 15:37:13 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1 2007/09/17 15:28:04 jlam Exp $
-
---- tcpd/libcouriertls.c.orig  Sat Oct 28 17:47:32 2006
-+++ tcpd/libcouriertls.c
-@@ -418,7 +418,8 @@ SSL_CTX *tls_create(int isserver, const 
- 
-       ctx=SSL_CTX_new(protocol && strcmp(protocol, "SSL2") == 0
-                                                       ? SSLv2_method():
--              protocol && strcmp(protocol, "SSL3") == 0 ? SSLv23_method():
-+              protocol && strcmp(protocol, "SSL3") == 0 ? SSLv3_method():
-+              protocol && strcmp(protocol, "SSL23") == 0 ? SSLv23_method():
-               TLSv1_method());
- 
-       if (!ctx)
diff -r 7135d7e9faf5 -r fe38bfc9e816 mail/courier-imap/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/courier-imap/patches/patch-an        Mon Oct 15 15:37:20 2007 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2007/10/15 15:37:21 jlam Exp $
+
+--- imap/mailboxlist.c.orig    Fri Jul 27 02:41:01 2007
++++ imap/mailboxlist.c
+@@ -347,9 +347,11 @@ static void folder_entry(char *folder, c
+       if (!need_add_folders && !need_add_hier)
+               return; /* Nothing to do */
+ 
++      {
+       CHECK_RIGHTSM(folder, have_rights, ACL_LOOKUP);
+       if (!have_rights[0])
+               return;
++      }
+ 
+       if (need_add_folders)
Prev by Date: [pkgsrc/trunk]: pkgsrc/net Activated nagios-plugin-spamd
Next by Date: [pkgsrc/trunk]: pkgsrc/net/gethost Added Solaris libraries. Removed patch-aa,...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net Activated nagios-plugin-spamd
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/gethost Added Solaris libraries. Removed patch-aa,...
Indexes:
Home | Main Index | Thread Index | Old Index