Here is an update to Dovecot 2.1rc1 for testing. No release of
Dovecot-pigeonhole
yet. Please test and let me know how it goes.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.177
diff -u -p -r1.177 Makefile
--- Makefile 18 Nov 2011 13:20:08 -0000 1.177
+++ Makefile 24 Nov 2011 04:00:38 -0000
@@ -9,8 +9,8 @@ COMMENT-postgresql= PostgreSQL authentic
COMMENT-sqlite= SQLite authentication / dictionary support for Dovecot
# Bump dovecot-pigeonhole every time you update to a new Dovecot version.
-V_MAJOR= 2.0
-V_DOVECOT= 2.0.16
+V_MAJOR= 2.1
+V_DOVECOT= 2.1.rc1
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
@@ -20,11 +20,12 @@ PKGNAME-mysql= dovecot-mysql-${V_DOVECOT
PKGNAME-postgresql= dovecot-postgresql-${V_DOVECOT}
PKGNAME-sqlite= dovecot-sqlite-${V_DOVECOT}
CATEGORIES= mail
-MASTER_SITES= ${HOMEPAGE}releases/${V_MAJOR}/
+MASTER_SITES= ${HOMEPAGE}releases/${V_MAJOR}/rc/
SHARED_LIBS= dovecot-lda 0.0 \
dovecot-login 0.0 \
dovecot-sql 0.0 \
+ dovecot-ssl 0.0 \
dovecot-storage 0.0 \
dovecot 0.0
@@ -37,21 +38,25 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB-server= ${MODLIBICONV_WANTLIB} asn1 bz2 c crypto gssapi krb5
ssl z
+
+WANTLIB-server= asn1 bz2 c crypto gssapi krb5 ssl z
${MODLIBICONV_WANTLIB}
+WANTLIB-ldap= asn1 com_err crypto gssapi krb5 lber ldap sasl2 ssl
+WANTLIB-mysql= crypto m lib/mysql/mysqlclient>=10 ssl z
+WANTLIB-postgresql= pq>=4
+WANTLIB-sqlite= sqlite3 z
MODULES= converters/libiconv
LIB_DEPENDS+= archivers/bzip2
+LIB_DEPENDS-ldap= databases/openldap
+RUN_DEPENDS-ldap= ${BASE_PKGPATH}=${V_DOVECOT}
+LIB_DEPENDS-mysql= databases/mysql
+RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_DOVECOT}
+LIB_DEPENDS-postgresql= databases/postgresql
+RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
+LIB_DEPENDS-sqlite= databases/sqlite3
+RUN_DEPENDS-sqlite= ${BASE_PKGPATH}=${V_DOVECOT}
-MULTI_PACKAGES= -server -ldap -mysql -postgresql -sqlite
-SUBPACKAGE?= -server
-
-PSEUDO_FLAVORS= no_db no_ldap no_mysql no_postgresql no_sqlite
-FLAVOR?=
-.if ${FLAVOR:Mno_db}
-FLAVOR += no_ldap no_mysql no_postgresql no_sqlite
-.endif
-
-USE_LIBTOOL= Yes
+USE_LIBTOOL= gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --localstatedir=/var \
--with-gssapi \
@@ -60,37 +65,50 @@ CONFIGURE_ARGS= --localstatedir=/var \
--with-statedir=/var/dovecot \
--without-pam \
--without-shadow \
+ --without-stemmer \
--without-vpopmail
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+PSEUDO_FLAVORS= no_db no_ldap no_mysql no_postgresql no_sqlite
+FLAVOR?=
+.if ${FLAVOR:Mno_db}
+FLAVOR += no_ldap no_mysql no_postgresql no_sqlite
+.endif
+
+MULTI_PACKAGES= -server -ldap -mysql -postgresql -sqlite
+SUBPACKAGE?= -server
+
+.if !${FLAVOR:L:Mno_ldap}
+MULTI_PACKAGES+=-ldap
+.endif
+
+.if !${FLAVOR:L:Mno_mysql}
+MULTI_PACKAGES+=-mysql
+.endif
+
+.if !${FLAVOR:L:Mno_postgresql}
+MULTI_PACKAGES+=-postgresql
+.endif
+
+.if !${FLAVOR:L:Mno_sqlite}
+MULTI_PACKAGES+=-sqlite
+.endif
.include <bsd.port.arch.mk>
-LIB_DEPENDS-ldap= databases/openldap
-RUN_DEPENDS-ldap= ${BASE_PKGPATH}=${V_DOVECOT}
-WANTLIB-ldap= asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
.if ${BUILD_PACKAGES:M-ldap}
CONFIGURE_ARGS+=--with-ldap=plugin
.endif
-LIB_DEPENDS-mysql= databases/mysql
-RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_DOVECOT}
-WANTLIB-mysql= crypto m lib/mysql/mysqlclient>=10 ssl z
.if ${BUILD_PACKAGES:M-mysql}
CONFIGURE_ARGS+=--with-mysql
.endif
-LIB_DEPENDS-postgresql= databases/postgresql
-RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
-WANTLIB-postgresql= com_err crypto pq>=4 ssl
.if ${BUILD_PACKAGES:M-postgresql}
CONFIGURE_ARGS+=--with-pgsql
.endif
-LIB_DEPENDS-sqlite= databases/sqlite3
-RUN_DEPENDS-sqlite= ${BASE_PKGPATH}=${V_DOVECOT}
-WANTLIB-sqlite= sqlite3 z
.if ${BUILD_PACKAGES:M-sqlite}
CONFIGURE_ARGS+=--with-sqlite
.endif
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.93
diff -u -p -r1.93 distinfo
--- distinfo 17 Nov 2011 10:39:00 -0000 1.93
+++ distinfo 24 Nov 2011 03:15:28 -0000
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0.16.tar.gz) = 4Bopo1Wv78uftfi3pU4aFA==
-RMD160 (dovecot-2.0.16.tar.gz) = 3+DPK70hGge7SSwvDZRKap8cX3k=
-SHA1 (dovecot-2.0.16.tar.gz) = DfboQjMznuMI3q7Njxp//dyuyhY=
-SHA256 (dovecot-2.0.16.tar.gz) = qWUs4fB2e5pNT2E91NQbvntVwlcovm8Sg9rPCv9i8Fc=
-SIZE (dovecot-2.0.16.tar.gz) = 3317662
+MD5 (dovecot-2.1.rc1.tar.gz) = OxNnrisQyZHCJ+jaeegtNg==
+RMD160 (dovecot-2.1.rc1.tar.gz) = 9FBXGDcC/W+qWso0X8SHVTibY4c=
+SHA1 (dovecot-2.1.rc1.tar.gz) = 7zpYAxGLv2/JxnxLRDf/ORAwWCg=
+SHA256 (dovecot-2.1.rc1.tar.gz) = Ypw08A8ml3X1XMw7Ll+gQmMpkbFZSx7x1OJmPc2s+zM=
+SIZE (dovecot-2.1.rc1.tar.gz) = 3561759
Index: patches/patch-doc_example-config_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_Makefile_in
--- patches/patch-doc_example-config_Makefile_in 23 May 2011 22:54:38
-0000 1.1
+++ patches/patch-doc_example-config_Makefile_in 24 Nov 2011 03:15:28
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_example-config_Makefile_in,v 1.1 2011/05/23 22:54:38 sthen
Exp $
---- doc/example-config/Makefile.in.orig Wed May 11 10:35:51 2011
-+++ doc/example-config/Makefile.in Wed May 11 20:26:49 2011
-@@ -285,7 +285,7 @@ top_srcdir = @top_srcdir@
+--- doc/example-config/Makefile.in.orig Fri Sep 16 10:00:02 2011
++++ doc/example-config/Makefile.in Sun Sep 18 16:38:16 2011
+@@ -288,7 +288,7 @@ top_srcdir = @top_srcdir@
SUBDIRS = conf.d
pkgsysconfdir = $(sysconfdir)/dovecot
nodist_pkgsysconf_DATA = README
Index: patches/patch-doc_example-config_conf_d_10-mail_conf
===================================================================
RCS file:
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_10-mail_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_conf_d_10-mail_conf
--- patches/patch-doc_example-config_conf_d_10-mail_conf 23 May 2011
22:54:38 -0000 1.1
+++ patches/patch-doc_example-config_conf_d_10-mail_conf 24 Nov 2011
03:15:28 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_example-config_conf_d_10-mail_conf,v 1.1 2011/05/23
22:54:38 sthen Exp $
---- doc/example-config/conf.d/10-mail.conf.orig Thu Dec 30 10:42:54 2010
-+++ doc/example-config/conf.d/10-mail.conf Tue Mar 22 15:11:14 2011
+--- doc/example-config/conf.d/10-mail.conf.orig Tue Nov 15 15:24:30 2011
++++ doc/example-config/conf.d/10-mail.conf Wed Nov 23 22:01:15 2011
@@ -132,8 +132,9 @@
##
@@ -26,7 +26,7 @@ $OpenBSD: patch-doc_example-config_conf_
# Space separated list of plugins to load for all services. Plugins specific
to
# IMAP, LDA, etc. are added to this list in their own .conf files.
-@@ -266,7 +267,7 @@
+@@ -276,7 +277,7 @@
# locking methods as well. Some operating systems don't allow using some of
# them simultaneously.
#mbox_read_locks = fcntl
Index: patches/patch-doc_example-config_conf_d_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_conf_d_Makefile_in
--- patches/patch-doc_example-config_conf_d_Makefile_in 23 May 2011 22:54:38
-0000 1.1
+++ patches/patch-doc_example-config_conf_d_Makefile_in 24 Nov 2011 03:15:28
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-doc_example-config_conf_d_Makefile_in,v 1.1 2011/05/23
22:54:38 sthen Exp $
---- doc/example-config/conf.d/Makefile.in.orig Wed May 11 10:35:51 2011
-+++ doc/example-config/conf.d/Makefile.in Wed May 11 20:26:49 2011
-@@ -242,7 +242,7 @@ top_build_prefix = @top_build_prefix@
+--- doc/example-config/conf.d/Makefile.in.orig Fri Sep 16 10:00:02 2011
++++ doc/example-config/conf.d/Makefile.in Sun Sep 18 16:38:16 2011
+@@ -245,7 +245,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkgsysconfdir = $(sysconfdir)/dovecot
Index: pkg/PLIST-server
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/pkg/PLIST-server,v
retrieving revision 1.24
diff -u -p -r1.24 PLIST-server
--- pkg/PLIST-server 17 Nov 2011 10:39:01 -0000 1.24
+++ pkg/PLIST-server 24 Nov 2011 04:11:09 -0000
@@ -99,6 +99,7 @@ include/dovecot/fs-api-private.h
include/dovecot/fs-api.h
include/dovecot/fs-sis-common.h
include/dovecot/fsync-mode.h
+include/dovecot/guid.h
include/dovecot/hash-format.h
include/dovecot/hash-method.h
include/dovecot/hash.h
@@ -106,6 +107,7 @@ include/dovecot/hash2.h
include/dovecot/hex-binary.h
include/dovecot/hex-dec.h
include/dovecot/hmac-md5.h
+include/dovecot/hmac-sha1.h
include/dovecot/home-expand.h
include/dovecot/hostpid.h
include/dovecot/imap-arg.h
@@ -132,10 +134,19 @@ include/dovecot/imap-status.h
include/dovecot/imap-sync.h
include/dovecot/imap-utf7.h
include/dovecot/imap-util.h
+include/dovecot/imapc-client-private.h
+include/dovecot/imapc-client.h
+include/dovecot/imapc-connection.h
+include/dovecot/imapc-list.h
+include/dovecot/imapc-mail.h
+include/dovecot/imapc-msgmap.h
+include/dovecot/imapc-settings.h
+include/dovecot/imapc-storage.h
+include/dovecot/imapc-sync.h
include/dovecot/imem.h
include/dovecot/index-attachment.h
include/dovecot/index-mail.h
-include/dovecot/index-mailbox-list.h
+include/dovecot/index-search-private.h
include/dovecot/index-search-result.h
include/dovecot/index-sort-private.h
include/dovecot/index-sort.h
@@ -143,11 +154,15 @@ include/dovecot/index-storage.h
include/dovecot/index-sync-changes.h
include/dovecot/index-sync-private.h
include/dovecot/index-thread-private.h
-include/dovecot/ioloop-internal.h
include/dovecot/ioloop-iolist.h
include/dovecot/ioloop-notify-fd.h
+include/dovecot/ioloop-private.h
include/dovecot/ioloop.h
-include/dovecot/iostream-internal.h
+include/dovecot/iostream-openssl.h
+include/dovecot/iostream-private.h
+include/dovecot/iostream-rawlog-private.h
+include/dovecot/iostream-rawlog.h
+include/dovecot/iostream-ssl.h
include/dovecot/ipc-client.h
include/dovecot/ipc-server.h
include/dovecot/ipwd.h
@@ -157,9 +172,10 @@ include/dovecot/istream-concat.h
include/dovecot/istream-crlf.h
include/dovecot/istream-dot.h
include/dovecot/istream-header-filter.h
-include/dovecot/istream-internal.h
-include/dovecot/istream-mail-stats.h
+include/dovecot/istream-mail.h
+include/dovecot/istream-private.h
include/dovecot/istream-raw-mbox.h
+include/dovecot/istream-rawlog.h
include/dovecot/istream-seekable.h
include/dovecot/istream-tee.h
include/dovecot/istream.h
@@ -205,9 +221,9 @@ include/dovecot/mail-transaction-log-vie
include/dovecot/mail-transaction-log.h
include/dovecot/mail-types.h
include/dovecot/mail-user.h
+include/dovecot/mailbox-guid-cache.h
include/dovecot/mailbox-list-delete.h
include/dovecot/mailbox-list-fs.h
-include/dovecot/mailbox-list-index-private.h
include/dovecot/mailbox-list-index.h
include/dovecot/mailbox-list-maildir.h
include/dovecot/mailbox-list-private.h
@@ -217,6 +233,7 @@ include/dovecot/mailbox-log.h
include/dovecot/mailbox-search-result-private.h
include/dovecot/mailbox-tree.h
include/dovecot/mailbox-uidvalidity.h
+include/dovecot/maildir-filename-flags.h
include/dovecot/maildir-filename.h
include/dovecot/maildir-keywords.h
include/dovecot/maildir-settings.h
@@ -274,10 +291,12 @@ include/dovecot/nfs-workarounds.h
include/dovecot/notify-plugin-private.h
include/dovecot/notify-plugin.h
include/dovecot/ostream-cmp.h
-include/dovecot/ostream-internal.h
+include/dovecot/ostream-private.h
+include/dovecot/ostream-rawlog.h
include/dovecot/ostream.h
include/dovecot/passdb-blocking.h
include/dovecot/passdb-cache.h
+include/dovecot/passdb-template.h
include/dovecot/passdb.h
include/dovecot/password-scheme.h
include/dovecot/pop3-capability.h
@@ -333,7 +352,7 @@ include/dovecot/unix-socket-create.h
include/dovecot/unlink-directory.h
include/dovecot/unlink-old-files.h
include/dovecot/userdb-blocking.h
-include/dovecot/userdb-static.h
+include/dovecot/userdb-template.h
include/dovecot/userdb-vpopmail.h
include/dovecot/userdb.h
include/dovecot/utc-mktime.h
@@ -343,12 +362,14 @@ include/dovecot/wildcard-match.h
include/dovecot/write-full.h
lib/dovecot/
lib/dovecot/auth/
+lib/dovecot/auth/libauthdb_imap.so
lib/dovecot/dict/
lib/dovecot/doveadm/
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.so
+lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so
lib/dovecot/dovecot-config
lib/dovecot/lib01_acl_plugin.so
lib/dovecot/lib02_imap_acl_plugin.so
@@ -367,9 +388,12 @@ lib/dovecot/lib20_virtual_plugin.so
lib/dovecot/lib20_zlib_plugin.so
lib/dovecot/lib21_fts_squat_plugin.so
lib/dovecot/lib30_imap_zlib_plugin.so
+lib/dovecot/lib90_stats_plugin.so
+lib/dovecot/lib95_imap_stats_plugin.so
@lib lib/dovecot/libdovecot-lda.so.${LIBdovecot-lda_VERSION}
@lib lib/dovecot/libdovecot-login.so.${LIBdovecot-login_VERSION}
@lib lib/dovecot/libdovecot-sql.so.${LIBdovecot-sql_VERSION}
+@lib lib/dovecot/libdovecot-ssl.so.${LIBdovecot-ssl_VERSION}
@lib lib/dovecot/libdovecot-storage.so.${LIBdovecot-storage_VERSION}
@lib lib/dovecot/libdovecot.so.${LIBdovecot_VERSION}
libexec/dovecot/
@@ -377,6 +401,7 @@ libexec/dovecot/
@bin libexec/dovecot/auth
@bin libexec/dovecot/checkpassword-reply
@bin libexec/dovecot/config
+libexec/dovecot/decode2text.sh
libexec/dovecot/deliver
@bin libexec/dovecot/dict
@bin libexec/dovecot/director
@@ -386,8 +411,9 @@ libexec/dovecot/deliver
@bin libexec/dovecot/gdbhelper
@bin libexec/dovecot/imap
@bin libexec/dovecot/imap-login
+@bin libexec/dovecot/indexer
+@bin libexec/dovecot/indexer-worker
@bin libexec/dovecot/ipc
-@bin libexec/dovecot/listview
@bin libexec/dovecot/lmtp
@bin libexec/dovecot/log
@bin libexec/dovecot/maildirlock
@@ -397,6 +423,8 @@ libexec/dovecot/deliver
@bin libexec/dovecot/script
@bin libexec/dovecot/script-login
@bin libexec/dovecot/ssl-params
+@bin libexec/dovecot/stats
+@bin libexec/dovecot/xml2text
@comment @man man/man1/deliver.1
@man man/man1/doveadm-altmove.1
@man man/man1/doveadm-auth.1
@@ -433,7 +461,6 @@ sbin/dovecot-mkcert.sh
share/aclocal/
share/aclocal/dovecot.m4
share/doc/dovecot/
-share/doc/dovecot/auth-protocol.txt
share/doc/dovecot/documentation.txt
@sample ${SYSCONFDIR}/dovecot/
@sample ${SYSCONFDIR}/dovecot/conf.d/
@@ -474,6 +501,7 @@ share/doc/dovecot/wiki/Debugging.Rawlog.
share/doc/dovecot/wiki/Debugging.Thunderbird.txt
share/doc/dovecot/wiki/Design.Arrays.txt
share/doc/dovecot/wiki/Design.AuthProcess.txt
+share/doc/dovecot/wiki/Design.AuthProtocol.txt
share/doc/dovecot/wiki/Design.Buffers.txt
share/doc/dovecot/wiki/Design.Dsync.txt
share/doc/dovecot/wiki/Design.Indexes.Cache.txt
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
