pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/courier-imap courier-imap-4.8.0:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/09a8d2cdd15b
branches:  trunk
changeset: 576658:09a8d2cdd15b
user:      pettai <pettai%pkgsrc.org@localhost>
date:      Tue Jun 15 23:07:06 2010 +0000

description:
courier-imap-4.8.0:

* tcpd/configure.in: Check if explicit linking with libgpg-error is required.
* imapd.c (main): Fix typo in alert message.
* Big quota patch (with some changes).
* imapd.c (main): Dummy FAM/Gamin initialization, report an error
  during login, upon a failure.
* imapd.c (imapenhancedidle): Make FAM error more meaningful.
* pop3dserver.c (main): "disableinsecurepop3" account option disables
  non-SSL logins.
* imapd.c (chkdisabled): "disableinsecureimap" account option disables
  non-SSL logins.

(See the Changelog for the previous releases)

Based on patch(es) from PR pkg/42989 by Brian Candler

diffstat:

 mail/courier-imap/Makefile         |   9 ++++-----
 mail/courier-imap/PLIST            |  10 +++++-----
 mail/courier-imap/distinfo         |  17 ++++++++---------
 mail/courier-imap/patches/patch-aa |  31 +++++++++++++++++--------------
 mail/courier-imap/patches/patch-ad |   4 ++--
 mail/courier-imap/patches/patch-af |   4 ++--
 mail/courier-imap/patches/patch-ah |   4 ++--
 mail/courier-imap/patches/patch-an |  16 ----------------
 8 files changed, 40 insertions(+), 55 deletions(-)

diffs (226 lines):

diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/Makefile        Tue Jun 15 23:07:06 2010 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2010/03/21 16:29:40 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/15 23:07:06 pettai Exp $
 
-DISTNAME=      courier-imap-4.3.0
-PKGREVISION=   1
+DISTNAME=      courier-imap-4.8.0
 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.58.0:../../mail/courier-maildir
-DEPENDS+=      couriertcpd>=0.58.0:../../net/couriertcpd
+DEPENDS+=      courier-maildir>=0.65.0:../../mail/courier-maildir
+DEPENDS+=      couriertcpd>=0.65.0:../../net/couriertcpd
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/PLIST
--- a/mail/courier-imap/PLIST   Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/PLIST   Tue Jun 15 23:07:06 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:04:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2010/06/15 23:07:07 pettai Exp $
 bin/imapd
 libexec/courier/courierpop3d
 libexec/courier/courierpop3login
@@ -13,12 +13,12 @@
 sbin/mkpop3dcert
 sbin/pop3d
 sbin/pop3d-ssl
-share/courier/imapd
-share/courier/imapd-ssl
+share/courier/imapd.rc
+share/courier/imapd-ssl.rc
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
-share/courier/pop3d
-share/courier/pop3d-ssl
+share/courier/pop3d.rc
+share/courier/pop3d-ssl.rc
 share/doc/courier/courierpop3d.html
 share/doc/courier/imap/BUGS.html
 share/doc/courier/imap/README.html
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/distinfo
--- a/mail/courier-imap/distinfo        Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/distinfo        Tue Jun 15 23:07:06 2010 +0000
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.23 2008/02/19 18:45:14 jlam Exp $
+$NetBSD: distinfo,v 1.24 2010/06/15 23:07:07 pettai Exp $
 
-SHA1 (courier-imap-4.3.0.tar.bz2) = b7c091f2bfdd22308ac26724e88b50e7a4f68cb2
-RMD160 (courier-imap-4.3.0.tar.bz2) = 8865d4b139af5f85a08ce5f1b6e1e453d3827120
-Size (courier-imap-4.3.0.tar.bz2) = 3342522 bytes
-SHA1 (patch-aa) = 9b60c07f2a8c4c3fea3fac8c22a8386de3f7d53b
-SHA1 (patch-ad) = 8a80f42a179e34a838317a0aac2d0a811fd47071
+SHA1 (courier-imap-4.8.0.tar.bz2) = f688cea87c66181362622ce9cbd4710d75268cfc
+RMD160 (courier-imap-4.8.0.tar.bz2) = cfc0beec6893c155cf9712d920002320169ad0c5
+Size (courier-imap-4.8.0.tar.bz2) = 3362734 bytes
+SHA1 (patch-aa) = 268f89763de3cd3a02eb5179ca29fbd5478537a2
+SHA1 (patch-ad) = c62c5efde80bbd748d213e14235393bba81b57f5
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
-SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29
+SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f
 SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
-SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c
+SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d
 SHA1 (patch-ak) = 057df5c41382768a0f221107137412c46200c035
-SHA1 (patch-an) = da8ce37a8a4ff57a25325153f1d68b7df865faee
 SHA1 (patch-ao) = f576d11ee217000a7760f153b131ed7a445d48f6
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/patches/patch-aa
--- a/mail/courier-imap/patches/patch-aa        Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/patches/patch-aa        Tue Jun 15 23:07:06 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
+$NetBSD: patch-aa,v 1.15 2010/06/15 23:07:07 pettai Exp $
 
---- Makefile.in.orig   Sat Sep 29 14:48:20 2007
-+++ Makefile.in
-@@ -250,9 +250,10 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
+--- Makefile.in.orig   2010-05-30 23:20:04.000000000 +0200
++++ Makefile.in        2010-06-14 00:25:33.000000000 +0200
+@@ -289,9 +289,10 @@
  
 -sbin_SCRIPTS = sharedindexinstall sharedindexsplit
 +sbin_SCRIPTS = 
@@ -18,12 +18,12 @@
 +sbinPROGRAMS = 
 +libexecPROGRAMS = imaplogin courierpop3login courierpop3d
  bin_PROGRAMS = @binPROGRAMS_exec@
-@@ -260,3 +261,3 @@ sbin_PROGRAMS = @sbinPROGRAMS_exec@
+@@ -299,3 +300,3 @@
  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
  
-@@ -271,5 +272,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
+@@ -310,5 +311,5 @@
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -      imapd.cnf pop3d.cnf quotawarnmsg.example
 +      imapd.cnf pop3d.cnf
@@ -31,7 +31,7 @@
 -libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +libexec_SCRIPTS = 
  HTML2TXT = links -dump -no-numbering -no-references
-@@ -1045,7 +1046,7 @@ sharedindexsplit: maildir/sharedindexspl
+@@ -1227,7 +1228,7 @@
  
 -pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
 -      cp imap/pop3login$(EXEEXT) .
@@ -43,7 +43,7 @@
 +courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
 +      cp imap/pop3d$(EXEEXT) ./$@
  
-@@ -1093,4 +1094,7 @@ maildirkw.1: maildir/maildirkw.1
+@@ -1275,4 +1276,7 @@
  
 -imapd.8: imap/imapd.8
 -      cp imap/imapd.8 .
@@ -53,15 +53,18 @@
 +courierpop3d.8: imap/courierpop3d.8
 +      cp imap/courierpop3d.8 .
  
-@@ -1120,6 +1124,4 @@ install-exec-local:
+@@ -1302,4 +1306,2 @@
        $(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 ; \
-@@ -1129,17 +1131,4 @@ install-exec-local:
+@@ -1308,2 +1310,5 @@
+               $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
++      for f in imapd-ssl imapd pop3d pop3d-ssl ; \
++              do rm -f $(DESTDIR)$(sbindir)/$$f ; \
++              $(LN_S) $(databindir)/$$f.rc $(DESTDIR)$(sbindir)/$$f ; done
+       $(mkinstalldirs) $(DESTDIR)$(localstatedir)
+@@ -1311,17 +1316,4 @@
  install-exec-hook:
 -      chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared
@@ -79,7 +82,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
-@@ -1150,3 +1139,2 @@ uninstall-local:
+@@ -1332,3 +1324,2 @@
                do rm -f $(DESTDIR)$(sbindir)/$$f ; done
 -      rm -f $(DESTDIR)$(bindir)/couriertls
  
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/patches/patch-ad
--- a/mail/courier-imap/patches/patch-ad        Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/patches/patch-ad        Tue Jun 15 23:07:06 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2008/02/19 18:45:14 jlam Exp $
+$NetBSD: patch-ad,v 1.10 2010/06/15 23:07:07 pettai Exp $
 
 --- configure.orig     2007-11-23 22:20:27.000000000 -0500
 +++ configure
-@@ -20576,9 +20576,6 @@ else
+@@ -12377,9 +12377,6 @@ else
  fi
  
  
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/patches/patch-af
--- a/mail/courier-imap/patches/patch-af        Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/patches/patch-af        Tue Jun 15 23:07:06 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.8 2005/08/11 00:04:01 jlam Exp $
+$NetBSD: patch-af,v 1.9 2010/06/15 23:07:07 pettai Exp $
 
 --- imapd.rc.in.orig   2005-07-01 21:13:56.000000000 -0400
 +++ imapd.rc.in
@@ -15,6 +15,6 @@
                        bindir=@bindir@ ;
                        libexecdir=@libexecdir@ ;
 +                      sbindir=@sbindir@ ;
+                               . @sysconfdir@/imapd-ssl ; \
                                . @sysconfdir@/imapd ; \
-                               . @sysconfdir@/imapd-ssl ; \
                IMAP_STARTTLS=$IMAPDSTARTTLS ; \
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/patches/patch-ah
--- a/mail/courier-imap/patches/patch-ah        Tue Jun 15 23:01:23 2010 +0000
+++ b/mail/courier-imap/patches/patch-ah        Tue Jun 15 23:07:06 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.7 2005/08/11 00:04:01 jlam Exp $
+$NetBSD: patch-ah,v 1.8 2010/06/15 23:07:07 pettai Exp $
 
 --- pop3d.rc.in.orig   2005-07-01 21:13:56.000000000 -0400
 +++ pop3d.rc.in
@@ -15,6 +15,6 @@
                bindir=@bindir@ ;
                libexecdir=@libexecdir@ ;
 +              sbindir=@sbindir@ ;
+               . @sysconfdir@/pop3d-ssl ; \
                . @sysconfdir@/pop3d ; \
-               . @sysconfdir@/pop3d-ssl ; \
                PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
diff -r 637d7dd6c15e -r 09a8d2cdd15b mail/courier-imap/patches/patch-an
--- a/mail/courier-imap/patches/patch-an        Tue Jun 15 23:01:23 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$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)
-               (void) add_hier(folders, folder);



Home | Main Index | Thread Index | Old Index