Made pkg buildable, updated PLIST, removed deprecated post-install steps

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Made pkg buildable, updated PLIST, removed deprecated post-install steps
From: Matthias Petermann <mp%petermann-it.de@localhost>
Date: Mon, 09 Mar 2020 14:46:00 +0000
Module Name:	pkgsrc-wip
Committed By:	Matthias Petermann <mp%petermann-it.de@localhost>
Pushed By:	mp
Date:		Mon Mar 9 15:46:00 2020 +0100
Changeset:	5428b0a2dd17b80521d887fcf05252c578e09b49

Modified Files:
	cyrus-imapd30/Makefile
	cyrus-imapd30/PLIST
	cyrus-imapd30/TODO
	cyrus-imapd30/files/cyrus.sh
	cyrus-imapd30/files/imapd.conf
Added Files:
	cyrus-imapd30/files/cyrus.conf

Log Message:
Made pkg buildable, updated PLIST, removed deprecated post-install steps

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5428b0a2dd17b80521d887fcf05252c578e09b49

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cyrus-imapd30/Makefile         |  62 +++++-----
 cyrus-imapd30/PLIST            | 252 +++++++++++++++++++++++------------------
 cyrus-imapd30/TODO             |  28 +++--
 cyrus-imapd30/files/cyrus.conf |  52 +++++++++
 cyrus-imapd30/files/cyrus.sh   |   4 +-
 cyrus-imapd30/files/imapd.conf | 134 +++++++++++++++++++---
 6 files changed, 358 insertions(+), 174 deletions(-)

diffs:
diff --git a/cyrus-imapd30/Makefile b/cyrus-imapd30/Makefile
index 01859fb7d7..300c29eecb 100644
--- a/cyrus-imapd30/Makefile
+++ b/cyrus-imapd30/Makefile
@@ -1,22 +1,23 @@
 # $NetBSD: $
 
 DISTNAME=	cyrus-imapd-3.0.13
-#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PKGNAME}/
-#MASTER_SITES=	${MASTER_SITE_GITHUB:=cyrusimap/}
-#GITHUB_TAG=     v${PKGVERSION_NOREV}
 
 MAINTAINER=	mp%petermann-it.de@localhost
 HOMEPAGE=	https://www.cyrusimap.org/
 COMMENT=	Cyrus IMAP server
 #LICENSE=	original-bsd # like license
 
+DEPENDS+=       p5-Term-ReadLine>=1.20:../../devel/p5-Term-ReadLine
+
 MAKE_JOBS_SAFE=	no
 
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		perl:run makedepend yacc pkg-config sed awk gmake
+
 USE_PKGLOCALEDIR=	yes
+
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 
@@ -26,9 +27,6 @@ CHECK_PORTABILITY_SKIP=	configure.lineno
 
 .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
 
@@ -49,34 +47,35 @@ CONFIGURE_ARGS+=	--enable-idled
 CONFIGURE_ARGS+=	--enable-murder
 CONFIGURE_ARGS+=	--enable-nntp
 CONFIGURE_ARGS+=	--enable-replication
+CONFIGURE_ARGS+=	--htmldir=${DESTDIR}${HTMLDIR}
 
 CONFIGURE_ARGS+=	andrew_cv_runpath_switch=${COMPILER_RPATH_FLAG}
 
 .include "options.mk"
 
 MAKE_ENV+=		PERL=${PERL5:Q}
+MAKE_ENV+=		PERLLIBDIR=${PERL5_INSTALLVENDORLIB}
 
 HTMLDIR=		${PREFIX}/share/doc/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
+CONF_FILES+=		${EGDIR}/cyrus.conf ${PKG_SYSCONFDIR}/cyrus.conf
 RCD_SCRIPTS=		cyrus
 FILES_SUBST+=		IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
 
 REPLACE_PERL+=		tools/rehash
 
-SUBST_CLASSES+=		sh
-SUBST_STAGE.sh=		post-build
-SUBST_FILES.sh=		perl/imap/blib/script/cyradm
-SUBST_SED.sh+=		-e 's|^\#!.*|\#!/bin/sh|'
+#SUBST_CLASSES+=		sh
+#SUBST_STAGE.sh=		post-build
+#SUBST_FILES.sh=		perl/imap/blib/script/cyradm
+#SUBST_SED.sh+=		-e 's|^\#!.*|\#!/bin/sh|'
 
-PERL5_PACKLIST= \
-	auto/Cyrus/IMAP/.packlist			\
-	auto/Cyrus/SIEVE/managesieve/.packlist
+#PERL5_PACKLIST= \
+#	auto/Cyrus/IMAP/.packlist				\
+#	auto/Cyrus/SIEVE/managesieve/.packlist
 
 pre-build:
-	${RUN}${_ULIMIT_CMD} \
-#	cd ${WRKSRC} && ${BUILD_MAKE_CMD} depend
+	${RUN}${_ULIMIT_CMD}
 
 .include "../../lang/perl5/module.mk"
 BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.17
@@ -96,10 +95,10 @@ BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.17
 post-patch:
 	cd ${WRKSRC}/man;						\
 	set --	deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8	\
-		nntpd 8	notifyd 8 pop3d 8 quota 8;			\
+		nntpd 8	notifyd 8 pop3d 8 quota 8 httpd 8 httpdtest 8;			\
 	while [ $$# -gt 0 ]; do						\
 		man=$$1.$$2;						\
-		for file in Makefile.in *.[0-9]; do			\
+		for file in *.[0-9]; do			\
 			sed	-e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \
 				-e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \
 				$$file > $$file.fixed;			\
@@ -120,24 +119,23 @@ post-patch:
 	done
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/migrate-metadata ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR}
-	cd ${WRKSRC}/master/conf; for file in *.conf; do		\
-		${INSTALL_DATA} $${file} ${DESTDIR}${EGDIR};		\
-	done
-	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
-	cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do		\
-		${INSTALL_DATA} $${file} ${DESTDIR}${HTMLDIR};		\
-	done
+	${INSTALL_DATA} ${FILESDIR}/cyrus.conf ${DESTDIR}${EGDIR}
+	#${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
+	# TODO: incomplete - source HTML folder contains subdirs not
+	# taken care of yet
+	#cd ${WRKSRC}/doc/html; for file in *.html; do		\
+	#	${INSTALL_DATA} $${file} ${DESTDIR}${HTMLDIR};		\
+	#done
 
 .include "../../devel/zlib/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
\ No newline at end of file
+.include "../../mk/bsd.pkg.mk"
diff --git a/cyrus-imapd30/PLIST b/cyrus-imapd30/PLIST
index 143b5ae81b..00b3b8925b 100644
--- a/cyrus-imapd30/PLIST
+++ b/cyrus-imapd30/PLIST
@@ -1,105 +1,121 @@
-@comment $NetBSD: $
+@comment $NetBSD$
+bin/httptest
 bin/imtest
 bin/installsieve
 bin/lmtptest
+bin/masssievec
+bin/mkimap
+bin/mknewsgroups
 bin/mupdatetest
 bin/nntptest
 bin/pop3test
+bin/rehash
 bin/sieveshell
 bin/sivtest
 bin/smtptest
 bin/synctest
-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_dbtool
-cyrus/bin/cyr_df
-cyrus/bin/cyr_expire
-cyrus/bin/cyr_sequence
-cyrus/bin/cyr_synclog
-cyrus/bin/cyr_userseen
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/fetchnews
-cyrus/bin/fud
-cyrus/bin/idled
-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/migrate-metadata
-cyrus/bin/mkimap
-cyrus/bin/mknewsgroups
-cyrus/bin/mupdate
-cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/pop3proxyd
-cyrus/bin/proxyd
-${PLIST.ldap}cyrus/bin/ptdump
-${PLIST.ldap}cyrus/bin/ptexpire
-${PLIST.ldap}cyrus/bin/ptloader
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/rehash
-cyrus/bin/sievec
-cyrus/bin/sieved
-cyrus/bin/smmapd
-cyrus/bin/squatter
-cyrus/bin/sync_client
-cyrus/bin/sync_reset
-cyrus/bin/sync_server
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/translatesieve
-cyrus/bin/unexpunge
+bin/translatesieve
 include/cyrus/acl.h
+include/cyrus/arrayu64.h
 include/cyrus/assert.h
 include/cyrus/auth.h
+include/cyrus/auth_pts.h
+include/cyrus/bitvector.h
+include/cyrus/bloom.h
 include/cyrus/bsearch.h
-include/cyrus/byteorder64.h
+include/cyrus/bufarray.h
 include/cyrus/charset.h
+include/cyrus/chartable.h
+include/cyrus/command.h
 include/cyrus/crc32.h
+include/cyrus/crc32c.h
 include/cyrus/cyr_lock.h
 include/cyrus/cyrusdb.h
+include/cyrus/exitcodes.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
 include/cyrus/hash.h
+include/cyrus/hashu64.h
 include/cyrus/imapopts.h
 include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
+include/cyrus/iostat.h
 include/cyrus/iptostring.h
-include/cyrus/libconfig.h
 include/cyrus/libcyr_cfg.h
 include/cyrus/lsort.h
 include/cyrus/map.h
-include/cyrus/md5.h
+include/cyrus/mappedfile.h
 include/cyrus/mkgmtime.h
 include/cyrus/mpool.h
+include/cyrus/murmurhash2.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
-include/cyrus/prot.h
 include/cyrus/retry.h
-include/cyrus/rfc822date.h
+include/cyrus/rfc822tok.h
+include/cyrus/sieve/sieve_err.h
+include/cyrus/sieve/sieve_interface.h
 include/cyrus/signals.h
+include/cyrus/sqldb.h
 include/cyrus/strarray.h
 include/cyrus/strhash.h
 include/cyrus/stristr.h
 include/cyrus/sysexits.h
-include/cyrus/util.h
+include/cyrus/times.h
+include/cyrus/tok.h
+include/cyrus/vparse.h
+include/cyrus/wildmat.h
 include/cyrus/xmalloc.h
-include/cyrus/xstrlcat.h
-include/cyrus/xstrlcpy.h
-lib/libcyrus.a
-lib/libcyrus_min.a
+lib/libcyrus.la
+lib/libcyrus_com_err.la
+lib/libcyrus_imap.la
+lib/libcyrus_min.la
+lib/libcyrus_sieve.la
+${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod
+lib/perl5/site_perl/5.30.0/Cyrus/Annotator/AnnotateInlinedCIDs.pm
+lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Daemon.pm
+lib/perl5/site_perl/5.30.0/Cyrus/Annotator/Message.pm
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP.pm
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/Admin.pm
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/IMSP.pm
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/IMAP/Shell.pm
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/Cyrus/SIEVE/managesieve.pm
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/Annotator/Daemon/.packlist
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/IMAP/.packlist
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/IMAP/IMAP.so
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/SIEVE/managesieve/.packlist
+lib/perl5/site_perl/5.30.0/x86_64-netbsd-thread-multi/auto/Cyrus/SIEVE/managesieve/managesieve.so
+lib/perl5/site_perl/bin/cyradm
+lib/perl5/site_perl/man/man1/cyradm.1
+lib/perl5/site_perl/man/man3/Cyrus::Annotator::Daemon.3
+lib/perl5/site_perl/man/man3/Cyrus::Annotator::Message.3
+lib/perl5/site_perl/man/man3/Cyrus::IMAP.3
+lib/perl5/site_perl/man/man3/Cyrus::IMAP::Admin.3
+lib/perl5/site_perl/man/man3/Cyrus::IMAP::IMSP.3
+lib/perl5/site_perl/man/man3/Cyrus::IMAP::Shell.3
+lib/perl5/site_perl/man/man3/Cyrus::SIEVE::managesieve.3
+lib/pkgconfig/libcyrus.pc
+lib/pkgconfig/libcyrus_imap.pc
+lib/pkgconfig/libcyrus_min.pc
+lib/pkgconfig/libcyrus_sieve.pc
+libexec/fud
+${PLIST.http}libexec/httpd
+libexec/idled
+libexec/imapd
+libexec/lmtpd
+libexec/lmtpproxyd
+libexec/master
+libexec/mupdate
+libexec/nntpd
+libexec/notifyd
+libexec/pop3d
+libexec/pop3proxyd
+libexec/proxyd
+${PLIST.ldap}libexec/ptloader
+libexec/smmapd
+libexec/sync_server
+libexec/timsieved
+man/man1/httptest.1
 man/man1/imtest.1
 man/man1/installsieve.1
 man/man1/lmtptest.1
@@ -114,77 +130,87 @@ man/man5/cyrus.conf.5
 man/man5/imapd.conf.5
 man/man5/krb.equiv.5
 man/man8/arbitron.8
+man/man8/backupd.8
 man/man8/chk_cyrus.8
+man/man8/ctl_backups.8
+man/man8/ctl_conversationsdb.8
 man/man8/ctl_cyrusdb.8
 man/man8/ctl_deliver.8
 man/man8/ctl_mboxlist.8
+${PLIST.http}man/man8/ctl_zoneinfo.8
 man/man8/cvt_cyrusdb.8
+man/man8/cyr_backup.8
+man/man8/cyr_buildinfo.8
 man/man8/cyr_dbtool.8
+man/man8/cyr_deny.8
 man/man8/cyr_df.8
 man/man8/cyr_expire.8
+man/man8/cyr_info.8
 man/man8/cyr_synclog.8
-man/man8/cyrus-deliver.8
-man/man8/cyrus-fetchnews.8
-man/man8/cyrus-idled.8
-man/man8/cyrus-imapd.8
-man/man8/cyrus-lmtpd.8
-man/man8/cyrus-master.8
-man/man8/cyrus-nntpd.8
-man/man8/cyrus-notifyd.8
-man/man8/cyrus-pop3d.8
-man/man8/cyrus-quota.8
+man/man8/cyr_virusscan.8
+man/man8/deliver.8
+man/man8/fetchnews.8
 man/man8/fud.8
+${PLIST.http}man/man8/httpd.8
+man/man8/idled.8
+man/man8/imapd.8
 man/man8/ipurge.8
+man/man8/lmtpd.8
+man/man8/master.8
 man/man8/mbexamine.8
 man/man8/mbpath.8
+man/man8/mbtool.8
+man/man8/nntpd.8
+man/man8/notifyd.8
+man/man8/pop3d.8
+man/man8/quota.8
 man/man8/reconstruct.8
-man/man8/rmnews.8
+man/man8/restore.8
 man/man8/smmapd.8
 man/man8/squatter.8
 man/man8/sync_client.8
 man/man8/sync_reset.8
 man/man8/sync_server.8
-man/man8/syncnews.8
 man/man8/timsieved.8
 man/man8/tls_prune.8
 man/man8/unexpunge.8
-share/doc/cyrus-imapd/ag.html
-share/doc/cyrus-imapd/altnamespace.html
-share/doc/cyrus-imapd/anoncvs.html
-share/doc/cyrus-imapd/bugs.html
-share/doc/cyrus-imapd/changes.html
-share/doc/cyrus-imapd/cyrusv2.mc
-share/doc/cyrus-imapd/faq.html
-share/doc/cyrus-imapd/feedback.html
-share/doc/cyrus-imapd/index.html
-share/doc/cyrus-imapd/install-admin-mb.html
-share/doc/cyrus-imapd/install-auth.html
-share/doc/cyrus-imapd/install-compile.html
-share/doc/cyrus-imapd/install-configure.html
-share/doc/cyrus-imapd/install-murder.html
-share/doc/cyrus-imapd/install-netnews.html
-share/doc/cyrus-imapd/install-perf.html
-share/doc/cyrus-imapd/install-prereq.html
-share/doc/cyrus-imapd/install-replication.html
-share/doc/cyrus-imapd/install-sieve.html
-share/doc/cyrus-imapd/install-snmpmon.html
-share/doc/cyrus-imapd/install-testing.html
-share/doc/cyrus-imapd/install-upgrade.html
-share/doc/cyrus-imapd/install-virtdomains.html
-share/doc/cyrus-imapd/install.html
-share/doc/cyrus-imapd/mailing-list.html
-share/doc/cyrus-imapd/man.html
-share/doc/cyrus-imapd/notes.html
-share/doc/cyrus-imapd/os.html
-share/doc/cyrus-imapd/overview.html
-share/doc/cyrus-imapd/questions.html
-share/doc/cyrus-imapd/readme.html
-share/doc/cyrus-imapd/sieve-protocol.html
-share/doc/cyrus-imapd/sieve.html
-share/doc/cyrus-imapd/specs.html
-share/examples/cyrus-imapd/cmu-backend.conf
-share/examples/cyrus-imapd/cmu-frontend.conf
+sbin/arbitron
+sbin/chk_cyrus
+sbin/ctl_conversationsdb
+sbin/ctl_cyrusdb
+sbin/ctl_deliver
+sbin/ctl_mboxlist
+${PLIST.http}sbin/ctl_zoneinfo
+sbin/cvt_cyrusdb
+sbin/cvt_xlist_specialuse
+sbin/cyr_buildinfo
+sbin/cyr_dbtool
+sbin/cyr_deny
+sbin/cyr_df
+sbin/cyr_expire
+sbin/cyr_info
+sbin/cyr_sequence
+sbin/cyr_synclog
+sbin/cyr_userseen
+sbin/cyr_virusscan
+sbin/cyrdump
+${PLIST.http}sbin/dav_reconstruct
+sbin/deliver
+sbin/fetchnews
+sbin/ipurge
+sbin/mbexamine
+sbin/mbpath
+sbin/mbtool
+${PLIST.ldap}sbin/ptdump
+${PLIST.ldap}sbin/ptexpire
+sbin/quota
+sbin/reconstruct
+sbin/sievec
+sbin/sieved
+sbin/squatter
+sbin/sync_client
+sbin/sync_reset
+sbin/tls_prune
+sbin/unexpunge
+share/examples/cyrus-imapd/cyrus.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
diff --git a/cyrus-imapd30/TODO b/cyrus-imapd30/TODO
index 492a73d3f2..10f85c859d 100644
--- a/cyrus-imapd30/TODO
+++ b/cyrus-imapd30/TODO
@@ -4,25 +4,31 @@ be built, let alone that it will work as expected. I plan to keep the
 pkg up to date here so that the progress is transparent. I am open to
 suggestions or active support.
 
+Done:
+
+- Make it build the most basic way [DONE]
+
 Next steps:
 
-1) Make it build the most basic way [DONE]
+- Make it install
 
-2) Update PLIST (take care of ldap / http options)
+- Update PLIST (take care of ldap / http options)
 
-3) Evaluation of the patches of the existing Cyrus-imap-pkgs and
-   their applicability for cyrus-imap 3
+- Integrate / regenerate documentation at build time
 
-4) Possibly create further patches for cyrus-imap 3 (especially with
-   regard to the newly added functions CalDAV / CardDAV), if necessary
+- Evaluation of the patches of the existing Cyrus-imap-pkgs and
+  their applicability for cyrus-imap 3
 
-5) Review and adjustment of scripts / provided files (configuration
-   examples, man pages)
+- Possibly create further patches for cyrus-imap 3 (especially with
+  regard to the newly added functions CalDAV / CardDAV), if necessary
 
-6) Fine-tuning of the build
+- Review and adjustment of scripts / provided files (configuration
+  examples, man pages)
 
-For questions, tips or offers of help you can contact me at mp%petermann-it.de@localhost
+- Fine-tuning of the build
 
 Bugs:
 
-- Kerberos support, PostgreSQL and MySQL are currently not tested
\ No newline at end of file
+- Kerberos support, PostgreSQL and MySQL are currently not tested
+
+For questions, tips or offers of help you can contact me at mp%petermann-it.de@localhost
diff --git a/cyrus-imapd30/files/cyrus.conf b/cyrus-imapd30/files/cyrus.conf
new file mode 100644
index 0000000000..3ce73da39f
--- /dev/null
+++ b/cyrus-imapd30/files/cyrus.conf
@@ -0,0 +1,52 @@
+# standard standalone server implementation
+
+START {
+  # do not delete this entry!
+  recover       cmd="ctl_cyrusdb -r"
+}
+
+# UNIX sockets start with a slash and are put into /var/imap/socket
+SERVICES {
+  # add or remove based on preferences
+  imap          cmd="imapd" listen="imap" prefork=0
+  imaps         cmd="imapd -s" listen="imaps" prefork=0
+  pop3          cmd="pop3d" listen="pop3" prefork=0
+  pop3s         cmd="pop3d -s" listen="pop3s" prefork=0
+  sieve         cmd="timsieved" listen="sieve" prefork=0
+
+  # these are only necessary if receiving/exporting usenet via NNTP
+#  nntp          cmd="nntpd" listen="nntp" prefork=0
+#  nntps         cmd="nntpd -s" listen="nntps" prefork=0
+
+  # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
+  http          cmd="httpd" listen="http" prefork=0
+  https         cmd="httpd -s" listen="https" prefork=0
+
+  # at least one LMTP is required for delivery
+#  lmtp          cmd="lmtpd" listen="lmtp" prefork=0
+  lmtpunix      cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
+
+  # this is required if using notifications
+#  notify        cmd="notifyd" listen="/var/imap/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,
+  # Sieve or NNTP
+  delprune      cmd="cyr_expire -E 3" at=0400
+
+  # Expire data older than 28 days.
+  deleteprune   cmd="cyr_expire -E 4 -D 28" at=0430
+  expungeprune  cmd="cyr_expire -E 4 -X 28" at=0445
+
+  # this is only necessary if caching TLS sessions
+  tlsprune      cmd="tls_prune" at=0400
+}
+
+DAEMON {
+  # this is only necessary if using idled for IMAP IDLE
+#  idled         cmd="idled"
+}
diff --git a/cyrus-imapd30/files/cyrus.sh b/cyrus-imapd30/files/cyrus.sh
index f5acdfb10f..0b8daad8ee 100644
--- a/cyrus-imapd30/files/cyrus.sh
+++ b/cyrus-imapd30/files/cyrus.sh
@@ -18,7 +18,7 @@ rcd_dir=`@DIRNAME@ $0`
 
 name="cyrus"
 rcvar=$name
-command="@PREFIX@/cyrus/bin/master"
+command="@PREFIX@/bin/master"
 command_args="-d"
 pidfile="@VARBASE@/run/cyrus-master.pid"
 sig_stop=QUIT
@@ -65,7 +65,7 @@ cyrus_mkimap()
 				@CHGRP@ @CYRUS_GROUP@ "$dir"
 			fi
 		done
-		@SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap"
+		@SU@ -m @CYRUS_USER@ -c "@PREFIX@/bin/mkimap"
 	fi
 }
 
diff --git a/cyrus-imapd30/files/imapd.conf b/cyrus-imapd30/files/imapd.conf
index aba0e6b82a..974397b16a 100644
--- a/cyrus-imapd30/files/imapd.conf
+++ b/cyrus-imapd30/files/imapd.conf
@@ -3,23 +3,125 @@
 # Cyrus IMAP server configuration file.  Refer to imapd.conf(5) for
 # more options.
 
-configdirectory: /var/imap
-partition-default: /var/spool/imap
-sieveusehomedir: false
-sievedir: /var/sieve
-hashimapspool: false
-
+# Space-separated users who have admin rights for all services.
+# NB: THIS MUST BE CONFIGURED
 admins: cyrus
 
-# If use the saslauthd daemon to verify plaintext passwords, please ensure that
-# the saslauthd daemon is running before trying to authenticate.
-#
-#sasl_pwcheck_method: saslauthd
-sasl_pwcheck_method: auxprop
+###################################################################
+## File, socket and DB location settings.
+###################################################################
+
+# Configuration directory
+configdirectory: /var/lib/cyrus
+# OLD pkgsrc: configdirectory: /var/imap
+
+# Directories for proc and lock files
+proc_path: /run/cyrus/proc
+mboxname_lockpath: /run/cyrus/lock
+
+# Locations for DB files
+# The following DB are recreated upon initialization, so should live in
+# ephemeral storage for best performance.
+duplicate_db_path: /run/cyrus/deliver.db
+ptscache_db_path:  /run/cyrus/ptscache.db
+statuscache_db_path: /run/cyrus/statuscache.db
+tls_sessions_db_path: /run/cyrus/tls_sessions.db
+
+# Which partition to use for default mailboxes
+defaultpartition: default
+partition-default: /var/spool/cyrus/mail
+# OLD pkgsrc: partition-default: /var/spool/imap
+
+# If sieveusehomedir is false (the default), this directory is searched
+# for Sieve scripts.
+sievedir: /var/spool/sieve
+# OLD pkgsrc: sievedir:/var/sieve
+# OLD pkgsrc: hashimapspool: false
 
-# 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.
+###################################################################
+## Important: KEEP THESE IN SYNC WITH cyrus.conf
+###################################################################
+
+lmtpsocket: /run/cyrus/socket/lmtp
+idlesocket: /run/cyrus/socket/idle
+notifysocket: /run/cyrus/socket/notify
+
+# Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap
+# etc.)
+syslog_prefix: cyrus
+
+###################################################################
+## Server behaviour settings
+###################################################################
+
+# Space-separated list of HTTP modules that will be enabled in
+# httpd(8).  This option has no effect on modules that are disabled at
+# compile time due to missing dependencies (e.g. libical).
 #
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
+# Allowed values: caldav, carddav, domainkey, ischedule, rss
+httpmodules: caldav carddav
+
+# If enabled, the partitions will also be hashed, in addition to the
+# hashing done on configuration directories. This is recommended if one
+# partition has a very bushy mailbox tree.
+hashimapspool: true
+
+# Enable virtual domains
+# and set default domain to localhost
+virtdomains: yes
+defaultdomain: localhost
+
+###################################################################
+## User experience settings
+###################################################################
+
+# Minimum time between POP mail fetches in minutes
+popminpoll: 1
+
+###################################################################
+## User Authentication settings
+###################################################################
+
+# Allow plaintext logins by default (SASL PLAIN)
+allowplaintext: yes
+
+###################################################################
+## SASL library options (these are handled directly by the SASL
+## libraries, refer to SASL documentation for an up-to-date list of
+## these)
+###################################################################
+
+# The mechanism(s) used by the server to verify plaintext passwords.
+# Possible values are "saslauthd", "auxprop", "pwcheck" and
+# "alwaystrue".  They are tried in order, you can specify more than one,
+# separated by spaces.
+sasl_pwcheck_method: saslauthd
+# OLD pkgsrc: sasl_pwcheck_method: auxprop
+
+# If enabled, the SASL library will automatically create authentication
+# secrets when given a plaintext password. Refer to SASL documentation
+sasl_auto_transition: no
+
+###################################################################
+## SSL/TLS Options
+###################################################################
+
+# File containing the global certificate used for ALL services (imap,
+# pop3, lmtp, sieve)
+#tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
+
+# File containing the private key belonging to the global server
+# certificate.
+#tls_server_key: /etc/ssl/private/ssl-cert-snakeoil.key
+
+
+# File containing one or more Certificate Authority (CA) certificates.
+#tls_client_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+
+# Path to directory with certificates of CAs.
+tls_client_ca_dir: /etc/ssl/certs
+
+# The length of time (in minutes) that a TLS session will be cached for
+# later reuse.  The maximum value is 1440 (24 hours), the default.  A
+# value of 0 will disable session caching.
+tls_session_timeout: 1440
Prev by Date: dbip-city-lite: remove, imported in pkgsrc as net/dbip-city-lite.
Next by Date: p5-GeoIP2: remove, imported in pkgsrc as net/p5-GeoIP2.
Previous by Thread: dbip-city-lite: remove, imported in pkgsrc as net/dbip-city-lite.
Next by Thread: p5-GeoIP2: remove, imported in pkgsrc as net/p5-GeoIP2.
Indexes:
Home | Main Index | Thread Index | Old Index