initial import of cyrus imapd 2.2.3

IMAP (Internet Message Access Protocol) is an Internet standards-track
protocol for accessing messages (mail, bboards, news, etc). The Cyrus
IMAP server differs from other IMAP server implementations in that it
is generally intended to be run on "sealed" servers, where normal users
are not permitted to log in. The mailbox database is stored in parts of
the filesystem that are private to the Cyrus IMAP system. All user
access to mail is through the IMAP, POP3, or KPOP protocols.

17 files changed, 625 insertions, 0 deletions

diff --git a/mail/cyrus-imapd22/DEINSTALL b/mail/cyrus-imapd22/DEINSTALL
new file mode 100644
index 00000000000..4a6e8c32874
--- /dev/null
+++ b/mail/cyrus-imapd22/DEINSTALL
@@ -0,0 +1,21 @@
+# $NetBSD: DEINSTALL,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+IMAPDCONF=@IMAPDCONF@
+
+case ${STAGE} in
+DEINSTALL)
+	if [ -f ${IMAPDCONF} ]; then
+		imap_dirs=`						\
+			${AWK} '/configdirectory:/      { print $2 };	\
+				/partition-.*:/         { print $2 };	\
+				/sievedir:/             { print $2 }'	\
+				${IMAPDCONF}				\
+		`
+		for dir in ${imap_dirs}; do
+			if [ -d ${dir} ]; then
+				ALL_DIRS="${ALL_DIRS} ${dir}"
+			fi
+		done
+	fi
+	;;
+esac
diff --git a/mail/cyrus-imapd22/DESCR b/mail/cyrus-imapd22/DESCR
new file mode 100644
index 00000000000..e742d558a95
--- /dev/null
+++ b/mail/cyrus-imapd22/DESCR
@@ -0,0 +1,7 @@
+IMAP (Internet Message Access Protocol) is an Internet standards-track
+protocol for accessing messages (mail, bboards, news, etc). The Cyrus
+IMAP server differs from other IMAP server implementations in that it
+is generally intended to be run on "sealed" servers, where normal users
+are not permitted to log in. The mailbox database is stored in parts of
+the filesystem that are private to the Cyrus IMAP system. All user
+access to mail is through the IMAP, POP3, or KPOP protocols.
diff --git a/mail/cyrus-imapd22/INSTALL b/mail/cyrus-imapd22/INSTALL
new file mode 100644
index 00000000000..76ca76a379c
--- /dev/null
+++ b/mail/cyrus-imapd22/INSTALL
@@ -0,0 +1,24 @@
+# $NetBSD: INSTALL,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${CAT} << EOF
+===========================================================================
+Please also refer to:
+
+	${PKG_PREFIX}/share/doc/html/cyrus-imapd/install.html
+
+for more detailed instructions on setting up the environment before
+starting the Cyrus IMAP server.  In particular, several services will
+probably need to be added to /etc/services.
+
+Note anyone upgrading from an earlier version of cyrus should read:
+
+	${PKG_PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html
+
+Also note that cyrus-imapd now uses saslauthd rather then pwcheck by
+default.
+===========================================================================
+EOF
+	;;
+esac
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
new file mode 100644
index 00000000000..14f3d0ea94b
--- /dev/null
+++ b/mail/cyrus-imapd22/Makefile
@@ -0,0 +1,126 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/01/18 12:42:10 recht Exp $
+#
+
+DISTNAME=	cyrus-imapd-2.2.3
+CATEGORIES=	mail
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
+
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://asg.web.cmu.edu/cyrus/imapd/
+COMMENT=	Cyrus IMAP server
+
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+PERL5_CONFIGURE=	no
+
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+
+.include "../../mk/bsd.prefs.mk"
+
+# CYRUS_USER		username of the Cyrus administrator
+# CYRUS_GROUP		group of the Cyrus administrator
+#
+CYRUS_USER?=		cyrus
+CYRUS_GROUP?=		mail
+
+BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
+FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
+FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP}
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
+CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
+CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
+CONFIGURE_ARGS+=	--with-statedir=/var/run
+CONFIGURE_ARGS+=	--with-bdb-libdir=${BUILDLINK_PREFIX.db4}/lib
+CONFIGURE_ARGS+=	--with-bdb-incdir=${BUILDLINK_PREFIX.db4}/include/db4
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--enable-listext
+CONFIGURE_ARGS+=	--enable-murder
+CONFIGURE_ARGS+=	--enable-nntp
+CONFIGURE_ARGS+=	--without-zephyr
+CONFIGURE_ARGS+=	--without-ucdsnmp
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
+CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
+
+.if exists(/usr/include/krb5/com_err.h)
+CPPFLAGS+=		-I/usr/include/krb5
+CONFIGURE_ARGS+=	--with-com_err=
+.else
+CONFIGURE_ARGS+=	--with-com_err=yes
+.endif
+
+.if defined(KERBEROS) && ${KERBEROS} == 4
+PKG_USE_KERBEROS=	# defined
+CONFIGURE_ARGS+=	--with-auth=krb
+.else
+CONFIGURE_ARGS+=	--with-auth=unix
+CONFIGURE_ARGS+=	--without-krb
+.endif
+
+MAKEFLAGS+=		PERL=${PERL5}
+
+HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
+EGDIR=			${PREFIX}/share/examples/cyrus-imapd
+CONF_FILES=		${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
+CONF_FILES+=		${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
+RCD_SCRIPTS=		cyrus
+FILES_SUBST+=		IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
+
+PERL5_PACKLIST= \
+	${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist			\
+	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/managesieve/.packlist
+
+# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
+# manpage conflicts with other packages.  Also change references to
+# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
+#
+post-patch:
+	cd ${WRKSRC}/man;						\
+	for file in deliver.8 imapd.8 master.8 pop3d.8; do		\
+		${MV} $${file} cyrus-$${file};				\
+		${SED}	-e "s|\(\$$(srcdir)/\)\($${file}\)|\1cyrus-\2|g" \
+			Makefile.in > Makefile.in.fixed;		\
+		${MV} -f Makefile.in.fixed Makefile.in;			\
+	done
+	files=`${FIND} ${WRKSRC} -type f -exec ${GREP} -l \
+		-e /etc/imapd\.conf -e /etc/cyrus\.conf {} \;`; \
+	for file in $${files}; do					\
+		${SED}	-e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
+			-e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g"	\
+			-e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
+			-e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
+	cd ${WRKSRC}/master/conf; for file in *.conf; do		\
+		${INSTALL_DATA} $$file ${EGDIR};			\
+	done
+	${INSTALL_DATA_DIR} ${HTMLDIR}
+	cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do		\
+		${INSTALL_DATA} $$file ${HTMLDIR};			\
+	done
+
+.include "../../databases/db4/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+
+.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd22/PLIST b/mail/cyrus-imapd22/PLIST
new file mode 100644
index 00000000000..36452e32ae2
--- /dev/null
+++ b/mail/cyrus-imapd22/PLIST
@@ -0,0 +1,165 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+bin/imtest
+bin/installsieve
+bin/lmtptest
+bin/mupdatetest
+bin/nntptest
+bin/pop3test
+bin/sieveshell
+bin/sivtest
+bin/smtptest
+cyrus/bin/arbitron
+cyrus/bin/chk_cyrus
+cyrus/bin/ctl_cyrusdb
+cyrus/bin/ctl_deliver
+cyrus/bin/ctl_mboxlist
+cyrus/bin/cvt_cyrusdb
+cyrus/bin/cyr_expire
+cyrus/bin/cyrdump
+cyrus/bin/deliver
+cyrus/bin/fetchnews
+cyrus/bin/fud
+cyrus/bin/imapd
+cyrus/bin/ipurge
+cyrus/bin/lmtpd
+cyrus/bin/lmtpproxyd
+cyrus/bin/masssievec
+cyrus/bin/master
+cyrus/bin/mbexamine
+cyrus/bin/mbpath
+cyrus/bin/mkimap
+cyrus/bin/mknewsgroups
+cyrus/bin/mupdate
+cyrus/bin/nntpd
+cyrus/bin/notifyd
+cyrus/bin/pop3d
+cyrus/bin/pop3proxyd
+cyrus/bin/proxyd
+cyrus/bin/quota
+cyrus/bin/reconstruct
+cyrus/bin/rehash
+cyrus/bin/sievec
+cyrus/bin/smmapd
+cyrus/bin/squatter
+cyrus/bin/timsieved
+cyrus/bin/tls_prune
+cyrus/bin/translatesieve
+etc/rc.d/cyrus
+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/imapopts.h
+include/cyrus/imapurl.h
+include/cyrus/imclient.h
+include/cyrus/imparse.h
+include/cyrus/iptostring.h
+include/cyrus/libconfig.h
+include/cyrus/libcyr_cfg.h
+include/cyrus/lock.h
+include/cyrus/lsort.h
+include/cyrus/map.h
+include/cyrus/mkgmtime.h
+include/cyrus/mpool.h
+include/cyrus/nonblock.h
+include/cyrus/parseaddr.h
+include/cyrus/prot.h
+include/cyrus/retry.h
+include/cyrus/rfc822date.h
+include/cyrus/strhash.h
+include/cyrus/strhash.o
+include/cyrus/stristr.h
+include/cyrus/sysexits.h
+include/cyrus/util.h
+include/cyrus/xmalloc.h
+lib/libcyrus.a
+lib/libcyrus_min.a
+man/man1/imtest.1
+man/man1/installsieve.1
+man/man1/lmtptest.1
+man/man1/mupdatetest.1
+man/man1/nntptest.1
+man/man1/pop3test.1
+man/man1/sieveshell.1
+man/man1/sivtest.1
+man/man1/smtptest.1
+man/man3/imclient.3
+man/man5/cyrus.conf.5
+man/man5/imapd.conf.5
+man/man5/krb.equiv.5
+man/man8/arbitron.8
+man/man8/chk_cyrus.8
+man/man8/ctl_cyrusdb.8
+man/man8/ctl_deliver.8
+man/man8/ctl_mboxlist.8
+man/man8/cvt_cyrusdb.8
+man/man8/cyr_expire.8
+man/man8/cyrus-deliver.8
+man/man8/cyrus-imapd.8
+man/man8/cyrus-master.8
+man/man8/cyrus-pop3d.8
+man/man8/fetchnews.8
+man/man8/fud.8
+man/man8/idled.8
+man/man8/ipurge.8
+man/man8/lmtpd.8
+man/man8/mbexamine.8
+man/man8/mbpath.8
+man/man8/nntpd.8
+man/man8/notifyd.8
+man/man8/quota.8
+man/man8/reconstruct.8
+man/man8/rmnews.8
+man/man8/smmapd.8
+man/man8/squatter.8
+man/man8/syncnews.8
+man/man8/timsieved.8
+man/man8/tls_prune.8
+share/doc/html/cyrus-imapd/altnamespace.html
+share/doc/html/cyrus-imapd/anoncvs.html
+share/doc/html/cyrus-imapd/bugs.html
+share/doc/html/cyrus-imapd/changes.html
+share/doc/html/cyrus-imapd/cyrusv2.mc
+share/doc/html/cyrus-imapd/faq.html
+share/doc/html/cyrus-imapd/feedback.html
+share/doc/html/cyrus-imapd/index.html
+share/doc/html/cyrus-imapd/install-admin-mb.html
+share/doc/html/cyrus-imapd/install-auth.html
+share/doc/html/cyrus-imapd/install-compile.html
+share/doc/html/cyrus-imapd/install-configure.html
+share/doc/html/cyrus-imapd/install-murder.html
+share/doc/html/cyrus-imapd/install-netnews.html
+share/doc/html/cyrus-imapd/install-perf.html
+share/doc/html/cyrus-imapd/install-prereq.html
+share/doc/html/cyrus-imapd/install-sieve.html
+share/doc/html/cyrus-imapd/install-snmpmon.html
+share/doc/html/cyrus-imapd/install-testing.html
+share/doc/html/cyrus-imapd/install-upgrade.html
+share/doc/html/cyrus-imapd/install-virtdomains.html
+share/doc/html/cyrus-imapd/install.html
+share/doc/html/cyrus-imapd/mailing-list.html
+share/doc/html/cyrus-imapd/man.html
+share/doc/html/cyrus-imapd/notes.html
+share/doc/html/cyrus-imapd/os.html
+share/doc/html/cyrus-imapd/overview.html
+share/doc/html/cyrus-imapd/questions.html
+share/doc/html/cyrus-imapd/readme.html
+share/doc/html/cyrus-imapd/sieve-protocol.html
+share/doc/html/cyrus-imapd/sieve.html
+share/doc/html/cyrus-imapd/specs.html
+share/examples/cyrus-imapd/cmu-backend.conf
+share/examples/cyrus-imapd/cmu-frontend.conf
+share/examples/cyrus-imapd/imapd.conf
+share/examples/cyrus-imapd/normal.conf
+share/examples/cyrus-imapd/prefork.conf
+share/examples/cyrus-imapd/small.conf
+@dirrm share/examples/cyrus-imapd
+@dirrm share/doc/html/cyrus-imapd
+@dirrm include/cyrus
+@dirrm cyrus/bin
+@dirrm cyrus
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
new file mode 100644
index 00000000000..903c3e0585a
--- /dev/null
+++ b/mail/cyrus-imapd22/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+SHA1 (cyrus-imapd-2.2.3.tar.gz) = 782582f86a1970bf1cf54f3ed58adbdfca867dd4
+Size (cyrus-imapd-2.2.3.tar.gz) = 1887717 bytes
+SHA1 (patch-ac) = 08b2694fa3cc895d56d3bc5c89028b5343805709
+SHA1 (patch-ad) = 61fdf605f77d8b08190146d3e3ae3932114a8dee
+SHA1 (patch-ae) = 0b07e9f2a66e0c10ee9d19b307201d22a794cf3c
+SHA1 (patch-af) = 6cbb81899a2009d4c822ea00a52842a34132fed5
+SHA1 (patch-ag) = 28d2e26a6a3d2ee7d90a06f8b07daa9a15f29a58
+SHA1 (patch-ah) = c419672788766583c61ceb0a9328aa398cda0f09
+SHA1 (patch-ai) = 4b9d3cca6d48af708d19c105d01477b22bbcba93
+SHA1 (patch-ak) = b607ef81063c7b05b6768ca58b8d2b44a1d4a070
+SHA1 (patch-al) = a0e4d20bd11bf78f6ed2e8ee9e3cc7b8d7ba35c1
diff --git a/mail/cyrus-imapd22/files/cyrus.sh b/mail/cyrus-imapd22/files/cyrus.sh
new file mode 100644
index 00000000000..1f34b4cb443
--- /dev/null
+++ b/mail/cyrus-imapd22/files/cyrus.sh
@@ -0,0 +1,79 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: cyrus.sh,v 1.1.1.1 2004/01/18 12:42:12 recht Exp $
+#
+# PROVIDE: cyrus
+# REQUIRE: DAEMON
+#
+# To start cyrus-imapd at startup, copy this script to /etc/rc.d and set
+# cyrus=YES in /etc/rc.conf.
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+rcd_dir=`@DIRNAME@ $0`
+
+name="cyrus"
+rcvar=$name
+command="@PREFIX@/cyrus/bin/master"
+command_args="-d"
+pidfile="/var/run/cyrus-master.pid"
+required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@"
+extra_commands="mkimap reload"
+
+mkimap_cmd="cyrus_mkimap"
+start_precmd="cyrus_prestart"
+
+cyrus_prestart()
+{
+	# Check to see if "configdirectory" is present before we start
+	# the Cyrus IMAP server.  Otherwise, we run mkimap to generate
+	# the necessary directories.
+	#
+	if [ -f @IMAPDCONF@ ]; then
+		configdir=`						\
+			@AWK@ '/^configdirectory:/ { print $2; exit };'	\
+			      @IMAPDCONF@				\
+		`
+		if [ -z "$configdir" ]; then
+			@ECHO@ "@IMAPDCONF@ missing 'configdirectory' setting"
+			exit 1
+		fi
+		if [ ! -d "$configdir" ]; then
+			$rcd_dir/cyrus mkimap
+		fi
+	fi
+}
+
+cyrus_mkimap()
+{
+	# Generate the prerequisite directory structure for Cyrus IMAP.
+	if [ -f @IMAPDCONF@ ]; then
+		imap_dirs=`
+			@AWK@ '/^configdirectory:/	{ print $2 };	\
+			       /^partition-.*:/		{ print $2 };	\
+			       /^sievedir:/		{ print $2 }'	\
+			      @IMAPDCONF@				\
+		`
+		for dir in ${imap_dirs}; do
+			if [ ! -d ${dir} ]; then
+				@MKDIR@ ${dir}
+				@CHMOD@ 750 ${dir}
+				@CHOWN@ @CYRUS_USER@ ${dir}
+				@CHGRP@ @CYRUS_GROUP@ ${dir}
+			fi
+		done
+		@SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap"
+	fi
+}
+
+if [ -f /etc/rc.subr -a -f /etc/rc.conf \
+     -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO@ -n " ${name}"
+	eval ${start_precmd}
+	${command} ${cyrus_flags} ${command_args}
+fi
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
new file mode 100644
index 00000000000..a2d5a20ad04
--- /dev/null
+++ b/mail/cyrus-imapd22/files/imapd.conf
@@ -0,0 +1,23 @@
+# $NetBSD: imapd.conf,v 1.1.1.1 2004/01/18 12:42:12 recht Exp $
+#
+# Cyrus IMAP server configuration file.  Refer to imapd.conf(5) for
+# more options.
+
+configdirectory: /var/imap
+partition-default: /var/spool/imap
+sieveusehomedir: true
+hashimapspool: false
+
+admins: cyrus
+
+# Use the saslauthd daemon to verify plaintext passwords.  Please ensure that
+# the saslauthd daemon is running before trying to authenticate.
+#
+sasl_pwcheck_method: saslauthd
+
+# The server certificate and key files must be specified for the
+# server to repond to IMAPS or POP3S requests.  See imapd.conf(5) for
+# a complete listing of tls_* options.
+#
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
diff --git a/mail/cyrus-imapd22/patches/patch-ac b/mail/cyrus-imapd22/patches/patch-ac
new file mode 100644
index 00000000000..b98b6e5fe06
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- imap/imapd.c~	2003-10-24 20:24:05.000000000 +0200
++++ imap/imapd.c	2003-11-03 11:08:40.000000000 +0100
+@@ -5858,7 +5858,7 @@
+ {
+     int i=0, j=0;
+     char tagbuf[128];
+-    char c;
++    int c;
+     struct buf tag, cmd, tmp, user;
+     int r = 0;
+ 
+@@ -5973,7 +5973,7 @@
+ 		   char *mailbox, char *acl_in) 
+ {
+     int r = 0;
+-    char c;
++    int c;
+     char tag[128];
+     int tagnum = 1;
+     char *rights, *nextid;
diff --git a/mail/cyrus-imapd22/patches/patch-ad b/mail/cyrus-imapd22/patches/patch-ad
new file mode 100644
index 00000000000..503070cc854
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- imap/mbpath.c.orig	2003-02-13 21:32:58.000000000 +0100
++++ imap/mbpath.c	2003-07-26 16:28:49.000000000 +0200
+@@ -89,7 +89,7 @@
+ {
+   char *path;
+   int rc, i, quiet = 0, stop_on_error=0;
+-  char opt;
++  int opt;
+   char *alt_config = NULL;
+ 
+   while ((opt = getopt(argc, argv, "C:qs")) != EOF) {
diff --git a/mail/cyrus-imapd22/patches/patch-ae b/mail/cyrus-imapd22/patches/patch-ae
new file mode 100644
index 00000000000..ffe15b10668
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- imap/ipurge.c~	2003-11-20 19:47:46.000000000 +0100
++++ imap/ipurge.c	2004-01-15 23:04:30.000000000 +0100
+@@ -109,7 +109,7 @@
+ void print_stats(mbox_stats_t *stats);
+ 
+ int main (int argc, char *argv[]) {
+-  char option;
++  int option;
+   char buf[MAX_MAILBOX_PATH+1];
+   char *alt_config = NULL;
+   int r;
diff --git a/mail/cyrus-imapd22/patches/patch-af b/mail/cyrus-imapd22/patches/patch-af
new file mode 100644
index 00000000000..506e9f87c5d
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-af
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- configure~	2004-01-15 15:36:50.000000000 +0100
++++ configure	2004-01-15 23:03:32.000000000 +0100
+@@ -308,7 +308,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL MD5OBJ SNMP_SUBDIRS LIB_WRAP LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS PERL_CCCDLFLAGS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -13187,6 +13187,8 @@
+     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
+     PERL_SUBDIRS="imap"
+     PERL="${with_perl}"
++    eval `${PERL} -V:cccdlflags`
++    PERL_CCCDLFLAGS="$cccdlflags"
+ fi
+ 
+ if test "$sievedir" != "no"; then
+@@ -14660,6 +14662,7 @@
+ s,@LIB_SASL@,$LIB_SASL,;t t
+ s,@SASLFLAGS@,$SASLFLAGS,;t t
+ s,@PERL@,$PERL,;t t
++s,@PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+ s,@MD5OBJ@,$MD5OBJ,;t t
+ s,@SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
+ s,@LIB_WRAP@,$LIB_WRAP,;t t
diff --git a/mail/cyrus-imapd22/patches/patch-ag b/mail/cyrus-imapd22/patches/patch-ag
new file mode 100644
index 00000000000..cb4c25b332d
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- sieve/Makefile.in~	2003-11-12 05:02:12.000000000 +0100
++++ sieve/Makefile.in	2004-01-15 23:05:12.000000000 +0100
+@@ -38,7 +38,7 @@
+ 
+ DEFS = @DEFS@
+ CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd22/patches/patch-ah b/mail/cyrus-imapd22/patches/patch-ah
new file mode 100644
index 00000000000..1bd0f81a1c8
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- perl/sieve/lib/Makefile.in.orig	2003-02-11 15:17:40.000000000 +0100
++++ perl/sieve/lib/Makefile.in	2003-07-26 16:30:58.000000000 +0200
+@@ -55,8 +55,8 @@
+ IMAP_LIBS = @IMAP_LIBS@
+ DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
+ 
+-CFLAGS = -g
+-LDFLAGS = -g @LDFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd22/patches/patch-ai b/mail/cyrus-imapd22/patches/patch-ai
new file mode 100644
index 00000000000..df0b7160c2f
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- lib/Makefile.in.orig	2003-07-14 18:01:55.000000000 +0200
++++ lib/Makefile.in	2003-07-26 16:31:15.000000000 +0200
+@@ -60,7 +60,7 @@
+ CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
+ LIBS = @LIBS@
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
+ SHELL = /bin/sh
diff --git a/mail/cyrus-imapd22/patches/patch-ak b/mail/cyrus-imapd22/patches/patch-ak
new file mode 100644
index 00000000000..da2dcd50a6a
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-ak
@@ -0,0 +1,33 @@
+$NetBSD: patch-ak,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- imap/ctl_cyrusdb.c~	2003-10-22 20:50:07.000000000 +0200
++++ imap/ctl_cyrusdb.c	2003-11-03 11:09:25.000000000 +0100
+@@ -226,9 +226,9 @@
+ 
+     /* create the names of the backup directories */
+     strcpy(backup1, dirname);
+-    strcat(backup1, ".backup1/");
++    strcat(backup1, ".backup1");
+     strcpy(backup2, dirname);
+-    strcat(backup2, ".backup2/");
++    strcat(backup2, ".backup2");
+ 
+     syslog(LOG_NOTICE, "%s", msg);
+ 
+@@ -273,6 +273,7 @@
+ 		struct dirent *dirent;
+ 
+ 		tail = backup2 + strlen(backup2);
++		*tail++ = '/';
+ 
+ 		/* remove db.backup2 */
+ 		dirp = opendir(backup2);
+@@ -286,7 +287,7 @@
+ 
+ 		    closedir(dirp);
+ 		}
+-		*tail = '\0';
++		tail[-1] = '\0';
+ 		r2 = rmdir(backup2);
+ 
+ 		/* move db.backup1 to db.backup2 */
diff --git a/mail/cyrus-imapd22/patches/patch-al b/mail/cyrus-imapd22/patches/patch-al
new file mode 100644
index 00000000000..b339cd558b1
--- /dev/null
+++ b/mail/cyrus-imapd22/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1.1.1 2004/01/18 12:42:11 recht Exp $
+
+--- imtest/imtest.c~	2003-10-22 20:50:10.000000000 +0200
++++ imtest/imtest.c	2003-11-03 11:09:41.000000000 +0100
+@@ -72,6 +72,10 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+ 
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++
+ #include <sasl/sasl.h>
+ #include <sasl/saslutil.h>
+