diff --git a/www/squid31/Makefile b/www/squid31/Makefile index e091e6e04663..41ab6a699aa8 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -61,13 +61,13 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirror.aarnet.edu.au/pub/squid/squid/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid,} \ http://www.squid-cache.org/Versions/v3/3.1/ \ - http://www2.us.squid-cache.org/Versions/v3/3.1/ \ + http://www3.us.squid-cache.org/Versions/v3/3.1/ \ http://www1.at.squid-cache.org/Versions/v3/3.1/ \ http://www2.de.squid-cache.org/Versions/v3/3.1/ \ http://www.eu.squid-cache.org/Versions/v3/3.1/ \ http://www1.ie.squid-cache.org/Versions/v3/3.1/ \ http://www1.jp.squid-cache.org/Versions/v3/3.1/ \ - http://www2.tw.squid-cache.org/Versions/v3/3.1/ + http://www1.za.squid-cache.org/Versions/v3/3.1/ MASTER_SITE_SUBDIR= squid DISTNAME= squid-3.1.${SQUID_STABLE_VER} DIST_SUBDIR= squid3.1 @@ -88,7 +88,7 @@ COMMENT= HTTP Caching Proxy LATEST_LINK= squid31 -SQUID_STABLE_VER= 8 +SQUID_STABLE_VER= 9 CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 915bd5738090..6711e88f3518 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (squid3.1/squid-3.1.9.tar.bz2) = 896ace723445ac168986ba8854437ce3 +SHA256 (squid3.1/squid-3.1.9.tar.bz2) = bcc0d8e391a442fdeef0fe4676d89eddfce3cd9d9391ba6c217b1aa57b378f03 +SIZE (squid3.1/squid-3.1.9.tar.bz2) = 2432312 diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in index 7ab0c9e01aae..6aadb91b3978 100644 --- a/www/squid31/files/squid.in +++ b/www/squid31/files/squid.in @@ -77,6 +77,7 @@ squid_chdir=${squid_chdir:-"/var/squid"} squid_conf=${squid_conf:-"%%PREFIX%%/etc/squid/squid.conf"} squid_enable=${squid_enable:-"NO"} squid_fib=${squid_fib:-"NONE"} +squid_flags="-f ${squid_conf} ${squid_flags}" squid_pidfile=${squid_pidfile:-"/var/run/squid/squid.pid"} squid_user=${squid_user:-%%SQUID_UID%%}