I need the new sleep feature (smtpd_*_restrictions) of Postfix 2.3 snapshots, but I'm using the Dovecot auth patch. The 2.2.1 patch had problems in the snapshots I tried.
Fortunately the problems were very simple.
rob0@room101:~/src/mail/postfix-2.3-20050630$ patch -p1 < ~/dl/postfix-2.2.1-dovecot-auth.patch [snip] patching file src/smtpd/Makefile.in Hunk #1 FAILED at 1. Hunk #2 FAILED at 296. 2 out of 2 hunks FAILED -- saving rejects to file src/smtpd/Makefile.in.rej patching file src/smtpd/smtpd.c Hunk #1 FAILED at 854. Hunk #2 succeeded at 1006 (offset 16 lines). Hunk #3 succeeded at 1173 (offset 1 line). Hunk #4 succeeded at 1306 (offset 20 lines). Hunk #5 succeeded at 1562 (offset 33 lines). Hunk #6 succeeded at 1692 (offset 54 lines). Hunk #7 succeeded at 1834 (offset 72 lines). Hunk #8 succeeded at 2918 (offset 135 lines). Hunk #9 succeeded at 2952 (offset 73 lines). Hunk #10 succeeded at 3262 (offset 152 lines). Hunk #11 succeeded at 3301 (offset 73 lines). Hunk #12 succeeded at 3551 (offset 154 lines). 1 out of 12 hunks FAILED -- saving rejects to file src/smtpd/smtpd.c.rej [snip]
I fixed the failures manually. Attached is a patch which only changes those two files ... it's a supplement to the existing patch as provided by Timo: http://dovecot.org/patches/postfix/postfix-2.2.1-dovecot-auth.patch
I have not yet tested either sleep or AUTH, because I *do* need sleep for real. :) But it did compile with no errors nor [noted] warnings. I do have this running.
mail to this address is discarded unless "/dev/rob0"
or "not-spam" is in Subject: header