RE: [squid-users] ntlm_auth/auth_rewrite patch problems

> -----Original Message-----
> From: robin.garner@iname.com [mailto:robin.garner@iname.com]
> Sent: Wednesday, May 23, 2001 12:43 PM
> To: squid-users@squid-cache.org
> Subject: [squid-users] ntlm_auth/auth_rewrite patch problems
>
>
> After seeing on the squid-dev list that Robert and Kinkie's
> latest ntlm auth changes have been committed, I tried to
> download the latest dev snapshot for testing.
>
> I have downloaded the latest head snapshot
> (squid-head-200105222300-src.tar.gz), and the current
> auth_rewrite.patch and ntlm.patch.
>
> The patches don't seem to match the snapshot - output from
> the patch command is given at the end.
>
> Is there something going awry at sourceforge, or were a bunch
> of changes committed between patch and snapshot creation ?
> Or am I doing something wrong (heaven forfend :).

The daily snapshots on squid-cache.org are not generated from the
sourceforge sourcecode. You don't need the auth_rewrite and ntlm patchs
to access the latest NTLM changes. The problem you are seeing is that
you are trying to patch the squid-cache source to include features it
already has. This will be fixed when I merge down the HEAD changes...
but I'm holding off that until we have some nasty abstraction breaking
code fixed up.

Simply use the squid-cache source for now. It has all the
expected-to-be-stable fixes.

Rob
 
> robin
>
>
> What I did:
>
> wget
> http://www.squid-cache.org/Versions/v2/2.5/squid-head-20010522
2300-src.tar.gz
> wget http://squid.sourceforge.net/cgi-bin/diff/auth_rewrite.patch
> wget -O ntlm.patch
> http://squid.sourceforge.net/cgi-bin/diff/ntlm.patch?auth_rewrite
> tar -xvzf squid-head-200105222300-src.tar.gz
> cd squid-head-200105222300
> patch -p1 ../auth_rewrite.patch
>
>
> The full errors:
>
> patch -p1 <../auth_rewrite.patch
> patching file `src/authenticate.c'
> Hunk #1 FAILED at 155.
> Hunk #2 succeeded at 258 (offset 4 lines).
> Hunk #3 FAILED at 418.
> Hunk #4 FAILED at 442.
> Hunk #5 FAILED at 462.
> Hunk #6 succeeded at 567 (offset 3 lines).
> Hunk #7 succeeded at 585 (offset 4 lines).
> Hunk #8 succeeded at 627 (offset 3 lines).
> Hunk #9 succeeded at 693 (offset 4 lines).
> 4 out of 9 hunks FAILED -- saving rejects to src/authenticate.c.rej
> patching file `src/client_side.c'
> Hunk #2 FAILED at 323.
> Hunk #3 FAILED at 1355.
> 2 out of 3 hunks FAILED -- saving rejects to src/client_side.c.rej
> patching file `src/errorpage.c'
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to src/errorpage.c.rej
> patching file `src/helper.c'
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 3 out of 3 hunks ignored -- saving rejects to src/helper.c.rej
> patching file `src/protos.h'
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to src/protos.h.rej
> patching file `src/auth/basic/auth_basic.c'
> patching file `src/auth/basic/helpers/multi-domain-NTLM/README.txt'
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to
> src/auth/basic/helpers/multi-domain-NTLM/README.txt.rej
> patching file `src/auth/basic/helpers/multi-domain-NTLM/smb_auth.pl'
> Hunk #1 FAILED at 1.
> Hunk #2 FAILED at 11.
> Hunk #3 FAILED at 36.
> 3 out of 3 hunks FAILED -- saving rejects to
> src/auth/basic/helpers/multi-domain-NTLM/smb_auth.pl.rej
> patching file `src/auth/ntlm/auth_ntlm.c'
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to
> src/auth/ntlm/auth_ntlm.c.rej
>
>
> The patches are the right ones:
>
> This file is generated from the auth_rewrite branch in CVS on
> SourceForge
> Wed May 23 01:21:05 2001 GMT
>
> This file is generated from the ntlm branch in CVS on SourceForge
> Wed May 23 01:21:24 2001 GMT
>
>
>
>
> ---------------------------------------------------
> Get free personalized email at http://www.iname.com
>
Received on Tue May 22 2001 - 21:20:29 MDT