www/squid 7.7

- Update to 2.6.STABLE11. - Update the ICAP client patchset to not remove a specific function call;   this should fix timeout issues reported on the squid-dev list

PR:             110471
Submitted by:   Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Update to 2.6 stable10

PR:             110046
Submitted by:   Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

Rename

www/squid -> www/squid25
  www/squid26 -> www/squid

thus effectively updating www/squid to 2.6.STABLE9

PR:		ports/108562
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Repocopies by:	marcus

- Update to 2.6.STABLE9

PR:		ports/108314
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Add a patch for Squid bug #1857 (segfault on certain FTP URLs). - Bump Portrevision

PR:		ports/107961
Submitted by:	Thomas-Martin Sec <tmseck@netcologne.de>

- Update to 2.6.STABLE7. - Use OPENSSLLIB when referring to the OpenSSL library path (thanks to Angelo Turetta for submitting a patch).

Note: this update includes, among others, a fix for Squid bug #1857
(segfault when accessing certain FTP URLs), see also ports/107961.
The security implications of this bug are unknown (to me, the maintainer).

PR:		ports/108006
Submitted by:	maintainer (Thomas-Martin Seck)

- Update to 2.6.STABLE6 - update the ICAP core patchset to CVS as of 2006/12/14

PR:		ports/106718
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Fix mastersites.

PR:		ports/105418
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Fix typo in LDFLAGS (s,-I,-L,)

Approved by:	maintainer via private email

- update to 2.6.STABLE5, including changeset 11086 - correct the setting of configuration options when compiling COSS: only         specify --enable-coss-aio-ops when COSS is not built alongside with aufs;         in this scenario the user needs to supply POSIX AIO support via aio(4)         or the VFS_AIO kernel option; add a note to the storage type section in         squid.conf.default (thanks 

PR:		ports/105296
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Update to 2.6STABLE4

- integrate most of the vendor patches available from
        <http://www.squid-cache.org/Versions/v2/2.6/changesets/> up to
        changeset 11066
- replace the FTP mirror at progeny.com (which seems to be gone and is
        no longer listed on <http://www.squid-cache.org/Mirrors/ftp-mirrors.html>)
        with the one hosted by Vistech
- remove a redundant / from PATCH_SITE_SUBDIR
- update the ICAP patchsets to current ICAP CVS
- add an extra patch that adds a decription of how to remap the threading
        library to the documentation of the aufs file system in squid.conf when
        Squid is built with aufs support on FreeBSD >= 5.1
- make the rc script pass ${squid_flags} in the shutdown and reconfigure
        case (ports/100510)
- fix a path description in pkg-message (pointed out by
"Tuc at the Beach House")
- use "Squid" in the pseudo-user's description, too

PR:		ports/105022
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Sponsored by:   FreeBSD Bug-a-thon #2

- update pkg-descr and remove some cruft - consistently use "Squid" when referring to the software's name - define COMMENT a bit less chatty - replace the progeny.com mirror with the one hosted by Vistech - fix a wrong path in pkg-message.in (thanks to "Tuc at the Beach House") - pass ${squid_flags} when stopping or reconfiguring Squid (ports/100510)

PR:		ports/105023
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Sponsored by:   FreeBSD Bug-a-thon #2

- update to 2.6.STABLE3 - update the ICAP core patchset to CVS as of 2006-08-13 and correct   the name of the CVS branch used in creating the diff - remove a superfluous hunk from the ICAP bootstrap patchset

PR:		ports/102274
Submitted by:	Thomas-Martin Seck <tmseck(at)netcologne.de>
Approved by:	krion (mentor)

- Update to 2.6.STABLE2. - Include most of the post-STABLE2 changes/bugfixes published at   <http://www.squid-cache.org/Versions/v2/2.6/changesets/>. - Remove the local fix for the problem that ipfw(4) support was not   working because the problem was fixed upstream. - Remove the SQUID_IPFW option again, ipfw(4) should now work out   of the box as in earlier Squid versions. - Add ICAP support.

PR:		ports/101422
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- integrate a vendor patch from   <http://www.squid-cache.org/Versions/v2/2.5/bugs/>   to correct a problem with logging that could occur in certain cases   (Squid bug #1605) - add some of the WWW mirrors found on   <http://www.squid-cache.org/Mirrors/http-mirrors.html> as additional   PATCH_SITES   (thanks to Robert Backhaus for the initial submission) - make the rc.d script print "Stopping squid

PR:		ports/100056
Submitted by:	maintainer

- Add an OPTION to enable transparent proxying with IPFW - Include official patchset #10799 - Minor fixes

Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

The squid developers have just released 2.6.STABLE1 as the new stable Squid release. Because of the large amount changes introduced in 2.6, we keep 2.5 as www/squid and make www/squid26.

New OPTIONS:
- WITH_/WITHOUT_SQUID_KQUEUE: use kqueue(2) support (defaults to yes)
- WITH_/WITHOUT_SQUID_WCCPV2: enable WCCPv2 support (defaults to no)
- WITH_/WITHOUT_SQUID_REFERER_LOG: enable referer-header logging (default no)
- make WITH_DEBUG a synonym for WITH_SQUID_STACKTRACES

Removed OPTIONS:
- WITH_SQUID_CUSTOM_LOG: the code is now part of mainline squid and can
  be configured via squid.conf
- WITH_/WITHOUT_SQUID_UNDERSCORES: no longer configurable
- WITH_/WITHOUT_SQUID_CHECK_HOSTNAME: no longer configurable
- WITH_/WITHOUT_SQUID_RCNG: the start script is now rc.d only

Changed default:

- CARP support is enabled by default in squid 2.6 and needs to be
  explicitly disabled defining WITHOUT_SQUID_CARP

Port infrastructural changes:
- no longer check for invalid user/group id; this problem should no longer
  be an issue (if it ever was one, but you never know) and remove the
  'changeuser:' target
- use files/squid.in instead of files/squid.sh.in as template
- remove ancient information about Harvest from pkg-descr, tighten COMMENT
- add some HTTP mirror sites taken from
  <http://www.squid-cache.org/Mirrors/http-mirrors.html> as additional
  PATCH_SITES (thanks to Robert Backhaus for the initial submission)
- ICAP support is not yet available, the squid-devel CVS is not synchronized
  with mainline squid as I write this so mark WITH_SQUID_ICAP as IGNORE for
  now. I'll add the necessary patches ASAP.
- spell "squid" as "Squid" when referring to the project as this seems to be
  the spelling the Squid project prefers
- some cosmetic changes in macro definitions

PR:		ports/99750
Submitted by:	Thomas-Martin Seck <tmseck_at_netcologne.de> (squid maintainer)

- Update the list of MASTER_SITES. - Update the icap-core patchset to CVS as of 2006-05-25.

PR:		ports/98279
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Approved by:	mnag (mentor)

- Integrate a vendor patch published on   <http://www.squid-cache.org/Versions/v2/2.5/bugs/> to fix an "assertion   failed: HttpReply.c:105: rep" error (squid bug #1606).

- Update the customlog patchset accordingly.

- Bump PORTREVISION.

PR:		ports/97066
Submitted by:	maintainer

- Update to 2.5.STABLE14 - accept 7-CURRENT's WITHOUT_NIS switch as a synonym for NO_NIS - add a missing "/" in files/pkg-message.in - update the ICAP core patchset to the latest CVS (2006-05-21) - update the custom logfile patchset to the latest CVS (2006-05-21)

PR:		ports/97607
Submitted by:	maintainer

- Introduce four vendor patches [1] which:

- simplify definition of the SQUIDHOSTNAMELEN constant (squid bug #1434)
 - correct display of mime icons when visible_hostname contains only the plain
   hostname  without a domain (squid bug #1532)
 - plug a memory leak in the HTCP client code (squid bug #1553)
 - plug a memory leak in the ident processing code (squid bug #1557)

- Bump PORTREVISION

[1] http://www.squid-cache.org/Versions/v2/2.5/bugs/

PR:		97356
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Fix WITH_SQUID_CUSTOM_LOG patch to work with 2.5.13

PR:		ports/94665
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Update to 2.5.STABLE13 - Implement a new option WITH_SQUID_SASL_AUTH, off by default - Update the ICAP core patchset to the latest CVS - Extensive portlintification and cleanups

PR:		ports/94642
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

Implemented custom log format patch, providing similar functionality to that of Apache LogFormat and CustomLog configuration directives. This also allows for output in multiple formats to different log files.

See http://devel.squid-cache.org/customlog/ for more information.

PR:		ports/92522
Submitted by:	Matthew Will <mwill@spingen.com>
Approved by:	maintainer

Integrate two vendor patches being published on <http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

- Fix wbinfo_group.pl to correctly work with the wbinfo command
  from samba-3.0.21 (squid bug #1472)

- Fix a crash when accessing async IO function counters via the
  cachemgr CGI in cases where squid was compiled for aufs support
  but not actually using it (squid bug #1464)

While at it, remove an unneeded patch from the ICAP core patchset.

PR:		ports/91831
Submitted by:	maintainer

Rename the rc script back to squid.sh, since some versions of /etc/rc.d/localpkg only run scripts ending in .sh

PR:		ports/91387
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>, maintainer

[Maintainer] www/squid: rc(8) related fixups

- Fix rc(8) preamble in the squid run script
	- Use the .sh suffix only for the old style script
	- Do not refer to "rcNG" in pkg-install anymore, rcNG is the default
	  rc style by now
	- Bump PORTREVISION (to mark this change and because the package content
	  changes)

PR:		ports/90858
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de>

- Integrate vendor patch to fix a problem with the SMB helper when   --enable-ntlm-fail-open was specified as an additional configuration   option (squid bug #1022).   The port does not enable this option by default; document it, while at it. - Add SHA256 checksum for the squid tarball - Integrate ICAP client support based upon the icap project's CVS repository,   turned off by default.   To activ

PR:		ports/90688
Submitted by:	maintainer

Update to 2.5.STABLE12

PR:		ports/88327
Submitted by:	maintainer

Integrate the following vendor patches as published on <http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

- document that tcp_outgoing_xxx works badly in combination with
  server_persistent_connections (squid bug #454)
- add more tracing in test mode of squid_ldap_auth (squid bug #1395)
- fix breakage of accel_single_host when combined with
  server_persistent_connection (squid bug #1402)
- correctly implement the CACHE_HTTP_PORT configuration directive
  (squid bug #1403)
- fix the problem that CNAME addresses were remembered with a wrong TTL
  (squid bug #1404)
- fix incorrect handling of squid-internal-dynamic/netdb in conjunction with
  httpd_accel/transparent proxies (squid bug #1410)
- properly revalidate the cache on HEAD requests (squid bug #1411)
- correct handling of Set-Cookie headers on cache refreshes (squid bug #1419)
- fix a vulnerability in the FTP parsing code (squid bug #1426)

PR:		ports/87637
Submitted by:	maintainer

Fix smb_auth helper

PR:		86850
Pointed by:	Dean M. Phillips <dmphilli@gmail.com>
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

Integrate a patch from <http://www.squid-cache.org/Versions/v2/2.5/bugs/>: - fix delay pools behaviour which was broken by the patch for squid bug #500,   introduced in squid-2.5.10_6 (squid bug #1405)

PR:		ports/86669
Submitted by:	maintainer

- Update to 2.5-STABLE11 - Adapt the follow-XFF patches to the changes to squid's sources

PR:		ports/86472
Submitted by:	maintainer

Update the NTLM-scheme patch to version 2. The first version of the patch is broken (cf <http://www.squid-cache.org/bugs/show_bug.cgi?id=1391>).

PR:		ports/86215
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Integrate the following vendor patches:   - LDAP helpers do not work with TLS (-Z option)     (squid bug #1389)   - Incorrect store dir selection debug message on objects >2G     (squid bug #1343)   - Enums cannot be assumed to be signed ints     (squid bug #1343)   - Allow leaving core dumps on Linux     (squid bug #1335)   - Do not let clients bypass delay pools by faking a cache hit     (squi

PR:		ports/86179
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Remove dependencies on security/pf, it was removed. pf is in base since   502106

Pointy hat to:	pav

- Fix somewhat messed up titles in FTP listings (squid bug #1220) - FTP listings use "BASE HREF" much more than necessary (squid bug #1204) - Cleanups for 64bit architectures (squid bug #1316) - Allow wb_ntlm_auth to run more silent (squid bug #518) - Add a new 'mail_program' configuration option - Fix a possible denial of service condition regarding sslConnectTimeout   (squid bug #1355, Secunia A

PR:		ports/85688
Submitted by:	maintainer

- Update transparent patch.

PR:		ports/82838
Submitted by:	maintainer

Update the chroot vendor patch to version 2, cf http://www.squid-cache.org/Versions/v2/2.5/bugs/#squid-2.5.STABLE10-chroot

PR:		ports/82739
Submitted by:	maintainer

- Integrate the following vendor patches as published on   <http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

+ double content-length often harmless (squid bug #1305)
  + update spanish error pages
  + squid internal icons were served with slightly incorrect headers
    (squid bug #1275)
  + squid -k fails in combination with chroot (squid bug #1307)
  + core dump with --enable-ipf-transparent if access to NAT device is denied
    (squid bug #1313)
  + http_accel_single_host incompatible with redirection (squid bug #1314)
  + squid -k reconfigure caused data corruption when a cache_dir type had been
    changed (squid bug #1308)
  + SNMP getnext failed if the given OID was outside the squid MIB (squid bug
    #1317)

PR:		ports/82703
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Read cachemgr.conf rather than cachemgr.conf.default - Add a missing %SUBDIR% in MASTER_SITES

PR:		ports/81319
Submitted by:	maintainer

- Update Squid to 2.5.STABLE10

PR:		ports/81213
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- update distinfo for the updated syslog patch - remove local patch that is now incorporated into the corresponding   vendor patch (with slightly different wording)

PR:		ports/80367
Submitted by:	maintainer

- Update distinfo for the 2GB patch, this includes a fix for   squid bugs #1283, 1287 and 1288 (assertion failed in store_client.c:343).   (already committed)

- Bump portrevision as a datapoint for this bugfix.

PR:		80163
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- according web page, the patch file is rerolled at 2005-04-20 14:59 again   http://www.squid-cache.org/Versions/v2/2.5/bugs/#squid-2.5.STABLE9-2GB

Noticed by:	kris

- the patch is repacked at 2005-04-18 00:57, after maintainer submit PR 80028

- diff is listed below:

--- /tmp/squid-2.5.STABLE9-2GB.patch	Mon Apr  4 17:09:16 2005
+++ /usr/ports/distfiles/squid2.5/squid-2.5.STABLE9-2GB.patch	Mon Apr 18 08:57:57 2005
@@ -3000,7 +3000,7 @@
       }
       /* there are some things we cannot do yet */
 Index: squid/src/protos.h
-diff -c squid/src/protos.h:1.420.2.28 squid/src/protos.h:1.420.2.32
+diff -c squid/src/protos.h:1.420.2.28 squid/src/protos.h:1.420.2.30
 *** squid/src/protos.h:1.420.2.28	Fri Mar 18 17:01:52 2005
 --- squid/src/protos.h	Sat Mar 26 10:36:01 2005
 ***************
@@ -3455,9 +3455,9 @@
 +
   #endif /* SQUID_H */
 Index: squid/src/ssl.c
-diff -c squid/src/ssl.c:1.118.2.9 squid/src/ssl.c:1.118.2.10
+diff -c squid/src/ssl.c:1.118.2.9 squid/src/ssl.c:1.118.2.11
 *** squid/src/ssl.c:1.118.2.9	Mon Mar 21 12:39:29 2005
---- squid/src/ssl.c	Fri Mar 25 19:50:53 2005
+--- squid/src/ssl.c	Sun Apr 17 18:54:30 2005
 ***************
 *** 46,52 ****
   	int len;
@@ -3482,7 +3482,7 @@
   	kb_incr(&statCounter.server.all.kbytes_out, len);
   	kb_incr(&statCounter.server.other.kbytes_out, len);
 + 	/* increment total object size */
-+ 	if (sslState->size_ptr)
++ 	if (sslState->size_ptr && sslState->client.fd != -1)
 + #if SIZEOF_SQUID_OFF_T <= 4
 + 	    if (*sslState->size_ptr < 0x7FFF0000)
 + #endif

Noticed by:	many people ...

Integrate the following vendor patches as published on <http://www.squid-cache.org/Versions/v2/2.5/bugs/>:

- Correct several minor aufs issues (squid bug #671)
- Basic authentification fails when login+password totalled to more than
  64 characters (squid bug #1171)
- Fix an assertion that could occur when traffic other than HTTPS was
  tunneled through squid via the CONNECT method (squid bug #1269)
- Make the --disable-hostname-check configuration option actually work
  (squid bug #1270)
- Fix aufs warning about open filedescriptors when the cache was shut down
  (squid bug #671)
- Allow squid to process requests for files larger than 2GB in size
  (squid bug #437)

  Introduce a new OPTION "WITH_SQUID_LARGEFILE", default to off to match
  squid's default behaviour.
  Rebuild squid with -DWITH_SQUID_LARGEFILE or run 'make config' and
  select this new option.

- Add two new cachemgr actions: "pending_objects" and "client_objects"
- Make external acls that require authentication request new credentials
  after access had been denied (squid bug #1278)
- Make squid use "daemon" instead of "local4" as syslog facility (squid bug
  #1227)

PR:		80028
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

- Chase checksum of the updated pid_t patch

PR:		ports/78897
Submitted by:	maintainer

- Integrate the following vendor patches as published on   <http://www.squid-cache.org/Versions/v2/2.5/bugs/>:   + Handle odd data formats (squid bug #321)   + reload_into_ims fails to revalidate negatively cached entries     (squid bug #1159)   + Clarify delay_access function (squid bug #1245)   + Check several squid.conf directives for int overflows (squid bug #1247)   + Use memset(3) instead of

- Enable IPFilter based transparent proxying on all FreeBSD versions where
  IPFilter headers are part of the base system (i.e. RELENG_4 < 4.7-RELEASE,
  RELENG_5 and 6-CURRENT). Create a new OPTION WITH_SQUID_IPFILTER for this
  purpose. Thanks to sem@ for keeping track of this issue!

PR:		ports/78780
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)

Integrate the following vendor patches as published on - correct a race condition related to the Set-Cookie header - correct the FTP parser with regards to the EPLF format   (squid bug #1252) - correct FTP listing output when the URL was requested without a trailing   slash (squid bug #1253) - make ACL configuration errors fatal (squid bug #1255)

PR:		ports/78446
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)