mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Integrate the following vendor patches as published on

Browse Source 
<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)
This commit is contained in:
Michael Johnson 2005-06-28 02:38:39 +00:00
parent 166e1fd444
commit 342997ec98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=138090
18 changed files with 228 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/squid/Makefile
View File

@ -66,7 +66,7 @@
PORTNAME= squid
PORTVERSION= 2.5.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -79,7 +79,14 @@ DISTNAME= squid-2.5.STABLE10
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
PATCHFILES= squid-2.5.STABLE10-content_length.patch \
squid-2.5.STABLE10-spanish.patch \
squid-2.5.STABLE10-internal_date.patch \
squid-2.5.STABLE10-chroot.patch \
squid-2.5.STABLE10-transparent.patch \
squid-2.5.STABLE10-redirect_flags.patch \
squid-2.5.STABLE10-cache_dir_change.patch \
squid-2.5.STABLE10-snmp_getnext.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

16
www/squid/distinfo
View File

@ -1,2 +1,18 @@
MD5 (squid2.5/squid-2.5.STABLE10.tar.bz2) = e6db8bdfc783b3baed7de803c9a39e55
SIZE (squid2.5/squid-2.5.STABLE10.tar.bz2) = 1069922
MD5 (squid2.5/squid-2.5.STABLE10-content_length.patch) = a3cc2465b99792e48c70963e0d08b1e0
SIZE (squid2.5/squid-2.5.STABLE10-content_length.patch) = 1879
MD5 (squid2.5/squid-2.5.STABLE10-spanish.patch) = 7542771b1f5581661aeddffff424bb74
SIZE (squid2.5/squid-2.5.STABLE10-spanish.patch) = 17111
MD5 (squid2.5/squid-2.5.STABLE10-internal_date.patch) = fe87792a7351c7d7a81a7b78f510ad60
SIZE (squid2.5/squid-2.5.STABLE10-internal_date.patch) = 8150
MD5 (squid2.5/squid-2.5.STABLE10-chroot.patch) = 2ba246a5ea04b0f2664d10baf151608d
SIZE (squid2.5/squid-2.5.STABLE10-chroot.patch) = 3062
MD5 (squid2.5/squid-2.5.STABLE10-transparent.patch) = 225cc597ae5e7b8951e96ce2656263c1
SIZE (squid2.5/squid-2.5.STABLE10-transparent.patch) = 4702
MD5 (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 3ab3faa007c77b763d4b11af5ebe694a
SIZE (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 945
MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf23bb298715b
SIZE (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = 2843
MD5 (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 187e8312b9c3b1f80ce78eb6470f4d6d
SIZE (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 1012

27
www/squid/files/follow_xff-2.5.patch
View File

@ -341,15 +341,14 @@ Index: src/delay_pools.c
ch.src_addr = r->client_addr;
ch.my_addr = r->my_addr;
ch.my_port = r->my_port;
Index: src/structs.h
*** src/structs.h.orig Wed Oct 6 00:56:14 2004
--- src/structs.h Mon Oct 18 20:23:13 2004
*** src/structs.h.orig Sun Jun 26 12:45:58 2005
--- src/structs.h Sun Jun 26 12:48:45 2005
***************
*** 609,614 ****
--- 609,619 ----
int relaxed_header_parser;
*** 610,615 ****
--- 610,620 ----
int accel_uses_host_header;
int accel_no_pmtu_disc;
int global_internal_static;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
@ -359,8 +358,8 @@ Index: src/structs.h
acl *aclList;
struct {
***************
*** 627,632 ****
--- 632,640 ----
*** 631,636 ****
--- 636,644 ----
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@ -371,8 +370,8 @@ Index: src/structs.h
acl_deny_info_list *denyInfoList;
struct _authConfig {
***************
*** 1623,1628 ****
--- 1631,1641 ----
*** 1620,1625 ****
--- 1628,1638 ----
unsigned int internal:1;
unsigned int body_sent:1;
unsigned int reset_tcp:1;
@ -385,8 +384,8 @@ Index: src/structs.h
struct _link_list {
***************
*** 1669,1674 ****
--- 1682,1690 ----
*** 1666,1671 ****
--- 1679,1687 ----
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
struct in_addr client_addr;
@ -397,8 +396,8 @@ Index: src/structs.h
unsigned short my_port;
HttpHeader header;
***************
*** 1680,1685 ****
--- 1696,1706 ----
*** 1677,1682 ****
--- 1693,1703 ----
const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */
BODY_HANDLER *body_reader;
void *body_reader_data;

11
www/squid25/Makefile
View File

@ -66,7 +66,7 @@
PORTNAME= squid
PORTVERSION= 2.5.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -79,7 +79,14 @@ DISTNAME= squid-2.5.STABLE10
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
PATCHFILES= squid-2.5.STABLE10-content_length.patch \
squid-2.5.STABLE10-spanish.patch \
squid-2.5.STABLE10-internal_date.patch \
squid-2.5.STABLE10-chroot.patch \
squid-2.5.STABLE10-transparent.patch \
squid-2.5.STABLE10-redirect_flags.patch \
squid-2.5.STABLE10-cache_dir_change.patch \
squid-2.5.STABLE10-snmp_getnext.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

16
www/squid25/distinfo
View File

@ -1,2 +1,18 @@
MD5 (squid2.5/squid-2.5.STABLE10.tar.bz2) = e6db8bdfc783b3baed7de803c9a39e55
SIZE (squid2.5/squid-2.5.STABLE10.tar.bz2) = 1069922
MD5 (squid2.5/squid-2.5.STABLE10-content_length.patch) = a3cc2465b99792e48c70963e0d08b1e0
SIZE (squid2.5/squid-2.5.STABLE10-content_length.patch) = 1879
MD5 (squid2.5/squid-2.5.STABLE10-spanish.patch) = 7542771b1f5581661aeddffff424bb74
SIZE (squid2.5/squid-2.5.STABLE10-spanish.patch) = 17111
MD5 (squid2.5/squid-2.5.STABLE10-internal_date.patch) = fe87792a7351c7d7a81a7b78f510ad60
SIZE (squid2.5/squid-2.5.STABLE10-internal_date.patch) = 8150
MD5 (squid2.5/squid-2.5.STABLE10-chroot.patch) = 2ba246a5ea04b0f2664d10baf151608d
SIZE (squid2.5/squid-2.5.STABLE10-chroot.patch) = 3062
MD5 (squid2.5/squid-2.5.STABLE10-transparent.patch) = 225cc597ae5e7b8951e96ce2656263c1
SIZE (squid2.5/squid-2.5.STABLE10-transparent.patch) = 4702
MD5 (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 3ab3faa007c77b763d4b11af5ebe694a
SIZE (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 945
MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf23bb298715b
SIZE (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = 2843
MD5 (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 187e8312b9c3b1f80ce78eb6470f4d6d
SIZE (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 1012

27
www/squid25/files/follow_xff-2.5.patch
View File

@ -341,15 +341,14 @@ Index: src/delay_pools.c
ch.src_addr = r->client_addr;
ch.my_addr = r->my_addr;
ch.my_port = r->my_port;
Index: src/structs.h
*** src/structs.h.orig Wed Oct 6 00:56:14 2004
--- src/structs.h Mon Oct 18 20:23:13 2004
*** src/structs.h.orig Sun Jun 26 12:45:58 2005
--- src/structs.h Sun Jun 26 12:48:45 2005
***************
*** 609,614 ****
--- 609,619 ----
int relaxed_header_parser;
*** 610,615 ****
--- 610,620 ----
int accel_uses_host_header;
int accel_no_pmtu_disc;
int global_internal_static;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
@ -359,8 +358,8 @@ Index: src/structs.h
acl *aclList;
struct {
***************
*** 627,632 ****
--- 632,640 ----
*** 631,636 ****
--- 636,644 ----
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@ -371,8 +370,8 @@ Index: src/structs.h
acl_deny_info_list *denyInfoList;
struct _authConfig {
***************
*** 1623,1628 ****
--- 1631,1641 ----
*** 1620,1625 ****
--- 1628,1638 ----
unsigned int internal:1;
unsigned int body_sent:1;
unsigned int reset_tcp:1;
@ -385,8 +384,8 @@ Index: src/structs.h
struct _link_list {
***************
*** 1669,1674 ****
--- 1682,1690 ----
*** 1666,1671 ****
--- 1679,1687 ----
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
struct in_addr client_addr;
@ -397,8 +396,8 @@ Index: src/structs.h
unsigned short my_port;
HttpHeader header;
***************
*** 1680,1685 ****
--- 1696,1706 ----
*** 1677,1682 ****
--- 1693,1703 ----
const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */
BODY_HANDLER *body_reader;
void *body_reader_data;

11
www/squid26/Makefile
View File

@ -66,7 +66,7 @@
PORTNAME= squid
PORTVERSION= 2.5.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -79,7 +79,14 @@ DISTNAME= squid-2.5.STABLE10
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
PATCHFILES= squid-2.5.STABLE10-content_length.patch \
squid-2.5.STABLE10-spanish.patch \
squid-2.5.STABLE10-internal_date.patch \
squid-2.5.STABLE10-chroot.patch \
squid-2.5.STABLE10-transparent.patch \
squid-2.5.STABLE10-redirect_flags.patch \
squid-2.5.STABLE10-cache_dir_change.patch \
squid-2.5.STABLE10-snmp_getnext.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

16
www/squid26/distinfo
View File

@ -1,2 +1,18 @@
MD5 (squid2.5/squid-2.5.STABLE10.tar.bz2) = e6db8bdfc783b3baed7de803c9a39e55
SIZE (squid2.5/squid-2.5.STABLE10.tar.bz2) = 1069922
MD5 (squid2.5/squid-2.5.STABLE10-content_length.patch) = a3cc2465b99792e48c70963e0d08b1e0
SIZE (squid2.5/squid-2.5.STABLE10-content_length.patch) = 1879
MD5 (squid2.5/squid-2.5.STABLE10-spanish.patch) = 7542771b1f5581661aeddffff424bb74
SIZE (squid2.5/squid-2.5.STABLE10-spanish.patch) = 17111
MD5 (squid2.5/squid-2.5.STABLE10-internal_date.patch) = fe87792a7351c7d7a81a7b78f510ad60
SIZE (squid2.5/squid-2.5.STABLE10-internal_date.patch) = 8150
MD5 (squid2.5/squid-2.5.STABLE10-chroot.patch) = 2ba246a5ea04b0f2664d10baf151608d
SIZE (squid2.5/squid-2.5.STABLE10-chroot.patch) = 3062
MD5 (squid2.5/squid-2.5.STABLE10-transparent.patch) = 225cc597ae5e7b8951e96ce2656263c1
SIZE (squid2.5/squid-2.5.STABLE10-transparent.patch) = 4702
MD5 (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 3ab3faa007c77b763d4b11af5ebe694a
SIZE (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 945
MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf23bb298715b
SIZE (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = 2843
MD5 (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 187e8312b9c3b1f80ce78eb6470f4d6d
SIZE (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 1012

27
www/squid26/files/follow_xff-2.5.patch
View File

@ -341,15 +341,14 @@ Index: src/delay_pools.c
ch.src_addr = r->client_addr;
ch.my_addr = r->my_addr;
ch.my_port = r->my_port;
Index: src/structs.h
*** src/structs.h.orig Wed Oct 6 00:56:14 2004
--- src/structs.h Mon Oct 18 20:23:13 2004
*** src/structs.h.orig Sun Jun 26 12:45:58 2005
--- src/structs.h Sun Jun 26 12:48:45 2005
***************
*** 609,614 ****
--- 609,619 ----
int relaxed_header_parser;
*** 610,615 ****
--- 610,620 ----
int accel_uses_host_header;
int accel_no_pmtu_disc;
int global_internal_static;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
@ -359,8 +358,8 @@ Index: src/structs.h
acl *aclList;
struct {
***************
*** 627,632 ****
--- 632,640 ----
*** 631,636 ****
--- 636,644 ----
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@ -371,8 +370,8 @@ Index: src/structs.h
acl_deny_info_list *denyInfoList;
struct _authConfig {
***************
*** 1623,1628 ****
--- 1631,1641 ----
*** 1620,1625 ****
--- 1628,1638 ----
unsigned int internal:1;
unsigned int body_sent:1;
unsigned int reset_tcp:1;
@ -385,8 +384,8 @@ Index: src/structs.h
struct _link_list {
***************
*** 1669,1674 ****
--- 1682,1690 ----
*** 1666,1671 ****
--- 1679,1687 ----
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
struct in_addr client_addr;
@ -397,8 +396,8 @@ Index: src/structs.h
unsigned short my_port;
HttpHeader header;
***************
*** 1680,1685 ****
--- 1696,1706 ----
*** 1677,1682 ****
--- 1693,1703 ----
const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */
BODY_HANDLER *body_reader;
void *body_reader_data;

11
www/squid27/Makefile
View File

@ -66,7 +66,7 @@
PORTNAME= squid
PORTVERSION= 2.5.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -79,7 +79,14 @@ DISTNAME= squid-2.5.STABLE10
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
PATCHFILES= squid-2.5.STABLE10-content_length.patch \
squid-2.5.STABLE10-spanish.patch \
squid-2.5.STABLE10-internal_date.patch \
squid-2.5.STABLE10-chroot.patch \
squid-2.5.STABLE10-transparent.patch \
squid-2.5.STABLE10-redirect_flags.patch \
squid-2.5.STABLE10-cache_dir_change.patch \
squid-2.5.STABLE10-snmp_getnext.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

16
www/squid27/distinfo
View File

@ -1,2 +1,18 @@
MD5 (squid2.5/squid-2.5.STABLE10.tar.bz2) = e6db8bdfc783b3baed7de803c9a39e55
SIZE (squid2.5/squid-2.5.STABLE10.tar.bz2) = 1069922
MD5 (squid2.5/squid-2.5.STABLE10-content_length.patch) = a3cc2465b99792e48c70963e0d08b1e0
SIZE (squid2.5/squid-2.5.STABLE10-content_length.patch) = 1879
MD5 (squid2.5/squid-2.5.STABLE10-spanish.patch) = 7542771b1f5581661aeddffff424bb74
SIZE (squid2.5/squid-2.5.STABLE10-spanish.patch) = 17111
MD5 (squid2.5/squid-2.5.STABLE10-internal_date.patch) = fe87792a7351c7d7a81a7b78f510ad60
SIZE (squid2.5/squid-2.5.STABLE10-internal_date.patch) = 8150
MD5 (squid2.5/squid-2.5.STABLE10-chroot.patch) = 2ba246a5ea04b0f2664d10baf151608d
SIZE (squid2.5/squid-2.5.STABLE10-chroot.patch) = 3062
MD5 (squid2.5/squid-2.5.STABLE10-transparent.patch) = 225cc597ae5e7b8951e96ce2656263c1
SIZE (squid2.5/squid-2.5.STABLE10-transparent.patch) = 4702
MD5 (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 3ab3faa007c77b763d4b11af5ebe694a
SIZE (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 945
MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf23bb298715b
SIZE (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = 2843
MD5 (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 187e8312b9c3b1f80ce78eb6470f4d6d
SIZE (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 1012

27
www/squid27/files/follow_xff-2.5.patch
View File

@ -341,15 +341,14 @@ Index: src/delay_pools.c
ch.src_addr = r->client_addr;
ch.my_addr = r->my_addr;
ch.my_port = r->my_port;
Index: src/structs.h
*** src/structs.h.orig Wed Oct 6 00:56:14 2004
--- src/structs.h Mon Oct 18 20:23:13 2004
*** src/structs.h.orig Sun Jun 26 12:45:58 2005
--- src/structs.h Sun Jun 26 12:48:45 2005
***************
*** 609,614 ****
--- 609,619 ----
int relaxed_header_parser;
*** 610,615 ****
--- 610,620 ----
int accel_uses_host_header;
int accel_no_pmtu_disc;
int global_internal_static;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
@ -359,8 +358,8 @@ Index: src/structs.h
acl *aclList;
struct {
***************
*** 627,632 ****
--- 632,640 ----
*** 631,636 ****
--- 636,644 ----
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@ -371,8 +370,8 @@ Index: src/structs.h
acl_deny_info_list *denyInfoList;
struct _authConfig {
***************
*** 1623,1628 ****
--- 1631,1641 ----
*** 1620,1625 ****
--- 1628,1638 ----
unsigned int internal:1;
unsigned int body_sent:1;
unsigned int reset_tcp:1;
@ -385,8 +384,8 @@ Index: src/structs.h
struct _link_list {
***************
*** 1669,1674 ****
--- 1682,1690 ----
*** 1666,1671 ****
--- 1679,1687 ----
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
struct in_addr client_addr;
@ -397,8 +396,8 @@ Index: src/structs.h
unsigned short my_port;
HttpHeader header;
***************
*** 1680,1685 ****
--- 1696,1706 ----
*** 1677,1682 ****
--- 1693,1703 ----
const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */
BODY_HANDLER *body_reader;
void *body_reader_data;

11
www/squid30/Makefile
View File

@ -66,7 +66,7 @@
PORTNAME= squid
PORTVERSION= 2.5.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -79,7 +79,14 @@ DISTNAME= squid-2.5.STABLE10
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
PATCHFILES= squid-2.5.STABLE10-content_length.patch \
squid-2.5.STABLE10-spanish.patch \
squid-2.5.STABLE10-internal_date.patch \
squid-2.5.STABLE10-chroot.patch \
squid-2.5.STABLE10-transparent.patch \
squid-2.5.STABLE10-redirect_flags.patch \
squid-2.5.STABLE10-cache_dir_change.patch \
squid-2.5.STABLE10-snmp_getnext.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

16
www/squid30/distinfo
View File

@ -1,2 +1,18 @@
MD5 (squid2.5/squid-2.5.STABLE10.tar.bz2) = e6db8bdfc783b3baed7de803c9a39e55
SIZE (squid2.5/squid-2.5.STABLE10.tar.bz2) = 1069922
MD5 (squid2.5/squid-2.5.STABLE10-content_length.patch) = a3cc2465b99792e48c70963e0d08b1e0
SIZE (squid2.5/squid-2.5.STABLE10-content_length.patch) = 1879
MD5 (squid2.5/squid-2.5.STABLE10-spanish.patch) = 7542771b1f5581661aeddffff424bb74
SIZE (squid2.5/squid-2.5.STABLE10-spanish.patch) = 17111
MD5 (squid2.5/squid-2.5.STABLE10-internal_date.patch) = fe87792a7351c7d7a81a7b78f510ad60
SIZE (squid2.5/squid-2.5.STABLE10-internal_date.patch) = 8150
MD5 (squid2.5/squid-2.5.STABLE10-chroot.patch) = 2ba246a5ea04b0f2664d10baf151608d
SIZE (squid2.5/squid-2.5.STABLE10-chroot.patch) = 3062
MD5 (squid2.5/squid-2.5.STABLE10-transparent.patch) = 225cc597ae5e7b8951e96ce2656263c1
SIZE (squid2.5/squid-2.5.STABLE10-transparent.patch) = 4702
MD5 (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 3ab3faa007c77b763d4b11af5ebe694a
SIZE (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 945
MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf23bb298715b
SIZE (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = 2843
MD5 (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 187e8312b9c3b1f80ce78eb6470f4d6d
SIZE (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 1012

27
www/squid30/files/follow_xff-2.5.patch
View File

@ -341,15 +341,14 @@ Index: src/delay_pools.c
ch.src_addr = r->client_addr;
ch.my_addr = r->my_addr;
ch.my_port = r->my_port;
Index: src/structs.h
*** src/structs.h.orig Wed Oct 6 00:56:14 2004
--- src/structs.h Mon Oct 18 20:23:13 2004
*** src/structs.h.orig Sun Jun 26 12:45:58 2005
--- src/structs.h Sun Jun 26 12:48:45 2005
***************
*** 609,614 ****
--- 609,619 ----
int relaxed_header_parser;
*** 610,615 ****
--- 610,620 ----
int accel_uses_host_header;
int accel_no_pmtu_disc;
int global_internal_static;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
@ -359,8 +358,8 @@ Index: src/structs.h
acl *aclList;
struct {
***************
*** 627,632 ****
--- 632,640 ----
*** 631,636 ****
--- 636,644 ----
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@ -371,8 +370,8 @@ Index: src/structs.h
acl_deny_info_list *denyInfoList;
struct _authConfig {
***************
*** 1623,1628 ****
--- 1631,1641 ----
*** 1620,1625 ****
--- 1628,1638 ----
unsigned int internal:1;
unsigned int body_sent:1;
unsigned int reset_tcp:1;
@ -385,8 +384,8 @@ Index: src/structs.h
struct _link_list {
***************
*** 1669,1674 ****
--- 1682,1690 ----
*** 1666,1671 ****
--- 1679,1687 ----
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
struct in_addr client_addr;
@ -397,8 +396,8 @@ Index: src/structs.h
unsigned short my_port;
HttpHeader header;
***************
*** 1680,1685 ****
--- 1696,1706 ----
*** 1677,1682 ****
--- 1693,1703 ----
const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */
BODY_HANDLER *body_reader;
void *body_reader_data;

11
www/squid31/Makefile
View File

@ -66,7 +66,7 @@
PORTNAME= squid
PORTVERSION= 2.5.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= \
ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@ -79,7 +79,14 @@ DISTNAME= squid-2.5.STABLE10
DIST_SUBDIR= squid2.5
PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
PATCHFILES= squid-2.5.STABLE10-content_length.patch \
squid-2.5.STABLE10-spanish.patch \
squid-2.5.STABLE10-internal_date.patch \
squid-2.5.STABLE10-chroot.patch \
squid-2.5.STABLE10-transparent.patch \
squid-2.5.STABLE10-redirect_flags.patch \
squid-2.5.STABLE10-cache_dir_change.patch \
squid-2.5.STABLE10-snmp_getnext.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmseck@netcologne.de

16
www/squid31/distinfo
View File

@ -1,2 +1,18 @@
MD5 (squid2.5/squid-2.5.STABLE10.tar.bz2) = e6db8bdfc783b3baed7de803c9a39e55
SIZE (squid2.5/squid-2.5.STABLE10.tar.bz2) = 1069922
MD5 (squid2.5/squid-2.5.STABLE10-content_length.patch) = a3cc2465b99792e48c70963e0d08b1e0
SIZE (squid2.5/squid-2.5.STABLE10-content_length.patch) = 1879
MD5 (squid2.5/squid-2.5.STABLE10-spanish.patch) = 7542771b1f5581661aeddffff424bb74
SIZE (squid2.5/squid-2.5.STABLE10-spanish.patch) = 17111
MD5 (squid2.5/squid-2.5.STABLE10-internal_date.patch) = fe87792a7351c7d7a81a7b78f510ad60
SIZE (squid2.5/squid-2.5.STABLE10-internal_date.patch) = 8150
MD5 (squid2.5/squid-2.5.STABLE10-chroot.patch) = 2ba246a5ea04b0f2664d10baf151608d
SIZE (squid2.5/squid-2.5.STABLE10-chroot.patch) = 3062
MD5 (squid2.5/squid-2.5.STABLE10-transparent.patch) = 225cc597ae5e7b8951e96ce2656263c1
SIZE (squid2.5/squid-2.5.STABLE10-transparent.patch) = 4702
MD5 (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 3ab3faa007c77b763d4b11af5ebe694a
SIZE (squid2.5/squid-2.5.STABLE10-redirect_flags.patch) = 945
MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf23bb298715b
SIZE (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = 2843
MD5 (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 187e8312b9c3b1f80ce78eb6470f4d6d
SIZE (squid2.5/squid-2.5.STABLE10-snmp_getnext.patch) = 1012

27
www/squid31/files/follow_xff-2.5.patch
View File

@ -341,15 +341,14 @@ Index: src/delay_pools.c
ch.src_addr = r->client_addr;
ch.my_addr = r->my_addr;
ch.my_port = r->my_port;
Index: src/structs.h
*** src/structs.h.orig Wed Oct 6 00:56:14 2004
--- src/structs.h Mon Oct 18 20:23:13 2004
*** src/structs.h.orig Sun Jun 26 12:45:58 2005
--- src/structs.h Sun Jun 26 12:48:45 2005
***************
*** 609,614 ****
--- 609,619 ----
int relaxed_header_parser;
*** 610,615 ****
--- 610,620 ----
int accel_uses_host_header;
int accel_no_pmtu_disc;
int global_internal_static;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
@ -359,8 +358,8 @@ Index: src/structs.h
acl *aclList;
struct {
***************
*** 627,632 ****
--- 632,640 ----
*** 631,636 ****
--- 636,644 ----
acl_access *reply;
acl_address *outgoing_address;
acl_tos *outgoing_tos;
@ -371,8 +370,8 @@ Index: src/structs.h
acl_deny_info_list *denyInfoList;
struct _authConfig {
***************
*** 1623,1628 ****
--- 1631,1641 ----
*** 1620,1625 ****
--- 1628,1638 ----
unsigned int internal:1;
unsigned int body_sent:1;
unsigned int reset_tcp:1;
@ -385,8 +384,8 @@ Index: src/structs.h
struct _link_list {
***************
*** 1669,1674 ****
--- 1682,1690 ----
*** 1666,1671 ****
--- 1679,1687 ----
int max_forwards;
/* these in_addr's could probably be sockaddr_in's */
struct in_addr client_addr;
@ -397,8 +396,8 @@ Index: src/structs.h
unsigned short my_port;
HttpHeader header;
***************
*** 1680,1685 ****
--- 1696,1706 ----
*** 1677,1682 ****
--- 1693,1703 ----
const char *vary_headers; /* Used when varying entities are detected. Changes how the store key is calculated */
BODY_HANDLER *body_reader;
void *body_reader_data;