Bill:

I tried to apply the patches in top of vpopmail 5.4.10 and get these errors:


-------------------------------------
patching file vdelivermail.c
Hunk #1 FAILED at 453.
Hunk #2 succeeded at 477 (offset -13 lines).
Hunk #4 FAILED at 673.
Hunk #5 FAILED at 702.
3 out of 5 hunks FAILED -- saving rejects to file vdelivermail.c.rej
[EMAIL PROTECTED] vpopmail-5.4.10]# cd ..
[EMAIL PROTECTED] src]# rm -rf vpopmail-5.4.10
[EMAIL PROTECTED] src]# tar xfz tar/vpopmail-5.4.10.tar.gz 
[EMAIL PROTECTED] src]# cd vpopmail-5.4.10/
[EMAIL PROTECTED] vpopmail-5.4.10]# patch -p1 < ../5_4_10-spamc
5_4_10-spamc.patch                  5_4_10-spamc-to-maildrop.patch.txt  
[EMAIL PROTECTED] vpopmail-5.4.10]# patch -p1 < ../5_4_10-spamc.patch 
(Stripping trailing CRs from patch.)
patching file Makefile.in
Hunk #4 FAILED at 47.
Hunk #8 FAILED at 171.
Hunk #11 FAILED at 521.
3 out of 12 hunks FAILED -- saving rejects to file Makefile.in.rej
(Stripping trailing CRs from patch.)
patching file aclocal.m4
Hunk #1 FAILED at 1.
Hunk #3 FAILED at 106.
2 out of 3 hunks FAILED -- saving rejects to file aclocal.m4.rej
(Stripping trailing CRs from patch.)
patching file config.h.in
(Stripping trailing CRs from patch.)
patching file configure
Hunk #4 FAILED at 1352.
Hunk #6 FAILED at 1390.
Hunk #7 FAILED at 1406.
Hunk #8 FAILED at 1435.
Hunk #9 FAILED at 1455.
Hunk #10 FAILED at 2389.
Hunk #11 FAILED at 5498.
Hunk #12 FAILED at 6726.
Hunk #14 succeeded at 7132 with fuzz 2.
Hunk #18 FAILED at 7669.
Hunk #19 FAILED at 7727.
Hunk #20 succeeded at 8029 with fuzz 2.
10 out of 20 hunks FAILED -- saving rejects to file configure.rej
(Stripping trailing CRs from patch.)
patching file configure.in
Hunk #2 succeeded at 1728 with fuzz 2.
(Stripping trailing CRs from patch.)
patching file vdelivermail.c
Hunk #5 FAILED at 648.
1 out of 6 hunks FAILED -- saving rejects to file vdelivermail.c.rej
(Stripping trailing CRs from patch.)
patching file vlimits.c
Hunk #1 succeeded at 139 with fuzz 1.
Hunk #2 FAILED at 225.
Hunk #3 succeeded at 267 with fuzz 2.
1 out of 3 hunks FAILED -- saving rejects to file vlimits.c.rej
(Stripping trailing CRs from patch.)
patching file vlimits.h
(Stripping trailing CRs from patch.)
patching file vmoddomlimits.c
Hunk #2 FAILED at 247.
1 out of 4 hunks FAILED -- saving rejects to file vmoddomlimits.c.rej
(Stripping trailing CRs from patch.)
patching file vmoduser.c
----------------------------------------------

do i need to apply other patches before?




regards,
Ingo

        

-----Mensaje original-----
De: Bill Shupp [mailto:[EMAIL PROTECTED] 
Enviado el: Jueves, 28 de Abril de 2005 16:35
Para: toaster@shupp.org
Asunto: [toaster] vdelivermail spamassassin/maildrop patches ported to
vpopmail 5.4.10

All,

I have ported the spamassassin patch from the CVS version of vpopmail (at
Source Forge) back to vpopmail 5.4.10.  I have tested it and put it in
production, but you might still want to use it with caution.  The only
change I made was to use the default TCP socket connect to spamd, rather
than the non-default UNIX socket.

Here is the patch:

http://shupp.org/patches/5.4.10-spamc.patch



Also, I have updated my maildrop version of this patch, which applies ON TOP
of the above patch.  It is located here:

http://shupp.org/patches/5.4.10-spamc-to-maildrop.patch

You can use this file for /etc/maildroprc:
http://shupp.org/software/maildroprc

This second patch lets you use the spamassassin GID flag to do per user
maildrop processing (which calls spamc, and does optional filtering/deleting
of mail, more logging, etc).  The GID flag for deleting spam is not used,
though.  This method is much more flexible IMO.

Also, please note that this newer version patch to call maildrop fixes a
problem with the previous patch where both vdelivermail AND maildrop were
updating quotas, so all messages got counted twice.

Please post any feedback to this list.

Regards,

Bill Shupp

Reply via email to