From 4e9c0a92b4b2059e8d4a2486d8c7c424d2e63f78 Mon Sep 17 00:00:00 2001 From: Yen-Ming Lee Date: Mon, 18 Apr 2005 01:05:35 +0000 Subject: Integrate the following vendor patches as published on : - 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 (maintainer) --- www/squid/Makefile | 17 +++++++++++++++-- www/squid/distinfo | 18 ++++++++++++++++++ www/squid/files/patch-doc-squid.8 | 29 +++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 www/squid/files/patch-doc-squid.8 (limited to 'www/squid') diff --git a/www/squid/Makefile b/www/squid/Makefile index 02b6a50758eb..4919f29a1b8f 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -66,7 +66,7 @@ PORTNAME= squid PORTVERSION= 2.5.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -92,7 +92,16 @@ PATCHFILES= squid-2.5.STABLE9-setcookie.patch \ squid-2.5.STABLE9-ctype.patch \ squid-2.5.STABLE9-defer_digest_fetch.patch \ squid-2.5.STABLE9-dup_content_length.patch \ - squid-2.5.STABLE9-excess_data.patch + squid-2.5.STABLE9-excess_data.patch \ + squid-2.5.STABLE9-aufs.patch \ + squid-2.5.STABLE9-long_basic_auth.patch \ + squid-2.5.STABLE9-CONNECT_truncated.patch \ + squid-2.5.STABLE9-disable_hostname_checks.patch \ + squid-2.5.STABLE9-aufs_shutdown.patch \ + squid-2.5.STABLE9-2GB.patch \ + squid-2.5.STABLE9-cachemgr_objects.patch \ + squid-2.5.STABLE9-extaclauth.patch \ + squid-2.5.STABLE9-syslog.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -135,6 +144,7 @@ OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \ SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \ SQUID_AUFS "Enable the aufs storage scheme" off \ SQUID_COSS "Enable the COSS storage scheme" off \ + SQUID_LARGEFILE "Support log and cache files >2GB" off \ SQUID_STACKTRACES "Create backtraces on fatal errors" off \ SQUID_RCNG "Install an rcNG startup script" on @@ -307,6 +317,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/follow_xff-2.5.patch \ ${PATCHDIR}/follow_xff-configure.patch CONFIGURE_ARGS+= --enable-follow-x-forwarded-for .endif +.if defined(WITH_SQUID_LARGEFILE) +CONFIGURE_ARGS+= --with-large-files --enable-large-cache-files +.endif .if defined(WITH_SQUID_STACKTRACES) CONFIGURE_ARGS+= --enable-stacktraces CFLAGS+= -g diff --git a/www/squid/distinfo b/www/squid/distinfo index c911f0c44a51..0d8825dbac7e 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -28,3 +28,21 @@ MD5 (squid2.5/squid-2.5.STABLE9-dup_content_length.patch) = 50da2e64f2b3a80b1a8f SIZE (squid2.5/squid-2.5.STABLE9-dup_content_length.patch) = 1685 MD5 (squid2.5/squid-2.5.STABLE9-excess_data.patch) = c9ab2d162574e44da51f4e14c653652e SIZE (squid2.5/squid-2.5.STABLE9-excess_data.patch) = 1553 +MD5 (squid2.5/squid-2.5.STABLE9-aufs.patch) = db9e5a04e525da825e8d16764a996618 +SIZE (squid2.5/squid-2.5.STABLE9-aufs.patch) = 9317 +MD5 (squid2.5/squid-2.5.STABLE9-long_basic_auth.patch) = 38ba50f5fd44ba860cff7a4ddc67dac0 +SIZE (squid2.5/squid-2.5.STABLE9-long_basic_auth.patch) = 1328 +MD5 (squid2.5/squid-2.5.STABLE9-CONNECT_truncated.patch) = 76292a83e6f4c4d0b368522deac045ee +SIZE (squid2.5/squid-2.5.STABLE9-CONNECT_truncated.patch) = 4885 +MD5 (squid2.5/squid-2.5.STABLE9-disable_hostname_checks.patch) = dc3eb6e50a1c5e59beddad2e78d0743e +SIZE (squid2.5/squid-2.5.STABLE9-disable_hostname_checks.patch) = 2964 +MD5 (squid2.5/squid-2.5.STABLE9-aufs_shutdown.patch) = 2ab5c4eaa70d5236c867a68834e1ff4d +SIZE (squid2.5/squid-2.5.STABLE9-aufs_shutdown.patch) = 10649 +MD5 (squid2.5/squid-2.5.STABLE9-2GB.patch) = 5b77c60d1801bce9591744ba5690699a +SIZE (squid2.5/squid-2.5.STABLE9-2GB.patch) = 250589 +MD5 (squid2.5/squid-2.5.STABLE9-cachemgr_objects.patch) = cc3c6c61b46f50ea93271997e3002349 +SIZE (squid2.5/squid-2.5.STABLE9-cachemgr_objects.patch) = 2625 +MD5 (squid2.5/squid-2.5.STABLE9-extaclauth.patch) = b3c3282e6f1550e698e7a3f3ad87a7bc +SIZE (squid2.5/squid-2.5.STABLE9-extaclauth.patch) = 1799 +MD5 (squid2.5/squid-2.5.STABLE9-syslog.patch) = c04abf725b5061c0a009364097ccd253 +SIZE (squid2.5/squid-2.5.STABLE9-syslog.patch) = 6859 diff --git a/www/squid/files/patch-doc-squid.8 b/www/squid/files/patch-doc-squid.8 new file mode 100644 index 000000000000..b6465fb14cb7 --- /dev/null +++ b/www/squid/files/patch-doc-squid.8 @@ -0,0 +1,29 @@ +Index: doc/squid.8 +=================================================================== +RCS file: /squid/squid/doc/squid.8,v +retrieving revision 1.1 +diff -p -u -r1.1 squid.8 +--- doc/squid.8 18 Dec 2000 21:54:18 -0000 1.1 ++++ doc/squid.8 17 Apr 2005 14:17:48 -0000 +@@ -6,7 +6,11 @@ squid \- proxy caching server + .SH SYNOPSIS + .B squid + [ +-.B \-dhsvzCDFNRVYX ++.B \-dhvzCDFNRVYX ++] [ ++.B \-s ++| ++.BI \-l " facility" + ] [ + .BI \-f " config-file" + ] [ +@@ -73,7 +77,7 @@ Print help message. + .IP "-k reconfigure | rotate | shutdown | interrupt | kill | debug | check | parse" + Parse configuration file, then send signal to running copy + (except -k parse) and exit. +-.IP -s ++.IP "-s | -l facility" + Enable logging to syslog. + .IP "-u port" + Specify ICP port number (default: 3130), disable with 0. -- cgit v1.2.3