Including patches containing $Log$ keywords seems erratic. as cvs grows $Log$ expansions, the patches break and real lines get truncated. So I regenerated Andrzej'z files, replacing $Log$ with a plain "Log". Also added a straightforward ruleset, FEATURE(`ckuser_cyrus'), which I believe works more transparently and fits default installations of Cyrus. Fix: Please, consider the following diff: How-To-Repeat: To see the breakage of mrs_* files, type a cd /usr/ports/mail/sendmail && make SENDMAIL_WITH_CYRUSLOOKUP=yes patch and then compare cf/feature/mrs* with what's available at the original site.
Responsible Changed From-To: freebsd-ports-bugs->dinoex Over to maintainer.
State Changed From-To: open->feedback Your patches do not apply, Patching file files/cyruslookup.patch using Plan A... Hunk #1 succeeded at 1. Hunk #2 failed at 53. Hunk #3 failed at 61. Hunk #4 failed at 79. Hunk #5 failed at 99. Hunk #6 succeeded at 114 (offset -8 lines). Hunk #7 succeeded at 138 (offset -8 lines). 4 out of 7 hunks failed--saving rejects to files/cyruslookup.patch.rej Hmm... Ignoring the trailing garbage. Please cvsup and rediff.
Hmm, very strange! OK, I did it again, i.e. cvs get, copied new files over the old ones, cvs diff. I wonder if it sucks again. Should it happen, it must be the $log lines that seem to break the very patches, and also patches for these patches. Thus, I put the new files too, to be sure. The new patch is at: http://tric.ru/users/mike/20040927/sendmail.patch The new files are: http://tric.ru/users/mike/20040927/cyruslookup.patch http://tric.ru/users/mike/20040927/CYRUS_LOOKUP > Synopsis: [PATCH] update and fix Cyrus lookup features of mail/sendmail > > State-Changed-From-To: open->feedback > State-Changed-By: dinoex > State-Changed-When: Fri Sep 24 08:09:51 CEST 2004 > State-Changed-Why: > > > Your patches do not apply, > > Patching file files/cyruslookup.patch using Plan A... > Hunk #1 succeeded at 1. > Hunk #2 failed at 53. > Hunk #3 failed at 61. > Hunk #4 failed at 79. > Hunk #5 failed at 99. > Hunk #6 succeeded at 114 (offset -8 lines). > Hunk #7 succeeded at 138 (offset -8 lines). > 4 out of 7 hunks failed--saving rejects to files/cyruslookup.patch.rej > Hmm... Ignoring the trailing garbage. > > Please cvsup and rediff. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=71995
State Changed From-To: feedback->analyzed updated patch availible http://people.freebsd.org/~dinoex/ports/sendmail/files/cyruslookup.patch Will be commited once the freeze is lifted.
State Changed From-To: analyzed->closed committed, thanks.
(Dirk, sorry if you'll end up receiving two msgs, I'm not sure if GNATS notifies responsible about follow-ups...) This was committed on Oct 12, but the resulting files/cyruslookup.patch doesn't apply (from what I understand, some lines got duplicated) You can verify by: make -DSENDMAIL_WITH_CYRUSLOOKUP clean patch the attached diff fixes the 'patch' stage, but I can't judge whether the resulting file is working as due. Please review. Hope this helps Angelo.
State Changed From-To: closed->analyzed I will take care of it.