diff options
Diffstat (limited to 'mail/cyrus-imapd23')
25 files changed, 222 insertions, 235 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index a3609b3fae95..8c030d25c868 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -1,96 +1,108 @@ -# New ports collection makefile for: cyrus -# Date created: May 4th 1997 -# Whom: jfitz@FreeBSD.org +# New ports collection makefile for: cyrus-imapd +# Date created: Jan 4th 2001 +# Whom: ume@FreeBSD.org # # $FreeBSD$ # -PORTNAME= cyrus -PORTVERSION= 1.6.24 -PORTREVISION= 1 -CATEGORIES= mail tcl82 +PORTNAME= cyrus-imapd +PORTVERSION= 2.0.12 +CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ -DISTNAME= ${PORTNAME}-imapd-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/ +PATCHFILES= ${DISTNAME}-ipv6-20010222.diff.gz -LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 +MAINTAINER= ume@FreeBSD.org + +LIB_DEPENDS= sasl.8:${PORTSDIR}/security/cyrus-sasl \ + db3.2:${PORTSDIR}/databases/db3 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-group=cyrus \ - --with-sasldir=${LOCALBASE} \ - --with-tclsh=${LOCALBASE}/bin/tclsh8.2 \ + --with-sasl=${LOCALBASE} \ + --with-dbdir=${LOCALBASE} \ --with-auth=unix \ - --with-com-err + --with-com_err + +.if defined(WITH_SNMP) +# It seems not compilable due to lack of auto_nlist_value() in libucdagent. +CONFIGURE_ENV= LIBS=-lkvm +.else +CONFIGURE_ARGS+=--with-ucdsnmp=no +.endif MAN1= cyradm.1 imtest.1 installsieve.1 MAN3= imclient.3 -MAN5= imapd.conf.5 krb.equiv.5 -MAN8= arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \ - imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \ - timsieved.8 +MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 +MAN8= arbitron.8 ctl_deliver.8 ctl_mboxlist.8 collectnews.8 \ + cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \ + lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \ + syncnews.8 timsieved.8 -post-configure: - @ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c +DOCS= HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \ + changes copyrights feedback index install install-admin-mb \ + install-compile install-configure install-murder install-perf \ + install-prereq install-sieve install-snmpmon install-testing \ + install-upgrade mailing-list notes os overview questions \ + quota-extension readme server-design sieve sieve-protocol +HTDOCS= anoncvs bugs changes faq feedback index install-admin-mb \ + install-auth install-compile install-configure install-murder \ + install-perf install-prereq install-sieve install-snmpmon \ + install-testing install-upgrade install mailing-list notes \ + os overview questions readme sieve-protocol sieve pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 @${PKGINSTALL} ${PKGNAME} PRE-INSTALL -DOCS= README acl-extension anoncvs bugs changes copyrights install \ - mailing-list overview quota-extension server-design -HTDOCS= anoncvs bugs changes index install mailing-list overview \ - questions readme sieve-protocol sieve post-install: @ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/cyrus/html -.for file in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} \ + ${MKDIR} ${PREFIX}/share/doc/cyrus/text +.for file in ${HTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file} >>${TMPPLIST} + @${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST} .endfor -.for file in ${HTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \ - ${PREFIX}/share/doc/cyrus/html - @${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST} + ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ + ${PREFIX}/share/doc/cyrus + @${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} +.for file in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ + ${PREFIX}/share/doc/cyrus/text + @${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST} + @${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif + ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ + ${PREFIX}/etc/rc.d/imapd.sh.sample ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist - ${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \ - ${PREFIX}/etc/ - ${INSTALL} -d -m 750 -o cyrus -g cyrus \ - /var/spool/imap \ - ${PREFIX}/etc/imap \ - ${PREFIX}/etc/imap/user \ - ${PREFIX}/etc/imap/quota \ - ${PREFIX}/etc/imap/proc \ - ${PREFIX}/etc/imap/log \ - ${PREFIX}/etc/imap/msg - ${TOUCH} ${PREFIX}/etc/imap/mailboxes - ${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes - ${CHOWN} cyrus:cyrus ${PREFIX}/etc/imap/mailboxes - @${ECHO} "@exec ${MKDIR} %D/etc/imap" >>${TMPPLIST} -.for dir in user quota proc log msg - @${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST} - @${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST} + ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ + ${PREFIX}/etc/cyrus.conf.dist + ${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf + ${CHOWN} -R cyrus:cyrus /var/imap + ${CHOWN} -R cyrus:cyrus /var/spool/imap + @${ECHO} "@cwd /var" >>${TMPPLIST} + @${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST} +.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db + @${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST} + @${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST} .endfor - @${ECHO} "@dirrm etc/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST} - @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST} + @${ECHO} "@dirrm imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST} @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST} - @${ECHO} "@exec ${MKDIR} /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CHOWN} cyrus:cyrus /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CHMOD} g-w,o= /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@cwd /var" >>${TMPPLIST} + @${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST} + @${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST} @${ECHO} "@dirrm spool/imap" >>${TMPPLIST} @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo index 6ad67e22eaa6..1a94dab95222 100644 --- a/mail/cyrus-imapd23/distinfo +++ b/mail/cyrus-imapd23/distinfo @@ -1 +1,2 @@ -MD5 (cyrus-imapd-1.6.24.tar.gz) = 490a246e787581e0bbc558788ff5f562 +MD5 (cyrus-imapd-2.0.12.tar.gz) = 61c2e2b200d487852f1856e8787f546f +MD5 (cyrus-imapd-2.0.12-ipv6-20010222.diff.gz) = 11ac759bbb18d7bdfbc1c016ed6985df diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf index 8c657589f69f..eaae8d05ad8a 100644 --- a/mail/cyrus-imapd23/files/imapd.conf +++ b/mail/cyrus-imapd23/files/imapd.conf @@ -7,7 +7,7 @@ # The pathname of the IMAP configuration directory # -configdirectory: /usr/local/etc/imap +configdirectory: /var/imap # The partition name used by default for new mailboxes # @@ -115,9 +115,9 @@ sieveusehomedir: false # If sieveusehomedir is false, this directory is searched for Sieve scripts. # The active Sieve script is s called "default", placed in the users sieve -# sieve directory (ie. /usr/local/etc/imap/sieve/u/user). +# sieve directory (ie. /var/imap/sieve/u/user). # -sievedir: /usr/local/etc/imap/sieve +sievedir: /var/imap/sieve # If enabled, the partitions will also be hashed, in addition to the hashing # done on configuration directories. This is recommended if one partition has diff --git a/mail/cyrus-imapd23/files/imapd.sh b/mail/cyrus-imapd23/files/imapd.sh new file mode 100644 index 000000000000..e190969bf571 --- /dev/null +++ b/mail/cyrus-imapd23/files/imapd.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +case "$1" in +start) + if [ -x /usr/local/cyrus/bin/master -a \ + -f /usr/local/etc/cyrus.conf -a \ + -f /usr/local/etc/imapd.conf ]; then + /usr/local/cyrus/bin/master & + echo -n ' imapd' + fi + ;; +stop) + killall -u cyrus master && echo -n ' imapd' + ;; +*) + echo "Usage: `basename $0` {start|stop}" >&2 + ;; +esac + +exit 0 diff --git a/mail/cyrus-imapd23/files/inetd.conf.cyrus b/mail/cyrus-imapd23/files/inetd.conf.cyrus deleted file mode 100644 index a38c90ac5ee9..000000000000 --- a/mail/cyrus-imapd23/files/inetd.conf.cyrus +++ /dev/null @@ -1,19 +0,0 @@ -# -# Example entry for inetd.conf for the Cyrus IMAP server. -# $FreeBSD$ -# -# Replace /usr/local with the path where you've installed the package. -# -# The IMAP-4 server. -imap4 stream tcp nowait cyrus /usr/local/cyrus/bin/imapd imapd -# -# To be able to access the IMAP mailbox by POP-3, use this line. -pop3 stream tcp nowait cyrus /usr/local/cyrus/bin/pop3d pop3d -# -# Program to upload user sieve scripts to the IMAP server. -# -# NOTE: you will need to add "sieve" to /etc/services. -# timsieved uses port 2000. -# -sieve stream tcp nowait cyrus /usr/local/cyrus/bin/timsieved sieve - diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac index ab7854846479..c9a2a9eb6353 100644 --- a/mail/cyrus-imapd23/files/patch-ac +++ b/mail/cyrus-imapd23/files/patch-ac @@ -1,11 +1,13 @@ ---- configure Thu Jan 6 22:28:51 2000 -+++ /tmp/configure.new Sat Apr 8 20:55:29 2000 -@@ -4951,7 +4951,7 @@ - # try the user-specified path --- too lazy to test for it right now - LIB_SASL="-L$sasldir/lib -lsasl" - -- SASLFLAGS="-I$sasldir/include" -+ SASLFLAGS="-I$sasldir/include/sasl" - - fi +Index: configure +diff -u configure.orig configure +--- configure.orig Thu Dec 21 06:39:31 2000 ++++ configure Thu Jan 4 23:22:47 2001 +@@ -4178,7 +4178,7 @@ + cmu_saved_LIBS=$LIBS + if test -d ${with_sasl}; then + ac_cv_sasl_where_lib=${with_sasl}/lib +- ac_cv_sasl_where_inc=${with_sasl}/include ++ ac_cv_sasl_where_inc=${with_sasl}/include/sasl + SASLFLAGS="-I$ac_cv_sasl_where_inc" + LIB_SASL="-L$ac_cv_sasl_where_lib" diff --git a/mail/cyrus-imapd23/files/patch-ad b/mail/cyrus-imapd23/files/patch-ad deleted file mode 100644 index bcd310e991d3..000000000000 --- a/mail/cyrus-imapd23/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig Sun Apr 9 01:13:23 2000 -+++ configure.in Sun Apr 9 01:13:43 2000 -@@ -528,7 +528,7 @@ - # filename, it should be safe to add it (to the front of the line -- - # somef vendors have older, badly installed tclshs that we want to avoid - # if we can) -- AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown") -+ AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown") - fi - - # Do we know where to get a tclsh? diff --git a/mail/cyrus-imapd23/files/patch-ae b/mail/cyrus-imapd23/files/patch-ae deleted file mode 100644 index dde3c7177004..000000000000 --- a/mail/cyrus-imapd23/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- imap/deliver.c.orig Tue Jan 4 17:49:02 2000 -+++ imap/deliver.c Tue Oct 31 22:49:37 2000 -@@ -821,7 +821,7 @@ - } - } - --#define SENDMAIL "/usr/lib/sendmail" -+#define SENDMAIL "/usr/sbin/sendmail" - #define POSTMASTER "postmaster" - - static char *month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", diff --git a/mail/cyrus-imapd23/files/patch-af b/mail/cyrus-imapd23/files/patch-af new file mode 100644 index 000000000000..0a8d78f88d0c --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-af @@ -0,0 +1,13 @@ +Index: imap/lmtpd.c +diff -u imap/lmtpd.c.orig imap/lmtpd.c +--- imap/lmtpd.c.orig Wed Dec 20 04:31:41 2000 ++++ imap/lmtpd.c Thu Jan 4 23:26:22 2001 +@@ -407,7 +407,7 @@ + } + } + +-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail") ++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail") + #define DEFAULT_POSTMASTER ("postmaster") + + #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL)) diff --git a/mail/cyrus-imapd23/files/patch-ag b/mail/cyrus-imapd23/files/patch-ag new file mode 100644 index 000000000000..d22ee0d59350 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-ag @@ -0,0 +1,13 @@ +Index: imap/lmtpproxyd.c +diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c +--- imap/lmtpproxyd.c.orig Wed Dec 20 04:31:41 2000 ++++ imap/lmtpproxyd.c Thu Jan 4 23:26:48 2001 +@@ -398,7 +398,7 @@ + } + } + +-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail") ++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail") + #define DEFAULT_POSTMASTER ("postmaster") + + #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL)) diff --git a/mail/cyrus-imapd23/files/patch-bb b/mail/cyrus-imapd23/files/patch-bb deleted file mode 100644 index 11f8698c92eb..000000000000 --- a/mail/cyrus-imapd23/files/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ ---- cyradm/Makefile.in.orig Fri Aug 7 08:48:26 1998 -+++ cyradm/Makefile.in Mon May 10 02:40:06 1999 -@@ -33,8 +33,8 @@ - RANLIB = @RANLIB@ - - DEFS = @DEFS@ @TCL_DEFS@ --CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ --LIBS = @TCL_LIBS@ @IMAP_LIBS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@ -+LIBS = @TCL_LIBS@ -lm @IMAP_LIBS@ - DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ - - CFLAGS = @CFLAGS@ diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc index 5310441ee96c..f31ed31d722f 100644 --- a/mail/cyrus-imapd23/files/patch-bc +++ b/mail/cyrus-imapd23/files/patch-bc @@ -1,19 +1,13 @@ -*** imap/Makefile.in.orig Fri Nov 5 01:00:34 1999 ---- imap/Makefile.in Thu Mar 9 18:59:14 2000 -*************** -*** 45,51 **** - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - -! DEFS = @DEFS@ @LOCALDEFS@ - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ - IMAP_LIBS = @IMAP_LIBS@ - SIEVE_LIBS = @SIEVE_LIBS@ ---- 45,51 ---- - CYRUS_USER=@cyrus_user@ - CYRUS_GROUP=@cyrus_group@ - -! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" - CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ - IMAP_LIBS = @IMAP_LIBS@ - SIEVE_LIBS = @SIEVE_LIBS@ +Index: imap/Makefile.in +diff -u imap/Makefile.in.orig imap/Makefile.in +--- imap/Makefile.in.orig Tue Dec 19 05:27:14 2000 ++++ imap/Makefile.in Thu Jan 4 23:30:15 2001 +@@ -64,7 +64,7 @@ + CYRUS_USER=@cyrus_user@ + CYRUS_GROUP=@cyrus_group@ + +-DEFS = @DEFS@ @LOCALDEFS@ ++DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" + CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@ + IMAP_LIBS = @IMAP_LIBS@ + SIEVE_LIBS = @SIEVE_LIBS@ diff --git a/mail/cyrus-imapd23/files/patch-bf b/mail/cyrus-imapd23/files/patch-bf deleted file mode 100644 index 0252ec589130..000000000000 --- a/mail/cyrus-imapd23/files/patch-bf +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig Fri Dec 4 11:34:53 1998 -+++ configure.in Sun Apr 9 12:16:24 2000 -@@ -698,6 +698,8 @@ - - dnl Kerberos wants this so we might as well check on it first - AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search)) -+ dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it -+ AC_CHECK_LIB(com_err, init_error_table) - - dnl gotta do this: crypt is used by sasl_krb_server.c - AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt)) diff --git a/mail/cyrus-imapd23/files/patch-bg b/mail/cyrus-imapd23/files/patch-bg deleted file mode 100644 index 964814930475..000000000000 --- a/mail/cyrus-imapd23/files/patch-bg +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig Fri Dec 4 12:03:58 1998 -+++ configure Sat Apr 15 11:44:42 2000 -@@ -3348,6 +3348,9 @@ - - fi - -+# Kerberos IV on FreeBSD depends on libcom_err. -+LIBS="-lcom_err $LIBS" -+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h - - echo $ac_n "checking for crypt""... $ac_c" 1>&6 - echo "configure:3354: checking for crypt" >&5 diff --git a/mail/cyrus-imapd23/files/patch-bh b/mail/cyrus-imapd23/files/patch-bh deleted file mode 100644 index d9fcb4716f4d..000000000000 --- a/mail/cyrus-imapd23/files/patch-bh +++ /dev/null @@ -1,11 +0,0 @@ ---- timsieved/Makefile.in.orig Sun Apr 9 01:52:10 2000 -+++ timsieved/Makefile.in Sun Apr 9 01:52:37 2000 -@@ -34,7 +34,7 @@ - CYRUS_GROUP=@cyrus_group@ - - DEFS = @DEFS@ @LOCALDEFS@ --CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - diff --git a/mail/cyrus-imapd23/files/patch-bi b/mail/cyrus-imapd23/files/patch-bi deleted file mode 100644 index 38f5bb4ad0e7..000000000000 --- a/mail/cyrus-imapd23/files/patch-bi +++ /dev/null @@ -1,11 +0,0 @@ ---- installsieve/Makefile.in.orig Sun Apr 9 01:58:03 2000 -+++ installsieve/Makefile.in Sun Apr 9 01:58:35 2000 -@@ -28,7 +28,7 @@ - CC = @CC@ - - DEFS = @DEFS@ --CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ -+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - diff --git a/mail/cyrus-imapd23/files/patch-bj b/mail/cyrus-imapd23/files/patch-bj deleted file mode 100644 index adc8e7e3274d..000000000000 --- a/mail/cyrus-imapd23/files/patch-bj +++ /dev/null @@ -1,11 +0,0 @@ ---- timsieved/config.c Sun Apr 9 07:58:37 2000 -+++ config.c Sun Apr 9 07:58:47 2000 -@@ -41,7 +41,7 @@ - - extern int errno; - --#define CONFIG_FILENAME "/etc/imapd.conf" -+#define CONFIG_FILENAME "/usr/local/etc/imapd.conf" - - struct configlist { - char *key; diff --git a/mail/cyrus-imapd23/files/patch-ca b/mail/cyrus-imapd23/files/patch-ca deleted file mode 100644 index 87ec8c6c0aaa..000000000000 --- a/mail/cyrus-imapd23/files/patch-ca +++ /dev/null @@ -1,10 +0,0 @@ ---- sieve/comparator.h.orig Sun Nov 12 18:00:13 2000 -+++ sieve/comparator.h Sun Nov 12 18:00:19 2000 -@@ -31,6 +31,7 @@ - #ifdef HAVE_RX - #include <rxposix.h> - #else -+#include <sys/types.h> - #include <regex.h> - #endif - #endif diff --git a/mail/cyrus-imapd23/files/patch-dc b/mail/cyrus-imapd23/files/patch-dc new file mode 100644 index 000000000000..c913dc4f35ee --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-dc @@ -0,0 +1,13 @@ +Index: master/Makefile.in +diff -u master/Makefile.in.orig master/Makefile.in +--- master/Makefile.in.orig Fri Dec 15 04:26:50 2000 ++++ master/Makefile.in Sat Jan 6 06:08:21 2001 +@@ -52,7 +52,7 @@ + CYRUS_USER=@cyrus_user@ + CYRUS_GROUP=@cyrus_group@ + +-DEFS = @DEFS@ @LOCALDEFS@ ++DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\" + CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@ + DEPLIBS = @DEPLIBS@ + diff --git a/mail/cyrus-imapd23/files/patch-dd b/mail/cyrus-imapd23/files/patch-dd new file mode 100644 index 000000000000..94c0d694fa90 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-dd @@ -0,0 +1,14 @@ +Index: master/masterconf.c +diff -u master/masterconf.c.orig master/masterconf.c +--- master/masterconf.c.orig Wed May 24 05:56:30 2000 ++++ master/masterconf.c Sat Jan 6 06:07:22 2001 +@@ -60,7 +60,9 @@ + + extern int errno; + ++#if !defined(CONFIG_FILENAME) + #define CONFIG_FILENAME "/etc/cyrus.conf" ++#endif + + struct configlist { + char *key; diff --git a/mail/cyrus-imapd23/files/patch-df b/mail/cyrus-imapd23/files/patch-df new file mode 100644 index 000000000000..93540e209402 --- /dev/null +++ b/mail/cyrus-imapd23/files/patch-df @@ -0,0 +1,22 @@ +Index: master/service.c +=================================================================== +RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v +retrieving revision 1.2 +diff -u -r1.2 service.c +--- master/service.c 2001/02/01 14:11:43 1.2 ++++ master/service.c 2001/02/01 22:10:35 +@@ -99,7 +99,13 @@ + + /* is this a connection from the local host? */ + if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { +- if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { ++ switch (((struct sockaddr *)&sin)->sa_family) { ++ case AF_INET: ++#ifdef INET6 ++ case AF_INET6: ++#endif ++ break; ++ default: + return 1; + } + } diff --git a/mail/cyrus-imapd23/pkg-comment b/mail/cyrus-imapd23/pkg-comment index b26e555b2c72..b829c82f694d 100644 --- a/mail/cyrus-imapd23/pkg-comment +++ b/mail/cyrus-imapd23/pkg-comment @@ -1 +1 @@ -The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols +The cyrus mail server, supporting POP3 and IMAP4 protocols diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall index ed567ca504b0..7660fcc588a6 100644 --- a/mail/cyrus-imapd23/pkg-deinstall +++ b/mail/cyrus-imapd23/pkg-deinstall @@ -40,6 +40,7 @@ case $2 in cd ${PKG_PREFIX} cyrus_conf checkfile ${PKG_PREIFX}/etc/imapd.conf + checkfile ${PKG_PREIFX}/etc/cyrus.conf ;; POST-DEINSTALL) ;; diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install index 8f935faef8de..e79eba73b245 100644 --- a/mail/cyrus-imapd23/pkg-install +++ b/mail/cyrus-imapd23/pkg-install @@ -97,23 +97,7 @@ case $2 in cd ${PKG_PREFIX} cyrus_conf checkfile ${PKG_PREFIX}/etc/imapd.conf - if grep '^imap4' /etc/inetd.conf; then - echo "** Please check that your /etc/inetd.conf entry for \`imap4'" - echo " is suitable for the Cyrus IMAP server." - else - echo "** Please add an entry for the imap4 protocol to /etc/inetd.conf." - fi - echo - if grep '^sieve' /etc/inetd.conf; then - echo "** Please check that your /etc/inetd.conf entry for \`sieve'" - echo " is suitable for the Cyrus timsieved daemon" - else - echo "** Please add an entry for timseived to /etc/inetd.conf." - echo " If you wish to have user's upload their sieve filter" - echo " scripts to the server." - fi - echo - echo " An example can be found in ${PKG_PREFIX}/etc/inetd.conf.cyrus." + checkfile ${PKG_PREFIX}/etc/cyrus.conf if grep 'sieve' /etc/services; then echo else diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist index 5c8f74047cb5..36cb89cba204 100644 --- a/mail/cyrus-imapd23/pkg-plist +++ b/mail/cyrus-imapd23/pkg-plist @@ -1,41 +1,59 @@ -bin/cyradm bin/imtest -bin/installsieve -cyrus/bin/arbitron -cyrus/bin/collectnews +bin/cyradm +cyrus/bin/ctl_deliver +cyrus/bin/ctl_mboxlist cyrus/bin/cyrquota cyrus/bin/deliver -cyrus/bin/dump_deliverdb cyrus/bin/feedcyrus cyrus/bin/fud cyrus/bin/imapd +cyrus/bin/ipurge +cyrus/bin/lmtpd +cyrus/bin/master cyrus/bin/mbpath cyrus/bin/pop3d cyrus/bin/reconstruct -cyrus/bin/syncnews cyrus/bin/timsieved +etc/cyrus.conf.dist +etc/cyrus.conf etc/imapd.conf.dist -etc/inetd.conf.cyrus +etc/imapd.conf +etc/rc.d/imapd.sh.sample +include/cyrus/acap.h include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h include/cyrus/bsearch.h include/cyrus/charset.h +include/cyrus/cyrusdb.h include/cyrus/glob.h include/cyrus/gmtoff.h +include/cyrus/hash.h +include/cyrus/imapurl.h include/cyrus/imclient.h include/cyrus/imparse.h include/cyrus/lock.h +include/cyrus/lsort.h include/cyrus/map.h include/cyrus/mkgmtime.h include/cyrus/nonblock.h include/cyrus/parseaddr.h include/cyrus/prot.h include/cyrus/retry.h +include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h lib/libcyrus.a +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm +lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm @dirrm cyrus/bin @dirrm cyrus @dirrm include/cyrus +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE +@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus |