Attached is a start at providing updates to Dovecot 2.1 and the
associated add-ons. The antispam update was provided by sthen@.
So if you have a new enough -current system and can provide any
feedback please do so.
Note: none of this has been tested so far other than ensuring
it builds.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.187
diff -u -p -r1.187 Makefile
--- Makefile 17 May 2012 07:48:15 -0000 1.187
+++ Makefile 17 May 2012 21:35:15 -0000
@@ -6,11 +6,10 @@ COMMENT-server= compact IMAP/POP3 server
COMMENT-ldap= LDAP authentication support for Dovecot
COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
-REVISION-server= 0
# Bump dovecot-pigeonhole every time you update to a new Dovecot version.
-V_MAJOR= 2.0
-V_DOVECOT= 2.0.20
+V_MAJOR= 2.1
+V_DOVECOT= 2.1.6
DISTNAME= dovecot-${V_DOVECOT}
PKGNAME= dovecot-${V_DOVECOT}
@@ -21,11 +20,12 @@ PKGNAME-postgresql= dovecot-postgresql-$
CATEGORIES= mail
MASTER_SITES= ${HOMEPAGE}releases/${V_MAJOR}/
-SHARED_LIBS= dovecot-lda 0.0 \
- dovecot-login 0.0 \
- dovecot-sql 0.0 \
- dovecot-storage 0.0 \
- dovecot 0.0
+SHARED_LIBS= dovecot-lda 1.0 \
+ dovecot-login 1.0 \
+ dovecot-sql 1.0 \
+ dovecot-ssl 0.0 \
+ dovecot-storage 1.0 \
+ dovecot 1.0
HOMEPAGE= http://www.dovecot.org/
@@ -39,7 +39,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB-server= asn1 bz2 c crypto gssapi krb5 sqlite3 ssl z \
${MODLIBICONV_WANTLIB}
-WANTLIB-ldap= asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
+WANTLIB-ldap= asn1 com_err crypto gssapi krb5 lber ldap sasl2 ssl
WANTLIB-mysql= crypto m lib/mysql/mysqlclient>=10 ssl z
WANTLIB-postgresql= com_err crypto pq>=4 ssl
@@ -52,7 +52,7 @@ RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_D
LIB_DEPENDS-postgresql= databases/postgresql
RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
-USE_LIBTOOL= Yes
+USE_LIBTOOL= gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-gssapi \
--with-rundir=/var/dovecot \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo 10 Apr 2012 22:39:08 -0000 1.97
+++ distinfo 13 May 2012 02:37:07 -0000
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0.20.tar.gz) = 5nwWxbfKaCRK6IVpq1eQPw==
-RMD160 (dovecot-2.0.20.tar.gz) = T7Pv5s6hzaRzYBKAg1Vz6NtGNMc=
-SHA1 (dovecot-2.0.20.tar.gz) = xCHprLb7TlCabJu9gpcCCVQ8//A=
-SHA256 (dovecot-2.0.20.tar.gz) = +mMBWRJ+cQ3NYjuZvGVdH1+FiR/RYV8ZTqctT+PPgsA=
-SIZE (dovecot-2.0.20.tar.gz) = 3360751
+MD5 (dovecot-2.1.6.tar.gz) = VtKo1Sc9OcqkHWqN2fRELA==
+RMD160 (dovecot-2.1.6.tar.gz) = gH3cxBQCsOpsi/0z7I357R/3XZU=
+SHA1 (dovecot-2.1.6.tar.gz) = iL3oqBEGRu8aW1lDN6IZZOWzWFA=
+SHA256 (dovecot-2.1.6.tar.gz) = S4GyzfYkNExsL/kb4beUkRtRyY3/okCVpty8fra8Hok=
+SIZE (dovecot-2.1.6.tar.gz) = 3773967
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 13 May 2012 02:49:32
-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 May 4 17:14:16 2012
++++ doc/example-config/Makefile.in Sat May 12 22:47:30 2012
+@@ -296,7 +296,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 13 May 2012
02:49:31 -0000
@@ -1,7 +1,7 @@
$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
-@@ -132,8 +132,9 @@
+--- doc/example-config/conf.d/10-mail.conf.orig Fri May 4 17:14:02 2012
++++ doc/example-config/conf.d/10-mail.conf Sat May 12 22:47:31 2012
+@@ -129,8 +129,9 @@ namespace inbox {
##
# Don't use mmap() at all. This is required if you store indexes to shared
@@ -13,7 +13,7 @@ $OpenBSD: patch-doc_example-config_conf_
# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
# since version 3, so this should be safe to use nowadays by default.
-@@ -197,10 +198,10 @@
+@@ -194,10 +195,10 @@ namespace inbox {
# UNIX socket path to master authentication server to find users.
# This is used by imap (for shared users) and lda.
@@ -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 @@
+@@ -277,7 +278,7 @@ namespace inbox {
# 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 13 May 2012 02:49:32
-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 May 4 17:14:16 2012
++++ doc/example-config/conf.d/Makefile.in Sat May 12 22:47:31 2012
+@@ -253,7 +253,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkgsysconfdir = $(sysconfdir)/dovecot
Index: patches/patch-doc_example-config_dovecot_conf
===================================================================
RCS file:
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_dovecot_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_example-config_dovecot_conf
--- patches/patch-doc_example-config_dovecot_conf 17 Feb 2012 22:10:34
-0000 1.2
+++ patches/patch-doc_example-config_dovecot_conf 13 May 2012 02:49:32
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_example-config_dovecot_conf,v 1.2 2012/02/17 22:10:34
sthen Exp $
---- doc/example-config/dovecot.conf.orig Thu Feb 9 12:32:48 2012
-+++ doc/example-config/dovecot.conf Thu Feb 16 19:05:38 2012
+--- doc/example-config/dovecot.conf.orig Thu Mar 15 10:12:46 2012
++++ doc/example-config/dovecot.conf Sat May 12 22:47:31 2012
@@ -26,7 +26,7 @@
#listen = *, ::
@@ -8,5 +8,5 @@ $OpenBSD: patch-doc_example-config_dovec
-#base_dir = /var/run/dovecot/
+#base_dir = /var/dovecot/
- # Name of this instance. Used to prefix all Dovecot processes in ps output.
- #instance_name = dovecot
+ # Name of this instance. In multi-instance setup doveadm and other commands
+ # can use -i <instance_name> to select which instance is used (an alternative
Index: patches/patch-src_auth_Makefile_in
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/patches/patch-src_auth_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_auth_Makefile_in
--- patches/patch-src_auth_Makefile_in 28 Jan 2012 21:35:02 -0000 1.1
+++ patches/patch-src_auth_Makefile_in 13 May 2012 03:47:41 -0000
@@ -4,9 +4,9 @@ Heimdal libkrb5 exports base64_encode an
with libdovecot's versions. Workaround the namespace pollution issue
by statically linking libdovecot so its symbols take precedence.
---- src/auth/Makefile.in.orig Sat Jan 28 20:46:02 2012
-+++ src/auth/Makefile.in Sat Jan 28 20:46:30 2012
-@@ -218,7 +218,7 @@ LD = @LD@
+--- src/auth/Makefile.in.orig Fri May 4 17:14:17 2012
++++ src/auth/Makefile.in Sat May 12 23:47:00 2012
+@@ -241,7 +241,7 @@ LD = @LD@
LDAP_LIBS = @LDAP_LIBS@
LDFLAGS = @LDFLAGS@
LIBCAP = @LIBCAP@
Index: patches/patch-src_doveadm_Makefile_in
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/patches/patch-src_doveadm_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_doveadm_Makefile_in
--- patches/patch-src_doveadm_Makefile_in 28 Jan 2012 21:35:02 -0000
1.1
+++ patches/patch-src_doveadm_Makefile_in 13 May 2012 03:47:36 -0000
@@ -4,9 +4,9 @@ Heimdal libkrb5 exports base64_encode an
with libdovecot's versions. Workaround the namespace pollution issue
by statically linking libdovecot so its symbols take precedence.
---- src/doveadm/Makefile.in.orig Fri Jan 6 13:26:43 2012
-+++ src/doveadm/Makefile.in Sat Jan 28 20:22:18 2012
-@@ -146,7 +146,7 @@ LD = @LD@
+--- src/doveadm/Makefile.in.orig Fri May 4 17:14:17 2012
++++ src/doveadm/Makefile.in Sat May 12 23:47:29 2012
+@@ -187,7 +187,7 @@ LD = @LD@
LDAP_LIBS = @LDAP_LIBS@
LDFLAGS = @LDFLAGS@
LIBCAP = @LIBCAP@
Index: patches/patch-src_master_master-settings_c
===================================================================
RCS file:
/home/cvs/ports/mail/dovecot/patches/patch-src_master_master-settings_c,v
retrieving revision 1.14
diff -u -p -r1.14 patch-src_master_master-settings_c
--- patches/patch-src_master_master-settings_c 17 Feb 2012 22:10:34 -0000
1.14
+++ patches/patch-src_master_master-settings_c 13 May 2012 02:49:31 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_master_master-settin
changed settings are also present in src/config/all-settings.c; this file
is rebuilt as part of the Dovecot build.
---- src/master/master-settings.c.orig Thu Feb 9 12:32:48 2012
-+++ src/master/master-settings.c Thu Feb 16 19:05:38 2012
-@@ -216,8 +216,8 @@ static const struct master_settings master_default_set
+--- src/master/master-settings.c.orig Mon Apr 23 08:35:06 2012
++++ src/master/master-settings.c Sat May 12 22:47:31 2012
+@@ -217,8 +217,8 @@ static const struct master_settings master_default_set
.protocols = "imap pop3 lmtp",
.listen = "*, ::",
.ssl = "yes:no:required",
Index: pkg/PLIST-server
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/pkg/PLIST-server,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST-server
--- pkg/PLIST-server 17 May 2012 07:48:15 -0000 1.30
+++ pkg/PLIST-server 17 May 2012 20:52:34 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-server,v 1.30 2012/05/17 07:48:15 sthen Exp $
+@conflict dovecot-sqlite-*
@pkgpath mail/dovecot
@pkgpath mail/dovecot,-server,bdb
@pkgpath mail/dovecot,-server,bdb,ldap,mysql,postgresql,sqlite
@@ -12,7 +13,6 @@
@pkgpath mail/dovecot,postgresql
@pkgpath mail/dovecot,sqlite
@pkgpath mail/dovecot,-sqlite
-@conflict dovecot-sqlite-*
@ask-update dovecot-<2.0 You will need to change your conf
@newgroup _dovecot:518
@newgroup _dovenull:666
@@ -21,7 +21,7 @@
@extraunexec rm -rf /var/dovecot/*
@bin bin/doveadm
@bin bin/doveconf
-@bin bin/dsync
+bin/dsync
include/dovecot/
include/dovecot/abspath.h
include/dovecot/access-lookup.h
@@ -40,6 +40,7 @@ include/dovecot/auth-common.h
include/dovecot/auth-master-connection.h
include/dovecot/auth-master.h
include/dovecot/auth-penalty.h
+include/dovecot/auth-postfix-connection.h
include/dovecot/auth-request-handler.h
include/dovecot/auth-request.h
include/dovecot/auth-server-connection.h
@@ -87,6 +88,7 @@ include/dovecot/duplicate.h
include/dovecot/eacces-error.h
include/dovecot/env-util.h
include/dovecot/execv-const.h
+include/dovecot/fail-mail-storage.h
include/dovecot/failures.h
include/dovecot/fd-close-on-exec.h
include/dovecot/fd-set-nonblock.h
@@ -101,6 +103,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
@@ -108,6 +111,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
@@ -134,10 +138,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
@@ -145,11 +158,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
@@ -159,9 +176,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
@@ -206,10 +224,11 @@ include/dovecot/mail-transaction-log-pri
include/dovecot/mail-transaction-log-view-private.h
include/dovecot/mail-transaction-log.h
include/dovecot/mail-types.h
+include/dovecot/mail-user-hash.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
@@ -219,6 +238,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
@@ -226,6 +246,7 @@ include/dovecot/maildir-storage.h
include/dovecot/maildir-sync.h
include/dovecot/maildir-uidlist.h
include/dovecot/master-auth.h
+include/dovecot/master-instance.h
include/dovecot/master-interface.h
include/dovecot/master-login-auth.h
include/dovecot/master-login.h
@@ -269,6 +290,7 @@ include/dovecot/mkdir-parents.h
include/dovecot/mmap-util.h
include/dovecot/module-context.h
include/dovecot/module-dir.h
+include/dovecot/mountpoint-list.h
include/dovecot/mountpoint.h
include/dovecot/mycrypt.h
include/dovecot/network.h
@@ -276,10 +298,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
@@ -287,6 +311,10 @@ include/dovecot/pop3-client.h
include/dovecot/pop3-commands.h
include/dovecot/pop3-common.h
include/dovecot/pop3-settings.h
+include/dovecot/pop3c-client.h
+include/dovecot/pop3c-settings.h
+include/dovecot/pop3c-storage.h
+include/dovecot/pop3c-sync.h
include/dovecot/primes.h
include/dovecot/printf-format-fix.h
include/dovecot/priorityq.h
@@ -335,7 +363,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
@@ -345,6 +373,7 @@ include/dovecot/wildcard-match.h
include/dovecot/write-full.h
lib/dovecot/
lib/dovecot/auth/
+lib/dovecot/auth/libauthdb_imap.so
lib/dovecot/auth/libdriver_sqlite.so
lib/dovecot/dict/
lib/dovecot/dict/libdriver_sqlite.so
@@ -353,10 +382,12 @@ lib/dovecot/doveadm/lib10_doveadm_acl_pl
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
lib/dovecot/lib02_lazy_expunge_plugin.so
+lib/dovecot/lib05_pop3_migration_plugin.so
lib/dovecot/lib05_snarf_plugin.so
lib/dovecot/lib10_quota_plugin.so
lib/dovecot/lib11_imap_quota_plugin.so
@@ -367,21 +398,27 @@ lib/dovecot/lib20_expire_plugin.so
lib/dovecot/lib20_fts_plugin.so
lib/dovecot/lib20_listescape_plugin.so
lib/dovecot/lib20_mail_log_plugin.so
+lib/dovecot/lib20_replication_plugin.so
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}
lib/dovecot/libdriver_sqlite.so
libexec/dovecot/
+@bin libexec/dovecot/aggregator
@bin libexec/dovecot/anvil
@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
@@ -391,17 +428,21 @@ 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
@bin libexec/dovecot/pop3
@bin libexec/dovecot/pop3-login
@bin libexec/dovecot/rawlog
+@bin libexec/dovecot/replicator
@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
@@ -414,9 +455,11 @@ libexec/dovecot/deliver
@man man/man1/doveadm-help.1
@man man/man1/doveadm-import.1
@man man/man1/doveadm-index.1
+@man man/man1/doveadm-instance.1
@man man/man1/doveadm-kick.1
@man man/man1/doveadm-log.1
@man man/man1/doveadm-mailbox.1
+@man man/man1/doveadm-mount.1
@man man/man1/doveadm-move.1
@man man/man1/doveadm-penalty.1
@man man/man1/doveadm-purge.1
@@ -438,7 +481,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/
@@ -514,6 +556,7 @@ share/doc/dovecot/wiki/Errors.ChgrpNoPer
share/doc/dovecot/wiki/FindMailLocation.txt
share/doc/dovecot/wiki/FinishBasicConfiguration.txt
share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
+share/doc/dovecot/wiki/HowTo.F5SLBTLSOffload.txt
share/doc/dovecot/wiki/HowTo.ImapcProxy.txt
share/doc/dovecot/wiki/HowTo.PopBSMTPAndDovecot.txt
share/doc/dovecot/wiki/HowTo.PopRelay.txt
@@ -678,6 +721,8 @@ share/examples/dovecot/example-config/co
@sample ${SYSCONFDIR}/dovecot/conf.d/10-ssl.conf
share/examples/dovecot/example-config/conf.d/15-lda.conf
@sample ${SYSCONFDIR}/dovecot/conf.d/15-lda.conf
+share/examples/dovecot/example-config/conf.d/15-mailboxes.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/15-mailboxes.conf
share/examples/dovecot/example-config/conf.d/20-imap.conf
@sample ${SYSCONFDIR}/dovecot/conf.d/20-imap.conf
share/examples/dovecot/example-config/conf.d/20-lmtp.conf
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 10 Apr 2012 22:39:40 -0000 1.14
+++ Makefile 17 May 2012 22:53:34 -0000
@@ -4,10 +4,9 @@ SHARED_ONLY= Yes
COMMENT= Sieve mail filtering for Dovecot
-V_SIEVE= 0.2.6
-V_DOVECOT= 2.0
-V_DOVECOT_FULL= 2.0.20
-REVISION= 1
+V_SIEVE= 0.3.0
+V_DOVECOT= 2.1
+V_DOVECOT_FULL= 2.1.6
DISTNAME= dovecot-${V_DOVECOT}-pigeonhole-${V_SIEVE}
EPOCH= 0
@@ -15,7 +14,7 @@ CATEGORIES= mail
PKGNAME= dovecot-pigeonhole-${V_SIEVE}
MASTER_SITES= http://www.rename-it.nl/dovecot/${V_DOVECOT}/
-SHARED_LIBS= dovecot-sieve 0.1
+SHARED_LIBS= dovecot-sieve 1.0
HOMEPAGE= http://pigeonhole.dovecot.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 17 Feb 2012 22:10:57 -0000 1.5
+++ distinfo 13 May 2012 04:04:24 -0000
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0-pigeonhole-0.2.6.tar.gz) = viqsxEeybhTrkDJBFq9wqg==
-RMD160 (dovecot-2.0-pigeonhole-0.2.6.tar.gz) = HuNarJE2W+WF8ZvyGjsSwsgd4Mg=
-SHA1 (dovecot-2.0-pigeonhole-0.2.6.tar.gz) = EIv+/mUD3PkQyXIHU40Q9UHQSpk=
-SHA256 (dovecot-2.0-pigeonhole-0.2.6.tar.gz) =
SYKeSu12OEi2Oyv54ojUvJQCDJJM4GIbyFDgpL9IIas=
-SIZE (dovecot-2.0-pigeonhole-0.2.6.tar.gz) = 1234253
+MD5 (dovecot-2.1-pigeonhole-0.3.0.tar.gz) = o+GXAbd1v+HYBZwd/9Q/gA==
+RMD160 (dovecot-2.1-pigeonhole-0.3.0.tar.gz) = ZGkrA7YAebntIrBp3pR9p/SjIRQ=
+SHA1 (dovecot-2.1-pigeonhole-0.3.0.tar.gz) = 5GVTbOFGkIBGZbTuoJFpaVYtySY=
+SHA256 (dovecot-2.1-pigeonhole-0.3.0.tar.gz) =
Ku7oqm3HAEg7Clo9MfU1q85xaY7R1GfxHpMa6s4rCto=
+SIZE (dovecot-2.1-pigeonhole-0.3.0.tar.gz) = 1277277
Index: patches/patch-doc_example-config_conf_d_90-sieve_conf
===================================================================
RCS file:
/home/cvs/ports/mail/dovecot-pigeonhole/patches/patch-doc_example-config_conf_d_90-sieve_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_example-config_conf_d_90-sieve_conf
--- patches/patch-doc_example-config_conf_d_90-sieve_conf 17 Feb 2012
22:10:57 -0000 1.2
+++ patches/patch-doc_example-config_conf_d_90-sieve_conf 13 May 2012
04:52:04 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-doc_example-config_conf_d_90-sieve_conf,v 1.2 2012/02/17
22:10:57 sthen Exp $
---- doc/example-config/conf.d/90-sieve.conf.orig Sat Jan 7 10:21:02 2012
-+++ doc/example-config/conf.d/90-sieve.conf Thu Feb 16 20:13:06 2012
+--- doc/example-config/conf.d/90-sieve.conf.orig Sat Jan 7 09:58:07 2012
++++ doc/example-config/conf.d/90-sieve.conf Sun May 13 00:51:44 2012
@@ -16,7 +16,7 @@ plugin {
# command line tool.
# --> See sieve_before fore executing scripts before the user's personal
# script.
-- #sieve_global_path = /var/lib/dovecot/sieve/default.sieve
-+ #sieve_global_path = /var/dovecot/sieve/default.sieve
+- #sieve_default = /var/lib/dovecot/sieve/default.sieve
++ #sieve_default = /var/dovecot/sieve/default.sieve
# Directory for :personal include scripts for the include extension. This
# is also where the ManageSieve service stores the user's scripts.
Index: patches/patch-src_lib-managesieve_managesieve-parser_c
===================================================================
RCS file: patches/patch-src_lib-managesieve_managesieve-parser_c
diff -N patches/patch-src_lib-managesieve_managesieve-parser_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib-managesieve_managesieve-parser_c 13 May 2012
05:04:53 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- src/lib-managesieve/managesieve-parser.c.orig Sun May 13 01:03:02 2012
++++ src/lib-managesieve/managesieve-parser.c Sun May 13 01:03:32 2012
+@@ -636,7 +636,7 @@ static ssize_t quoted_string_istream_read(struct istre
+ if (ret <= 0 && (ret != -2 || stream->skip == 0)) {
+ if ( stream->istream.eof &&
stream->istream.stream_errno == 0 ) {
+ stream->istream.eof = 0;
+- stream->istream.stream_errno = EPROTO;
++ stream->istream.stream_errno = EIO;
+ } else {
+ stream->istream.stream_errno =
stream->parent->stream_errno;
+ stream->istream.eof = stream->parent->eof;
+@@ -673,7 +673,7 @@ static ssize_t quoted_string_istream_read(struct istre
+ if ( !IS_QUOTED_SPECIAL(data[i]) ) {
+ qsstream->parser->error =
+ "Escaped quoted-string character is not
a QUOTED-SPECIAL.";
+- stream->istream.stream_errno = EPROTO;
++ stream->istream.stream_errno = EIO;
+ ret = -1;
+ break;
+ }
+@@ -682,7 +682,7 @@ static ssize_t quoted_string_istream_read(struct istre
+
+ if ( (data[i] & 0x80) == 0 && ( data[i] == '\r' || data[i] ==
'\n' ) ) {
+ qsstream->parser->error = "String contains invalid
character.";
+- stream->istream.stream_errno = EPROTO;
++ stream->istream.stream_errno = EIO;
+ ret = -1;
+ break;
+ }
Index: patches/patch-src_managesieve-login_client-authenticate_c
===================================================================
RCS file: patches/patch-src_managesieve-login_client-authenticate_c
diff -N patches/patch-src_managesieve-login_client-authenticate_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_managesieve-login_client-authenticate_c 13 May 2012
05:04:59 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/managesieve-login/client-authenticate.c.orig Sun May 13 01:03:58 2012
++++ src/managesieve-login/client-authenticate.c Sun May 13 01:04:12 2012
+@@ -234,7 +234,7 @@ static int managesieve_client_auth_read_response
+ if ( ret == 0 ) return 0;
+
+ if ( msieve_client->auth_response_input->stream_errno != 0 ) {
+- if ( msieve_client->auth_response_input->stream_errno == EPROTO
) {
++ if ( msieve_client->auth_response_input->stream_errno == EIO ) {
+ error =
managesieve_parser_get_error(msieve_client->parser, &fatal);
+ if (error != NULL ) {
+ if (fatal) {
Index: patches/patch-src_managesieve_cmd-putscript_c
===================================================================
RCS file: patches/patch-src_managesieve_cmd-putscript_c
diff -N patches/patch-src_managesieve_cmd-putscript_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_managesieve_cmd-putscript_c 13 May 2012 05:04:53
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/managesieve/cmd-putscript.c.orig Sun May 13 01:04:33 2012
++++ src/managesieve/cmd-putscript.c Sun May 13 01:04:46 2012
+@@ -371,7 +371,7 @@ static bool cmd_putscript_continue_script(struct clien
+ bool all_written = FALSE;
+
+ if ( ctx->script_size == 0 ) {
+- if ( ctx->input->stream_errno == EPROTO ) {
++ if ( ctx->input->stream_errno == EIO ) {
+ bool fatal;
+ const char *parse_error;
+
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 10 Jun 2011 13:48:52 -0000 1.2
+++ pkg/PLIST 13 May 2012 05:11:23 -0000
@@ -8,9 +8,11 @@
@pkgpath mail/dovecot,-sieve,sqlite
@pkgpath mail/dovecot,-sieve,ldap,mysql,postgresql,sqlite,bdb
@bin bin/sieve-dump
+@bin bin/sieve-filter
@bin bin/sieve-test
@bin bin/sievec
include/dovecot/sieve/
+include/dovecot/sieve/edit-mail.h
include/dovecot/sieve/pigeonhole-config.h
include/dovecot/sieve/rfc2822.h
include/dovecot/sieve/sieve-actions.h
@@ -63,6 +65,7 @@ lib/dovecot/settings/libmanagesieve_sett
@bin libexec/dovecot/managesieve
@bin libexec/dovecot/managesieve-login
@man man/man1/sieve-dump.1
+@man man/man1/sieve-filter.1
@man man/man1/sieve-test.1
@man man/man1/sievec.1
@man man/man1/sieved.1
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/dovecot-antispam/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 10 Apr 2012 22:39:25 -0000 1.5
+++ Makefile 10 May 2012 22:38:47 -0000
@@ -4,14 +4,16 @@ SHARED_ONLY= Yes
COMMENT= anti-spam plugin for Dovecot
-V_DOVECOT_FULL= 2.0.20
+V_DOVECOT_FULL= 2.1.6
-DISTNAME= dovecot-antispam-2.0
-REVISION= 2
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= dovecot-antispam-plugin-5e8351bcfb29
+PKGNAME= dovecot-antispam-2.1
CATEGORIES= mail
-MASTER_SITES= http://johannes.sipsolutions.net/download/dovecot-antispam/
-HOMEPAGE= http://johannes.sipsolutions.net/Projects/dovecot-antispam
+
+# http://hg.dovecot.org/dovecot-antispam-plugin/
+MASTER_SITES= http://spacehopper.org/mirrors/
+HOMEPAGE= http://wiki2.dovecot.org/Plugins/Antispam
+
MAINTAINER= Anil Madhavapeddy <[email protected]>
# GPLv2
@@ -23,17 +25,19 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= lib/dovecot/dovecot-lda lib/dovecot/dovecot-login \
lib/dovecot/dovecot-storage lib/dovecot/dovecot
+AUTOCONF_VERSION= 2.68
+AUTOMAKE_VERSION= 1.11
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ lang/gawk
LIB_DEPENDS= mail/dovecot=${V_DOVECOT_FULL}
USE_GMAKE= Yes
+CONFIGURE_STYLE= gnu
-MAKE_ENV= DOVECOT=${LOCALBASE}/include/dovecot
-MAKE_ENV+= INSTALLDIR=$(PREFIX)/lib/dovecot
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/dovecot
-
-post-install:
- ${INSTALL_DATA} ${WRKBUILD}/antispam.7 ${PREFIX}/man/man7/antispam.7
+pre-configure:
+ cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ ./autogen.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/dovecot-antispam/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 Jan 2012 22:31:28 -0000 1.1.1.1
+++ distinfo 10 May 2012 22:38:47 -0000
@@ -1,5 +1,5 @@
-MD5 (dovecot-antispam-2.0.tar.bz2) = FFR4mHWfvZPyuYMEUg3sxg==
-RMD160 (dovecot-antispam-2.0.tar.bz2) = uIjnEO/1za9PabxfFiDA8zqicWQ=
-SHA1 (dovecot-antispam-2.0.tar.bz2) = OmZO7P8FG333eyYjfLqZAGNC1/c=
-SHA256 (dovecot-antispam-2.0.tar.bz2) =
xe9speFLBLSUBJExBeCYFZ6W2cwoO6//9He91HR7lg8=
-SIZE (dovecot-antispam-2.0.tar.bz2) = 28564
+MD5 (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) = k0/U5k06S/zAtwfXldnojA==
+RMD160 (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) =
dWUy7GbzMwUj3kth+0AeNlgEQLQ=
+SHA1 (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) =
EgmEbgAiusZE58KJoc0NB/0HxFc=
+SHA256 (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) =
Vb3kZMc4GAa4gUMeDmxnVJPi26WbQ+0q7e3FxO4jU58=
+SIZE (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) = 62162
Index: patches/patch-doc_Makefile
===================================================================
RCS file: patches/patch-doc_Makefile
diff -N patches/patch-doc_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_Makefile 10 May 2012 22:38:47 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- doc/Makefile.orig Thu May 10 23:27:53 2012
++++ doc/Makefile Thu May 10 23:28:01 2012
+@@ -17,4 +17,5 @@ ${MAN}: ${MAN}.txt
+ else \
+ ${COMPILE_FAILED}; \
+ fi
+- sed -i'' -e "s/\(antispam_[^ ,]*\)/\\\fI\1\\\fP/g" $@
++ sed -e "s/\(antispam_[^ ,]*\)/\\\fI\1\\\fP/g" < $@ > [email protected]
++ mv [email protected] $@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/dovecot-antispam/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Jan 2012 22:31:28 -0000 1.1.1.1
+++ pkg/PLIST 10 May 2012 22:38:47 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/18 22:31:28 avsm Exp $
lib/dovecot/lib90_antispam_plugin.so
-@man man/man7/antispam.7
+@man man/man7/dovecot-antispam.7
