cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add cyrus-imapd 2.0.12, the cyrus mail server, supporting POP3 and

Browse Source 
IMAP4 protocols.

PR:		ports/25597
Submitted by:	Christopher K Davis <ckd@ckdhr.com>
This commit is contained in:
Hajimu UMEMOTO 2001-03-13 11:15:12 +00:00
parent 507c0e77f5
commit a3b3c78cee
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=39740
125 changed files with 1120 additions and 1185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
mail/cyrus-imapd/Makefile
View File

@ -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} \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
.endfor
${MKDIR} ${PREFIX}/share/doc/cyrus/text
.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/${file}.html \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST}
.endfor
@${ECHO} "@dirrm share/doc/cyrus/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/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}
.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} "@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}
${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 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} 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

3
mail/cyrus-imapd/distinfo
View File

@ -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

6
mail/cyrus-imapd/files/imapd.conf
View File

@ -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

20
mail/cyrus-imapd/files/imapd.sh Normal file
View File

@ -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

19
mail/cyrus-imapd/files/inetd.conf.cyrus
View File

@ -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

22
mail/cyrus-imapd/files/patch-ac
View File

@ -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"

11
mail/cyrus-imapd/files/patch-ad
View File

@ -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?

11
mail/cyrus-imapd/files/patch-ae
View File

@ -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",

13
mail/cyrus-imapd/files/patch-af Normal file
View File

@ -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))

13
mail/cyrus-imapd/files/patch-ag Normal file
View File

@ -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))

13
mail/cyrus-imapd/files/patch-bb
View File

@ -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@

32
mail/cyrus-imapd/files/patch-bc
View File

@ -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@

11
mail/cyrus-imapd/files/patch-bf
View File

@ -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))

12
mail/cyrus-imapd/files/patch-bg
View File

@ -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

11
mail/cyrus-imapd/files/patch-bh
View File

@ -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@

11
mail/cyrus-imapd/files/patch-bi
View File

@ -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@

11
mail/cyrus-imapd/files/patch-bj
View File

@ -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;

10
mail/cyrus-imapd/files/patch-ca
View File

@ -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

13
mail/cyrus-imapd/files/patch-dc Normal file
View File

@ -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@

14
mail/cyrus-imapd/files/patch-dd Normal file
View File

@ -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;

22
mail/cyrus-imapd/files/patch-df Normal file
View File

@ -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;
}
}

2
mail/cyrus-imapd/pkg-comment
View File

@ -1 +1 @@
The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
The cyrus mail server, supporting POP3 and IMAP4 protocols

1
mail/cyrus-imapd/pkg-deinstall
View File

@ -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)
;;

18
mail/cyrus-imapd/pkg-install
View File

@ -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

32
mail/cyrus-imapd/pkg-plist
View File

@ -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

130
mail/cyrus-imapd2/Makefile
View File

@ -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} \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
.endfor
${MKDIR} ${PREFIX}/share/doc/cyrus/text
.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/${file}.html \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST}
.endfor
@${ECHO} "@dirrm share/doc/cyrus/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/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}
.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} "@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}
${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 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} 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

3
mail/cyrus-imapd2/distinfo
View File

@ -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

6
mail/cyrus-imapd2/files/imapd.conf
View File

@ -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

20
mail/cyrus-imapd2/files/imapd.sh Normal file
View File

@ -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

19
mail/cyrus-imapd2/files/inetd.conf.cyrus
View File

@ -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

22
mail/cyrus-imapd2/files/patch-ac
View File

@ -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"

11
mail/cyrus-imapd2/files/patch-ad
View File

@ -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?

11
mail/cyrus-imapd2/files/patch-ae
View File

@ -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",

13
mail/cyrus-imapd2/files/patch-af Normal file
View File

@ -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))

13
mail/cyrus-imapd2/files/patch-ag Normal file
View File

@ -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))

13
mail/cyrus-imapd2/files/patch-bb
View File

@ -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@

32
mail/cyrus-imapd2/files/patch-bc
View File

@ -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@

11
mail/cyrus-imapd2/files/patch-bf
View File

@ -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))

12
mail/cyrus-imapd2/files/patch-bg
View File

@ -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

11
mail/cyrus-imapd2/files/patch-bh
View File

@ -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@

11
mail/cyrus-imapd2/files/patch-bi
View File

@ -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@

11
mail/cyrus-imapd2/files/patch-bj
View File

@ -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;

10
mail/cyrus-imapd2/files/patch-ca
View File

@ -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

13
mail/cyrus-imapd2/files/patch-dc Normal file
View File

@ -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@

14
mail/cyrus-imapd2/files/patch-dd Normal file
View File

@ -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;

22
mail/cyrus-imapd2/files/patch-df Normal file
View File

@ -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;
}
}

2
mail/cyrus-imapd2/pkg-comment
View File

@ -1 +1 @@
The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
The cyrus mail server, supporting POP3 and IMAP4 protocols

1
mail/cyrus-imapd2/pkg-deinstall
View File

@ -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)
;;

18
mail/cyrus-imapd2/pkg-install
View File

@ -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

32
mail/cyrus-imapd2/pkg-plist
View File

@ -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

130
mail/cyrus-imapd22/Makefile
View File

@ -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} \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
.endfor
${MKDIR} ${PREFIX}/share/doc/cyrus/text
.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/${file}.html \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST}
.endfor
@${ECHO} "@dirrm share/doc/cyrus/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/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}
.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} "@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}
${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 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} 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

3
mail/cyrus-imapd22/distinfo
View File

@ -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

6
mail/cyrus-imapd22/files/imapd.conf
View File

@ -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

20
mail/cyrus-imapd22/files/imapd.sh Normal file
View File

@ -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

19
mail/cyrus-imapd22/files/inetd.conf.cyrus
View File

@ -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

22
mail/cyrus-imapd22/files/patch-ac
View File

@ -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"

11
mail/cyrus-imapd22/files/patch-ad
View File

@ -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?

11
mail/cyrus-imapd22/files/patch-ae
View File

@ -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",

13
mail/cyrus-imapd22/files/patch-af Normal file
View File

@ -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))

13
mail/cyrus-imapd22/files/patch-ag Normal file
View File

@ -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))

13
mail/cyrus-imapd22/files/patch-bb
View File

@ -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@

32
mail/cyrus-imapd22/files/patch-bc
View File

@ -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@

11
mail/cyrus-imapd22/files/patch-bf
View File

@ -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))

12
mail/cyrus-imapd22/files/patch-bg
View File

@ -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

11
mail/cyrus-imapd22/files/patch-bh
View File

@ -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@

11
mail/cyrus-imapd22/files/patch-bi
View File

@ -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@

11
mail/cyrus-imapd22/files/patch-bj
View File

@ -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;

10
mail/cyrus-imapd22/files/patch-ca
View File

@ -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

13
mail/cyrus-imapd22/files/patch-dc Normal file
View File

@ -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@

14
mail/cyrus-imapd22/files/patch-dd Normal file
View File

@ -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;

22
mail/cyrus-imapd22/files/patch-df Normal file
View File

@ -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;
}
}

2
mail/cyrus-imapd22/pkg-comment
View File

@ -1 +1 @@
The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
The cyrus mail server, supporting POP3 and IMAP4 protocols

1
mail/cyrus-imapd22/pkg-deinstall
View File

@ -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)
;;

18
mail/cyrus-imapd22/pkg-install
View File

@ -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

32
mail/cyrus-imapd22/pkg-plist
View File

@ -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

130
mail/cyrus-imapd23/Makefile
View File

@ -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} \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
.endfor
${MKDIR} ${PREFIX}/share/doc/cyrus/text
.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/${file}.html \
${PREFIX}/share/doc/cyrus
@${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST}
.endfor
@${ECHO} "@dirrm share/doc/cyrus/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/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}
.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} "@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}
${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 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} 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

3
mail/cyrus-imapd23/distinfo
View File

@ -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

6
mail/cyrus-imapd23/files/imapd.conf
View File

@ -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

20
mail/cyrus-imapd23/files/imapd.sh Normal file
View File

@ -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

19
mail/cyrus-imapd23/files/inetd.conf.cyrus
View File

@ -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

22
mail/cyrus-imapd23/files/patch-ac
View File

@ -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"

11
mail/cyrus-imapd23/files/patch-ad
View File

@ -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?

11
mail/cyrus-imapd23/files/patch-ae
View File

@ -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",

13
mail/cyrus-imapd23/files/patch-af Normal file
View File

@ -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))

13
mail/cyrus-imapd23/files/patch-ag Normal file
View File

@ -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))

13
mail/cyrus-imapd23/files/patch-bb
View File

@ -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@

32
mail/cyrus-imapd23/files/patch-bc
View File

@ -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@

11
mail/cyrus-imapd23/files/patch-bf
View File

@ -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))

12
mail/cyrus-imapd23/files/patch-bg
View File

@ -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

11
mail/cyrus-imapd23/files/patch-bh
View File

@ -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@

11
mail/cyrus-imapd23/files/patch-bi
View File

@ -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@

11
mail/cyrus-imapd23/files/patch-bj
View File

@ -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;

10
mail/cyrus-imapd23/files/patch-ca
View File

@ -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

13
mail/cyrus-imapd23/files/patch-dc Normal file
View File

@ -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@

14
mail/cyrus-imapd23/files/patch-dd Normal file
View File

@ -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;

22
mail/cyrus-imapd23/files/patch-df Normal file
View File

@ -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;
}
}

2
mail/cyrus-imapd23/pkg-comment
View File

@ -1 +1 @@
The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
The cyrus mail server, supporting POP3 and IMAP4 protocols

1
mail/cyrus-imapd23/pkg-deinstall
View File

@ -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)
;;

18
mail/cyrus-imapd23/pkg-install
View File

@ -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

32
mail/cyrus-imapd23/pkg-plist
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More