RE: [squid-users] patching squid with developments

I'm knida active on te, just haven't done anything pending the io flow
reworking... which I'm lagging on very badly.

Rob

> -----Original Message-----
> From: Henrik Nordstrom [mailto:hno@squid-cache.org]
> Sent: Friday, November 09, 2001 12:57 AM
> To: Edward
> Cc: Squid Developers
> Subject: Re: [squid-users] patching squid with developments
>
>
> You would have to start by bringing the te branch up to date
> with current
> Squid developments first. There is no active developer
> currently working on
> the "te" branch, so it lags behind slightly...
>
> Regards
> Henrik
>
> On Thursday 08 November 2001 14.23, Edward wrote:
> > ok.
> >
> > For example, I would like to apply Content Transfer Encoding.
> >
> > now I have the patch and my squid 2.5 snapshot is in /tmp/squid-*
> >
> > I cd to squid-* and do a patch -p1 /tmp/te.patch.
> >
> > Result:
> >
> > patching file acconfig.h
> > Hunk #1 succeeded at 292 (offset 16 lines).
> > patching file configure.in
> > Hunk #1 succeeded at 767 (offset 93 lines).
> > patching file doc/debug-sections.txt
> > patching file include/version.h
> > Hunk #1 FAILED at 4.
> > 1 out of 1 hunk FAILED -- saving rejects to file
> include/version.h.rej
> > patching file src/HttpHeader.c
> > Hunk #2 succeeded at 151 (offset 4 lines).
> > Hunk #3 FAILED at 161.
> > Hunk #4 succeeded at 168 (offset 3 lines).
> > Hunk #5 succeeded at 208 (offset 7 lines).
> > 1 out of 5 hunks FAILED -- saving rejects to file
> src/HttpHeader.c.rej
> > patching file src/HttpHeaderTools.c
> > patching file src/HttpMsg.c
> > patching file src/Makefile.in
> > Hunk #1 FAILED at 176.
> > 1 out of 1 hunk FAILED -- saving rejects to file src/Makefile.in.rej
> > patching file src/client_side.c
> > Hunk #2 succeeded at 810 (offset 45 lines).
> > Hunk #3 succeeded at 1223 (offset 6 lines).
> > Hunk #4 succeeded at 1310 (offset 45 lines).
> > Hunk #5 succeeded at 1290 (offset 6 lines).
> > Hunk #6 succeeded at 1405 (offset 45 lines).
> > Hunk #7 succeeded at 1418 (offset 6 lines).
> > Hunk #8 succeeded at 1491 (offset 45 lines).
> > Hunk #9 succeeded at 1908 (offset 45 lines).
> > Hunk #10 FAILED at 1920.
> > Hunk #11 succeeded at 1934 (offset 45 lines).
> > Hunk #12 succeeded at 2009 (offset 47 lines).
> > Hunk #13 succeeded at 2019 (offset 45 lines).
> > Hunk #14 succeeded at 2075 (offset 47 lines).
> > Hunk #15 succeeded at 2104 (offset 45 lines).
> > Hunk #16 succeeded at 2182 with fuzz 2 (offset 47 lines).
> > Hunk #17 succeeded at 2198 (offset 45 lines).
> > Hunk #18 succeeded at 2255 (offset 47 lines).
> > Hunk #19 succeeded at 2394 (offset 40 lines).
> > Hunk #20 succeeded at 2459 (offset 47 lines).
> > Hunk #21 succeeded at 3066 (offset 80 lines).
> > Hunk #22 succeeded at 3199 (offset 27 lines).
> > Hunk #23 succeeded at 3503 (offset 196 lines).
> > 1 out of 23 hunks FAILED -- saving rejects to file
> src/client_side.c.rej
> > patching file src/defines.h
> > Hunk #1 FAILED at 294.
> > 1 out of 1 hunk FAILED -- saving rejects to file src/defines.h.rej
> > patching file src/enums.h
> > Hunk #1 succeeded at 225 (offset 4 lines).
> > patching file src/forward.c
> > Hunk #1 succeeded at 484 (offset 60 lines).
> > patching file src/http.c
> > Hunk #1 succeeded at 416 (offset 66 lines).
> > Hunk #2 succeeded at 501 with fuzz 2 (offset 15 lines).
> > Hunk #3 succeeded at 610 (offset 68 lines).
> > Hunk #4 succeeded at 577 (offset 15 lines).
> > Hunk #5 succeeded at 892 (offset 68 lines).
> > patching file src/protos.h
> > Hunk #1 succeeded at 404 (offset 10 lines).
> > Hunk #2 succeeded at 1153 (offset 12 lines).
> > Hunk #3 FAILED at 1307.
> > 1 out of 3 hunks FAILED -- saving rejects to file src/protos.h.rej
> > patching file src/structs.h
> > Hunk #1 succeeded at 929 (offset 60 lines).
> > Hunk #2 FAILED at 960.
> > Hunk #3 succeeded at 918 (offset 1 line).
> > Hunk #4 succeeded at 1053 (offset 60 lines).
> > Hunk #5 succeeded at 1031 (offset 2 lines).
> > Hunk #6 succeeded at 1613 (offset 63 lines).
> > Hunk #7 succeeded at 2062 (offset 8 lines).
> > 1 out of 7 hunks FAILED -- saving rejects to file src/structs.h.rej
> > patching file src/tools.c
> > Hunk #1 succeeded at 958 (offset 3 lines).
> > patching file src/transfer-encoding.c
> >
> >
> >
> > Now when I get these error, how can I correct them.
> >
> >
> > Thank you very much.
> >
> > Best regards,
> >
> > Edward Millington. BSc, Network+
> > (Systems Administrator)
> > Cariaccess Communications Ltd.
> > Palm Plaza
> > Wildey
> > St. Michael
> > Barbados
> > 1-246-430-7435
> > Fax : 1-246-431-0170
> > edward@cariaccess.com
> > www.cariaccess.com
> > ----- Original Message -----
> > From: "Henrik Nordstrom" <hno@squid-cache.org>
> > To: "Edward" <edward@cariaccess.com>
> > Cc: "Squid Users" <squid-users@squid-cache.org>
> > Sent: Thursday, October 18, 2001 4:03 PM
> > Subject: Re: [squid-users] patching squid with developments
> >
> > > All patches from devel.squid-cache.org can be applied
> using the "-p1"
> > > argument to patch.
> > >
> > > Please note that you will need a full developmen suite including
> > > * automake 1.5 + some patches for better result
> > > * libtool
> > > * autoconf
> > > * normal development tools
> > >
> > > Many of the devel.squid-cache.org patches will require
> some work to get
> > > them going, and certainly so if you are testing more than
> one of these
> > > developments at the same time.
> > >
> > > Regards
> > > Henrik Nordström
> > > Squid Hacker
> > >
> > > Edward wrote:
> > > > Hi there!
> > > >
> > > > Can someone who does alot of patching using the
> developments for squid
> >
> > give
> >
> > > > me the full command line for patching?
> > > >
> > > > I am currently running 2.5 devel for awhile now and I
> would like to
> >
> > start
> >
> > > > testing some of the developments for squid.
> > > >
> > > > I am having the problem where the patch is looking for
> a particular
> >
> > file.
> >
> > > > How can I run the patch program to patch everything at once
> > > >
> > > > Thank you very much.
> > > >
> > > > Best regards,
> > > >
> > > > Edward Millington. BSc, Network+
> > > > (Systems Administrator)
> > > > Cariaccess Communications Ltd.
> > > > Palm Plaza
> > > > Wildey
> > > > St. Michael
> > > > Barbados
> > > > 1-246-430-7435
> > > > Fax : 1-246-431-0170
> > > > edward@cariaccess.com
> > > > www.cariaccess.com
>
Received on Thu Nov 08 2001 - 15:46:26 MST