[squid-users] Questions on FreeBSD port

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?

Many Thanks,

Kurt

The rej files are as follows:

----------Begin HttpHeader.cc.rej----------
***************
*** 124,130 ****
          {"Title", HDR_TITLE, ftStr},
          {"Trailers", HDR_TRAILERS, ftStr},
          {"Transfer-Encoding", HDR_TRANSFER_ENCODING, ftStr},
          {"Upgrade", HDR_UPGRADE, ftStr}, /* for now */
          {"User-Agent", HDR_USER_AGENT, ftStr},
          {"Vary", HDR_VARY, ftStr}, /* for now */
          {"Via", HDR_VIA, ftStr}, /* for now */
--- 124,132 ----
          {"Title", HDR_TITLE, ftStr},
          {"Trailers", HDR_TRAILERS, ftStr},
          {"Transfer-Encoding", HDR_TRANSFER_ENCODING, ftStr},
+ {"Translate", HDR_TRANSLATE, ftStr}, /* for now. may need to crop */
          {"Upgrade", HDR_UPGRADE, ftStr}, /* for now */
+ {"Unless-Modified-Since", HDR_UNLESS_MODIFIED_SINCE, ftStr},
/* for now ignore. may need to crop */
          {"User-Agent", HDR_USER_AGENT, ftStr},
          {"Vary", HDR_VARY, ftStr}, /* for now */
          {"Via", HDR_VIA, ftStr}, /* for now */
----------End HttpHeader.cc.rej----------

----------Begin src/HttpHeader.h.rej----------
***************
*** 98,104 ****
      HDR_TITLE,
      HDR_TRAILERS,
      HDR_TRANSFER_ENCODING,
      HDR_UPGRADE,
      HDR_USER_AGENT,
      HDR_VARY,
      HDR_VIA,
--- 98,106 ----
      HDR_TITLE,
      HDR_TRAILERS,
      HDR_TRANSFER_ENCODING,
+ HDR_TRANSLATE, /* IIS custom header we may need to cut off */
      HDR_UPGRADE,
+ HDR_UNLESS_MODIFIED_SINCE, /* IIS custom header we
may need to cut off */
      HDR_USER_AGENT,
      HDR_VARY,
      HDR_VIA,
----------End src/HttpHeader.h.rej----------
Received on Wed Jul 29 2009 - 15:55:56 MDT