Skip site navigation (1)Skip section navigation (2)
Date:      19 Jul 2004 17:52:46 -0000
From:      Thomas-Martin Seck <tmseck@netcologne.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/69307: [Maintainer] www/squid: integrate various vendor patches
Message-ID:  <20040719175246.2670.qmail@laurel.tmseck.homedns.org>
Resent-Message-ID: <200407191800.i6JI0kA1089406@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         69307
>Category:       ports
>Synopsis:       [Maintainer] www/squid: integrate various vendor patches
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 19 18:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of July 19th, 2004.

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

- fix a memory leak in client_db (squid bug #833)
- add delay pools information to cachemgr's active_requests page
  (squid bug #882)
- make basic authentication operate case insensitive by default, case
  sensitive operation can be enabled via squid.conf (squid bug #431)
- log if cache files cannot be created for some reason (squid bug #918)
- make sure that a HTTP HEAD request does not return stale data
  (squid bug #1012)
- correctly log partial hits as TCP_MISS instead of TCP_HIT
  (squid bug #1011)
- fix memory leaks within the NTLM authentication helper (squid bugs
  #994 and #910)
- handle the request_header_max_size directive correctly (squid bug #899)
- avoid creating a large number of queued DNS lookups for the same domain
  in case of DNS problems (squid bug #852)
- update LDAP helper

and chase renaming of the "ufs_no_valid_dir" patch.

Wordsmith comments regarding the usage of SQUID_LANGUAGES and
SQUID_CONFIGURE_ARGS.
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: distinfo
===================================================================
--- distinfo	(.../www/squid)	(revision 120)
+++ distinfo	(.../local/squid)	(revision 120)
@@ -1,4 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE6.tar.bz2) = 7fd964ac27b43b613d6b981cc702a29e
 SIZE (squid2.5/squid-2.5.STABLE6.tar.bz2) = 1047199
-MD5 (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
-SIZE (squid2.5/squid-2.5.STABLE6.ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 26a4ab522a2469f805f746bcdbe0109c
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_no_valid_dir.patch) = 566
+MD5 (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 2c367b09a30a8c1bb8af290cbc5d15c8
+SIZE (squid2.5/squid-2.5.STABLE6-ldap_helpers.patch) = 25080
+MD5 (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 2d6c81bd95659aa936281962b86e8a90
+SIZE (squid2.5/squid-2.5.STABLE6-concurrent_dns_lookups.patch) = 6467
+MD5 (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 1900043f6b73aa8a3cbd5004633a6c5c
+SIZE (squid2.5/squid-2.5.STABLE6-request_header_max_size.patch) = 765
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = f8f2744de056a9a0cbe7cafe44e67c19
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch) = 12192
+MD5 (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 7a18ed9211ec65c9275767401d1f8cf9
+SIZE (squid2.5/squid-2.5.STABLE6-ntlm_noreuse_leak.patch) = 3646
+MD5 (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 9ce8322cf6c48dc02a7a51d039489143
+SIZE (squid2.5/squid-2.5.STABLE6-partial_hit_is_miss.patch) = 747
+MD5 (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 929fe3d48046a7d17c0aa314befd8f7c
+SIZE (squid2.5/squid-2.5.STABLE6-HEAD.patch) = 895
+MD5 (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 63b5693268cbba233a442b345e5769bb
+SIZE (squid2.5/squid-2.5.STABLE6-ufs_create_error.patch) = 847
+MD5 (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = eb6f28d6d572c8cf996619aea925a1b6
+SIZE (squid2.5/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch) = 2337
+MD5 (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = f465bdbbadd83dee417aafeb974a9248
+SIZE (squid2.5/squid-2.5.STABLE6-active_requests_delaypool.patch) = 500
+MD5 (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 315e3bb42b4febde95b0974634ef8d66
+SIZE (squid2.5/squid-2.5.STABLE6-client_db_gc.patch) = 3668
Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 120)
+++ Makefile	(.../local/squid)	(revision 120)
@@ -21,17 +21,29 @@
 # SQUID_LANGUAGES
 #   A list of languages for which error page files should be installed
 #   (default: all)
+#
+#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
+#   install the files for these languages only.
+#   Use `make -VSQUID_LANGUAGES' or scroll down to this variable's
+#   definition to see which values are valid.
+#
 # SQUID_DEFAULT_LANG
 #   If you define SQUID_LANGUAGES, select which language should be the default
-#   (default: English)
+#   one (this variable defaults to English). This setting can be overwritten
+#   with squid.conf's error_directory directive.
+#
 # SQUID_CONFIGURE_ARGS
 #   Additional configuration options.
-#   To enable them, use an assignment like
-#   SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate"
-#   Below most of the additional configuration options are listed,
-#   please see the configure script in the squid source distribution for a
-#   complete list. Note that you probably do not need to worry about them.
 #
+#   To enable them, use e.g
+#   `make SQUID_CONFIGURE_ARGS="--enable-dlmalloc --enable-truncate" install'
+#   
+#   The list below may be incomplete, please see the configure script
+#   in the squid source distribution for the complete list of additional
+#   options.
+#   Note that you probably do not need to worry about these options in most
+#   cases, they are included in case you want to experiment with them.
+#
 #    --enable-dlmalloc
 #     Compile and use the malloc package from Doug Lea
 #    --enable-gnuregex
@@ -62,6 +74,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -74,7 +87,18 @@
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE6.ufs_no_valid_dir.patch
+PATCHFILES=	squid-2.5.STABLE6-ufs_no_valid_dir.patch \
+		squid-2.5.STABLE6-ldap_helpers.patch \
+		squid-2.5.STABLE6-concurrent_dns_lookups.patch \
+		squid-2.5.STABLE6-request_header_max_size.patch \
+		squid-2.5.STABLE6-ntlm_challengereuse_leak.patch \
+		squid-2.5.STABLE6-ntlm_noreuse_leak.patch \
+		squid-2.5.STABLE6-partial_hit_is_miss.patch \
+		squid-2.5.STABLE6-HEAD.patch \
+		squid-2.5.STABLE6-ufs_create_error.patch \
+		squid-2.5.STABLE6-basic_auth_caseinsensitive.patch \
+		squid-2.5.STABLE6-active_requests_delaypool.patch \
+		squid-2.5.STABLE6-client_db_gc.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040719175246.2670.qmail>