summaryrefslogtreecommitdiff
path: root/recipes/cyrus-imapd
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/cyrus-imapd
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/cyrus-imapd')
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.12/autotools.patch69
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch11
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch11
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.12/remove-install-strip.patch45
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.12/tail.patch8
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch69
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch8
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb53
-rw-r--r--recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb25
-rwxr-xr-xrecipes/cyrus-imapd/files/cyrus38
-rw-r--r--recipes/cyrus-imapd/files/cyrus.conf_2.242
-rw-r--r--recipes/cyrus-imapd/files/imapd.conf_2.250
-rw-r--r--recipes/cyrus-imapd/files/volatiles63
13 files changed, 492 insertions, 0 deletions
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.12/autotools.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/autotools.patch
new file mode 100644
index 0000000000..a7f5e64396
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/autotools.patch
@@ -0,0 +1,69 @@
+--- tmp/base/cyrus-imapd-2.2.5-r0/cyrus-imapd-2.2.5/configure.in 2004-05-28 14:03:00.000000000 -0400
++++ cyrus-imapd-2.2.5/configure.in 2004-06-04 21:42:20.745944000 -0400
+@@ -997,6 +997,16 @@
+ IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
+ IMAP_LIBS="${LIB_SASL} ${LIBS}"
+
++if test "x$BUILD_CC" = "x"; then
++ BUILD_CC="$(CC)"
++fi
++if test "x$BUILD_CFLAGS" = "x"; then
++ BUILD_CFLAGS="$(CFLAGS)"
++fi
++if test "x$BUILD_LDFLAGS" = "x"; then
++ BUILD_LDFLAGS="$(LDFLAGS)"
++fi
++
+ AC_SUBST(LIB_RT)
+ AC_SUBST(IMAP_COM_ERR_LIBS)
+ AC_SUBST(IMAP_LIBS)
+@@ -1010,6 +1020,9 @@
+ AC_SUBST(PERL_SUBDIRS)
+ AC_SUBST(PERL_DEPSUBDIRS)
+ AC_SUBST(PERL)
++AC_SUBST(BUILD_CC)
++AC_SUBST(BUILD_LDFLAGS)
++AC_SUBST(BUILD_CFLAGS)
+
+ AH_TOP([
+ /* $Id: configure.in,v 1.286 2004/05/28 18:03:00 rjs3 Exp $ */
+--- tmp/base/cyrus-imapd-2.2.5-r0/cyrus-imapd-2.2.5/lib/Makefile.in 2004-05-28 14:03:04.000000000 -0400
++++ cyrus-imapd-2.2.5/lib/Makefile.in 2004-06-04 21:40:57.325068000 -0400
+@@ -53,6 +53,7 @@
+ VPATH = @srcdir@
+
+ CC = @CC@
++BUILD_CC = @BUILD_CC@
+
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
+@@ -63,7 +64,9 @@
+
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+ CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++BUILD_CFLAGS = @BUILD_CFLAGS@
+ LDFLAGS = @LDFLAGS@
++BUILD_LDFLAGS = @BUILD_LDFLAGS@
+
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
+@@ -149,8 +152,17 @@
+ # ./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
+ # mv x-chartables.h chartables.h
+
+-mkchartable: mkchartable.o xmalloc.o assert.o
+- $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
++mkchartable: mkchartable.native.o xmalloc.native.o assert.native.o
++ $(BUILD_CC) $(BUILD_LDFLAGS) -o mkchartable mkchartable.native.o xmalloc.native.o assert.native.o
++
++xmalloc.native.o: xmalloc.c
++ $(BUILD_CC) $(BUILD_CFLAGS) -c -o xmalloc.native.o xmalloc.c
++
++assert.native.o: assert.c
++ $(BUILD_CC) $(BUILD_CFLAGS) -c -o assert.native.o assert.c
++
++mkchartable.native.o: mkchartable.c
++ $(BUILD_CC) $(BUILD_CFLAGS) -c -o mkchartable.native.o mkchartable.c
+
+ clean:
+ rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
new file mode 100644
index 0000000000..821fc9ad7f
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.c.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.c.orig 2006-08-10 14:43:19.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.c 2006-08-10 14:43:48.000000000 +0200
+@@ -24,7 +24,7 @@
+
+
+
+-struct imapopt_s imapopts[] =
++struct imapopt_s * imapopts =
+
+ {
+
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
new file mode 100644
index 0000000000..d1ab605801
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/imapopts.h.gcc4.patch
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.2.12/lib/imapopts.h.orig 2006-08-10 14:43:26.000000000 +0200
++++ cyrus-imapd-2.2.12/lib/imapopts.h 2006-08-10 14:44:58.000000000 +0200
+@@ -178,7 +178,7 @@
+
+ };
+
+-extern struct imapopt_s imapopts[];
++extern struct imapopt_s * imapopts;
+
+
+
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.12/remove-install-strip.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/remove-install-strip.patch
new file mode 100644
index 0000000000..bb43d16516
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/remove-install-strip.patch
@@ -0,0 +1,45 @@
+---
+ cyrus-imapd-2.2.12/imtest/Makefile.in | 2 +-
+ cyrus-imapd-2.2.12/installsieve/Makefile.in | 2 +-
+ cyrus-imapd-2.2.12/netnews/Makefile.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: cyrus-imapd-2.2.12/imtest/Makefile.in
+===================================================================
+--- cyrus-imapd-2.2.12.orig/imtest/Makefile.in
++++ cyrus-imapd-2.2.12/imtest/Makefile.in
+@@ -72,7 +72,7 @@
+ all: imtest
+
+ install:
+- $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
++ $(INSTALL) -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
+ ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
+ ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
+ ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
+Index: cyrus-imapd-2.2.12/installsieve/Makefile.in
+===================================================================
+--- cyrus-imapd-2.2.12.orig/installsieve/Makefile.in
++++ cyrus-imapd-2.2.12/installsieve/Makefile.in
+@@ -66,7 +66,7 @@
+ all: installsieve
+
+ install:
+- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
++ $(INSTALL) -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
+
+ OBJS=lex.o mystring.o request.o isieve.o
+
+Index: cyrus-imapd-2.2.12/netnews/Makefile.in
+===================================================================
+--- cyrus-imapd-2.2.12.orig/netnews/Makefile.in
++++ cyrus-imapd-2.2.12/netnews/Makefile.in
+@@ -69,7 +69,7 @@
+ all: remotepurge
+
+ install:
+- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
++ $(INSTALL) -m 755 remotepurge $(DESTDIR)$(service_path)
+
+ .c.o:
+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.12/tail.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/tail.patch
new file mode 100644
index 0000000000..38a3ecbac6
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.12/tail.patch
@@ -0,0 +1,8 @@
+--- cyrus-imapd-2.2.5/imap/xversion.sh.orig 2003-10-22 20:03:00 +0200
++++ cyrus-imapd-2.2.5/imap/xversion.sh 2004-08-26 16:57:29 +0200
+@@ -22,4 +22,4 @@
+ match ($0, pattern) {
+ printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
+ }' pattern="$DATEPAT $TIMEPAT" | \
+- sort | tail -1 >> xversion.h
++ sort | tail -n 1 >> xversion.h
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch
new file mode 100644
index 0000000000..a7f5e64396
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.5/autotools.patch
@@ -0,0 +1,69 @@
+--- tmp/base/cyrus-imapd-2.2.5-r0/cyrus-imapd-2.2.5/configure.in 2004-05-28 14:03:00.000000000 -0400
++++ cyrus-imapd-2.2.5/configure.in 2004-06-04 21:42:20.745944000 -0400
+@@ -997,6 +997,16 @@
+ IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
+ IMAP_LIBS="${LIB_SASL} ${LIBS}"
+
++if test "x$BUILD_CC" = "x"; then
++ BUILD_CC="$(CC)"
++fi
++if test "x$BUILD_CFLAGS" = "x"; then
++ BUILD_CFLAGS="$(CFLAGS)"
++fi
++if test "x$BUILD_LDFLAGS" = "x"; then
++ BUILD_LDFLAGS="$(LDFLAGS)"
++fi
++
+ AC_SUBST(LIB_RT)
+ AC_SUBST(IMAP_COM_ERR_LIBS)
+ AC_SUBST(IMAP_LIBS)
+@@ -1010,6 +1020,9 @@
+ AC_SUBST(PERL_SUBDIRS)
+ AC_SUBST(PERL_DEPSUBDIRS)
+ AC_SUBST(PERL)
++AC_SUBST(BUILD_CC)
++AC_SUBST(BUILD_LDFLAGS)
++AC_SUBST(BUILD_CFLAGS)
+
+ AH_TOP([
+ /* $Id: configure.in,v 1.286 2004/05/28 18:03:00 rjs3 Exp $ */
+--- tmp/base/cyrus-imapd-2.2.5-r0/cyrus-imapd-2.2.5/lib/Makefile.in 2004-05-28 14:03:04.000000000 -0400
++++ cyrus-imapd-2.2.5/lib/Makefile.in 2004-06-04 21:40:57.325068000 -0400
+@@ -53,6 +53,7 @@
+ VPATH = @srcdir@
+
+ CC = @CC@
++BUILD_CC = @BUILD_CC@
+
+ INSTALL = @INSTALL@
+ RANLIB = @RANLIB@
+@@ -63,7 +64,9 @@
+
+ MAKEDEPEND_CFLAGS = @CFLAGS@
+ CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
++BUILD_CFLAGS = @BUILD_CFLAGS@
+ LDFLAGS = @LDFLAGS@
++BUILD_LDFLAGS = @BUILD_LDFLAGS@
+
+ SHELL = /bin/sh
+ MAKEDEPEND = @MAKEDEPEND@
+@@ -149,8 +152,17 @@
+ # ./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
+ # mv x-chartables.h chartables.h
+
+-mkchartable: mkchartable.o xmalloc.o assert.o
+- $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xmalloc.o assert.o
++mkchartable: mkchartable.native.o xmalloc.native.o assert.native.o
++ $(BUILD_CC) $(BUILD_LDFLAGS) -o mkchartable mkchartable.native.o xmalloc.native.o assert.native.o
++
++xmalloc.native.o: xmalloc.c
++ $(BUILD_CC) $(BUILD_CFLAGS) -c -o xmalloc.native.o xmalloc.c
++
++assert.native.o: assert.c
++ $(BUILD_CC) $(BUILD_CFLAGS) -c -o assert.native.o assert.c
++
++mkchartable.native.o: mkchartable.c
++ $(BUILD_CC) $(BUILD_CFLAGS) -c -o mkchartable.native.o mkchartable.c
+
+ clean:
+ rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
diff --git a/recipes/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch b/recipes/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch
new file mode 100644
index 0000000000..38a3ecbac6
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd-2.2.5/tail.patch
@@ -0,0 +1,8 @@
+--- cyrus-imapd-2.2.5/imap/xversion.sh.orig 2003-10-22 20:03:00 +0200
++++ cyrus-imapd-2.2.5/imap/xversion.sh 2004-08-26 16:57:29 +0200
+@@ -22,4 +22,4 @@
+ match ($0, pattern) {
+ printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
+ }' pattern="$DATEPAT $TIMEPAT" | \
+- sort | tail -1 >> xversion.h
++ sort | tail -n 1 >> xversion.h
diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
new file mode 100644
index 0000000000..e80340f080
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -0,0 +1,53 @@
+SECTION = "console/network"
+DEPENDS = "cyrus-sasl virtual/db"
+LICENSE = "BSD"
+PR = "r12"
+DEPENDS += "install-native"
+
+SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
+ file://autotools.patch;patch=1 \
+ file://tail.patch;patch=1 \
+ file://imapopts.c.gcc4.patch;patch=1 \
+ file://imapopts.h.gcc4.patch;patch=1 \
+ file://cyrus \
+ file://cyrus.conf_2.2 \
+ file://imapd.conf_2.2 \
+ file://volatiles \
+ file://remove-install-strip.patch;patch=1 \
+ "
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "cyrus"
+INITSCRIPT_PARAMS = "start 56 3 4 5 . stop 15 0 1 6 ."
+
+TARGET_LDFLAGS_append_thumb = " -lpthread"
+EXTRA_OECONF = "--with-auth=unix \
+ --with-dblib=berkeley \
+ --with-bdb-libdir=${STAGING_LIBDIR} \
+ --with-bdb-incdir=${STAGING_INCDIR} \
+ --without-perl \
+ --without-snmp"
+
+FILES_${PN} += "${prefix}/cyrus/bin"
+
+# All, lib/foo.c includes <config.h> from the top level directory and
+# is natively compiled
+BUILD_CPPFLAGS += " -I${S} -I${S}/et"
+
+do_install_append () {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/cyrus ${D}${sysconfdir}/init.d/cyrus
+ install -m 644 ${WORKDIR}/cyrus.conf_2.2 ${D}${sysconfdir}/cyrus.conf
+ install -m 644 ${WORKDIR}/imapd.conf_2.2 ${D}${sysconfdir}/imapd.conf
+ install -d ${D}${sysconfdir}/default/volatiles
+ install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_cyrus-imapd
+}
+
+pkg_postinst () {
+ /etc/init.d/populate-volatile.sh update
+}
+
+pkg_postrm () {
+}
+
diff --git a/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb b/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb
new file mode 100644
index 0000000000..6dc81c5e3f
--- /dev/null
+++ b/recipes/cyrus-imapd/cyrus-imapd_2.2.5.bb
@@ -0,0 +1,25 @@
+SECTION = "console/network"
+DEPENDS = "cyrus-sasl"
+PR = "r2"
+LICENSE = "BSD"
+
+SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz \
+ file://autotools.patch;patch=1 \
+ file://tail.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-auth=unix \
+ --without-perl"
+
+BUILD_CFLAGS += " -I${S} -I${S}/et"
+#do_compile_prepend () {
+# cd lib
+# ccache arm-linux-gcc -L/home/kergoth/code/build-arm/tmp/staging/arm-linux/lib -Wl,-rpath-link,/home/kergoth/code/build-arm/tmp/staging/arm-linux/lib -o mkchartable mkchartable.o xmalloc.o assert.o
+# ${BUILD_CC} ${BUILD_CFLAGS} mkchartable.c -c -o mkchartable.o
+# ${BUILD_CC} ${BUILD_CFLAGS} xmalloc.c -c -o xmalloc.o
+# ${BUILD_CC} ${BUILD_CFLAGS} assert.c -c -o assert.o
+# ${BUILD_CC} ${BUILD_LDFLAGS} -o mkchartable mkchartable.o xmalloc.o assert.o
+# rm -f xmalloc.o assert.o mkchartable.o
+# cd ..
+#}
diff --git a/recipes/cyrus-imapd/files/cyrus b/recipes/cyrus-imapd/files/cyrus
new file mode 100755
index 0000000000..03ba55aa9c
--- /dev/null
+++ b/recipes/cyrus-imapd/files/cyrus
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/cyrus/bin
+DAEMON=/usr/cyrus/bin/master
+NAME=master
+DESC="Cyrus IMAP Master Daemon"
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME"
+ start-stop-daemon --start --quiet --background --pidfile /var/run/$NAME.pid --exec $DAEMON
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME "
+ start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+ sleep 1
+ killall imapd pop3d timsieved master lmtpd notifyd 2>/dev/null
+ echo "."
+ ;;
+ reload|force-reload)
+ echo "Reloading $DESC configuration..."
+ start-stop-daemon --stop --signal 1 --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+ echo "done."
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|reload|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+exit 0
+
diff --git a/recipes/cyrus-imapd/files/cyrus.conf_2.2 b/recipes/cyrus-imapd/files/cyrus.conf_2.2
new file mode 100644
index 0000000000..17541063fe
--- /dev/null
+++ b/recipes/cyrus-imapd/files/cyrus.conf_2.2
@@ -0,0 +1,42 @@
+# Standard standalone server configuration.
+
+START {
+ # Do not delete this entry!
+ recover cmd="ctl_cyrusdb -r"
+
+ # This is only necessary if using idled for IMAP IDLE.
+ #idled cmd="idled"
+}
+
+# UNIX sockets start with a slash and are put into /var/imap/socket.
+SERVICES {
+ # Add or remove based on preferences.
+ imap cmd="imapd" listen="imap2" prefork=0
+ #pop3 cmd="pop3d" listen="pop-3" prefork=0
+
+ # Don't forget to generate the needed keys for SSL or TLS
+ # (see doc/html/install-configure.html).
+ #imaps cmd="imapd -s" listen="imaps" prefork=0
+ #pop3s cmd="pop3d -s" listen="pop3s" prefork=0
+
+ #sieve cmd="timsieved" listen="sieve" prefork=0
+
+ # at least one LMTP is required for delivery
+ #lmtp cmd="lmtpd" listen="lmtp" prefork=0
+ lmtpunix cmd="lmtpd" listen="/var/lib/cyrus/socket/lmtp" prefork=0
+
+ # this is only necessary if using notifications
+ #notify cmd="notifyd" listen="/var/lib/cyrus/socket/notify" proto="udp" prefork=1
+}
+
+EVENTS {
+ # This is required.
+ checkpoint cmd="ctl_cyrusdb -c" period=30
+
+ # This is only necessary if using duplicate delivery suppression.
+ delprune cmd="ctl_deliver -E 3" period=1440
+
+ # This is only necessary if caching TLS sessions.
+ #tlsprune cmd="tls_prune" period=1440
+}
+
diff --git a/recipes/cyrus-imapd/files/imapd.conf_2.2 b/recipes/cyrus-imapd/files/imapd.conf_2.2
new file mode 100644
index 0000000000..5cf4ca9135
--- /dev/null
+++ b/recipes/cyrus-imapd/files/imapd.conf_2.2
@@ -0,0 +1,50 @@
+# Don't forget to use chattr +S (if you are using ext[23])
+# when you change these directories (read the docs).
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+
+sievedir: /var/lib/cyrus/sieve
+
+## News setup
+#partition-news: /var/spool/cyrus/news
+#newsspool: /var/spool/news
+
+
+tls_ca_path: /etc/ssl/certs
+tls_cert_file: /etc/ssl/cyrus/server.crt
+tls_key_file: /etc/ssl/cyrus/server.key
+
+# Who has the right to create Mailboxes
+admins: cyrus root
+
+hashimapspool: yes
+allowanonymouslogin: no
+allowplaintext: yes
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+# umask used by Cyrus programs
+umask: 077
+
+# Allow renaming of top-level mailboxes.
+#allowusermoves: yes
+
+# Use this if sieve-scripts could be in ~user/.sieve.
+#sieveusehomedir: yes
+
+#sasl_pwcheck_method: saslauthd
+
+## all possible values.
+#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
+## or limit to CRAM-MD5 only
+#sasl_mech_list: CRAM-MD5
+
+# This program will be used to send out Mails
+sendmail: /usr/sbin/sendmail
+
diff --git a/recipes/cyrus-imapd/files/volatiles b/recipes/cyrus-imapd/files/volatiles
new file mode 100644
index 0000000000..a95841c53c
--- /dev/null
+++ b/recipes/cyrus-imapd/files/volatiles
@@ -0,0 +1,63 @@
+d cyrus mail 0755 /var/lib/cyrus none
+d cyrus root 0755 /var/lib/cyrus/db none
+d cyrus mail 0755 /var/lib/cyrus/proc none
+d cyrus mail 0755 /var/lib/cyrus/sieve none
+# if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+d cyrus mail 0755 /var/lib/cyrus/sieve/a none
+d cyrus mail 0755 /var/lib/cyrus/sieve/b none
+d cyrus mail 0755 /var/lib/cyrus/sieve/c none
+d cyrus mail 0755 /var/lib/cyrus/sieve/d none
+d cyrus mail 0755 /var/lib/cyrus/sieve/e none
+d cyrus mail 0755 /var/lib/cyrus/sieve/f none
+d cyrus mail 0755 /var/lib/cyrus/sieve/g none
+d cyrus mail 0755 /var/lib/cyrus/sieve/h none
+d cyrus mail 0755 /var/lib/cyrus/sieve/i none
+d cyrus mail 0755 /var/lib/cyrus/sieve/j none
+d cyrus mail 0755 /var/lib/cyrus/sieve/k none
+d cyrus mail 0755 /var/lib/cyrus/sieve/l none
+d cyrus mail 0755 /var/lib/cyrus/sieve/m none
+d cyrus mail 0755 /var/lib/cyrus/sieve/n none
+d cyrus mail 0755 /var/lib/cyrus/sieve/o none
+d cyrus mail 0755 /var/lib/cyrus/sieve/p none
+d cyrus mail 0755 /var/lib/cyrus/sieve/q none
+d cyrus mail 0755 /var/lib/cyrus/sieve/r none
+d cyrus mail 0755 /var/lib/cyrus/sieve/s none
+d cyrus mail 0755 /var/lib/cyrus/sieve/t none
+d cyrus mail 0755 /var/lib/cyrus/sieve/u none
+d cyrus mail 0755 /var/lib/cyrus/sieve/v none
+d cyrus mail 0755 /var/lib/cyrus/sieve/w none
+d cyrus mail 0755 /var/lib/cyrus/sieve/x none
+d cyrus mail 0755 /var/lib/cyrus/sieve/y none
+d cyrus mail 0755 /var/lib/cyrus/sieve/z none
+d cyrus root 0755 /var/lib/cyrus/socket none
+d cyrus mail 0755 /var/lib/cyrus/user none
+# if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
+d cyrus mail 0755 /var/lib/cyrus/user/a none
+d cyrus mail 0755 /var/lib/cyrus/user/b none
+d cyrus mail 0755 /var/lib/cyrus/user/c none
+d cyrus mail 0755 /var/lib/cyrus/user/d none
+d cyrus mail 0755 /var/lib/cyrus/user/e none
+d cyrus mail 0755 /var/lib/cyrus/user/f none
+d cyrus mail 0755 /var/lib/cyrus/user/g none
+d cyrus mail 0755 /var/lib/cyrus/user/h none
+d cyrus mail 0755 /var/lib/cyrus/user/i none
+d cyrus mail 0755 /var/lib/cyrus/user/j none
+d cyrus mail 0755 /var/lib/cyrus/user/k none
+d cyrus mail 0755 /var/lib/cyrus/user/l none
+d cyrus mail 0755 /var/lib/cyrus/user/m none
+d cyrus mail 0755 /var/lib/cyrus/user/n none
+d cyrus mail 0755 /var/lib/cyrus/user/o none
+d cyrus mail 0755 /var/lib/cyrus/user/p none
+d cyrus mail 0755 /var/lib/cyrus/user/q none
+d cyrus mail 0755 /var/lib/cyrus/user/r none
+d cyrus mail 0755 /var/lib/cyrus/user/s none
+d cyrus mail 0755 /var/lib/cyrus/user/t none
+d cyrus mail 0755 /var/lib/cyrus/user/u none
+d cyrus mail 0755 /var/lib/cyrus/user/v none
+d cyrus mail 0755 /var/lib/cyrus/user/w none
+d cyrus mail 0755 /var/lib/cyrus/user/x none
+d cyrus mail 0755 /var/lib/cyrus/user/y none
+d cyrus mail 0755 /var/lib/cyrus/user/z none
+d root root 0755 /var/spool/cyrus none
+d cyrus mail 0750 /var/spool/cyrus/mail none
+d cyrus mail 0750 /var/spool/cyrus/news none