Re: patch error

From: Henrik Nordstrom <hno@dont-contact.us>
Date: Tue, 11 Apr 2000 22:51:54 +0200

The patch is failing because some of the surrounding squid.conf
(cf.data.pre) lines was changed by another patch.

If you take a look in cf.data.pre.rej it isn't that hard to manually add
in the failing lines to your cf.data.pre.

Actually the binary will probably work even if you don't change
cf.data.pre, but it might be a bit confusing to not have the correct
documentation in squid.conf.default and I cannot guarantee it works
(depends on time_t and int having the same size).

--
Henrik Nordstrom
Squid hacker
R.Ilker Gokhan wrote:
> 
>      Hi Henrik and all,
> 
>      I've got the following error while i was appling the
>      squid-2.3.STABLE1.strict_ip_authenticate_ttl.patch on my squid.
> 
>      #cd /usr/local/squid/src
>      # patch -p0 < patchfile
>      #patching file 'squid/src/cf.data.pre'
>      #Hunk #1 FAILED at 995
>      #Hunk #2 FAILED at 1018
> 
>      In addition I haven't got any error for acl.c and struct.h.
> 
>      Thank in advance..
> 
>      Ilker G.
>      Project Leader
>      NDD
>      Istanbul / Turkey
Received on Tue Apr 11 2000 - 15:17:53 MDT

This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:52:54 MST