From faabf45b2e996ea70ad05d966766a5a080ff36eb Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 8 Apr 2015 05:35:39 +0000
Subject: Add a comment to patch-ab. From Edgar Fuß in private mail.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mail/dovecot/distinfo         |  4 ++--
 mail/dovecot/patches/patch-ab | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index 42ead41fa63..50d2e3981ba 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.120 2015/01/26 23:26:48 wiz Exp $
+$NetBSD: distinfo,v 1.121 2015/04/08 05:35:39 wiz Exp $
 
 SHA1 (dovecot-1.2-managesieve-0.11.13.tar.gz) = cd5d2149250072aa8079f9db967cfeffc1b57c53
 RMD160 (dovecot-1.2-managesieve-0.11.13.tar.gz) = 9deed0637f1b5942a1b4996a343fed1b23301023
@@ -13,7 +13,7 @@ SHA1 (dovecot-1.2.17.tar.gz) = 457b16791a15e739c6bc8b02bc9c78f9ad794e39
 RMD160 (dovecot-1.2.17.tar.gz) = 59f619dba2aadef3cccd6ceb045a2e75a11700a2
 Size (dovecot-1.2.17.tar.gz) = 2983431 bytes
 SHA1 (patch-aa) = 447e46268a93201b3ef22491ff0968752978d020
-SHA1 (patch-ab) = e5b5d72f0553da42d14ee05a9ed0faff8a6c7075
+SHA1 (patch-ab) = f2126b875b13505f6123ff300b4d47de5e7d9d13
 SHA1 (patch-ac) = 5912392abb79df8e78de6f710c2a83264ee58fe7
 SHA1 (patch-ag) = 7e733d41c0607df64c2c3195b78683689f2143d6
 SHA1 (patch-ah) = a7d02fa3ab1d1a760e05510ebd3cfb07a6652863
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 49dddff4ede..ab4b0c414ec 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,4 +1,13 @@
-$NetBSD: patch-ab,v 1.31 2015/01/26 23:26:48 wiz Exp $
+$NetBSD: patch-ab,v 1.32 2015/04/08 05:35:39 wiz Exp $
+
+Please note that this patch cannot be regenerated automatically. What would be
+the first hunk has manually been split into two and the context reduced for the
+second half because the managesieve patch changes the line
+        # Protocols we want to be serving: imap imaps pop3 pop3s
+into
+        # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
+and the patch needs to apply to both versions. So this line must be kept out of
+the context.
 
 --- dovecot-example.conf.orig	2009-06-01 05:21:42.000000000 +0200
 +++ dovecot-example.conf
-- 
cgit v1.2.3