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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/courier-imap Update mail/courier-imap to 4.1.1. ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:35:52 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/baf14ab52e56
branches:  trunk
changeset: 514283:baf14ab52e56
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jun 09 22:12:10 2006 +0000

description:
Update mail/courier-imap to 4.1.1.  Changes from version 4.1.0 include:

   * Fix quota calculations on 32 bit platforms with 64 bit off_t.

diffstat:

 mail/courier-imap/DEINSTALL        |  12 +-----------
 mail/courier-imap/INSTALL          |  10 +++++-----
 mail/courier-imap/Makefile         |   9 +++------
 mail/courier-imap/PLIST            |   7 +------
 mail/courier-imap/distinfo         |  10 +++++-----
 mail/courier-imap/patches/patch-aa |  19 +++++++++++++------
 6 files changed, 28 insertions(+), 39 deletions(-)

diffs (190 lines):

diff -r b65b36eb5ea8 -r baf14ab52e56 mail/courier-imap/DEINSTALL
--- a/mail/courier-imap/DEINSTALL       Fri Jun 09 22:12:01 2006 +0000
+++ b/mail/courier-imap/DEINSTALL       Fri Jun 09 22:12:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.7 2006/04/28 18:15:20 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.8 2006/06/09 22:12:10 jlam Exp $
 
 case ${STAGE} in
 DEINSTALL)
@@ -17,14 +17,4 @@
                done
        fi
        ;;
-
-POST-DEINSTALL)
-       couriersslcache="@COURIER_STATEDIR@/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 b65b36eb5ea8 -r baf14ab52e56 mail/courier-imap/INSTALL
--- a/mail/courier-imap/INSTALL Fri Jun 09 22:12:01 2006 +0000
+++ b/mail/courier-imap/INSTALL Fri Jun 09 22:12:10 2006 +0000
@@ -1,22 +1,22 @@
-# $NetBSD: INSTALL,v 1.4 2006/04/28 18:15:20 jlam Exp $
+# $NetBSD: INSTALL,v 1.5 2006/06/09 22:12:10 jlam Exp $
 
 case ${STAGE} in
 POST-INSTALL)
        TLS_CERTFILE=
-       oldcert="@SSLCERT@/imapd.pem"
+       oldcert="@SSLCERTS@/imapd.pem"
        newcert="@PKG_SYSCONFDIR@/imapd.pem"
        if ${TEST} -f @PKG_SYSCONFDIR@/imapd-ssl; then
                . @PKG_SYSCONFDIR@/imapd-ssl
-               if "$TLS_CERTFILE" != "$newcert"; then
+               if ${TEST} "$TLS_CERTFILE" != "$newcert"; then
                        imapdmsg="$oldcert      -> $newcert"
                fi
        fi
        TLS_CERTFILE=
-       oldcert="@SSLCERT@/pop3d.pem"
+       oldcert="@SSLCERTS@/pop3d.pem"
        newcert="@PKG_SYSCONFDIR@/pop3d.pem"
        if ${TEST} -f @PKG_SYSCONFDIR@/pop3d-ssl; then
                . @PKG_SYSCONFDIR@/pop3d-ssl
-               if "$TLS_CERTFILE" != "$newcert"; then
+               if ${TEST} "$TLS_CERTFILE" != "$newcert"; then
                        pop3dmsg="$oldcert      -> $newcert"
                fi
        fi
diff -r b65b36eb5ea8 -r baf14ab52e56 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Fri Jun 09 22:12:01 2006 +0000
+++ b/mail/courier-imap/Makefile        Fri Jun 09 22:12:10 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2006/06/09 16:35:04 reed Exp $
+# $NetBSD: Makefile,v 1.55 2006/06/09 22:12:10 jlam Exp $
 
-DISTNAME=      courier-imap-4.1.0
-PKGREVISION=   1
+DISTNAME=      courier-imap-4.1.1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -11,6 +10,7 @@
 HOMEPAGE=      http://www.courier-mta.org/imap/
 
 DEPENDS+=      courier-maildir>=0.53.1:../../mail/courier-maildir
+DEPENDS+=      couriertcpd>=0.53.2:../../net/couriertcpd
 
 USE_TOOLS+=            env gmake perl
 USE_LANGUAGES=         c c++
@@ -37,7 +37,6 @@
 FILES_SUBST+=          SSLCERTS=${SSLCERTS:Q}
 
 REQD_DIRS+=            ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
-MAKE_DIRS+=            ${VARBASE}/run ${COURIER_STATEDIR}
 
 .for _file_ in         imapd.cnf imapd.dist imapd-ssl.dist             \
                        pop3d.cnf pop3d.dist pop3d-ssl.dist
@@ -83,8 +82,6 @@
        ${INSTALL_DATA} ${WRKSRC}/imap/imapd.html ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/imap/mkimapdcert.html ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/imap/mkpop3dcert.html ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/tcpd/couriertcpd.html ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/tcpd/couriertls.html ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/imap/imapd.pam ${EGDIR}/imap.authpam
        ${INSTALL_DATA} ${WRKSRC}/imap/pop3d.pam ${EGDIR}/pop3.authpam
 
diff -r b65b36eb5ea8 -r baf14ab52e56 mail/courier-imap/PLIST
--- a/mail/courier-imap/PLIST   Fri Jun 09 22:12:01 2006 +0000
+++ b/mail/courier-imap/PLIST   Fri Jun 09 22:12:10 2006 +0000
@@ -1,15 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/28 18:15:20 jlam Exp $
-bin/couriertls
+@comment $NetBSD: PLIST,v 1.15 2006/06/09 22:12:10 jlam Exp $
 bin/imapd
 libexec/courier/courierpop3d
 libexec/courier/courierpop3login
 libexec/courier/imaplogin
-man/man1/couriertcpd.1
 man/man8/courierimapd.8
 man/man8/courierpop3d.8
 man/man8/mkimapdcert.8
 man/man8/mkpop3dcert.8
-sbin/couriertcpd
 sbin/imapd
 sbin/imapd-ssl
 sbin/mkimapdcert
@@ -23,8 +20,6 @@
 share/courier/pop3d
 share/courier/pop3d-ssl
 share/doc/courier/courierpop3d.html
-share/doc/courier/couriertcpd.html
-share/doc/courier/couriertls.html
 share/doc/courier/imap/BUGS.html
 share/doc/courier/imap/README.html
 share/doc/courier/imap/README.proxy.html
diff -r b65b36eb5ea8 -r baf14ab52e56 mail/courier-imap/distinfo
--- a/mail/courier-imap/distinfo        Fri Jun 09 22:12:01 2006 +0000
+++ b/mail/courier-imap/distinfo        Fri Jun 09 22:12:10 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2006/04/28 18:15:20 jlam Exp $
+$NetBSD: distinfo,v 1.18 2006/06/09 22:12:10 jlam Exp $
 
-SHA1 (courier-imap-4.1.0.tar.bz2) = c479dd4e42c2b6c108d879670853e99f7f851699
-RMD160 (courier-imap-4.1.0.tar.bz2) = fd27a2ed380bb465cccb10addbc1d6c28d57856e
-Size (courier-imap-4.1.0.tar.bz2) = 3211530 bytes
-SHA1 (patch-aa) = 5a28095f0f6309cd16f6fde46b0047ebec2fd073
+SHA1 (courier-imap-4.1.1.tar.bz2) = 505f35a8a7d6f55b9d624e544785bc758700135c
+RMD160 (courier-imap-4.1.1.tar.bz2) = e7f4c0d7cbb0ccf061c31de1b0b2387ec9d87084
+Size (courier-imap-4.1.1.tar.bz2) = 3211569 bytes
+SHA1 (patch-aa) = 81b1f736141da4a38226be12b342c8e69f1ee55c
 SHA1 (patch-ad) = c23fdfcf1a37fb828850c9fbf3b9d0c8a9eb6f9e
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
 SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29
diff -r b65b36eb5ea8 -r baf14ab52e56 mail/courier-imap/patches/patch-aa
--- a/mail/courier-imap/patches/patch-aa        Fri Jun 09 22:12:01 2006 +0000
+++ b/mail/courier-imap/patches/patch-aa        Fri Jun 09 22:12:10 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2006/04/28 18:15:20 jlam Exp $
+$NetBSD: patch-aa,v 1.13 2006/06/09 22:12:10 jlam Exp $
 
---- Makefile.in.orig   2006-02-25 12:16:41.000000000 -0500
+--- Makefile.in.orig   2006-05-24 19:51:00.000000000 -0400
 +++ Makefile.in
 @@ -246,10 +246,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
  
@@ -16,9 +16,9 @@
 +databin_SCRIPTS = mkimapdcert mkpop3dcert \
 +      imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +binPROGRAMS = imapd
-+sbinPROGRAMS = couriertcpd
++sbinPROGRAMS = 
 +libexecPROGRAMS = imaplogin courierpop3login courierpop3d
-+man_MANS = couriertcpd.1 courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
++man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
  
 @@ -264,5 +265,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
@@ -50,12 +50,15 @@
 +courierpop3d.8: imap/courierpop3d.8
 +      cp imap/courierpop3d.8 .
  
-@@ -1109,3 +1113,3 @@ install-exec-local:
+@@ -1106,6 +1110,4 @@ install-exec-local:
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+-      test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
+-              tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
        $(mkinstalldirs) $(DESTDIR)$(sbindir)
 -      for f in mkimapdcert mkpop3dcert ; \
 +      for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
                do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-@@ -1115,17 +1119,4 @@ install-exec-local:
+@@ -1115,17 +1117,4 @@ install-exec-local:
  install-exec-hook:
 -      chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared
@@ -73,3 +76,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:
+               do rm -f $(DESTDIR)$(sbindir)/$$f ; done
+-      rm -f $(DESTDIR)$(bindir)/couriertls
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/games/freeciv-client freeciv-client is not only xaw-ba...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note addition of net/couriertcpd and updates of th...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/games/freeciv-client freeciv-client is not only xaw-ba...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note addition of net/couriertcpd and updates of th...
Indexes:
Home | Main Index | Thread Index | Old Index