> Simon Matter schrieb:
>>> They don't apply togheter, only one can be applied. Try with fresh
>>> sources
>>> and Andy Fiddaman's patch should apply fine.
>>>
>>> Simon
>
> I should have mentioned that that I did it with fresh sources.
>
> 1. fresh sources with first patch
> 2. delete source tree
> 3. unpack sources and second patch
Did you copy/paste the patch? Then maybe it's a problem with whitespace
and such. Can you try the attached one.
Simon
>
> I also verified right now again with fresh sources:
>
>> imap-1:/export/build# tar -xvzf source/cyrus-imapd-2.3.12.tar.gz
> > imap-1:/export/build# cd cyrus-imapd-2-3-12
>> imap-1:/export/build/cyrus-imapd-2.3.12# patch -p1 < ../libconfig3.patch
>> patching file lib/libconfig.c
>> Hunk #1 FAILED at 344.
>> 1 out of 1 hunk FAILED -- saving rejects to file lib/libconfig.c.rej
>
> Thomas
>
--- cyrus-imapd-2.3.12/lib/libconfig.c.orig 2008-04-11 22:07:00.000000000 +0200
+++ cyrus-imapd-2.3.12/lib/libconfig.c 2008-04-23 21:27:46.000000000 +0200
@@ -344,7 +344,7 @@
/* end of line */
buf[--len] = '\0';
- if (buf[len-1] == '\\') {
+ if (len && buf[len-1] == '\\') {
/* line continuation */
len--;
lineno++;----
Cyrus Home Page: http://cyrusimap.web.cmu.edu/
Cyrus Wiki/FAQ: http://cyrusimap.web.cmu.edu/twiki
List Archives/Info: http://asg.web.cmu.edu/cyrus/mailing-list.html
