pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/dovecot Add a comment to patch-ab. From Edgar Fuß...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d77d0b2ca86
branches:  trunk
changeset: 649703:3d77d0b2ca86
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Apr 08 05:35:39 2015 +0000

description:
Add a comment to patch-ab. From Edgar Fuß in private mail.

diffstat:

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

diffs (36 lines):

diff -r 3b34793738f5 -r 3d77d0b2ca86 mail/dovecot/distinfo
--- a/mail/dovecot/distinfo     Wed Apr 08 05:32:07 2015 +0000
+++ b/mail/dovecot/distinfo     Wed Apr 08 05:35:39 2015 +0000
@@ -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 @@
 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 -r 3b34793738f5 -r 3d77d0b2ca86 mail/dovecot/patches/patch-ab
--- a/mail/dovecot/patches/patch-ab     Wed Apr 08 05:32:07 2015 +0000
+++ b/mail/dovecot/patches/patch-ab     Wed Apr 08 05:35:39 2015 +0000
@@ -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



Home | Main Index | Thread Index | Old Index