Monday, May 24, 2004, 3:22:16 PM, Pieterjan Heyse wrote:
> On Mon, 24 May 2004, Pieterjan Heyse wrote:

>> I'm not subscribed to the list - please cc me when replying
>> I am tring to patch squid with the follow_xff patch from
>> http://squid.sourceforge.net/follow_xff/index.html
>> 
>> Following problems arise :
>> - When patching the 2.5 branch, I get errors that the file date/time
>> does not match, so I cannot patch.

> For 2.5 you need to use the 2.5 version of the patch.
Ok, I'll try again with 2.5

> If there is any rejects then you need to manually applyting the rejected
> parts. Trying to apply the 2.5 version of the patch to current 2.5 
> versions gives a trivial reject in src/structs.h otherwise the patch
> applied fine.
When applying the 2.5 patch against
http://www.squid-cache.org/Versions/v2/2.5/squid-2.5.STABLE5-20040524.tar.gz
I get :

can't find file to patch at input line 61
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/acl.c
|--- src/acl.c  13 May 2003 02:14:12 -0000      1.43.2.16
|+++ src/acl.c  23 Nov 2003 14:20:12 -0000
--------------------------

I suspect this is because the date/time is not correct ? I'm using the
command :
patch < ../follow_xff-2.5.patch
I am quite new into this whole 'patching' and stuff, so I apologise if
this is trivial to you, developers. But I must stress I  still don't
know how to start patching source code, even if all the files are
offered.

Thanks in advance,

Pieterjan Heyse
 
 
Scheppersintituut Wetteren
Cooppallaan 128
9230 Wetteren 
Tel: 09 3692072
Fax: 09 3661348
mailto:[EMAIL PROTECTED]
 

Reply via email to