Updated to version 3.1.8 which fixed a denial of service condition

PR:		ports/150364
Submitted by:	maintainer
Approved by:	itetcu (mentor, implicit)
Security:	CVE-2010-3072
Security:	http://www.vuxml.org/freebsd/e4dac715-c818-11df-a92c-0015587e2cc1.html

2 files changed, 6 insertions, 14 deletions

diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 224782acb810..e091e6e04663 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -88,7 +88,7 @@ COMMENT=	HTTP Caching Proxy
 
 LATEST_LINK=	squid31
 
-SQUID_STABLE_VER=	7
+SQUID_STABLE_VER=	8
 
 CONFLICTS=	squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
 GNU_CONFIGURE=	yes
@@ -177,15 +177,10 @@ error_files=	ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \
 		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
 
 error_dirs=	af ar az bg ca cs da de el en es et fa fi fr he hu hy id it \
-		ja ko lt lv ms nl pl pt pt-br ro ru sk sr sv th tr uk uz \
+		ja ko lt lv ms nl pl pt pt-br ro ru sk sr-latn sv th tr uk uz \
 		zh-cn zh-tw \
 		templates
 
-# XXX:	this is probably a bug in 3.1.6: sr-latn should probably a symlink but
-# 	is installed as a directory; if this is intentional the directory is
-# 	currently empty which is not really useful either.
-error_dirs+=	sr-latn
-
 error_dir_links=	ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \
 			ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye \
 			az-az bg-bg cs-cz da-dk \
@@ -202,7 +197,7 @@ error_dir_links=	ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \
 			he-il hu-hu hy-am id-id it-ch it-it \
 			ja-jp ko-kp ko-kr lt-lt lv-lv ms-my nl-nl \
 			pl-pl pt-pt ro-md ro-ro ru-ru sk-sk \
-			sr-latn-cs sr-sp sv-fi sv-se \
+			sr sr-latn-cs sr-sp sv-fi sv-se \
 			th-th tr-tr uk-ua zh-hk zh-mo zh-sg
 
 libexec=	cachemgr.cgi digest_pw_auth diskd ip_user_check \
@@ -375,9 +370,6 @@ CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
 .endif
 .if defined(WITH_SQUID_ECAP)
 CONFIGURE_ARGS+=	--enable-ecap --enable-loadable-modules
-# XXX:	work around issues with the bundled libtool from 3.1.5 onwards;
-# 	we need to tell c++ where to find them explicitly
-CFLAGS+=	-I${WRKSRC}/libltdl
 LIB_DEPENDS+=	ecap:${PORTSDIR}/www/libecap
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 6fa42b2af0de..915bd5738090 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,3 +1,3 @@
-MD5 (squid3.1/squid-3.1.7.tar.bz2) = 83e7aabc1b5bb5b7c83f6dc2f32ca418
-SHA256 (squid3.1/squid-3.1.7.tar.bz2) = 5252180a262bdd2cc4ab8afe40c1989c21035bdfe4eaa0bcb19589e3d316d4ac
-SIZE (squid3.1/squid-3.1.7.tar.bz2) = 2422189
+MD5 (squid3.1/squid-3.1.8.tar.bz2) = a8160dfba55ab7c400c622b72d39fc13
+SHA256 (squid3.1/squid-3.1.8.tar.bz2) = 088d4e798ca49e11713facccbd7ef3e7f9b16fc6eb86d59d0c43aa14d66501fe
+SIZE (squid3.1/squid-3.1.8.tar.bz2) = 2423617