4 files changed, 22 insertions, 114 deletions

diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index c5395c3a0a05..932e66e9902a 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -62,11 +62,14 @@
 #     Tune the number of worker threads for the aufs object
 #    --with-coss-membuf-size
 #     COSS membuf size (default: 1048576 bytes)
+#    --with-maxfd=N
+#     Override the maximum number of filedescriptors. Useful if you
+#     build as another user who is not privileged to use the amount
+#     of filedescriptors the resulting binary is expected to support.
 #
 
 PORTNAME=	squid
-PORTVERSION=	2.5.10
-PORTREVISION=	7
+PORTVERSION=	2.5.11
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -75,42 +78,11 @@ MASTER_SITES=	\
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE10
+DISTNAME=	squid-2.5.STABLE11
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-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-2.patch \
-		squid-2.5.STABLE10-transparent-2.patch \
-		squid-2.5.STABLE10-redirect_flags.patch \
-		squid-2.5.STABLE10-cache_dir_change.patch \
-		squid-2.5.STABLE10-snmp_getnext.patch \
-		squid-2.5.STABLE10-ftp_title-2.patch \
-		squid-2.5.STABLE10-ftp_basehref.patch \
-		squid-2.5.STABLE10-wbinfo_groups.patch \
-		squid-2.5.STABLE10-64bit_cleanup.patch \
-		squid-2.5.STABLE10-wb_ntlm_auth_silent.patch \
-		squid-2.5.STABLE10-mail_program.patch \
-		squid-2.5.STABLE10-sslConnectTimeout.patch \
-		squid-2.5.STABLE10-statHistAssert.patch \
-		squid-2.5.STABLE10-chroot_dir.patch \
-		squid-2.5.STABLE10-errmsg.patch \
-		squid-2.5.STABLE10-FORTIFY_SOURCE.patch \
-		squid-2.5.STABLE10-ftp_250.patch \
-		squid-2.5.STABLE10-Greek.patch \
-		squid-2.5.STABLE10-STORE_PENDING.patch \
-		squid-2.5.STABLE10-ldap_auth-U.patch \
-		squid-2.5.STABLE10-cacheClientTable.patch \
-		squid-2.5.STABLE10-mail_from.patch \
-		squid-2.5.STABLE10-LDAP_TLS.patch \
-		squid-2.5.STABLE10-storedir_objsize_debug.patch \
-		squid-2.5.STABLE10-header_id_enum.patch \
-		squid-2.5.STABLE10-allow_coredump.patch \
-		squid-2.5.STABLE10-delay_pools.patch \
-		squid-2.5.STABLE10-pipeline-CONNECT.patch \
-		squid-2.5.STABLE10-NTLM-scheme_assert-2.patch
+PATCHFILES=
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 44aaa72b06cc..ff75fc378cb9 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,66 +1,2 @@
-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-2.patch) = 4f4c0a21d75d77b17b7c35d80c0bd65e
-SIZE (squid2.5/squid-2.5.STABLE10-chroot-2.patch) = 3500
-MD5 (squid2.5/squid-2.5.STABLE10-transparent-2.patch) = 0c40fb64d70670130115a3ac21c84ae8
-SIZE (squid2.5/squid-2.5.STABLE10-transparent-2.patch) = 4008
-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
-MD5 (squid2.5/squid-2.5.STABLE10-ftp_title-2.patch) = b94e9fdd7a26942debb794df61670f61
-SIZE (squid2.5/squid-2.5.STABLE10-ftp_title-2.patch) = 4240
-MD5 (squid2.5/squid-2.5.STABLE10-ftp_basehref.patch) = a12a2ef50275589c65238a2383dae4b9
-SIZE (squid2.5/squid-2.5.STABLE10-ftp_basehref.patch) = 8250
-MD5 (squid2.5/squid-2.5.STABLE10-wbinfo_groups.patch) = 6ae4e46ee7ba4c07fe159089d6ca43ad
-SIZE (squid2.5/squid-2.5.STABLE10-wbinfo_groups.patch) = 1245
-MD5 (squid2.5/squid-2.5.STABLE10-64bit_cleanup.patch) = 6577071c711c2b03b7540813d6fd9bcb
-SIZE (squid2.5/squid-2.5.STABLE10-64bit_cleanup.patch) = 21491
-MD5 (squid2.5/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 1872b550bb3346a7817ecfff4b3c1c12
-SIZE (squid2.5/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 2035
-MD5 (squid2.5/squid-2.5.STABLE10-mail_program.patch) = a8cf7b7fea4c2dc7930d5eda88866e00
-SIZE (squid2.5/squid-2.5.STABLE10-mail_program.patch) = 1922
-MD5 (squid2.5/squid-2.5.STABLE10-sslConnectTimeout.patch) = f8e0a52bcd4771809b414e60108394ae
-SIZE (squid2.5/squid-2.5.STABLE10-sslConnectTimeout.patch) = 426
-MD5 (squid2.5/squid-2.5.STABLE10-statHistAssert.patch) = 6c523256183b8b71935f92163ef2446d
-SIZE (squid2.5/squid-2.5.STABLE10-statHistAssert.patch) = 738
-MD5 (squid2.5/squid-2.5.STABLE10-chroot_dir.patch) = 0ed67d475016e10647112ca83988447f
-SIZE (squid2.5/squid-2.5.STABLE10-chroot_dir.patch) = 685
-MD5 (squid2.5/squid-2.5.STABLE10-errmsg.patch) = fa3e859b2850f30c5df8b6601bc32b72
-SIZE (squid2.5/squid-2.5.STABLE10-errmsg.patch) = 19050
-MD5 (squid2.5/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = a30ea35f5675532d3e6993df4e944766
-SIZE (squid2.5/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 2397
-MD5 (squid2.5/squid-2.5.STABLE10-ftp_250.patch) = 36e143222b2e337927e6264243183808
-SIZE (squid2.5/squid-2.5.STABLE10-ftp_250.patch) = 2090
-MD5 (squid2.5/squid-2.5.STABLE10-Greek.patch) = 520132a389135f09512324ec54412a3c
-SIZE (squid2.5/squid-2.5.STABLE10-Greek.patch) = 37463
-MD5 (squid2.5/squid-2.5.STABLE10-STORE_PENDING.patch) = 859947945228575403ba387d1a12f154
-SIZE (squid2.5/squid-2.5.STABLE10-STORE_PENDING.patch) = 9169
-MD5 (squid2.5/squid-2.5.STABLE10-ldap_auth-U.patch) = 559d847418cb6e8bc0ac64ea83c6f1ce
-SIZE (squid2.5/squid-2.5.STABLE10-ldap_auth-U.patch) = 1380
-MD5 (squid2.5/squid-2.5.STABLE10-cacheClientTable.patch) = d3e76dbab6c22dcb18eeaf63d125e174
-SIZE (squid2.5/squid-2.5.STABLE10-cacheClientTable.patch) = 632
-MD5 (squid2.5/squid-2.5.STABLE10-mail_from.patch) = 8a944c1d3f3bac0d1dadcb7aace0ad68
-SIZE (squid2.5/squid-2.5.STABLE10-mail_from.patch) = 1863
-MD5 (squid2.5/squid-2.5.STABLE10-LDAP_TLS.patch) = be16c3bd42c1e72c84db9107d91fb1d7
-SIZE (squid2.5/squid-2.5.STABLE10-LDAP_TLS.patch) = 2466
-MD5 (squid2.5/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 50c480674cc3cf8de7362e0a440c2753
-SIZE (squid2.5/squid-2.5.STABLE10-storedir_objsize_debug.patch) = 1289
-MD5 (squid2.5/squid-2.5.STABLE10-header_id_enum.patch) = df2c547c9390f060333683e7e60b6363
-SIZE (squid2.5/squid-2.5.STABLE10-header_id_enum.patch) = 628
-MD5 (squid2.5/squid-2.5.STABLE10-allow_coredump.patch) = 14184adb5452ddac77c8511ee1202689
-SIZE (squid2.5/squid-2.5.STABLE10-allow_coredump.patch) = 3496
-MD5 (squid2.5/squid-2.5.STABLE10-delay_pools.patch) = bd4e5d3d8fbea996d29cfe6d6132cb0a
-SIZE (squid2.5/squid-2.5.STABLE10-delay_pools.patch) = 7782
-MD5 (squid2.5/squid-2.5.STABLE10-pipeline-CONNECT.patch) = 9e264ac64f93755ccfdce33f14a470c3
-SIZE (squid2.5/squid-2.5.STABLE10-pipeline-CONNECT.patch) = 6316
-MD5 (squid2.5/squid-2.5.STABLE10-NTLM-scheme_assert-2.patch) = 3a91ea506aa7de50adaa758aa4b0f090
-SIZE (squid2.5/squid-2.5.STABLE10-NTLM-scheme_assert-2.patch) = 1217
+MD5 (squid2.5/squid-2.5.STABLE11.tar.bz2) = 5e7f13ad95b64b60ddd6cdc2ab800d67
+SIZE (squid2.5/squid-2.5.STABLE11.tar.bz2) = 1075431
diff --git a/www/squid31/files/follow_xff-2.5.patch b/www/squid31/files/follow_xff-2.5.patch
index b3096c6d5ba4..3c08e0a7c398 100644
--- a/www/squid31/files/follow_xff-2.5.patch
+++ b/www/squid31/files/follow_xff-2.5.patch
@@ -370,11 +370,11 @@ Index: src/delay_pools.c
       acl_deny_info_list *denyInfoList;
       struct _authConfig {
 ***************
-*** 1620,1625 ****
---- 1628,1638 ----
-      unsigned int internal:1;
+*** 1623,1628 ****
+--- 1631,1641 ----
       unsigned int body_sent:1;
       unsigned int reset_tcp:1;
+      unsigned int must_keepalive:1;
 + #if FOLLOW_X_FORWARDED_FOR
 +     /* XXX this flag could be eliminated;
 +      * see comments in clientAccessCheck */
diff --git a/www/squid31/files/follow_xff-configure.patch b/www/squid31/files/follow_xff-configure.patch
index 0cf30da6c147..7892ad95278b 100644
--- a/www/squid31/files/follow_xff-configure.patch
+++ b/www/squid31/files/follow_xff-configure.patch
@@ -18,12 +18,12 @@
   * If your system has statvfs(), and if it actually works!
   */
  #undef HAVE_STATVFS
---- configure.orig	Tue Mar  2 10:18:14 2004
-+++ configure	Tue Mar  2 10:18:56 2004
-@@ -222,6 +222,12 @@
-                           variance within an accelerator setup.
-                           Typically used together with other code
-                           that adds custom HTTP headers to the requests."
+--- configure.orig	Thu Sep 22 10:16:26 2005
++++ configure	Thu Sep 22 17:29:01 2005
+@@ -249,6 +249,12 @@
+                           if you build as another user who is not privileged
+                           to use the number of filedescriptors you want the
+                           resulting binary to support"
 +ac_help="$ac_help
 +  --enable-follow-x-forwarded-for
 +                          Enable support for following the X-Forwarded-For
@@ -33,10 +33,11 @@
  
  # Initialize some variables set by options.
  # The variables have the same names as the options, with
-@@ -2966,6 +2972,29 @@
- fi
+@@ -3255,6 +3261,29 @@
  
+ fi
  
++
 +follow_xff=1
 +# Check whether --enable-follow-x-forwarded-for or --disable-follow-x-forwarded-for was given.
 +if test "${enable_follow_x_forwarded_for+set}" = set; then
@@ -59,7 +60,6 @@
 +EOF
 +
 +fi
-+
+ 
  # Force some compilers to use ANSI features
  #
- case "$host" in