diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-01-06 10:15:07 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-01-06 10:15:07 +0000 |
| commit | 4174fa298bce66cbae9d6543d5aded80a9031847 (patch) | |
| tree | 4807e6f016c73f58f8ef76c4eca97721dd797ece /www | |
| parent | d68832949d9212f8af8d6278e24341540c3e7bb2 (diff) | |
| download | ports-4174fa298bce66cbae9d6543d5aded80a9031847.tar.gz ports-4174fa298bce66cbae9d6543d5aded80a9031847.zip | |
Notes
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid31/Makefile | 14 | ||||
| -rw-r--r-- | www/squid31/distinfo | 5 | ||||
| -rw-r--r-- | www/squid31/files/squid.in | 5 |
3 files changed, 14 insertions, 10 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 41ab6a699aa8..d25b9f039fbe 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -88,7 +88,7 @@ COMMENT= HTTP Caching Proxy LATEST_LINK= squid31 -SQUID_STABLE_VER= 9 +SQUID_STABLE_VER= 10 CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes @@ -171,14 +171,16 @@ error_files= ERR_ACCESS_DENIED ERR_CACHE_ACCESS_DENIED \ ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \ ERR_ICAP_FAILURE ERR_INVALID_REQ ERR_INVALID_RESP \ ERR_INVALID_URL ERR_LIFETIME_EXP ERR_NO_RELAY \ - ERR_ONLY_IF_CACHED_MISS ERR_READ_ERROR ERR_READ_TIMEOUT \ + ERR_ONLY_IF_CACHED_MISS ERR_PRECONDITION_FAILED \ + ERR_READ_ERROR ERR_READ_TIMEOUT \ ERR_SECURE_CONNECT_FAIL ERR_SHUTTING_DOWN ERR_SOCKET_FAILURE \ ERR_TOO_BIG ERR_UNSUP_REQ ERR_UNSUP_HTTPVERSION \ 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-latn sv th tr uk uz \ - zh-cn zh-tw \ + ja ko lt lv ms nl oc pl pt pt-br ro ru sk sr-cyrl sr-latn sv \ + th tr uk uz \ + vi zh-cn zh-tw \ templates error_dir_links= ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \ @@ -194,11 +196,11 @@ error_dir_links= ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \ et-ee \ fa-fa fa-ir fi-fi \ fr-be fr-ca fr-ch fr-fr fr-lu fr-mc \ - he-il hu-hu hy-am id-id it-ch it-it \ + he-il hu-hu hy-am hy-armn 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 sr-latn-cs sr-sp sv-fi sv-se \ - th-th tr-tr uk-ua zh-hk zh-mo zh-sg + th-th tr-tr uk-ua vi-vn zh-hk zh-mo zh-sg libexec= cachemgr.cgi digest_pw_auth diskd ip_user_check \ msnt_auth ncsa_auth ntlm_smb_lm_auth pam_auth smb_auth \ diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 6711e88f3518..83b3ee533ba9 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,3 +1,2 @@ -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 +SHA256 (squid3.1/squid-3.1.10.tar.bz2) = 7371945cc4ca54c2010815cb1c436748a5425736c0f6e3722aefe0cc5073a94b +SIZE (squid3.1/squid-3.1.10.tar.bz2) = 2501825 diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in index 6aadb91b3978..54bbfaa3366c 100644 --- a/www/squid31/files/squid.in +++ b/www/squid31/files/squid.in @@ -77,7 +77,6 @@ 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%%} @@ -90,4 +89,8 @@ required_dirs=${squid_chdir} required_files=${squid_conf} +# Now make sure that we invoke squid with "-f ${squid_conf}": + +command_args="-f ${squid_conf}" + run_rc_command "$1" |