Date: 4 Jan 2011 20:49:33 -0000 From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/153691: [Maintainer] www/squid31: update to 3.1.10 Message-ID: <20110104204933.46268.qmail@wcfields.tmseck.homedns.org> Resent-Message-ID: <201101042050.p04Ko5iC067772@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153691
>Category: ports
>Synopsis: [Maintainer] www/squid31: update to 3.1.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 04 20:50:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 8.1-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of January 4, 2011.
>Description:
- Update to 3.1.10
- Use command_args to pass "-f ${squid_conf}" as a mandatory flag rather
than fiddling with squid_flags; thanks to dougb@ for the hint
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid31) (Revision 1900)
+++ Makefile (.../local/squid31) (Revision 1900)
@@ -88,7 +88,7 @@
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 @@
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 @@
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 \
Index: distinfo
===================================================================
--- distinfo (.../www/squid31) (Revision 1900)
+++ distinfo (.../local/squid31) (Revision 1900)
@@ -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
Index: files/squid.in
===================================================================
--- files/squid.in (.../www/squid31) (Revision 1900)
+++ files/squid.in (.../local/squid31) (Revision 1900)
@@ -77,7 +77,6 @@
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_files=${squid_conf}
+# Now make sure that we invoke squid with "-f ${squid_conf}":
+
+command_args="-f ${squid_conf}"
+
run_rc_command "$1"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110104204933.46268.qmail>