> Has anyone used the 2.3.14 autocreate patch on 2.3.15? There does not > seem to be a patch for 2.3.15 on the site and I have tried using the > 2.3.14 patch and it does not apply cleanly. It fails at > imap/Makefile.in Find attached my version of the patch adopted for 2.3.15. Note that this is not an official patch from UOA but it is widely used because it's the patch used in my cyrus-imapd rpms. IIRC UOA is not using 2.3.x which is why they are not so fast upgrading the patches. Regards, Simon > > Any help would be appreciated. Output is below. > > Thanks. > AJ > > patching file cyrus-imapd-2.3.15/README.autocreate > patching file cyrus-imapd-2.3.15/imap/Makefile.in > Hunk #2 FAILED at 118. > Hunk #4 FAILED at 199. > 2 out of 4 hunks FAILED -- saving rejects to file > cyrus-imapd-2.3.15/imap/Makefile.in.rej > patching file cyrus-imapd-2.3.15/imap/autosieve.c > patching file cyrus-imapd-2.3.15/imap/compile_sieve.c > patching file cyrus-imapd-2.3.15/imap/imapd.c > Hunk #1 succeeded at 211 (offset 2 lines). > Hunk #2 succeeded at 2002 (offset 26 lines). > Hunk #3 succeeded at 2191 (offset 2 lines). > Hunk #4 succeeded at 2375 (offset 26 lines). > patching file cyrus-imapd-2.3.15/imap/lmtpd.c > Hunk #2 succeeded at 979 (offset 1 line). > Hunk #4 succeeded at 1137 (offset 1 line). > patching file cyrus-imapd-2.3.15/imap/mboxlist.c > Hunk #3 succeeded at 3437 (offset 14 lines). > patching file cyrus-imapd-2.3.15/imap/mboxlist.h > Hunk #1 succeeded at 216 (offset 1 line). > patching file cyrus-imapd-2.3.15/imap/pop3d.c > Hunk #1 succeeded at 173 (offset 1 line). > Hunk #3 succeeded at 1552 (offset 1 line). > patching file cyrus-imapd-2.3.15/lib/auth.c > patching file cyrus-imapd-2.3.15/lib/auth.h > patching file cyrus-imapd-2.3.15/lib/auth_krb.c > Hunk #1 succeeded at 341 (offset 1 line). > Hunk #3 succeeded at 398 (offset 1 line). > patching file cyrus-imapd-2.3.15/lib/auth_krb5.c > patching file cyrus-imapd-2.3.15/lib/auth_pts.c > patching file cyrus-imapd-2.3.15/lib/auth_unix.c > Hunk #1 succeeded at 315 (offset 1 line). > patching file cyrus-imapd-2.3.15/lib/imapoptions > patching file cyrus-imapd-2.3.15/notifyd/Makefile.in > patching file cyrus-imapd-2.3.15/notifyd/notifyd.c > patching file cyrus-imapd-2.3.15/ptclient/Makefile.in > > ---- > 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 >
Attachment:
cyrus-imapd-2.3.15-autocreate-0.10-0.diff.gz
Description: GNU Zip compressed data
---- 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
