Upgrate to doevecot 2.2.0.

Changes since 2.1.13, from the NEWS file

v2.2.0 2013-04-11  Timo Sirainen <tss@iki.fi>

	* When creating home directories, the permissions are copied from the
	  parent directory if it has setgid-bit set. For full details, see
	  http://wiki2.dovecot.org/SharedMailboxes/Permissions
	* "doveadm auth" command was renamed to "doveadm auth test"
	* IMAP: ID command now advertises server name as Dovecot by default.
	  It was already trivial to guess this from command replies.
	* dovecot.index.cache files can be safely accessed only by v2.1.11+.
	  Older versions may think they're corrupted and delete them.
	* LDA/LMTP: If saving a mail brings user from under quota to over
	  quota, allow it based on quota_grace setting (default: 10%
	  above quota limit).
	* pop3_lock_session=yes now uses a POP3-only dovecot-pop3-session.lock
	  file instead of actually locking the mailbox (and causing
	  IMAP/LDA/LMTP to wait for the POP3 session to close).
	* mail_shared_explicit_inbox setting's default switched to "no".
	* ssl_client_ca_dir setting replaced imapc_ssl_ca_dir and
	  pop3c_ssl_ca_dir settings.

	+ Implemented IMAP MOVE and BINARY extensions
	+ Implemented IMAP CATENATE, URLAUTH and URLAUTH=BINARY extensions
	  (by Stephan Bosch).
	+ Implemented IMAP NOTIFY extension. Requires mailbox_list_index=yes
	  to be enabled.
	+ Redesigned and rewritten dsync. The new design makes the syncing
	  faster, more reliable and more featureful. The new dsync protocol
	  isn't backwards compatible with old dsync versions (but is designed
	  to be forwards compatible with future versions).
	+ All mailbox formats now support per-user message flags for shared
	  mailboxes by using a private index. It can be enabled by adding
	  :INDEXPVT=<path> to mail location. This should be used instead of
	  :INDEX also for Maildir/mbox to improve performance.
	+ Improved mailbox list indexes. They should be usable now, although
	  still disabled by default.
	+ Added LAYOUT=index. The mailbox directories are created using their
	  GUIDs in the filesystem, while the actual GUID <-> name mapping
	  exists only in the index.
	+ LMTP proxy: Implemented XCLIENT extension for passing remote IP
	  address through proxy.

v2.2.rc7 2013-04-10  Timo Sirainen <tss@iki.fi>

	* checkpasword: AUTH_PASSWORD environment is no longer set.
	* Running dsync no longer triggers quota warnings.

	+ dsync: Commit large transactions every 100 new messages, so if a
	  large sync crashes it doesn't have to be restarted from the
	  beginning.
	- replicator: doveadm commands and user list export may have skipped
	  some users.
	- Various fixes to mailbox_list_index=yes

v2.2.rc6 2013-04-08  Timo Sirainen <tss@iki.fi>

	* replicator: Don't create replicator-doveadm socket by default.
	  This way doveadm replicator commands don't accidentally start an
	  unconfigured replicator server.
	+ replicator: Have remote dsync notify the remote replicator that
	  a user was just synced. This way the replicators are kept roughly
	  in sync.
	+ Added ssl_client_ca_file to specify the CA certs as a file. This is
	  needed (instead of ssl_client_ca_dir) in RedHat-based systems.
	+ Added "doveadm fs" commands, mainly to debug lib-fs backends.
	- Mailbox list indexes weren't using proper file permissions based
	  on the root directory.

v2.2.rc5 2013-04-05  Timo Sirainen <tss@iki.fi>

	- A few small random fixes

v2.2.rc4 2013-04-05  Timo Sirainen <tss@iki.fi>

	+ Added "doveadm replicator" commands
	- Larger changes to lib-http and lib-ssl-iostream error handling.
	  The API caller can now get the exact error message as a string.
	- Various bugfixes to LDAP changes in rc3

v2.2.rc3 2013-03-20  Timo Sirainen <tss@iki.fi>

	+ dsync: Support syncing ACLs (and Sieve scripts with Pigeonhole)
	+ ldap: Support subqueries and value pointers, see
	  http://wiki2.dovecot.org/AuthDatabase/LDAP/Userdb
	+ postmaster_address setting: Expand %d to recipient's domain
	- Fixed a crash when decoding quoted-printable content.
	- dsync: Various bugfixes

v2.2.rc2 2013-02-15  Timo Sirainen <tss@iki.fi>

	- rc1 wasn't actually usable in most configurations.

v2.2.rc1 2013-02-15  Timo Sirainen <tss@iki.fi>

	* See v2.2.0 notes

15 files changed, 118 insertions, 464 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index aa6581f35cb..b3ac9149ff1 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2013/03/02 20:33:27 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2013/04/29 12:53:57 manu Exp $
 
-DISTNAME=	dovecot-2.1.15
-PKGREVISION=	1
+DISTNAME=	dovecot-2.2.0
+#PKGREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.dovecot.org/releases/2.1/
+MASTER_SITES=	http://www.dovecot.org/releases/2.2/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.dovecot.org/
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index f8f7f242c39..c60093ae723 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2013/02/11 21:30:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/04/29 12:53:57 manu Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -16,6 +16,7 @@ include/dovecot/auth-client-private.h
 include/dovecot/auth-client-request.h
 include/dovecot/auth-client.h
 include/dovecot/auth-common.h
+include/dovecot/auth-fields.h
 include/dovecot/auth-master-connection.h
 include/dovecot/auth-master.h
 include/dovecot/auth-penalty.h
@@ -24,7 +25,7 @@ include/dovecot/auth-request-handler.h
 include/dovecot/auth-request.h
 include/dovecot/auth-server-connection.h
 include/dovecot/auth-settings.h
-include/dovecot/auth-stream.h
+include/dovecot/auth-token.h
 include/dovecot/auth-worker-client.h
 include/dovecot/auth-worker-server.h
 include/dovecot/auth.h
@@ -35,8 +36,8 @@ include/dovecot/buffer.h
 include/dovecot/charset-utf8.h
 include/dovecot/child-wait.h
 include/dovecot/client-common.h
-include/dovecot/close-keep-errno.h
 include/dovecot/compat.h
+include/dovecot/compression.h
 include/dovecot/config-filter.h
 include/dovecot/config-parser-private.h
 include/dovecot/config-parser.h
@@ -57,13 +58,22 @@ include/dovecot/dbox-file.h
 include/dovecot/dbox-mail.h
 include/dovecot/dbox-save.h
 include/dovecot/dbox-storage.h
-include/dovecot/dbox-sync-rebuild.h
 include/dovecot/dict-client.h
 include/dovecot/dict-private.h
 include/dovecot/dict-sql-settings.h
 include/dovecot/dict-sql.h
+include/dovecot/dict-transaction-memory.h
 include/dovecot/dict.h
 include/dovecot/dns-lookup.h
+include/dovecot/doveadm-dump.h
+include/dovecot/doveadm-mail-iter.h
+include/dovecot/doveadm-mail.h
+include/dovecot/doveadm-mailbox-list-iter.h
+include/dovecot/doveadm-print-private.h
+include/dovecot/doveadm-print.h
+include/dovecot/doveadm-settings.h
+include/dovecot/doveadm-util.h
+include/dovecot/doveadm.h
 include/dovecot/dovecot-version.h
 include/dovecot/duplicate.h
 include/dovecot/eacces-error.h
@@ -85,16 +95,25 @@ include/dovecot/fs-api.h
 include/dovecot/fs-sis-common.h
 include/dovecot/fsync-mode.h
 include/dovecot/guid.h
+include/dovecot/hash-decl.h
 include/dovecot/hash-format.h
 include/dovecot/hash-method.h
 include/dovecot/hash.h
 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/hmac-cram-md5.h
+include/dovecot/hmac.h
 include/dovecot/home-expand.h
 include/dovecot/hostpid.h
+include/dovecot/http-client-private.h
+include/dovecot/http-client.h
+include/dovecot/http-date.h
+include/dovecot/http-header-parser.h
+include/dovecot/http-parser.h
+include/dovecot/http-response-parser.h
+include/dovecot/http-transfer.h
+include/dovecot/http-url.h
 include/dovecot/imap-arg.h
 include/dovecot/imap-base-subject.h
 include/dovecot/imap-bodystructure.h
@@ -107,7 +126,11 @@ include/dovecot/imap-envelope.h
 include/dovecot/imap-expunge.h
 include/dovecot/imap-fetch.h
 include/dovecot/imap-id.h
+include/dovecot/imap-list.h
 include/dovecot/imap-match.h
+include/dovecot/imap-msgpart-url.h
+include/dovecot/imap-msgpart.h
+include/dovecot/imap-notify.h
 include/dovecot/imap-parser.h
 include/dovecot/imap-quote.h
 include/dovecot/imap-resp-code.h
@@ -117,6 +140,12 @@ include/dovecot/imap-seqset.h
 include/dovecot/imap-settings.h
 include/dovecot/imap-status.h
 include/dovecot/imap-sync.h
+include/dovecot/imap-url.h
+include/dovecot/imap-urlauth-backend.h
+include/dovecot/imap-urlauth-connection.h
+include/dovecot/imap-urlauth-fetch.h
+include/dovecot/imap-urlauth-private.h
+include/dovecot/imap-urlauth.h
 include/dovecot/imap-utf7.h
 include/dovecot/imap-util.h
 include/dovecot/imapc-client-private.h
@@ -131,6 +160,7 @@ include/dovecot/imapc-sync.h
 include/dovecot/imem.h
 include/dovecot/index-attachment.h
 include/dovecot/index-mail.h
+include/dovecot/index-rebuild.h
 include/dovecot/index-search-private.h
 include/dovecot/index-search-result.h
 include/dovecot/index-sort-private.h
@@ -147,22 +177,34 @@ 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-private.h
 include/dovecot/iostream-ssl.h
+include/dovecot/iostream-temp.h
 include/dovecot/ipc-client.h
 include/dovecot/ipc-server.h
 include/dovecot/ipwd.h
-include/dovecot/istream-attachment.h
-include/dovecot/istream-base64-encoder.h
+include/dovecot/iso8601-date.h
+include/dovecot/istream-attachment-connector.h
+include/dovecot/istream-attachment-extractor.h
+include/dovecot/istream-base64.h
+include/dovecot/istream-binary-converter.h
+include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
 include/dovecot/istream-dot.h
 include/dovecot/istream-header-filter.h
+include/dovecot/istream-jsonstr.h
 include/dovecot/istream-mail.h
+include/dovecot/istream-metawrap.h
+include/dovecot/istream-nonuls.h
 include/dovecot/istream-private.h
+include/dovecot/istream-qp.h
 include/dovecot/istream-raw-mbox.h
 include/dovecot/istream-rawlog.h
 include/dovecot/istream-seekable.h
+include/dovecot/istream-sized.h
 include/dovecot/istream-tee.h
+include/dovecot/istream-zlib.h
 include/dovecot/istream.h
 include/dovecot/json-parser.h
 include/dovecot/lda-settings.h
@@ -211,8 +253,13 @@ 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-storage.h
+include/dovecot/mailbox-list-index-sync.h
 include/dovecot/mailbox-list-index.h
+include/dovecot/mailbox-list-iter.h
 include/dovecot/mailbox-list-maildir.h
+include/dovecot/mailbox-list-notify-tree.h
+include/dovecot/mailbox-list-notify.h
 include/dovecot/mailbox-list-private.h
 include/dovecot/mailbox-list-subscriptions.h
 include/dovecot/mailbox-list.h
@@ -235,6 +282,8 @@ include/dovecot/master-login.h
 include/dovecot/master-service-private.h
 include/dovecot/master-service-settings-cache.h
 include/dovecot/master-service-settings.h
+include/dovecot/master-service-ssl-settings.h
+include/dovecot/master-service-ssl.h
 include/dovecot/master-service.h
 include/dovecot/mbox-file.h
 include/dovecot/mbox-from.h
@@ -257,6 +306,7 @@ include/dovecot/mech-plain-common.h
 include/dovecot/mech.h
 include/dovecot/mempool.h
 include/dovecot/message-address.h
+include/dovecot/message-binary-part.h
 include/dovecot/message-date.h
 include/dovecot/message-decoder.h
 include/dovecot/message-header-decode.h
@@ -266,7 +316,6 @@ include/dovecot/message-id.h
 include/dovecot/message-parser.h
 include/dovecot/message-part-serialize.h
 include/dovecot/message-search.h
-include/dovecot/message-send.h
 include/dovecot/message-size.h
 include/dovecot/mkdir-parents.h
 include/dovecot/mmap-util.h
@@ -275,13 +324,17 @@ include/dovecot/module-dir.h
 include/dovecot/mountpoint-list.h
 include/dovecot/mountpoint.h
 include/dovecot/mycrypt.h
-include/dovecot/network.h
+include/dovecot/net.h
 include/dovecot/nfs-workarounds.h
 include/dovecot/notify-plugin-private.h
 include/dovecot/notify-plugin.h
+include/dovecot/numpack.h
 include/dovecot/ostream-cmp.h
+include/dovecot/ostream-hash.h
+include/dovecot/ostream-metawrap.h
 include/dovecot/ostream-private.h
 include/dovecot/ostream-rawlog.h
+include/dovecot/ostream-zlib.h
 include/dovecot/ostream.h
 include/dovecot/passdb-blocking.h
 include/dovecot/passdb-cache.h
@@ -301,6 +354,10 @@ include/dovecot/primes.h
 include/dovecot/printf-format-fix.h
 include/dovecot/priorityq.h
 include/dovecot/process-title.h
+include/dovecot/quota-fs.h
+include/dovecot/quota-plugin.h
+include/dovecot/quota-private.h
+include/dovecot/quota.h
 include/dovecot/quoted-printable.h
 include/dovecot/randgen.h
 include/dovecot/raw-storage.h
@@ -344,6 +401,7 @@ include/dovecot/unichar.h
 include/dovecot/unix-socket-create.h
 include/dovecot/unlink-directory.h
 include/dovecot/unlink-old-files.h
+include/dovecot/uri-util.h
 include/dovecot/userdb-blocking.h
 include/dovecot/userdb-template.h
 include/dovecot/userdb-vpopmail.h
@@ -357,7 +415,6 @@ lib/dovecot/auth/libauthdb_imap.la
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
-lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.la
 lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la
 lib/dovecot/dovecot-config
 lib/dovecot/lib01_acl_plugin.la
@@ -382,12 +439,19 @@ 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-ssl.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
@@ -403,6 +467,9 @@ libexec/dovecot/dovecot-lda
 libexec/dovecot/gdbhelper
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/imap-urlauth
+libexec/dovecot/imap-urlauth-login
+libexec/dovecot/imap-urlauth-worker
 libexec/dovecot/indexer
 libexec/dovecot/indexer-worker
 libexec/dovecot/ipc
@@ -411,6 +478,7 @@ libexec/dovecot/log
 libexec/dovecot/maildirlock
 libexec/dovecot/pop3
 libexec/dovecot/pop3-login
+libexec/dovecot/quota-status
 libexec/dovecot/rawlog
 libexec/dovecot/replicator
 libexec/dovecot/script
@@ -462,6 +530,7 @@ share/doc/dovecot/thread-refs.txt
 share/doc/dovecot/wiki/ACL.txt
 share/doc/dovecot/wiki/AixPluginsSupport.txt
 share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
+share/doc/dovecot/wiki/AuthDatabase.Dict.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.PasswordLookups.txt
 share/doc/dovecot/wiki/AuthDatabase.LDAP.Userdb.txt
@@ -495,6 +564,7 @@ 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.Code.txt
 share/doc/dovecot/wiki/Design.Dsync.txt
 share/doc/dovecot/wiki/Design.Indexes.Cache.txt
 share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
@@ -589,6 +659,7 @@ share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt
 share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt
 share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt
 share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt
+share/doc/dovecot/wiki/PasswordDatabase.IMAP.txt
 share/doc/dovecot/wiki/PasswordDatabase.PAM.txt
 share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
 share/doc/dovecot/wiki/PasswordDatabase.Static.txt
@@ -623,6 +694,7 @@ share/doc/dovecot/wiki/Plugins.FTS.txt
 share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
 share/doc/dovecot/wiki/Plugins.Listescape.txt
 share/doc/dovecot/wiki/Plugins.MailLog.txt
+share/doc/dovecot/wiki/Plugins.MailboxAlias.txt
 share/doc/dovecot/wiki/Plugins.Notify.txt
 share/doc/dovecot/wiki/Plugins.Snarf.txt
 share/doc/dovecot/wiki/Plugins.Trash.txt
@@ -638,6 +710,7 @@ share/doc/dovecot/wiki/Quota.Dirsize.txt
 share/doc/dovecot/wiki/Quota.FS.txt
 share/doc/dovecot/wiki/Quota.Maildir.txt
 share/doc/dovecot/wiki/Quota.txt
+share/doc/dovecot/wiki/Replication.txt
 share/doc/dovecot/wiki/RunningDovecot.txt
 share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
 share/doc/dovecot/wiki/SSL.CertificateCreation.txt
@@ -661,6 +734,7 @@ share/doc/dovecot/wiki/Upgrading.1.1.txt
 share/doc/dovecot/wiki/Upgrading.1.2.txt
 share/doc/dovecot/wiki/Upgrading.2.0.txt
 share/doc/dovecot/wiki/Upgrading.2.1.txt
+share/doc/dovecot/wiki/Upgrading.2.2.txt
 share/doc/dovecot/wiki/Upgrading.txt
 share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
 share/doc/dovecot/wiki/UserDatabase.NSS.txt
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 80a2e5325cb..e53b23073af 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,20 +1,11 @@
-$NetBSD: distinfo,v 1.32 2013/02/11 21:30:00 adam Exp $
+$NetBSD: distinfo,v 1.33 2013/04/29 12:53:57 manu Exp $
 
-SHA1 (dovecot-2.1.15.tar.gz) = b7a5db2b5fefc5033adf45c87079f2e4c15eb4d2
-RMD160 (dovecot-2.1.15.tar.gz) = ba1d02cfe7ca264469f236be3ffab7824809b489
-Size (dovecot-2.1.15.tar.gz) = 3862058 bytes
-SHA1 (patch-aa) = 882f0c9fcf3acdfd2feaf7919309f770324f9843
-SHA1 (patch-ab) = 218948585c96492a832ea903f31a6f9ad9fc69f0
+SHA1 (dovecot-2.2.0.tar.gz) = a39758b2e9283a972afc25af8e3416ef34840c4a
+RMD160 (dovecot-2.2.0.tar.gz) = 24d2485aeaa4a88b4b2f976e9297b4d8cf2530a6
+Size (dovecot-2.2.0.tar.gz) = 4255105 bytes
+SHA1 (patch-aa) = cc942bfcffc0cb3cd54464b27f3174fa929f7ee6
+SHA1 (patch-ab) = ce698e00729aeccbb7f3fa4ee9d037791fdd2d14
 SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
 SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
-SHA1 (patch-af) = 6d4b339898cba762243c1ff415e0fd09e3dec750
+SHA1 (patch-af) = 6998672aac3430ad36035d5eac75067ff3d853ee
 SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
-SHA1 (patch-ak) = ca4edaa46472a0cb609cea4d06893c7bd1312f54
-SHA1 (patch-config.h.in) = d6eb5879d71a838f17e3f2d33350d80a546f6ef4
-SHA1 (patch-configure) = 39f9bb98ac1a2c99ff277f522e725c56d381279f
-SHA1 (patch-configure.in) = bb80a414f28577450dfd139050d0577c4f056bcd
-SHA1 (patch-src_lib_network.c) = 31e666492a2ce7c660e04f5e6aa57018b047940d
-SHA1 (patch-src_plugins_quota_Makefile.am) = 8f36b1b089b164f2ef1828dbcc058a7666909e04
-SHA1 (patch-src_plugins_quota_Makefile.in) = 0919a4d99f53f0521d167f588db3418509122990
-SHA1 (patch-src_plugins_quota_quota-fs.c) = a2f47d3df1d508fdf894f91367f7899b23e156a3
-SHA1 (patch-src_plugins_quota_quota-fs.h) = 69f9dc9a97049229ebfe3f36a617952fba25e4a1
diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa
index f7b474580f6..d2c2124f907 100644
--- a/mail/dovecot2/patches/patch-aa
+++ b/mail/dovecot2/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2011/03/10 13:42:54 adam Exp $
+$NetBSD: patch-aa,v 1.5 2013/04/29 12:53:57 manu Exp $
 
---- doc/example-config/Makefile.in.orig	2010-10-21 17:37:01.000000000 +0000
-+++ doc/example-config/Makefile.in
-@@ -283,7 +283,7 @@ top_srcdir = @top_srcdir@
+--- 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@
  SUBDIRS = conf.d
  pkgsysconfdir = $(sysconfdir)/dovecot
  nodist_pkgsysconf_DATA = README
@@ -11,7 +12,9 @@ $NetBSD: patch-aa,v 1.4 2011/03/10 13:42:54 adam Exp $
  example_DATA = \
  	dovecot.conf \
  	dovecot-db.conf.ext \
-@@ -626,8 +626,7 @@ info: info-recursive
+ 	dovecot-dict-auth.conf.ext \
+@@ -643,10 +643,9 @@
+ info: info-recursive
  
  info-am:
  
@@ -21,3 +24,4 @@ $NetBSD: patch-aa,v 1.4 2011/03/10 13:42:54 adam Exp $
  
  install-dvi: install-dvi-recursive
  
+ install-dvi-am:
diff --git a/mail/dovecot2/patches/patch-ab b/mail/dovecot2/patches/patch-ab
index 01b2dc171c9..789341a7609 100644
--- a/mail/dovecot2/patches/patch-ab
+++ b/mail/dovecot2/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2010/12/03 21:21:10 ghen Exp $
+$NetBSD: patch-ab,v 1.3 2013/04/29 12:53:57 manu Exp $
 
---- doc/example-config/dovecot.conf.orig	2010-11-10 16:09:10.000000000 +0000
-+++ doc/example-config/dovecot.conf
-@@ -12,12 +12,9 @@
+--- doc/example-config/dovecot.conf.orig	2013-01-07 08:50:26.000000000 +0100
++++ doc/example-config/dovecot.conf	2013-04-11 10:01:20.000000000 +0200
+@@ -15,14 +15,11 @@
+ 
  # Default values are shown for each setting, it's not required to uncomment
  # those. These are exceptions to this though: No sections (e.g. namespace {})
  # or plugin settings are added by default, they're listed only as examples.
@@ -16,3 +17,4 @@ $NetBSD: patch-ab,v 1.2 2010/12/03 21:21:10 ghen Exp $
  
  # A comma separated list of IPs or hosts where to listen in for connections. 
  # "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces.
+ # If you want to specify non-default ports or anything more complex,
diff --git a/mail/dovecot2/patches/patch-af b/mail/dovecot2/patches/patch-af
index c358e95b242..69ce40f458e 100644
--- a/mail/dovecot2/patches/patch-af
+++ b/mail/dovecot2/patches/patch-af
@@ -1,8 +1,9 @@
-$NetBSD: patch-af,v 1.4 2011/03/10 13:42:54 adam Exp $
+$NetBSD: patch-af,v 1.5 2013/04/29 12:53:57 manu Exp $
 
---- doc/example-config/conf.d/Makefile.in.orig	2010-11-04 14:32:20.000000000 +0000
-+++ doc/example-config/conf.d/Makefile.in
-@@ -240,7 +240,7 @@ top_build_prefix = @top_build_prefix@
+--- 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@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  pkgsysconfdir = $(sysconfdir)/dovecot
@@ -11,3 +12,4 @@ $NetBSD: patch-af,v 1.4 2011/03/10 13:42:54 adam Exp $
  example_DATA = \
  	auth-checkpassword.conf.ext \
  	auth-deny.conf.ext \
+ 	auth-ldap.conf.ext \
diff --git a/mail/dovecot2/patches/patch-ak b/mail/dovecot2/patches/patch-ak
deleted file mode 100644
index 989483b8d0b..00000000000
--- a/mail/dovecot2/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2012/02/23 15:20:53 ghen Exp $
-
---- src/lib/mountpoint.c.orig	2012-02-12 19:58:18.000000000 +0000
-+++ src/lib/mountpoint.c
-@@ -136,7 +136,7 @@ struct mountpoint_iter {
- #elif defined(MOUNTPOINT_SOLARIS) || defined(MOUNTPOINT_LINUX)
- 	FILE *f;
- #elif defined(HAVE_GETMNTINFO) /* BSDs */
--	struct statfs *fs;
-+	struct statvfs *fs;
- 	int count;
- #endif
- 	struct mountpoint mnt;
-@@ -286,7 +286,7 @@ const struct mountpoint *mountpoint_iter
- 	return NULL;
- #elif defined(HAVE_GETMNTINFO) /* BSDs */
- 	while (iter->count > 0) {
--		struct statfs *fs = iter->fs;
-+		struct statvfs *fs = iter->fs;
- 
- 		iter->fs++;
- 		iter->count--;
diff --git a/mail/dovecot2/patches/patch-config.h.in b/mail/dovecot2/patches/patch-config.h.in
deleted file mode 100644
index ff8cc9a7bc1..00000000000
--- a/mail/dovecot2/patches/patch-config.h.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2013/01/19 05:25:51 manu Exp $
-
-Support NetBSD's libquota
-
---- config.h.in.orig	2013-01-18 18:24:40.000000000 +0100
-+++ config.h.in	2013-01-18 18:27:26.000000000 +0100
-@@ -283,8 +283,14 @@
- 
- /* Define to 1 if you have the `quotactl' function. */
- #undef HAVE_QUOTACTL
- 
-+/* Define to 1 if you have the <quota.h> header file. */
-+#undef HAVE_QUOTA_H
-+
-+/* Define if you have quota_open() */
-+#undef HAVE_QUOTA_OPEN
-+
- /* Define if Q_QUOTACTL exists */
- #undef HAVE_Q_QUOTACTL
- 
- /* Define if you have RLIMIT_AS for setrlimit() */
diff --git a/mail/dovecot2/patches/patch-configure b/mail/dovecot2/patches/patch-configure
deleted file mode 100644
index 856229969d5..00000000000
--- a/mail/dovecot2/patches/patch-configure
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2013/02/11 21:30:00 adam Exp $
-
---- configure.orig	2013-01-07 08:52:01.000000000 +0100
-+++ configure	2013-01-19 02:57:06.000000000 +0100
-@@ -631,8 +631,9 @@
- BUILD_SOLR_TRUE
- CURL_LIBS
- CURL_CFLAGS
- CURLCONFIG
-+QUOTA_LIBS
- HAVE_RQUOTA_FALSE
- HAVE_RQUOTA_TRUE
- RPCGEN
- BUILD_ZLIB_PLUGIN_FALSE
-@@ -18047,9 +18048,10 @@
- 
- 
- for ac_header in strings.h stdint.h unistd.h dirent.h malloc.h inttypes.h \
-   sys/uio.h sys/sysmacros.h sys/resource.h sys/select.h libgen.h \
--  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h sys/fs/quota_common.h \
-+  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h \
-+  quota.h sys/fs/quota_common.h \
-   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
-   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
-   sys/utsname.h glob.h linux/falloc.h ucred.h
- do :
-@@ -24214,8 +24216,72 @@
-   HAVE_RQUOTA_FALSE=
- fi
- 
- 
-+QUOTA_LIBS=""
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing quota_open" >&5
-+$as_echo_n "checking for library containing quota_open... " >&6; }
-+if ${ac_cv_search_quota_open+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char quota_open ();
-+int
-+main ()
-+{
-+return quota_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' quota; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_quota_open=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if ${ac_cv_search_quota_open+:} false; then :
-+  break
-+fi
-+done
-+if ${ac_cv_search_quota_open+:} false; then :
-+
-+else
-+  ac_cv_search_quota_open=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_quota_open" >&5
-+$as_echo "$ac_cv_search_quota_open" >&6; }
-+ac_res=$ac_cv_search_quota_open
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+
-+$as_echo "#define HAVE_QUOTA_OPEN /**/" >>confdefs.h
-+
-+  QUOTA_LIBS="-lquota"
-+
-+fi
-+
-+
-+
- 
- fts=" squat"
- not_fts=""
- 
diff --git a/mail/dovecot2/patches/patch-configure.in b/mail/dovecot2/patches/patch-configure.in
deleted file mode 100644
index 6b4b50636cc..00000000000
--- a/mail/dovecot2/patches/patch-configure.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-configure.in,v 1.2 2013/02/11 21:30:00 adam Exp $
-
---- configure.in.orig	2013-01-07 08:51:52.000000000 +0100
-+++ configure.in	2013-01-19 02:56:47.000000000 +0100
-@@ -288,9 +288,10 @@
- AC_DEFINE_UNQUOTED(DOVECOT_VERSION, "$PACKAGE_VERSION", Dovecot version)
- 
- AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h inttypes.h \
-   sys/uio.h sys/sysmacros.h sys/resource.h sys/select.h libgen.h \
--  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h sys/fs/quota_common.h \
-+  sys/quota.h sys/fs/ufs_quota.h ufs/ufs/quota.h jfs/quota.h \
-+  quota.h sys/fs/quota_common.h \
-   mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \
-   xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \
-   sys/utsname.h glob.h linux/falloc.h ucred.h)
- 
-@@ -2609,8 +2610,15 @@
-   have_rquota=yes
- fi
- AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
- 
-+QUOTA_LIBS=""
-+AC_SEARCH_LIBS(quota_open, quota, [
-+  AC_DEFINE(HAVE_QUOTA_OPEN,, Define if you have quota_open())
-+  QUOTA_LIBS="-lquota"
-+])
-+AC_SUBST(QUOTA_LIBS)
-+
- dnl
- dnl ** Full text search
- dnl
- 
diff --git a/mail/dovecot2/patches/patch-src_lib_network.c b/mail/dovecot2/patches/patch-src_lib_network.c
deleted file mode 100644
index 7c7751f6a96..00000000000
--- a/mail/dovecot2/patches/patch-src_lib_network.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-src_lib_network.c,v 1.1 2012/05/14 14:04:59 taca Exp $
-
-* Add support for net_getunixcred() to NetBSD before 5.0 which dosen't
-  have getpeereid(3); no LOCAL_PEEREID socket options.
-
---- src/lib/network.c.orig	2012-03-26 13:59:30.000000000 +0000
-+++ src/lib/network.c
-@@ -37,6 +37,10 @@ union sockaddr_union_unix {
- #  define SIZEOF_SOCKADDR(so) (sizeof(so.sin))
- #endif
- 
-+#if !defined(HAVE_GETPEEREID) && !defined(SO_PEERCRED) && !defined(HAVE_GETPEERUCRED) && defined(MSG_WAITALL) && defined(LOCAL_CREDS)
-+#  define NEEDS_LOCAL_CREDS 1
-+#endif
-+
- bool net_ip_compare(const struct ip_addr *ip1, const struct ip_addr *ip2)
- {
- 	return net_ip_cmp(ip1, ip2) == 0;
-@@ -298,6 +302,16 @@ int net_connect_unix(const char *path)
- 		return -1;
- 	}
- 
-+#ifdef NEEDS_LOCAL_CREDS
-+	{
-+		int on = 1;
-+		if (setsockopt(fd, 0, LOCAL_CREDS, &on, sizeof on)) {
-+			i_error("setsockopt(LOCAL_CREDS) failed: %m");
-+			return -1;
-+		}
-+	}
-+#endif
-+
- 	return fd;
- }
- 
-@@ -454,6 +468,16 @@ int net_listen_unix(const char *path, in
- 		return -1;
- 	}
- 
-+#ifdef NEEDS_LOCAL_CREDS
-+	{
-+		int on = 1;
-+		if (setsockopt(fd, 0, LOCAL_CREDS, &on, sizeof on)) {
-+			i_error("setsockopt(LOCAL_CREDS) failed: %m");
-+			return -1;
-+		}
-+	}
-+#endif
-+
- 	/* bind */
- 	if (bind(fd, &sa.sa, sizeof(sa)) < 0) {
- 		if (errno != EADDRINUSE)
-@@ -731,6 +755,44 @@ int net_getunixcred(int fd, struct net_u
- 		return -1;
- 	}
- 	return 0;
-+#elif NEEDS_LOCAL_CREDS
-+	/* NetBSD < 5 */
-+	int i, n, on;
-+	struct iovec iov;
-+	struct msghdr msg;
-+	struct {
-+		struct cmsghdr ch;
-+		char buf[110];
-+	} cdata;
-+	struct sockcred *sc;
-+
-+	iov.iov_base = (char *)&on;
-+	iov.iov_len = 1;
-+
-+	sc = (struct sockcred *)cdata.buf;
-+	sc->sc_uid = sc->sc_euid = sc->sc_gid = sc->sc_egid = -1;
-+	memset(&cdata.ch, 0, sizeof cdata.ch);
-+
-+	memset(&msg, 0, sizeof msg);
-+
-+	msg.msg_iov = &iov;
-+	msg.msg_iovlen = 1;
-+	msg.msg_control = &cdata;
-+	msg.msg_controllen = sizeof(cdata.ch) + sizeof(cdata.buf);
-+
-+	for (i = 0; i < 10; i++) {
-+		n = recvmsg(fd, &msg, MSG_WAITALL | MSG_PEEK);
-+		if (n >= 0 || errno != EAGAIN)
-+			break;
-+		usleep(100);
-+	}
-+	if (n < 0) {
-+		i_error("recvmsg() failed: %m");
-+		return -1;
-+	}
-+	cred_r->uid = sc->sc_euid;
-+	cred_r->gid = sc->sc_egid;
-+	return 0;
- #else
- 	errno = EINVAL;
- 	return -1;
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am b/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am
deleted file mode 100644
index 6c149efcf36..00000000000
--- a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_plugins_quota_Makefile.am,v 1.2 2013/02/11 21:30:00 adam Exp $
-
---- src/plugins/quota/Makefile.am.orig	2013-01-19 02:59:14.000000000 +0100
-+++ src/plugins/quota/Makefile.am	2013-01-19 03:05:16.000000000 +0100
-@@ -26,8 +26,11 @@
- 	quota-maildir.c \
-         quota-plugin.c \
- 	quota-storage.c
- 
-+lib10_quota_plugin_la_LIBADD = \
-+	$(QUOTA_LIBS)
-+
- lib10_quota_plugin_la_SOURCES = $(quota_dist_sources)
- nodist_lib10_quota_plugin_la_SOURCES = $(RQUOTA_XDR)
- 
- doveadm_module_LTLIBRARIES = \
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in b/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in
deleted file mode 100644
index 885b3a5d728..00000000000
--- a/mail/dovecot2/patches/patch-src_plugins_quota_Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_plugins_quota_Makefile.in,v 1.2 2013/02/11 21:30:00 adam Exp $
-
---- src/plugins/quota/Makefile.in.orig	2013-01-19 03:09:26.000000000 +0100
-+++ src/plugins/quota/Makefile.in	2013-01-19 03:07:06.000000000 +0100
-@@ -84,9 +84,10 @@
- lib10_doveadm_quota_plugin_la_LINK = $(LIBTOOL) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) \
- 	$(lib10_doveadm_quota_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
--lib10_quota_plugin_la_LIBADD =
-+am__DEPENDENCIES_1 =
-+lib10_quota_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__objects_1 = quota.lo quota-count.lo quota-fs.lo quota-dict.lo \
- 	quota-dirsize.lo quota-maildir.lo quota-plugin.lo \
- 	quota-storage.lo
- am_lib10_quota_plugin_la_OBJECTS = $(am__objects_1)
-@@ -215,8 +216,9 @@
- PG_CONFIG = @PG_CONFIG@
- PKG_CONFIG = @PKG_CONFIG@
- PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
- PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-+QUOTA_LIBS = @QUOTA_LIBS@
- RANLIB = @RANLIB@
- RPCGEN = @RPCGEN@
- RUN_TEST = @RUN_TEST@
- SED = @SED@
-@@ -319,8 +321,11 @@
- 	quota-maildir.c \
-         quota-plugin.c \
- 	quota-storage.c
- 
-+lib10_quota_plugin_la_LIBADD = \
-+	$(QUOTA_LIBS)
-+
- lib10_quota_plugin_la_SOURCES = $(quota_dist_sources)
- nodist_lib10_quota_plugin_la_SOURCES = $(RQUOTA_XDR)
- doveadm_module_LTLIBRARIES = \
- 	lib10_doveadm_quota_plugin.la
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c b/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c
deleted file mode 100644
index e73934267a1..00000000000
--- a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-src_plugins_quota_quota-fs.c,v 1.2 2013/01/26 19:38:54 bouyer Exp $
-
-Support NetBSD's libquota
-
---- src/plugins/quota/quota-fs.c.orig	2012-10-30 18:57:35.000000000 +0100
-+++ src/plugins/quota/quota-fs.c	2013-01-26 19:51:09.000000000 +0100
-@@ -526,7 +526,8 @@
- }
- #endif
- 
--#if defined(FS_QUOTA_LINUX) || defined(FS_QUOTA_BSDAIX)
-+#if defined(FS_QUOTA_LINUX) || defined(FS_QUOTA_BSDAIX) || \
-+    defined(FS_QUOTA_NETBSD)
- static void fs_quota_root_disable(struct fs_quota_root *root, bool group)
- {
- 	if (group)
-@@ -642,6 +643,49 @@
- }
- #endif
- 
-+#ifdef FS_QUOTA_NETBSD
-+static int
-+fs_quota_get_netbsd(struct fs_quota_root *root, bool group, bool bytes,
-+		    uint64_t *value_r, uint64_t *limit_r)
-+{
-+	struct quotahandle *qh;
-+	struct quotakey qk;
-+	struct quotaval qv;
-+	int ret;
-+
-+	if ((qh = quota_open(root->mount->mount_path)) == NULL) {
-+		i_error("cannot open quota for %s: %m",
-+			root->mount->mount_path);
-+		fs_quota_root_disable(root, group);
-+		return 0;
-+	}
-+
-+	qk.qk_idtype = group ? QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER;
-+	qk.qk_id = group ? root->gid : root->uid;
-+	qk.qk_objtype = bytes ? QUOTA_OBJTYPE_BLOCKS : QUOTA_OBJTYPE_FILES;
-+
-+	if (quota_get(qh, &qk, &qv) != 0) {
-+		if (errno == EOPNOTSUPP || errno == ENXIO) {
-+			fs_quota_root_disable(root, group);
-+			ret = 0;
-+			goto end;
-+		}
-+		i_error("quotactl(Q_GETQUOTA, %s) failed: %m",
-+			root->mount->mount_path);
-+		ret = -1;
-+		goto end;
-+	}
-+
-+	*value_r = qv.qv_usage * DEV_BSIZE;
-+	*limit_r = qv.qv_softlimit * DEV_BSIZE;
-+
-+	ret = 1;
-+end:
-+	quota_close(qh);
-+	return ret;
-+}
-+#endif
-+
- #ifdef FS_QUOTA_HPUX
- static int
- fs_quota_get_hpux(struct fs_quota_root *root, bool bytes,
-@@ -715,6 +759,8 @@
- 	}
- #ifdef FS_QUOTA_LINUX
- 	return fs_quota_get_linux(root, group, bytes, value_r, limit_r);
-+#elif defined (FS_QUOTA_NETBSD)
-+	return fs_quota_get_netbsd(root, group, bytes, value_r, limit_r);
- #elif defined (FS_QUOTA_BSDAIX)
- 	return fs_quota_get_bsdaix(root, group, bytes, value_r, limit_r);
- #else
diff --git a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.h b/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.h
deleted file mode 100644
index 4d131083f4d..00000000000
--- a/mail/dovecot2/patches/patch-src_plugins_quota_quota-fs.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_plugins_quota_quota-fs.h,v 1.2 2013/01/26 19:38:54 bouyer Exp $
-
-Support NetBSD's libquota
-
---- src/plugins/quota/quota-fs.h.orig	2011-12-13 12:35:29.000000000 +0100
-+++ src/plugins/quota/quota-fs.h	2013-01-26 19:49:14.000000000 +0100
-@@ -37,4 +37,12 @@
- #  undef HAVE_FS_QUOTA
- #endif
- 
-+#ifdef HAVE_QUOTA_OPEN /* NetBSD with libquota */
-+#  define FS_QUOTA_NETBSD
-+#  define HAVE_FS_QUOTA
-+#  undef FS_QUOTA_LINUX /* obtained because we also have <sys/quota.h> */
-+   /* absolute path to avoid confusion with ./quota.h */
-+#  include "/usr/include/quota.h" /* absolute path to avoid confusion with ./quota.h */
-+#endif
-+
- #endif