Re: WIP: Dovecot 2.1

2012-05-23 Thread Brad Smith 
On Thu, May 17, 2012 at 07:10:59PM -0400, Brad Smith wrote:
 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.

Tested now. Here is an updated diff with a README added to hint
at the fact that at least the max number of open file descriptors
needs to be bumped up.


Index: Makefile
===
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.187
diff -u -p -r1.187 Makefile
--- Makefile17 May 2012 07:48:15 -  1.187
+++ Makefile17 May 2012 23:12:30 -
@@ -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 \
@@ -61,6 +61,7 @@ CONFIGURE_ARGS=   --with-gssapi \
--with-statedir=/var/dovecot \
--without-pam \
--without-shadow \
+   --without-stemmer \
--without-vpopmail
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
Index: distinfo
===
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo10 Apr 2012 22:39:08 -  1.97
+++ distinfo13 May 2012 02:37:07 -
@@ -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_in23 May 2011 22:54:38 
-  1.1
+++ patches/patch-doc_example-config_Makefile_in13 May 2012 02:49:32 
-
@@ -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.origWed 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.origFri 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

Re: WIP: Dovecot 2.1

2012-05-18 Thread Stuart Henderson 
On 2012/05/17 19:10, Brad Smith wrote:
 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.

btw, I've been running various Dovecot 2.1.x and Pigeonhole for a while
now with diffs similar to this, that's all been working fine. I don't use
the antispam plugin though.

You might need to merge in changes to the default config, iirc there
was a small change to namespaces, but it's a while ago and I didn't make
notes..

WIP: Dovecot 2.1

2012-05-17 Thread Brad Smith 
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
--- Makefile17 May 2012 07:48:15 -  1.187
+++ Makefile17 May 2012 21:35:15 -
@@ -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
--- distinfo10 Apr 2012 22:39:08 -  1.97
+++ distinfo13 May 2012 02:37:07 -
@@ -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_in23 May 2011 22:54:38 
-  1.1
+++ patches/patch-doc_example-config_Makefile_in13 May 2012 02:49:32 
-
@@ -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.origWed 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.origFri 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_conf23 May 2011 
22:54:38 -  1.1
+++ patches/patch-doc_example-config_conf_d_10-mail_conf13 May 2012 
02:49:31 -
@@ -1,7 +1,7 @@
 $OpenBSD:

WIP: Dovecot 2.1.rc3

2012-01-16 Thread Brad 
Here is an update to Dovecot 2.1.rc3.

Still looking for testing and feedback for
the DB backends.


Index: Makefile
===
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.180
diff -u -p -r1.180 Makefile
--- Makefile16 Jan 2012 23:59:22 -  1.180
+++ Makefile17 Jan 2012 01:37:47 -
@@ -9,23 +9,23 @@ 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.17
+V_MAJOR=   2.1
+V_DOVECOT= 2.1.rc3
 
 DISTNAME=  dovecot-${V_DOVECOT}
 PKGNAME=   dovecot-${V_DOVECOT}
 PKGNAME-server=dovecot-${V_DOVECOT}
-REVISION-server= 0
 PKGNAME-ldap=  dovecot-ldap-${V_DOVECOT}
 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
 
@@ -65,6 +65,7 @@ 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
Index: distinfo
===
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.94
diff -u -p -r1.94 distinfo
--- distinfo16 Jan 2012 16:34:17 -  1.94
+++ distinfo16 Jan 2012 22:02:01 -
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0.17.tar.gz) = QcEN/6VuIouRdoM9su+qxQ==
-RMD160 (dovecot-2.0.17.tar.gz) = EIOZva8OA+ATt4t545xcil3S9i0=
-SHA1 (dovecot-2.0.17.tar.gz) = TBLxoHTFKxfLZPzHPEHwooIKiP4=
-SHA256 (dovecot-2.0.17.tar.gz) = Pw1CiQZ9I1W0zkoAJlvytL9lQLyo/c7Pxq0gYR2hRdI=
-SIZE (dovecot-2.0.17.tar.gz) = 3329794
+MD5 (dovecot-2.1.rc3.tar.gz) = QMgTz/w3XyewNaoJiTtYvQ==
+RMD160 (dovecot-2.1.rc3.tar.gz) = FDWDLQzedAGIVRKFVKNRb4gGFmA=
+SHA1 (dovecot-2.1.rc3.tar.gz) = lWhU2a+8LlydhSX+LHd26vsZ9/o=
+SHA256 (dovecot-2.1.rc3.tar.gz) = uht9uZyH8VI1ZDtIokkoUV7jPYdkp2nXBZzp7fHcCcg=
+SIZE (dovecot-2.1.rc3.tar.gz) = 3606163
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_in23 May 2011 22:54:38 
-  1.1
+++ patches/patch-doc_example-config_Makefile_in24 Nov 2011 03:15:28 
-
@@ -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.origWed 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.origFri 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_conf23 May 2011 
22:54:38 -  1.1
+++ patches/patch-doc_example-config_conf_d_10-mail_conf11 Jan 2012 
05:49:00 -
@@ -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.origThu 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.origTue Dec  6 16:55:44 2011
 doc/example-config/conf.d/10-mail.conf Wed Jan 11 00:48:48 2012
+@@ -127,8 +127,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 @@
+@@ -192,10 +193,10 @@ namespace inbox {
  
  # UNIX socket