Excellent. thanks for the feedback, and I'll do this tomorrow. On Thu, Jul 30, 2009 at 20:17, Amos Jeffries<squid3@xxxxxxxxxxxxx> wrote: > Kurt Buff wrote: >> >> I got a security notice from my squid box, and am trying to upgrade >> it, without success. My command line is: >> >> ./csupdoer.sh && portupgrade squid-3.0.15 >> >> where the csupdoer.sh is just: >> >> cd /usr/ports >> csup -L2 -z /root/csupfile && make fetchindex >> cd /root >> >> I get the following error output: >> >> ===> Applying FreeBSD patches for squid-3.0.17 >> 1 out of 1 hunks failed--saving rejects to src/HttpHeader.cc.rej >> 1 out of 1 hunks failed--saving rejects to src/HttpHeader.h.rej >> => Patch patch-HttpHeader failed to apply cleanly. >> *** Error code 1 >> >> Stop in /usr/ports/www/squid30. >> *** Error code 1 >> >> Stop in /usr/ports/www/squid30. >> ** Command failed [exit code 1]: /usr/bin/script -qa >> /tmp/portupgrade20090729-8913-10ps8hy-0 env UPGRADE_TOOL=portupgrade >> UPGRADE_PORT=squid-3.0.15 UPGRADE_PORT_VER=3.0.15 make >> ** Fix the problem and try again. >> ** Listing the failed packages (-:ignored / *:skipped / !:failed) >> ! www/squid30 (squid-3.0.15) (patch error) >> >> I believe that this is a result of my applying some patches that gave >> me the ability to filter some headers, >> >> My question: Have these patches been incorporated, and regardless of >> the answer, how should I proceed to upgrade, so that I retain the >> functionality that the patches I applied are in effect afterwards? > > Yes these patches have been added upstream. > Remove them from the custom ones applied during build. > > Amos > -- > Please be using > Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17 > Current Beta Squid 3.1.0.12 >
