- Fix somewhat messed up titles in FTP listings (squid bug #1220)

- FTP listings use "BASE HREF" much more than necessary (squid bug #1204)
- Cleanups for 64bit architectures (squid bug #1316)
- Allow wb_ntlm_auth to run more silent (squid bug #518)
- Add a new 'mail_program' configuration option
- Fix a possible denial of service condition regarding sslConnectTimeout
  (squid bug #1355, Secunia Advisory SA16674)
- Avoid a possible assertion failure in StatHist.c (squid bug #1325)
- Fix issues regarding chroot'ed installations on 'squid -k reconfigure'
  (squid bug #1331)
- Make URLs in error pages more consistent and less confusing (squid bug #1342)
- Fix compilation when _FORTIFY_SOURCE is defined (squid bug #1344)
- Fix handling of unexpected 250 replies from certain odd FTP servers
  (squid bug #1348)
- Add Greek error pages (squid bug #1351)
- Fix a possible denial of service condition with regards to aborted requests
  (squid bug #1368)
- Fix the -U option of squid_ldap_auth (squid bug #1370)
- Fix the output of the SNMP cacheClientTable for IP adresses that consist of
  16 digits (squid bug #1375)
- Make the From: field of mails sent from squid configurable to avoid
  mails getting lost due to spam filtering (squid bug #1380)

PR:		ports/85688
Submitted by:	maintainer

2 files changed, 54 insertions, 3 deletions

diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 80723db9c918..fd83f4f8a680 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -66,7 +66,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -86,7 +86,24 @@ PATCHFILES=	squid-2.5.STABLE10-content_length.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-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
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
@@ -327,7 +344,7 @@ rc_state=	rcold
 
 SQUID_LANGUAGES?=	\
 	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
-	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	French German Greek Hebrew Hungarian Italian Japanese Korean Lithuanian \
 	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
 	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
 SQUID_DEFAULT_LANG?=	English
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index f3db27044cef..205d28d1bc42 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -16,3 +16,37 @@ MD5 (squid2.5/squid-2.5.STABLE10-cache_dir_change.patch) = f22729393ededbe82acdf
 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