www/squid to 2.5.STABLE4 ?

Sun Oct 19 04:44:37 UTC 2003

I already submitted a PR for this:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/58090

All adrian@ has to do is commit it...

As an alternative (while you wait), you may update the port yourself 
with the attached diff (replacing "/path/to" with the location you saved 
squid.diff):
1) login as root and cvsup ports tree
2) cd /usr/ports/www/squid
3) patch -p1 < /path/to/squid.diff
4) portupgrade squid (or whatever port update scheme you use)

Steps 2 and 3 are the only ones added to the normal cvsup/portupgrade 
routine.

NOTE: You may want to remove the .orig files generated after the patch 
to ensure you don't get confused after future cvsups.  They shouldn't 
hurt anything but my BSD sense of order tells me they should go away :).

This is what the patch process looks like for me:
******************************************************************
$ patch -p1 < ~noackjr/squid.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN /usr/ports/www/squid/Makefile squid/Makefile
|--- /usr/ports/www/squid/Makefile      Sun Jul 27 03:45:10 2003
|+++ squid/Makefile     Wed Oct 15 14:06:01 2003
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 7.
Hunk #2 succeeded at 16.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN /usr/ports/www/squid/distinfo squid/distinfo
|--- /usr/ports/www/squid/distinfo      Sun Jul 27 03:45:11 2003
|+++ squid/distinfo     Wed Oct 15 14:07:54 2003
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -ruN /usr/ports/www/squid/pkg-plist squid/pkg-plist
|--- /usr/ports/www/squid/pkg-plist     Sun Jul 27 03:45:11 2003
|+++ squid/pkg-plist    Tue Sep 16 14:40:00 2003
--------------------------
Patching file pkg-plist using Plan A...
Hunk #1 succeeded at 461.
Hunk #2 succeeded at 871.
done
******************************************************************

I have been using this for a week or so now with no issues.

Jon

Adam McLaurin said the following on 10/18/2003 11:13 PM:

> http://www.squid-cache.org/Versions/v2/2.5/squid-2.5.STABLE3-STABLE4.diff
> 
> diff -rupN squid-2.5.STABLE3/ChangeLog squid-2.5.STABLE4/ChangeLog
> --- squid-2.5.STABLE3/ChangeLog	Sun May 25 07:03:25 2003
> +++ squid-2.5.STABLE4/ChangeLog	Sun Sep 14 17:44:48 2003
> @@ -1,3 +1,77 @@
> +Changes to squid-2.5.STABLE4 (15 Sep 2003):
> +	- Lithuanian error messages added to the distribution
> +	- Bug #660: segfauld if more than one custom deny_info line
> +	- cache_dir disd documentation cleanup
> +	- check open of /dev/null to avoid 100% CPU loop in badly
> +	  configured chroot environments
> +	- documentation update on uri_whitespace to refer to the correct RFC
> +	- Bug #655: icmpRecv: recv: (11) Resource temporarily unavailable
> +	- Bug #683: external_acl does not wait for ident lookups to complete
> +	- aufs: Fix a minor use-after-free problem which could cause the
> +	  count of opening filedescriptors to grow larger than it should
> +	- Syntax changes to make GCC-3.3 accept Squid without complaints
> +	- Warning if CARP server defined in incorrect load factor order
> +	- neighbor_type_domain documentation update
> +	- http_header_access now works when using cache peers
> +	- high_memory_warning now uses sbrk as fallback mechanism on
> +	  platforms where neither mallinfo or mstats are available.
> +	- hosts_file now handles comments at the end of lines correcly
> +	- storeCheckCachable() Stats corrected for release_request and
> +	  wrong_content_length.
> +	- cachePeerPingsSent MIB type corrected
> +	- unused minimum_retry_timeout directive removed
> +	- Bug #702: ERR_TO_BIG spanish translation
> +	- Bug #705: Memory leak on deny_info TCP_RESET
> +	- Code cleanup to fix compile error in httpHeaderDelById
> +	- Bug #699: Host header now forwarded exactly where it was in the
> +	  original request to work around certain broken firewalls or
> +	  load balancers which fail if this header is too far into the
> +	  request headers.
> +	- Bug #704: Memory leak on reply_body_max_size
> +	- Bug #686: requests denied due to http_reply_access are now
> +	  logged with TCP_DENIED (instead of TCP_MISS, etc).
> +	- Bug #708: ie_refresh now sends no-cache to have the reload
> +	  request propagate properly in cache meshes
> +	- Bug #700: Crashes related to ftpTimeout: timeout in SENT_PASV state
> +	- Bug #709: cbdata.c:186: "c->valid" assertion due to peer
> +	  digest not found
> +	- Bug #710: round-robin cache_dir selection incorrectly
> +	  compares max-size.
> +	- Statistics corrections in HTTP header statitics
> +	- QUICKSTART cleanups
> +	- Bug #715: statCounter.syscalls.disk counters treated
> +	  inconsistently.  Now increment the counters in AUFS
> +	  functions and for unlinkd.
> +	- Improvements to the (experimental) COSS storage scheme.
> +	- Bug #721: User name field in access.log sometimes blank
> +	- Bug #94: assertion failed: http.c: "-1 == cfd ||
> +	  FD_SOCKET == fd_table[cfd].type"
> +	- Bug #716: assertion failed: client_side.c:1478: "size > 0"
> +	- Bug #732: aufs calculates number of threads and limits wrongly
> +	- Bug #663: Username not logged into access.log in case of /407
> +	- Bug #267: Form POSTing troubles with NTLM authentication
> +	  and occationally in differen other error conditions.
> +	- Bug #736: ICP dynamic timeout algorithm ignores multicast.
> +	- Bug #733: No explicit error message when ncsa_auth can't access
> +	  passwd file
> +	- Bug #267, #757: POST with NTLM stops after persistent connection
> +	  timeout
> +	- Bug #742: Wrong status code on access denials if delay_access
> +	  is used. Most notably 407 instead of 403 could be returned.
> +	- Bug #763: segfault if using ntlm in http_reply_access
> +	- Bug #638: assertion error if using proxy_auth in delay_access
> +	- Bug #756: segmentation fault if using ntlm proxy_auth in delay_access
> +	- The issue of reply_body_max_size limiting the size of error
> +	  messages no longer applies.
> +	- external_acl_type concurrency= option renamed to children= to
> +	  prepare for Squid-3 upgrades. Old syntax still accepted for the
> +	  duration of the Squid-2.5 release.
> +	- number of filedescriptors rounded down to an even multiple of 64
> +	  to work around issues in certain libc implementations.
> +	- winbind helpers less noisy in cache.log on restarts/shutdown.
> +	- Squid now automatically restarts helpers if too many of them
> +	  have crashed.
> +
> 
> ******
> 
> 
> Any chance of getting www/squid updated to 2.5.STABLE4 soon? There's a couple
> bug fixes in there that I'd love to get my hands on. Is updating the port overly
> complex?
> 
> Thanks.

-- 
Doing linear scans over an associative array is like trying to club 
someone to death with a loaded Uzi.
- Larry Wall
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: squid.diff
URL: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/attachments/20031018/158d2e7d/attachment.ksh>