Amos Jeffries wrote:
Kurt Buff wrote:
On Wed, May 27, 2009 at 12:11, Chris Robertson <crobertson@xxxxxxx>
wrote:
Kurt Buff wrote:
I cd'ed to /usr/ports/www/squid30/work/squid-3.0.STABLE15/ and saved
the file as httpheader.patch, with the following results:
----------
squid# patch <httpheader.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|=== modified file 'src/HttpHeader.cc'
|--- src/HttpHeader.cc 2009-04-14 15:38:39 +0000
|+++ src/HttpHeader.cc 2009-05-17 07:21:19 +0000
--------------------------
Patching file src/HttpHeader.cc using Plan A...
Hunk #1 succeeded at 124.
Good.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|=== modified file 'src/HttpHeader.h'
|--- src/HttpHeader.h 2009-04-10 07:49:36 +0000
|+++ src/HttpHeader.h 2009-05-17 07:19:47 +0000
--------------------------
Patching file src/HttpHeader.h using Plan A...
Hunk #1 succeeded at 98.
Good.
done
----------
Given my inexperience with this process - what next? As a reminder,
'cause I know you're busy, I'm running:
FreeBSD squid.mycompany.com 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon Jun
30 17:27:53 PDT 2008
root@xxxxxxxxxxxxxxxxxxx:/usr/obj/usr/src/sys/GENERIC i386
with squid-3.0.15
I performed a make, but that didn't seem to generate a recompile.
make clean && make
Not a go. It errors out with the following:
depbase=`echo HttpHdrContRange.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;
c++ -DHAVE_CONFIG_H
-DDEFAULT_CONFIG_FILE=\"/usr/local/etc/squid/squid.conf\" -I.
-I../include -I. -I. -I../include -I../include
-I../lib/libTrie/include -Werror -Wall -Wpointer-arith
-Wwrite-strings -Wcomments -D_REENTRANT -O2 -fno-strict-aliasing
-pipe -MT HttpHdrContRange.o -MD -MP -MF $depbase.Tpo -c -o
HttpHdrContRange.o HttpHdrContRange.cc && mv -f $depbase.Tpo
$depbase.Po
depbase=`echo HttpHeader.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`; c++
-DHAVE_CONFIG_H
-DDEFAULT_CONFIG_FILE=\"/usr/local/etc/squid/squid.conf\" -I.
-I../include -I. -I. -I../include -I../include
-I../lib/libTrie/include -Werror -Wall -Wpointer-arith
-Wwrite-strings -Wcomments -D_REENTRANT -O2 -fno-strict-aliasing
-pipe -MT HttpHeader.o -MD -MP -MF $depbase.Tpo -c -o HttpHeader.o
HttpHeader.cc && mv -f $depbase.Tpo $depbase.Po
HttpHeader.cc:127: error: 'ftSTr' was not declared in this scope
*** Error code 1
A typo in my patch :( sorry. Lower case 'T'.
Amos
FWIW, I'm just build testing for the commit now. It will be in the next
set of snapshots.
Amos
--
Please be using
Current Stable Squid 2.7.STABLE6 or 3.0.STABLE15
Current Beta Squid 3.1.0.8 or 3.0.STABLE16-RC1
