Hi,

When trying to patch the dovecot 2.2.1 release with latest upstream
patches I generated out of the repository, the patch fails to apply,
because 'doc/example-config/conf.d/auth-dict.conf.ext' is not
distributed within the release tarball.

Attached patch should fix the issue.

Cheers,
Chris
>From 086de5cf4c7a56cbf3aaa97cedbbea11b403af5e Mon Sep 17 00:00:00 2001
From: Christian Wiese <christian.wi...@securepoint.de>
Date: Thu, 16 May 2013 17:03:37 +0200
Subject: [PATCH] example-config: fix to also distribute auth-dict.conf.ext in
 releases

When trying to patch the dovecot 2.2.1 release with latest upstream patches
I generated out of the repository, the patch fails to apply.

-----------------%<----------------------------------------------------------
patching file doc/example-config/conf.d/auth-deny.conf.ext
can't find file to patch at input line 3029
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/doc/example-config/conf.d/auth-dict.conf.ext b/doc/example-config/conf.d/auth-dict.conf.ext
|index e6e42db..0be4847 100644
|--- a/doc/example-config/conf.d/auth-dict.conf.ext
|+++ b/doc/example-config/conf.d/auth-dict.conf.ext
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
-----------------%<----------------------------------------------------------

This is related to changeset 16351.
see: http://hg.dovecot.org/dovecot-2.2/rev/93bcbf5cabca
---
 doc/example-config/conf.d/Makefile.am |    1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/example-config/conf.d/Makefile.am b/doc/example-config/conf.d/Makefile.am
index 744d202..b7033d4 100644
--- a/doc/example-config/conf.d/Makefile.am
+++ b/doc/example-config/conf.d/Makefile.am
@@ -4,6 +4,7 @@ exampledir = $(docdir)/example-config/conf.d
 example_DATA = \
 	auth-checkpassword.conf.ext \
 	auth-deny.conf.ext \
+	auth-dict.conf.ext \
 	auth-ldap.conf.ext \
 	auth-master.conf.ext \
 	auth-passwdfile.conf.ext \
-- 
1.7.10.2

Reply via email to