summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/dovecot2/Makefile5
-rw-r--r--mail/dovecot2/PLIST13
-rw-r--r--mail/dovecot2/distinfo12
-rw-r--r--mail/dovecot2/patches/patch-aa14
-rw-r--r--mail/dovecot2/patches/patch-af10
5 files changed, 21 insertions, 33 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index edf861b3b6c..98c82ce1c0e 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2013/05/14 15:38:36 taca Exp $
+# $NetBSD: Makefile,v 1.45 2013/05/23 19:45:50 adam Exp $
-DISTNAME= dovecot-2.2.1
-PKGREVISION= 2
+DISTNAME= dovecot-2.2.2
CATEGORIES= mail
MASTER_SITES= http://www.dovecot.org/releases/2.2/
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 9b55da0d269..d954537df75 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2013/05/14 15:38:36 taca Exp $
+@comment $NetBSD: PLIST,v 1.24 2013/05/23 19:45:50 adam Exp $
bin/doveadm
bin/doveconf
bin/dsync
@@ -439,19 +439,13 @@ lib/dovecot/lib21_fts_squat_plugin.la
lib/dovecot/lib30_imap_zlib_plugin.la
lib/dovecot/lib90_stats_plugin.la
lib/dovecot/lib95_imap_stats_plugin.la
-lib/dovecot/libdovecot-compression.a
lib/dovecot/libdovecot-compression.la
-lib/dovecot/libdovecot-compression.so
-lib/dovecot/libdovecot-compression.so.0
-lib/dovecot/libdovecot-compression.so.0.0.0
lib/dovecot/libdovecot-lda.la
lib/dovecot/libdovecot-login.la
lib/dovecot/libdovecot-sql.la
lib/dovecot/libdovecot-storage.la
lib/dovecot/libdovecot.la
-lib/dovecot/libssl_iostream_openssl.a
lib/dovecot/libssl_iostream_openssl.la
-lib/dovecot/libssl_iostream_openssl.so
libexec/dovecot/aggregator
libexec/dovecot/anvil
libexec/dovecot/auth
@@ -612,12 +606,12 @@ share/doc/dovecot/wiki/LDA.Postfix.txt
share/doc/dovecot/wiki/LDA.Qmail.txt
share/doc/dovecot/wiki/LDA.Sendmail.txt
share/doc/dovecot/wiki/LDA.txt
+share/doc/dovecot/wiki/LMTP.Exim.txt
share/doc/dovecot/wiki/LMTP.txt
share/doc/dovecot/wiki/Logging.txt
share/doc/dovecot/wiki/LoginProcess.txt
share/doc/dovecot/wiki/MDA.txt
share/doc/dovecot/wiki/MTA.txt
-share/doc/dovecot/wiki/MailboxSettings.txt
share/doc/dovecot/wiki/MailLocation.LocalDisk.txt
share/doc/dovecot/wiki/MailLocation.Maildir.txt
share/doc/dovecot/wiki/MailLocation.SharedDisk.txt
@@ -717,6 +711,7 @@ share/doc/dovecot/wiki/RunningDovecot.txt
share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
share/doc/dovecot/wiki/SSL.CertificateCreation.txt
share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
+share/doc/dovecot/wiki/SSL.SNIClientSupport.txt
share/doc/dovecot/wiki/SSL.txt
share/doc/dovecot/wiki/Sasl.txt
share/doc/dovecot/wiki/SecurityTuning.txt
@@ -767,6 +762,7 @@ share/examples/dovecot/conf.d/90-plugin.conf
share/examples/dovecot/conf.d/90-quota.conf
share/examples/dovecot/conf.d/auth-checkpassword.conf.ext
share/examples/dovecot/conf.d/auth-deny.conf.ext
+share/examples/dovecot/conf.d/auth-dict.conf.ext
share/examples/dovecot/conf.d/auth-ldap.conf.ext
share/examples/dovecot/conf.d/auth-master.conf.ext
share/examples/dovecot/conf.d/auth-passwdfile.conf.ext
@@ -774,7 +770,6 @@ share/examples/dovecot/conf.d/auth-sql.conf.ext
share/examples/dovecot/conf.d/auth-static.conf.ext
share/examples/dovecot/conf.d/auth-system.conf.ext
share/examples/dovecot/conf.d/auth-vpopmail.conf.ext
-share/examples/dovecot/dovecot-db.conf.ext
share/examples/dovecot/dovecot-dict-auth.conf.ext
share/examples/dovecot/dovecot-dict-sql.conf.ext
share/examples/dovecot/dovecot-ldap.conf.ext
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index e1ef31fdd75..0ae3967a4b6 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2013/05/09 03:49:16 manu Exp $
+$NetBSD: distinfo,v 1.35 2013/05/23 19:45:50 adam Exp $
-SHA1 (dovecot-2.2.1.tar.gz) = 2b707701683b52d57972b02f09fcb78648f0920a
-RMD160 (dovecot-2.2.1.tar.gz) = 26ebac9a9ce6327c4b3288c33a9eb3fe30e78941
-Size (dovecot-2.2.1.tar.gz) = 4258863 bytes
-SHA1 (patch-aa) = cc942bfcffc0cb3cd54464b27f3174fa929f7ee6
+SHA1 (dovecot-2.2.2.tar.gz) = c095b0a8e25d730b854f0ace37544ad203db0891
+RMD160 (dovecot-2.2.2.tar.gz) = ada7c9c12949e1150a4a4bbe7bea257e296f13ca
+Size (dovecot-2.2.2.tar.gz) = 4282339 bytes
+SHA1 (patch-aa) = ea185011f0c1ee3aa1ff528e61f6f356fe385666
SHA1 (patch-ab) = ce698e00729aeccbb7f3fa4ee9d037791fdd2d14
SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
-SHA1 (patch-af) = 6998672aac3430ad36035d5eac75067ff3d853ee
+SHA1 (patch-af) = c066e94dd6593d16eec3e66f5f4d26f021918498
SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa
index d2c2124f907..456e6b96800 100644
--- a/mail/dovecot2/patches/patch-aa
+++ b/mail/dovecot2/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2013/04/29 12:53:57 manu Exp $
+$NetBSD: patch-aa,v 1.6 2013/05/23 19:45:50 adam Exp $
---- doc/example-config/Makefile.in.orig 2013-04-10 21:31:22.000000000 +0200
-+++ doc/example-config/Makefile.in 2013-04-11 10:00:23.000000000 +0200
-@@ -298,9 +298,9 @@
- top_srcdir = @top_srcdir@
+--- doc/example-config/Makefile.in.orig 2013-05-19 23:04:29.000000000 +0000
++++ doc/example-config/Makefile.in
+@@ -299,7 +299,7 @@ top_srcdir = @top_srcdir@
SUBDIRS = conf.d
pkgsysconfdir = $(sysconfdir)/dovecot
nodist_pkgsysconf_DATA = README
@@ -11,10 +10,8 @@ $NetBSD: patch-aa,v 1.5 2013/04/29 12:53:57 manu Exp $
+exampledir = $(datadir)/examples/dovecot
example_DATA = \
dovecot.conf \
- dovecot-db.conf.ext \
dovecot-dict-auth.conf.ext \
-@@ -643,10 +643,9 @@
- info: info-recursive
+@@ -643,8 +643,7 @@ info: info-recursive
info-am:
@@ -24,4 +21,3 @@ $NetBSD: patch-aa,v 1.5 2013/04/29 12:53:57 manu Exp $
install-dvi: install-dvi-recursive
- install-dvi-am:
diff --git a/mail/dovecot2/patches/patch-af b/mail/dovecot2/patches/patch-af
index 69ce40f458e..f0c72291088 100644
--- a/mail/dovecot2/patches/patch-af
+++ b/mail/dovecot2/patches/patch-af
@@ -1,9 +1,8 @@
-$NetBSD: patch-af,v 1.5 2013/04/29 12:53:57 manu Exp $
+$NetBSD: patch-af,v 1.6 2013/05/23 19:45:50 adam Exp $
---- doc/example-config/conf.d/Makefile.in.orig 2013-04-10 21:31:22.000000000 +0200
-+++ doc/example-config/conf.d/Makefile.in 2013-04-11 10:02:24.000000000 +0200
-@@ -255,9 +255,9 @@
- top_build_prefix = @top_build_prefix@
+--- doc/example-config/conf.d/Makefile.in.orig 2013-05-19 23:04:29.000000000 +0000
++++ doc/example-config/conf.d/Makefile.in
+@@ -256,7 +256,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
pkgsysconfdir = $(sysconfdir)/dovecot
@@ -12,4 +11,3 @@ $NetBSD: patch-af,v 1.5 2013/04/29 12:53:57 manu Exp $
example_DATA = \
auth-checkpassword.conf.ext \
auth-deny.conf.ext \
- auth-ldap.conf.ext \