From 70bb4d97e8e675d84e6845705f95ad538c2b29e8 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 11 Aug 2005 00:04:01 +0000 Subject: Update mail/courier-imap to 4.0.4. Changes from version 4.0.1 include: * imap: Implemented account groups, administrator group. * imapd.c: New OUTBOX_MULTIPLE_SEND option. * imap: add LOGGEROPTS and SSLLOGGEROPTS configuration settings which are passed to courierlogger to set the application name for syslog. * tcpd/tcpd.c: Added --accesslocal option. * smap: SMAP EXPUNGE >100 msg ranges was broken. * PROXY_HOSTNAME: new setting in imap and pop3 config file overrides gethostname() when checking if a proxy connection is required. * msgbodystructure.c (msgbodystructure): Fix MSGBODYSTRUCTURE response for a corrupted content-type of "text". --- mail/courier-imap/Makefile | 6 +++--- mail/courier-imap/distinfo | 20 ++++++++++---------- mail/courier-imap/patches/patch-aa | 18 +++++++++--------- mail/courier-imap/patches/patch-ad | 6 +++--- mail/courier-imap/patches/patch-ae | 6 +++--- mail/courier-imap/patches/patch-af | 6 +++--- mail/courier-imap/patches/patch-ag | 6 +++--- mail/courier-imap/patches/patch-ah | 8 ++++---- 8 files changed, 38 insertions(+), 38 deletions(-) (limited to 'mail/courier-imap') diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 04f36d7a034..cd508e33008 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:12 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/08/11 00:04:01 jlam Exp $ -DISTNAME= courier-imap-4.0.2 +DISTNAME= courier-imap-4.0.4 PKGBASE= ${DISTNAME:C/-[^-]*$//} CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} @@ -10,7 +10,7 @@ MAINTAINER= jlam@NetBSD.org COMMENT= IMAP server for access to maildir-style mailboxes HOMEPAGE= http://www.courier-mta.org/imap/ -DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir +DEPENDS+= courier-maildir>=0.51.0:../../mail/courier-maildir USE_TOOLS+= env gmake perl USE_LANGUAGES= c c++ diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo index b70efb0452c..ff08a06ccc1 100644 --- a/mail/courier-imap/distinfo +++ b/mail/courier-imap/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.14 2005/03/23 04:07:03 jlam Exp $ +$NetBSD: distinfo,v 1.15 2005/08/11 00:04:01 jlam Exp $ -SHA1 (courier-imap-4.0.2.tar.bz2) = 18ff76aefd657f6628294239b697f9fae1a3e2d7 -RMD160 (courier-imap-4.0.2.tar.bz2) = d80b47fafb5a988d123b70219fb6eae1b2fe4c79 -Size (courier-imap-4.0.2.tar.bz2) = 3036089 bytes -SHA1 (patch-aa) = f44c4c1ef778bc958ded32d3d83aeb51743b58ea -SHA1 (patch-ad) = 66a98fee9601c2f3a99456c223fea970678c31a0 -SHA1 (patch-ae) = 06d4b52eeea9444c989827c57478f2c5895b171a -SHA1 (patch-af) = 2d68c7dc275d7d800a431897eaba0f95a99493ab -SHA1 (patch-ag) = c41667ad85f8c500711211728348504f662bda17 -SHA1 (patch-ah) = d87676775a8cc7e63f56b8d7c7a21a49faa0b6e3 +SHA1 (courier-imap-4.0.4.tar.bz2) = 101f9d7868842e3cbc700cf7ac32ae32f0ef512b +RMD160 (courier-imap-4.0.4.tar.bz2) = 438559fe800ca47fb2d1cf5c3c3605964bab4cb1 +Size (courier-imap-4.0.4.tar.bz2) = 3156707 bytes +SHA1 (patch-aa) = 78ab9871154ad1fa7b21b54faed64071e0c6a960 +SHA1 (patch-ad) = 0496410af5b01cad01ca4967bf98405c6d5b0863 +SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c +SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29 +SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57 +SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c diff --git a/mail/courier-imap/patches/patch-aa b/mail/courier-imap/patches/patch-aa index ea5282a5264..1275b387f49 100644 --- a/mail/courier-imap/patches/patch-aa +++ b/mail/courier-imap/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2005/02/18 22:12:46 jlam Exp $ +$NetBSD: patch-aa,v 1.11 2005/08/11 00:04:01 jlam Exp $ ---- Makefile.in.orig 2005-01-04 19:57:19.000000000 -0500 +--- Makefile.in.orig 2005-07-23 09:33:42.000000000 -0400 +++ Makefile.in -@@ -231,10 +231,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd +@@ -246,10 +246,11 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd -sbin_SCRIPTS = sharedindexinstall sharedindexsplit +sbin_SCRIPTS = @@ -20,15 +20,15 @@ $NetBSD: patch-aa,v 1.10 2005/02/18 22:12:46 jlam Exp $ +libexecPROGRAMS = imaplogin courierpop3login courierpop3d +man_MANS = couriertcpd.1 courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8 -@@ -250,5 +251,5 @@ sysconftool +@@ -264,5 +265,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 = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"` -@@ -996,7 +997,7 @@ sharedindexsplit: maildir/sharedindexspl + HTML2TXT = links -dump -no-numbering +@@ -1019,7 +1020,7 @@ sharedindexsplit: maildir/sharedindexspl -pop3login$(EXEEXT): imap/pop3login$(EXEEXT) - cp imap/pop3login$(EXEEXT) . @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.10 2005/02/18 22:12:46 jlam Exp $ +courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT) + cp imap/pop3d$(EXEEXT) ./$@ -@@ -1044,4 +1045,7 @@ maildirkw.1: maildir/maildirkw.1 +@@ -1067,4 +1068,7 @@ maildirkw.1: maildir/maildirkw.1 -imapd.8: imap/imapd.8 - cp imap/imapd.8 . @@ -50,12 +50,12 @@ $NetBSD: patch-aa,v 1.10 2005/02/18 22:12:46 jlam Exp $ +courierpop3d.8: imap/courierpop3d.8 + cp imap/courierpop3d.8 . -@@ -1074,3 +1078,3 @@ install-exec-local: +@@ -1097,3 +1101,3 @@ install-exec-local: $(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 ; \ -@@ -1080,17 +1084,4 @@ install-exec-local: +@@ -1103,17 +1107,4 @@ install-exec-local: install-exec-hook: - chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example - mkdir -p $(DESTDIR)$(sysconfdir)/shared diff --git a/mail/courier-imap/patches/patch-ad b/mail/courier-imap/patches/patch-ad index 666ffb39198..5d792cc46b0 100644 --- a/mail/courier-imap/patches/patch-ad +++ b/mail/courier-imap/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2005/03/23 04:07:03 jlam Exp $ +$NetBSD: patch-ad,v 1.6 2005/08/11 00:04:01 jlam Exp $ ---- configure.orig 2005-02-28 21:32:52.000000000 -0500 +--- configure.orig 2005-07-23 09:33:43.000000000 -0400 +++ configure -@@ -20383,9 +20383,6 @@ else +@@ -20405,9 +20405,6 @@ else ac_configure_args="$ac_configure_args --with-authchangepwdir=/var/tmp/dev/null" fi; diff --git a/mail/courier-imap/patches/patch-ae b/mail/courier-imap/patches/patch-ae index bd7fa520105..1bdb7131522 100644 --- a/mail/courier-imap/patches/patch-ae +++ b/mail/courier-imap/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.7 2005/03/23 04:07:03 jlam Exp $ +$NetBSD: patch-ae,v 1.8 2005/08/11 00:04:01 jlam Exp $ ---- imapd-ssl.rc.in.orig 2005-02-16 18:46:48.000000000 -0500 +--- imapd-ssl.rc.in.orig 2005-07-01 21:13:56.000000000 -0400 +++ imapd-ssl.rc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -17,4 +17,4 @@ $NetBSD: patch-ae,v 1.7 2005/03/23 04:07:03 jlam Exp $ + sbindir=@sbindir@ ; . @sysconfdir@/imapd ; \ . @sysconfdir@/imapd-ssl ; \ - IMAP_TLS=1; export IMAP_TLS; \ + PROXY_HOSTNAME=$PROXY_HOSTNAME ; \ diff --git a/mail/courier-imap/patches/patch-af b/mail/courier-imap/patches/patch-af index f8d0869a7e4..bc8923ddc57 100644 --- a/mail/courier-imap/patches/patch-af +++ b/mail/courier-imap/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.7 2005/03/23 04:07:03 jlam Exp $ +$NetBSD: patch-af,v 1.8 2005/08/11 00:04:01 jlam Exp $ ---- imapd.rc.in.orig 2005-02-16 18:46:48.000000000 -0500 +--- imapd.rc.in.orig 2005-07-01 21:13:56.000000000 -0400 +++ imapd.rc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -17,4 +17,4 @@ $NetBSD: patch-af,v 1.7 2005/03/23 04:07:03 jlam Exp $ + sbindir=@sbindir@ ; . @sysconfdir@/imapd ; \ . @sysconfdir@/imapd-ssl ; \ - IMAP_STARTTLS=$IMAPDSTARTTLS ; export IMAP_STARTTLS ; \ + IMAP_STARTTLS=$IMAPDSTARTTLS ; \ diff --git a/mail/courier-imap/patches/patch-ag b/mail/courier-imap/patches/patch-ag index 302e96d89e4..b6853df3051 100644 --- a/mail/courier-imap/patches/patch-ag +++ b/mail/courier-imap/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.7 2005/03/23 04:07:03 jlam Exp $ +$NetBSD: patch-ag,v 1.8 2005/08/11 00:04:01 jlam Exp $ ---- pop3d-ssl.rc.in.orig 2005-02-16 18:46:48.000000000 -0500 +--- pop3d-ssl.rc.in.orig 2005-07-01 21:13:56.000000000 -0400 +++ pop3d-ssl.rc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -17,4 +17,4 @@ $NetBSD: patch-ag,v 1.7 2005/03/23 04:07:03 jlam Exp $ + sbindir=@sbindir@ ; . @sysconfdir@/pop3d ; \ . @sysconfdir@/pop3d-ssl ; \ - POP3_TLS=1; export POP3_TLS; \ + PROXY_HOSTNAME=$PROXY_HOSTNAME ; \ diff --git a/mail/courier-imap/patches/patch-ah b/mail/courier-imap/patches/patch-ah index 2a34019b62d..5add83baa0c 100644 --- a/mail/courier-imap/patches/patch-ah +++ b/mail/courier-imap/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.6 2005/03/23 04:07:03 jlam Exp $ +$NetBSD: patch-ah,v 1.7 2005/08/11 00:04:01 jlam Exp $ ---- pop3d.rc.in.orig 2005-02-16 18:46:48.000000000 -0500 +--- pop3d.rc.in.orig 2005-07-01 21:13:56.000000000 -0400 +++ pop3d.rc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -16,5 +16,5 @@ $NetBSD: patch-ah,v 1.6 2005/03/23 04:07:03 jlam Exp $ libexecdir=@libexecdir@ ; + sbindir=@sbindir@ ; . @sysconfdir@/pop3d ; \ - . @sysconfdir@/pop3d-ssl ; \ - TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \ + . @sysconfdir@/pop3d-ssl ; \ + PROXY_HOSTNAME=$PROXY_HOSTNAME ; \ -- cgit v1.2.3